Merge branch 'maint'

4 files changed, 31 insertions, 11 deletions

diff --git a/doc/exts/xmlschema.py b/doc/exts/xmlschema.py
index 727b4bbd0..24cbf2e2d 100644
--- a/doc/exts/xmlschema.py
+++ b/doc/exts/xmlschema.py
@@ -76,6 +76,11 @@ from sphinx.util.nodes import make_refnode, split_explicit_title, \
 from sphinx.util.compat import Directive
 from sphinx.domains import ObjType, Domain
 
+try:
+    from new import classobj
+except ImportError:
+    classobj = type
+
 XS = "http://www.w3.org/2001/XMLSchema"
 XS_NS = "{%s}" % XS
 NSMAP = dict(xs=XS)
@@ -653,7 +658,7 @@ def append_node(parent, cls_or_node, *contents):
 
 
 def build_node(cls_or_node, *contents):
-    if isinstance(cls_or_node, type):
+    if isinstance(cls_or_node, (type, classobj)):
         rv = cls_or_node()
     else:
         rv = cls_or_node
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index d8f2bc3df..3a0217aef 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -729,11 +729,21 @@ control the database connection of the server.
     port
         Port for database connections. Not used for sqlite3.
 
+Reporting options
+-----------------
+
+    config
+        Specifies the location of the reporting configuration (default
+        is /etc/bcfg2-web.conf.
+
     time_zone
-        Specify a time zone other than that used on the system. (Note
+        Specifies a time zone other than that used on the system. (Note
         that this will cause the Bcfg2 server to log messages in this
         time zone as well).
 
+    web_debug
+        Turn on Django debugging.
+
 See Also
 --------
 
diff --git a/doc/man/bcfg2.txt b/doc/man/bcfg2.txt
index 6a77a4a3c..6df4f9b4f 100644
--- a/doc/man/bcfg2.txt
+++ b/doc/man/bcfg2.txt
@@ -88,10 +88,13 @@ Options
                   the constraints of correctness, and thus should only
                   be used in safe conditions.
 -r mode           Cause bcfg2 to remove extra configuration elements
-                  it detects. Mode is one of "all", "Services", or
-                  "Packages". "all" removes all entries. Likewise,
-                  "Services" and "Packages" remove only the extra
+                  it detects. Mode is one of "all", "Services",
+                  "Packages", or "Users". "all" removes all extra entries.
+                  "Services", "Packages", and "Users" remove only the extra
                   configuration elements of the respective type.
+                  ("Services" actually just disables extra services,
+                  since they can't be removed, and "Users" removes
+                  extra POSIXUser and POSIXUser entries.)
 -s servicemode    Set bcfg2 interaction level for services. Default
                   behavior is to modify all services affected by
                   reconfiguration. "build" mode attempts to stop all
diff --git a/doc/reports/dynamic.txt b/doc/reports/dynamic.txt
index 19c947a71..14eff6f54 100644
--- a/doc/reports/dynamic.txt
+++ b/doc/reports/dynamic.txt
@@ -166,20 +166,22 @@ Upgrading
 2. Replace the DBStats plugin with the Reporting plugin.
 
 3. Migrate historic data.
-    Run `tools/upgrade/1.3/migrate_dbstats.py`
+    Run ``tools/upgrade/1.3/migrate_dbstats.py``
 
     The reporting schema is now managed using `South <http://south.aeracode.org>`_
     instead of a set of custom scripts. This creates the new schema and imports
     all of the historic data to the new format.
 
-.. Note:
+    .. note::
 
-    After the database is upgraded all of the old tables are left intact.  To
-    remove them any table starting with reports_ can be dropped.
+        After the database is upgraded all of the old tables are left
+        intact. To remove them any table starting with reports_ can
+        be dropped.
 
 4. `(Optional)` Run the :ref:`Report Collector <report_collector>`
-    Add "transport = LocalFilesystem" under "[reporting]" in `bcfg2.conf`.
-    Restart the bcfg2-server and start the bcfg2-report-collector.
+    Add "transport = LocalFilesystem" under "[reporting]" in
+    ``bcfg2.conf``.  Restart the bcfg2-server and start the
+    bcfg2-report-collector.
 
 Configuring
 ===========