doc: Update Packages documentation

Signed-off-by: Sol Jerome <sol.jerome@gmail.com>

4 files changed, 46 insertions, 48 deletions

diff --git a/doc/appendix/guides/converging_rhel5.txt b/doc/appendix/guides/converging_rhel5.txt
index d6a9d2d1c..1b52e198d 100644
--- a/doc/appendix/guides/converging_rhel5.txt
+++ b/doc/appendix/guides/converging_rhel5.txt
@@ -19,7 +19,7 @@ Unmanaged entries
 * Package (top-level)
 
  #. Enable the "Packages" plugin in ``/etc/bcfg2.conf``, and configure
-    the Yum repositories in ``/var/lib/bcfg2/Packages/config.xml``.
+    the Yum repositories in ``/var/lib/bcfg2/Packages/sources.xml``.
  #. If a package is unwanted, remove it::
 
         sudo yum remove PACKAGE
@@ -29,7 +29,7 @@ Unmanaged entries
 * Package (dependency)
 
  #. Ensure the Yum repository sources configured in
-    ``/var/lib/bcfg2/Packages/config.xml`` are correct.
+    ``/var/lib/bcfg2/Packages/sources.xml`` are correct.
  #. Ensure the Yum repositories themselves are up-to-date with the main
     package and dependencies.
  #. Rebuild the Packages plugin cache::
diff --git a/doc/appendix/guides/fedora.txt b/doc/appendix/guides/fedora.txt
index 7aaa02815..9d11414ef 100644
--- a/doc/appendix/guides/fedora.txt
+++ b/doc/appendix/guides/fedora.txt
@@ -190,28 +190,32 @@ Setup the :ref:`server-plugins-generators-packages` plugin
 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 
 First, replace **Pkgmgr** with **Packages** in the plugins
-line of ``bcfg2.conf``. Then create `Packages/` directory in
+line of ``bcfg2.conf``. Then create a `Packages/` directory in
 ``/var/lib/bcfg2`` ::
 
     $ su -c 'mkdir /var/lib/bcfg2/Packages'
 
-Create a ``config.xml`` file for the packages in
-``/var/lib/bcfg2/Packages`` with the following content.  Choose a
-mirror near your location according the `Mirror list`_ .
+Create a ``packages.conf`` in the ``/var/lib/bcfg2/Packages`` directory
+with the following contents::
+
+    [global]
+
+Create a ``sources.xml`` file for the packages in
+``/var/lib/bcfg2/Packages`` with the following content.  Choose a mirror
+near your location according the `Mirror list`_ .
 
 .. _Mirror list: http://mirrors.fedoraproject.org/publiclist/
 
 .. code-block:: xml
 
 	<Sources>
-	    <YUMSource>
-	    <Group>fedora-13</Group>
-	    <URL>ftp://fedora.tu-chemnitz.de/pub/linux/fedora/linux/releases/</URL>
-	    <Version>13</Version>
-	    <Component>Fedora</Component>
-	    <Arch>i386</Arch>
-	    <Arch>x86_64</Arch>
-	    </YUMSource>
+	    <Group name="fedora-13">
+	        <Source type="yum" url="ftp://fedora.tu-chemnitz.de/pub/linux/fedora/linux/releases/" version="13">
+	            <Component>Fedora</Component>
+	            <Arch>i386</Arch>
+	            <Arch>x86_64</Arch>
+	        <Source>
+	    </Group>
 	</Sources>
 
 
diff --git a/doc/appendix/guides/ubuntu.txt b/doc/appendix/guides/ubuntu.txt
index 6655a3b04..fe5564d19 100644
--- a/doc/appendix/guides/ubuntu.txt
+++ b/doc/appendix/guides/ubuntu.txt
@@ -152,39 +152,33 @@ Create Packages layout (as per :ref:`packages-exampleusage`) in
 .. code-block:: xml
 
     root@lucid:~# mkdir /var/lib/bcfg2/Packages
-    root@lucid:~# cat /var/lib/bcfg2/Packages/config.xml
+    root@lucid:~# cat /var/lib/bcfg2/Packages/packages.conf
+    [global]
+    root@lucid:~# cat /var/lib/bcfg2/Packages/sources.xml
     <Sources>
-      <APTSource>
-        <Group>ubuntu-lucid</Group>
-        <URL>http://us.archive.ubuntu.com/ubuntu</URL>
-        <Version>lucid</Version>
-        <Component>main</Component>
-        <Component>multiverse</Component>
-        <Component>restricted</Component>
-        <Component>universe</Component>
-        <Arch>amd64</Arch>
-        <Arch>i386</Arch>
-      </APTSource>
-       <APTSource>
-        <Group>lucid</Group>
-        <URL>http://archive.ubuntu.com/ubuntu</URL>
-        <Version>lucid-updates</Version>
-        <Component>main</Component>
-        <Component>multiverse</Component>
-        <Component>restricted</Component>
-        <Component>universe</Component>
-        <Arch>amd64</Arch>
-       </APTSource>
-       <APTSource>
-        <Group>lucid</Group>
-        <URL>http://security.ubuntu.com/ubuntu</URL>
-        <Version>lucid-security</Version>
-        <Component>main</Component>
-        <Component>multiverse</Component>
-        <Component>restricted</Component>
-        <Component>universe</Component>
-        <Arch>amd64</Arch>
-       </APTSource>
+      <Group name="lucid">
+        <Source type="apt" url="http://archive.ubuntu.com/ubuntu" version="lucid">
+          <Component>main</Component>
+          <Component>multiverse</Component>
+          <Component>restricted</Component>
+          <Component>universe</Component>
+          <Arch>amd64</Arch>
+        </Source>
+        <Source type="apt" url="http://archive.ubuntu.com/ubuntu" version="lucid-updates">
+          <Component>main</Component>
+          <Component>multiverse</Component>
+          <Component>restricted</Component>
+          <Component>universe</Component>
+          <Arch>amd64</Arch>
+        </Source>
+        <Source type="apt" url="http://security.ubuntu.com/ubuntu" version="lucid-security">
+          <Component>main</Component>
+          <Component>multiverse</Component>
+          <Component>restricted</Component>
+          <Component>universe</Component>
+          <Arch>amd64</Arch>
+        </Source>
+      </Group>
     </Sources>
 
 Due to the :ref:`server-plugins-generators-packages-magic-groups`,
diff --git a/doc/help/troubleshooting.txt b/doc/help/troubleshooting.txt
index 7aeb0f247..b964154e0 100644
--- a/doc/help/troubleshooting.txt
+++ b/doc/help/troubleshooting.txt
@@ -202,7 +202,7 @@ Server Errors
 | Packages: No matching        | Server   | None of the sources | [s12]_       |
 | sources for client           |          | defined in the      |              |
 | <clientname>; improper group |          | Package plugin's    |              |
-| memberships?                 |          | ``config.xml``      |              |
+| memberships?                 |          | ``sources.xml``     |              |
 |                              |          | apply to the client |              |
 +------------------------------+----------+---------------------+--------------+
 
@@ -222,7 +222,7 @@ Server Errors
         section of ``bcfg2.conf``.
 .. [s8] For packages listed other than **gpg-pubkey**, this error means
         that the Packages plugin is unable to find the package in any of
-        the sources listed in ``Packages/config.xml``. The issue often
+        the sources listed in ``Packages/sources.xml``. The issue often
         arises when the client is not in one of the groups necessary for
         the Source listed. In the case of gpg-pubkey, you can safely
         ignore the message as the Packages plugin has no knowledge of