From 1f6cb52d0c43f842766f3ecd6c8286f0f4eed5c2 Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Mon, 4 Feb 2013 16:20:46 -0500
Subject: Bundler: various changes

* Deprecated use of an explicit name attribute
* Deprecated .genshi bundles
* Minor restructuring for better performance
* bcfg2-lint updates
---
 doc/appendix/guides/converging_rhel5.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc/appendix/guides/converging_rhel5.txt')

diff --git a/doc/appendix/guides/converging_rhel5.txt b/doc/appendix/guides/converging_rhel5.txt
index d6883c778..615d104b1 100644
--- a/doc/appendix/guides/converging_rhel5.txt
+++ b/doc/appendix/guides/converging_rhel5.txt
@@ -79,7 +79,7 @@ For a "Package"
 
      .. code-block:: xml
 
-         <Bundle name='keys'>
+         <Bundle>
            <!-- GPG keys -->
            <BoundPackage name="gpg-pubkey" type="rpm" version="foo">
              <Instance simplefile="/etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL" version="217521f6" release="45e8a532"/>
-- 
cgit v1.2.3-1-g7c22


From f5f3e385306c11f0609144ea087b65e4202b714f Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Fri, 8 Feb 2013 13:44:41 -0500
Subject: removed deprecated Base plugin

---
 doc/appendix/guides/converging_rhel5.txt | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'doc/appendix/guides/converging_rhel5.txt')

diff --git a/doc/appendix/guides/converging_rhel5.txt b/doc/appendix/guides/converging_rhel5.txt
index 615d104b1..4ad5756b9 100644
--- a/doc/appendix/guides/converging_rhel5.txt
+++ b/doc/appendix/guides/converging_rhel5.txt
@@ -24,7 +24,8 @@ Unmanaged entries
 
         sudo yum remove PACKAGE
 
- #. Otherwise, add ``<Package name="PACKAGE" />`` to the Base or Bundler configuration.
+ #. Otherwise, add ``<Package name="PACKAGE" />`` to the Bundler
+  configuration.
 
 * Package (dependency)
 
@@ -38,7 +39,7 @@ Unmanaged entries
 
 * Service
 
- #. Add ``<Service name="SERVICE" />`` to the Base or Bundler configuration.
+ #. Add ``<Service name="SERVICE" />`` to the Bundler configuration.
  #. Add ``<Service name="SERVICE" status="on" type="chkconfig" />`` to
     ``/var/lib/bcfg2/Rules/services.xml``.
 
@@ -57,8 +58,8 @@ For a "Package"
   * For example, ``/etc/motd`` to ``/var/lib/bcfg2/Cfg/etc/motd/motd``.
     Yes, there is an extra directory level named after the file.
 
- #. Specify configuration files as ``<Path name='PATH' />`` in the Base
-    or Bundler configuration.
+ #. Specify configuration files as ``<Path name='PATH' />`` in the
+    Bundler configuration.
  #. Add directories to ``/var/lib/bcfg2/Rules/directories.xml``. For
     example:
 
@@ -73,7 +74,7 @@ For a "Package"
 
  * Option A: Explicitly list the instances
 
-  #. Drop the ``<Package />`` from the Base or Bundler configuration.
+  #. Drop the ``<Package />`` from the Bundler configuration.
   #. Add an explicit ``<BoundPackage>`` and ``<Instance />`` configuration
      to a new Bundle, like the following:
 
-- 
cgit v1.2.3-1-g7c22