5 files changed, 40 insertions, 19 deletions
diff --git a/doc/server/info.txt b/doc/server/info.txt
index c58bbd7a3..97bb92a0d 100644
--- a/doc/server/info.txt
+++ b/doc/server/info.txt
@@ -94,7 +94,9 @@ files are XML, and work similarly to those used by :ref:`Rules
 
 The following specifies a different global set of permissions
 (root/sys/0651) than on clients in group webserver or named
-"foo.example.com" (root/root/0652)::
+"foo.example.com" (root/root/0652).
+
+.. code-block:: xml
 
     <FileInfo>
       <Client name='foo.example.com'>
@@ -107,7 +109,9 @@ The following specifies a different global set of permissions
     </FileInfo>
 
 The following specifies a different set of permissions depending on
-the path of the file::
+the path of the file.
+
+.. code-block:: xml
 
     <FileInfo>
       <Path name="/etc/bcfg2-web.conf">
diff --git a/doc/server/plugins/generators/decisions.txt b/doc/server/plugins/generators/decisions.txt
index d75a9fede..acb1de6ee 100644
--- a/doc/server/plugins/generators/decisions.txt
+++ b/doc/server/plugins/generators/decisions.txt
@@ -67,7 +67,6 @@ can add comments such as this::
       <!-- vim: set ft=xml : -->
 
 
-=============
 Decision Mode
 =============
 
diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt
index b24dede28..83f44e393 100644
--- a/doc/server/plugins/generators/packages.txt
+++ b/doc/server/plugins/generators/packages.txt
@@ -147,7 +147,9 @@ Handling GPG Keys
 
 Packages can automatically handle GPG signing keys for Yum
 repositories. Simply specify the URL to the GPG key(s) for a
-repository in ``sources.xml``::
+repository in ``sources.xml``.
+
+.. code-block:: xml
 
     <Source type="yum"
             rawurl="http://mirror.example.com/centos6-x86_64/RPMS.os">
@@ -167,7 +169,9 @@ Example usage
 =============
 
 Create a ``sources.xml`` file in the Packages directory that looks
-something like this::
+something like this:
+
+.. code-block:: xml
 
     <Sources>
       <Group name="ubuntu-intrepid">
@@ -193,11 +197,15 @@ something like this::
     will notice that the default behavior for apt is to add Recommended
     packages as dependencies. You can configure the Packages plugin to
     add recommended packages by adding the ``recommended`` attribute,
-    e.g.::
+    e.g.:
+
+    .. code-block:: xml
 
         <Source type="apt" recommended="true" ...>
 
-Yum sources can be similarly specified::
+Yum sources can be similarly specified.
+
+.. code-block:: xml
 
     <Sources>
       <Group name="centos-5.2">
@@ -217,7 +225,9 @@ For sources with a **URL** attribute, the **Version** attribute is
 also necessary.
 
 .. note:: There is also a rawurl attribute for specifying sources that
-          don't follow the conventional layout::
+          don't follow the conventional layout.
+
+          .. code-block:: xml
 
               <Sources>
                 <Group name="centos5.4">
@@ -272,9 +282,10 @@ will report information like::
     Packages: Updating http://mirror.centos.org/centos/5/extras/x86_64/repodata/filelists.xml.gz
     Packages: Updating http://mirror.centos.org/centos/5/extras/x86_64/repodata/primary.xml.gz
 
-Once line per file download needed. ``Packages/sources.xml`` will be reloaded
-at this time, so any source specification changes (new or modified
-sources in this file) will be reflected by the server at this point.
+Once line per file download needed. ``Packages/sources.xml`` will
+be reloaded at this time, so any source specification changes (new
+or modified sources in this file) will be reflected by the server at
+this point.
 
 Soft reload
 -----------
diff --git a/doc/server/plugins/generators/rules.txt b/doc/server/plugins/generators/rules.txt
index 6bc407371..b74c37a39 100644
--- a/doc/server/plugins/generators/rules.txt
+++ b/doc/server/plugins/generators/rules.txt
@@ -354,11 +354,12 @@ how to assign Rules to a host's literal configuration.
 Using Regular Expressions in Rules
 ==================================
 
-The ``name`` attribute in Rules supports the use of regular
-expressions to match multiple abstract configuration entries.  For
-instance, to make all Service entries use the ``systemd``
-tool on Fedora 15 and the ``chkconfig`` tool on Fedora 14, you could
-do::
+The ``name`` attribute in Rules supports the use of regular expressions
+to match multiple abstract configuration entries.  For instance, to
+make all Service entries use the ``systemd`` tool on Fedora 15 and the
+``chkconfig`` tool on Fedora 14, you could do the following.
+
+.. code-block:: xml
 
     <Rules priority="0">
         <Group name="fedora-15">
diff --git a/doc/server/plugins/structures/bundler/index.txt b/doc/server/plugins/structures/bundler/index.txt
index 7483173cc..3184fe6eb 100644
--- a/doc/server/plugins/structures/bundler/index.txt
+++ b/doc/server/plugins/structures/bundler/index.txt
@@ -233,7 +233,9 @@ and returns them in a newline delimited string.
      0.4 (http://genshi.edgewall.org/ticket/84)
 
 If you want a file to be only on a per-client basis, you can use an
-if declaration::
+if declaration.
+
+.. code-block:: xml
 
     <Bundle name='bacula' xmlns:py="http://genshi.edgewall.org/">
          <Path name="/etc/bacula/bconsole.conf"/>
@@ -243,7 +245,9 @@ if declaration::
                name="/etc/bacula/bacula-dir.conf"/>
     </Bundle>
 
-or alternately::
+or alternately
+
+.. code-block:: xml
 
     <Bundle name='bacula' xmlns:py="http://genshi.edgewall.org/">
          <Path name="/etc/bacula/bconsole.conf"/>
@@ -254,7 +258,9 @@ or alternately::
          </py:if>
     </Bundle>
 
-or yet another way::
+or yet another way
+
+.. code-block:: xml
 
     <Bundle name='bacula' xmlns:py="http://genshi.edgewall.org/">
         <Path name="/etc/bacula/bconsole.conf"/>