From 70c48b2c06aba1dd8ad500b6dfc5c895a8f853f7 Mon Sep 17 00:00:00 2001
From: Sol Jerome <solj@ices.utexas.edu>
Date: Wed, 30 Dec 2009 18:17:26 +0000
Subject: examples: Update dirvish example for unified entries in 1.0

Signed-off-by: Sol Jerome <solj@ices.utexas.edu>


git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5647 ce84e21b-d406-0410-9b95-82705330c041
---
 doc/conf.py                             |  3 ++-
 examples/Bundler/sgenshi-dirvish.genshi | 10 +++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/doc/conf.py b/doc/conf.py
index 782e39320..52148bc16 100644
--- a/doc/conf.py
+++ b/doc/conf.py
@@ -11,7 +11,8 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os
+import os
+import sys
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
diff --git a/examples/Bundler/sgenshi-dirvish.genshi b/examples/Bundler/sgenshi-dirvish.genshi
index 2eb8acd75..19f44a0e8 100644
--- a/examples/Bundler/sgenshi-dirvish.genshi
+++ b/examples/Bundler/sgenshi-dirvish.genshi
@@ -4,7 +4,7 @@ vim: ft=xml
 <Bundle name='sgenshi-dirvish' xmlns:py="http://genshi.edgewall.org/">
 <py:for each="user in metadata.Properties['dirvish.xml'].data.find('users')">
 <!-- Generate configs for all users in dirvish.xml -->
-<BoundConfigFile
+<BoundPath
 	name='/backup/homes/${user.tag}/dirvish/default.conf'
 	owner='root'
 	group='root'
@@ -13,11 +13,11 @@ tree: /export/homes/${user.text}
 exclude:
 	*~
 	.nfs*
-</BoundConfigFile>
+</BoundPath>
 </py:for>
 
 <Package name='dirvish'/>
-<ConfigFile name='/etc/cron.d/dirvish'/>
-<ConfigFile name='/etc/dirvish/dirvish-cronjob'/>
-<ConfigFile name='/etc/dirvish/master.conf'/>
+<Path name='/etc/cron.d/dirvish'/>
+<Path name='/etc/dirvish/dirvish-cronjob'/>
+<Path name='/etc/dirvish/master.conf'/>
 </Bundle>
-- 
cgit v1.2.3-1-g7c22