Merge branch '1.4.x'

Conflicts:
	debian/bcfg2-server.install
	doc/server/plugins/grouping/metadata.txt
	src/lib/Bcfg2/Client/Client.py
	src/lib/Bcfg2/Client/Tools/Portage.py
	src/lib/Bcfg2/Client/Tools/RcUpdate.py
	src/lib/Bcfg2/Client/Tools/YUM24.py
	src/lib/Bcfg2/Client/Tools/__init__.py
	src/lib/Bcfg2/Client/Tools/launchd.py
	src/lib/Bcfg2/Options.py
	src/lib/Bcfg2/Server/Core.py
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/lib/Bcfg2/Server/Plugins/Metadata.py
	src/lib/Bcfg2/Server/models.py
	src/lib/Bcfg2/Utils.py
	src/sbin/bcfg2-info
	src/sbin/bcfg2-test
	testsuite/Testsrc/Testlib/TestClient/TestTools/Test_init.py
	testsuite/Testsrc/test_code_checks.py

2 files changed, 15 insertions, 17 deletions

diff --git a/doc/appendix/files/mysql.txt b/doc/appendix/files/mysql.txt
index 81104ec17..a84beb3f8 100644
--- a/doc/appendix/files/mysql.txt
+++ b/doc/appendix/files/mysql.txt
@@ -7,17 +7,17 @@
 MySQL example
 =============
 
-I had some time ago to continue with putting my configuration into 
+I had some time ago to continue with putting my configuration into
 Bcfg2 and maybe this helps someone else.
 
 I added a new bundle:
 
 .. code-block:: xml
 
-    <Bundle name="mysql-server" version="3.0">
+    <Bundle>
        <Path name="/root/bcfg2-install/mysql/users.sh"/>
        <Path name="/root/bcfg2-install/mysql/users.sql"/>
-       <PostInstall name="/root/bcfg2-install/mysql/users.sh"/>
+       <Action name="mysql_users"/>
        <Package name="mysql-server-4.1"/>
        <Service name="mysql"/>
     </Bundle>
@@ -31,9 +31,9 @@ The ``users.sh`` script looks like this:
     mysql --defaults-extra-file=/etc/mysql/debian.cnf mysql \
         < /root/bcfg2-install/mysql/users.sql
 
-On debian there is a user account in ``/etc/mysql/debian.cnf`` 
-automatically created, but you could also (manually) create a 
-user in the database that has enough permissions and add the 
+On debian there is a user account in ``/etc/mysql/debian.cnf``
+automatically created, but you could also (manually) create a
+user in the database that has enough permissions and add the
 login information in a file yourself. This file looks like this::
 
     [client]
diff --git a/doc/appendix/files/ntp.txt b/doc/appendix/files/ntp.txt
index e14816f6e..c999841da 100644
--- a/doc/appendix/files/ntp.txt
+++ b/doc/appendix/files/ntp.txt
@@ -13,7 +13,7 @@ another layer of functionality.
 * After each change, run ``bcfg-repo-validate -v``
 * Run the server with ``bcfg2-server -v``
 * Update the client with ``bcfg2 -v -d -n`` (will not actually make
-  client changes) 
+  client changes)
 
 Package only
 ------------
@@ -43,7 +43,7 @@ a client, a profile group, a list of packages, and an NTP bundle.
 
 .. code-block:: xml
 
-    <Bundle name="ntp">
+    <Bundle>
       <Package name='ntp'/>
     </Bundle>
 
@@ -75,7 +75,7 @@ Configure the service, and add it to Rules.
 
 .. code-block:: xml
 
-    <Bundle name="ntp">
+    <Bundle>
       <Package name='ntp'/>
       <Service name='ntpd'/>
     </Bundle>
@@ -85,16 +85,14 @@ Add config file
 
 Setup an ``etc/`` directory structure, and add it to the base::
 
-     # cat Cfg/etc/ntp.conf/ntp.conf 
+     # cat Cfg/etc/ntp.conf/ntp.conf
      server ntp1.utexas.edu
 
-``Base/base.xml``:
-
 ``Bundler/ntp.xml``:
 
 .. code-block:: xml
 
-    <Bundle name="ntp">
+    <Bundle>
       <Package name='ntp'/>
       <Service name='ntpd'/>
        <Path name='/etc/ntp.conf'/>
@@ -114,18 +112,18 @@ used to provide a single service. This is done for several reasons:
   packages are upgraded, so that they can be repaired if the
   package install clobbered them.
 * Services associated with a bundle get restarted whenever any entity
-  in that bundle is modified. This ensures that new configuration 
-  files and software are used after installation. 
+  in that bundle is modified. This ensures that new configuration
+  files and software are used after installation.
 
 The config file, package, and service are really all related
-components describing the idea of an ntp client, so they should be 
+components describing the idea of an ntp client, so they should be
 logically grouped together. We use a bundle to accomplish this.
 
 ``Bundler/ntp.xml``:
 
 .. code-block:: xml
 
-    <Bundle name='ntp'>
+    <Bundle>
       <Package name='ntp'/>
       <Service name='ntpd'/>
       <Path name='/etc/ntp.conf'/>