doc: Finish merging remaining documentation updates

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

1 files changed, 31 insertions, 19 deletions

diff --git a/doc/appendix/guides/converging_rhel5.txt b/doc/appendix/guides/converging_rhel5.txt
index 9d508e5e4..7581d307f 100644
--- a/doc/appendix/guides/converging_rhel5.txt
+++ b/doc/appendix/guides/converging_rhel5.txt
@@ -1,6 +1,6 @@
 .. -*- mode: rst -*-
 
-.. _unsorted-converging_rhel5:
+.. _appendix-guides-converging_rhel5:
 
 ======================================
 Converging on Verification with RHEL 5
@@ -18,25 +18,29 @@ 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}}}.
+ #. Enable the "Packages" plugin in ``/etc/bcfg2.conf``, and configure
+    the Yum repositories in ``/var/lib/bcfg2/Packages/config.xml``.
  #. If a package is unwanted, remove it::
 
         sudo yum remove PACKAGE
 
- #. Otherwise, add {{{<Package name="PACKAGE" />}}} to the Base or Bundler configuration.
+ #. Otherwise, add ``<Package name="PACKAGE" />`` to the Base or Bundler configuration.
 
 * Package (dependency)
 
- #. Ensure the Yum repository sources configured in {{{/var/lib/bcfg2/Packages/config.xml}}} are correct.
- #. Ensure the Yum repositories themselves are up-to-date with the main package and dependencies.
+ #. Ensure the Yum repository sources configured in
+    ``/var/lib/bcfg2/Packages/config.xml`` are correct.
+ #. Ensure the Yum repositories themselves are up-to-date with the main
+    package and dependencies.
  #. Rebuild the Packages plugin cache::
 
         bcfg2-admin xcmd Packages.Refresh
 
 * Service
 
- #. Add {{{<Service name="SERVICE" />}}} to the Base or Bundler configuration.
- #. Add {{{<Service name="SERVICE" status="on" type="chkconfig" />}}} to {{{/var/lib/bcfg2/Rules/services.xml}}}.
+ #. Add ``<Service name="SERVICE" />`` to the Base or Bundler configuration.
+ #. Add ``<Service name="SERVICE" status="on" type="chkconfig" />`` to
+    ``/var/lib/bcfg2/Rules/services.xml``.
 
 Incorrect entries
 =================
@@ -46,13 +50,17 @@ For a "Package"
 
 * Failed RPM verification
 
- #. Run {{{rpm -V PACKAGE}}}
- #. Add configuration files (the ones with "c" next to them in the verification output) to {{{/var/lib/bcfg2/Cfg/}}}.
+ #. Run ``rpm -V PACKAGE``
+ #. Add configuration files (the ones with "c" next to them in the
+    verification output) to ``/var/lib/bcfg2/Cfg/``.
 
-  * For example, {{{/etc/motd}}} to {{{/var/lib/bcfg2/Cfg/etc/motd/motd}}}. Yes, there is an extra directory level named after the file.
+  * 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.
- #. Add directories to {{{/var/lib/bcfg2/Rules/directories.xml}}}. For example:
+ #. Specify configuration files as ``<Path name='PATH' />`` in the Base
+    or Bundler configuration.
+ #. Add directories to ``/var/lib/bcfg2/Rules/directories.xml``. For
+    example:
 
     .. code-block:: xml
 
@@ -65,8 +73,9 @@ For a "Package"
 
  * Option A: Explicitly list the instances
 
-  #. Drop the {{{<Package />}}} from the Base or Bundler configuration.
-  #. Add an explicit {{{<BoundPackage>}}} and {{{<Instance />}}} configuration to a new Bundle, like the following:
+  #. Drop the ``<Package />`` from the Base or Bundler configuration.
+  #. Add an explicit ``<BoundPackage>`` and ``<Instance />`` configuration
+     to a new Bundle, like the following:
 
      .. code-block:: xml
 
@@ -78,22 +87,25 @@ For a "Package"
            </BoundPackage>
          </Bundle>
 
-  #. Add the bundle to the applicable groups in {{{/var/lib/bcfg2/Metadata/groups.xml}}}.
+  #. Add the bundle to the applicable groups in
+     ``/var/lib/bcfg2/Metadata/groups.xml``.
 
  * Option B: Disable verification of the package
 
-  #. Add {{{pkg_checks="false"}}} to the {{{<Package />}}} tag.
+  #. Add ``pkg_checks="false"`` to the ``<Package />`` tag.
 
 For a "Path"
 -------------------
 
- * Unclear verification problem (no details from BCFG2)
+ * Unclear verification problem (no details from Bcfg2)
 
-  1. Run {{{bcfg2 -vqI}}} to see detailed verification issues (but deny any suggested actions).
+  1. Run ``bcfg2 -vqI`` to see detailed verification issues (but deny
+     any suggested actions).
 
  * Permissions mismatch
 
-  1. Create an {{{info.xml}}} file in the same directory as the configuration file. Example:
+  1. Create an ``info.xml`` file in the same directory as the
+     configuration file. Example:
 
      .. code-block:: xml