merged maint

4 files changed, 43 insertions, 7 deletions

diff --git a/doc/development/client-driver.txt b/doc/development/client-driver.txt
index 32bb0aff4..c42d2b964 100644
--- a/doc/development/client-driver.txt
+++ b/doc/development/client-driver.txt
@@ -20,7 +20,7 @@ an existing driver, and the process that was used to create it.
    * Otherwise, subclass ``Bcfg2.Client.Tools.Tool`` (from here referenced
      as branch [T])
 
-#. Set ``__name__`` to "RPM"
+#. Set ``name`` to "RPM"
 #. Add any required executable programs to ``__execs__``
 #. Set ``__handles__`` to a list of (**entry.tag**, **entry.get('type')**)
    tuples. This determines which entries the Tool module can be used
diff --git a/doc/server/plugins/generators/packages.txt b/doc/server/plugins/generators/packages.txt
index b29752270..38952de3e 100644
--- a/doc/server/plugins/generators/packages.txt
+++ b/doc/server/plugins/generators/packages.txt
@@ -182,10 +182,40 @@ With the keys specified thusly, Packages will include the keys in the
 generated yum config file, and will ensure that the keys are imported
 on the client.
 
-There is no need to specify ``<GPGKey>`` tags for :ref:``Pulp sources
-<pulp-source-support>``; that data is pulled directly from the Pulp
+There is no need to specify ``<GPGKey>`` tags for :ref:`Pulp sources
+<pulp-source-support>`; that data is pulled directly from the Pulp
 REST API.
 
+Arbitrary Repo Options
+----------------------
+
+.. versionadded:: 1.2.3
+
+You can specify arbitrary options to be added to the repository config
+on the server side, if you are using the native yum libraries, and on
+the client side if you are using the ability of Packages to
+automatically generate your Yum config.  To do this, add an
+``<Options>`` tag to a Source; all of its attributes will be added
+verbatim to the repository in the generated config.  For instance::
+
+    <Source type="yum" rawurl="http://mirror.example.com/centos-6-os">
+      <Arch>x86_64</Arch>
+      <Options proxy="http://proxy.example.com"/>
+    </Source>
+
+If you are using native yum libraries and need to set options only on
+the Bcfg2 server, you can set the ``serveronly`` attribute to "true";
+or, if you need to set options only on the client, you can set the
+``clientonly`` attribute to "true".  For instance, if your Bcfg2
+server needed to use a proxy to access a repo, and you wanted to
+expire metadata caches very quickly on the client, you could do::
+
+    <Source type="yum" rawurl="http://mirror.example.com/centos-6-os">
+      <Arch>x86_64</Arch>
+      <Options serveronly="true" proxy="http://proxy.example.com"/>
+      <Options clientonly="true" metadata_expire="0"/>
+    </Source>
+
 .. _packages-exampleusage:
 
 Example usage
@@ -258,8 +288,8 @@ Yum sources can be similarly specified:
 For sources with a **URL** attribute, the **Version** attribute is
 also necessary.
 
-:ref:``Pulp sources <pulp-source-support>`` are very simple to specify
-due to the amount of data that can be queried from Pulp itself:
+:ref:`Pulp sources <pulp-source-support>` are very simple to specify
+due to the amount of data that can be queried from Pulp itself::
 
 .. code-block::xml
 
diff --git a/doc/server/plugins/generators/sslca.txt b/doc/server/plugins/generators/sslca.txt
index 8e33148cb..d2b051535 100644
--- a/doc/server/plugins/generators/sslca.txt
+++ b/doc/server/plugins/generators/sslca.txt
@@ -33,7 +33,7 @@ must contain full (not relative) paths.
 #. Add SSLCA to the **plugins** line in ``/etc/bcfg2.conf`` and restart the
    server -- This enabled the SSLCA plugin on the Bcfg2 server.
 
-#. Add a section to your ``/etc/bcfg2.conf`` called sslca_foo, replacing foo
+#. Add a section to your ``/etc/bcfg2.conf`` called ``sslca_foo``, replacing foo
    with the name you wish to give your CA so you can reference it in certificate
    definitions.
 
@@ -51,6 +51,12 @@ must contain full (not relative) paths.
    specification. If you're using a self signing CA this would be the CA cert
    that you generated.
 
+#. Optionally, add ``verify_certs = false`` if you don't wish to
+   perform certificate verification on the certs SSLCA generates.
+   Verification includes ``openssl verify`` to verify the CA chain,
+   and ensuring that both the key file and certificate file contain
+   the same key.
+
 #. Once all this is done, you should have a section in your ``/etc/bcfg2.conf``
    that looks similar to the following::
 
diff --git a/doc/server/plugins/probes/index.txt b/doc/server/plugins/probes/index.txt
index 95aa2d0ce..cacc42bc1 100644
--- a/doc/server/plugins/probes/index.txt
+++ b/doc/server/plugins/probes/index.txt
@@ -211,7 +211,7 @@ look something like:
         <FileProbe name="/etc/blah.conf" update="true"/>
       </Group>
       <Client name="bar.example.com">
-        <FileProbe name="/var/lib/bar.gz" base64="true"/>
+        <FileProbe name="/var/lib/bar.gz" encoding="base64"/>
       </Client>
     </FileProbes>