Merge branch 'maint'

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

Conflicts:
	doc/installation/distributions.txt
	doc/server/snapshots/index.txt
	src/lib/Bcfg2/Server/Plugin/helpers.py
	src/sbin/bcfg2-server

5 files changed, 12 insertions, 19 deletions

diff --git a/doc/development/plugins.txt b/doc/development/plugins.txt
index 3ca137159..e4f16b84d 100644
--- a/doc/development/plugins.txt
+++ b/doc/development/plugins.txt
@@ -215,4 +215,4 @@ See Also
 --------
 
 * :ref:`development-compat`
-* :ref:`development-utils
+* :ref:`development-utils`
diff --git a/doc/exts/xmlschema.py b/doc/exts/xmlschema.py
index 24cbf2e2d..c26aed81e 100644
--- a/doc/exts/xmlschema.py
+++ b/doc/exts/xmlschema.py
@@ -115,6 +115,7 @@ class _XMLDirective(Directive):
     def run(self):
         name = self.arguments[0]
         env = self.state.document.settings.env
+        reporter = self.state.memo.reporter
         ns_name = self.options.get('namespace')
         try:
             ns_uri = env.xmlschema_namespaces[ns_name]
@@ -129,8 +130,9 @@ class _XMLDirective(Directive):
             except KeyError:
                 pass
         else:
-            env.app.error("No XML %s %s found" %
-                          (" or ".join(self.types), name))
+            reporter.error("No XML %s %s found" %
+                           (" or ".join(self.types), name))
+            return []
         documentor = XMLDocumentor(entity, env, self.state, name=name,
                                    ns_uri=ns_uri,
                                    include=self.process_include(),
@@ -172,6 +174,7 @@ class XMLDocumentor(object):
         self.include = include
         self.options = options
         self.app = self.env.app
+        self.reporter = self.state.memo.reporter
 
         if name is None:
             self.ns_uri = ns_uri
@@ -312,7 +315,8 @@ class XMLDocumentor(object):
                 rv.extend(doc.document_complexType())
                 return rv
             else:
-                self.app.error("Unknown element type %s" % fqtype)
+                self.reporter.error("Unknown element type %s" % fqtype)
+                return []
         else:
             rv = []
             typespec = self.entity.xpath("xs:complexType", namespaces=NSMAP)[0]
diff --git a/doc/help/troubleshooting.txt b/doc/help/troubleshooting.txt
index 5ae668c89..aa46bda2a 100644
--- a/doc/help/troubleshooting.txt
+++ b/doc/help/troubleshooting.txt
@@ -54,7 +54,7 @@ the debug level individually on a given plugin, e.g.::
     bcfg2-admin xcmd Probes.toggle_debug
 
 Finally, the File Activity Monitor has its own analogue to these two
-methods, for setting the debug level of the FAM:
+methods, for setting the debug level of the FAM::
 
     bcfg2-admin xcmd Inotify.toggle_debug
     bcfg2-admin xcmd Inotify.set_debug false
diff --git a/doc/installation/distributions.txt b/doc/installation/distributions.txt
index eccd6e723..9db111682 100644
--- a/doc/installation/distributions.txt
+++ b/doc/installation/distributions.txt
@@ -66,19 +66,7 @@ This way is not recommended on production systems. Only for testing.
 Gentoo
 ======
 
-Early in July 2008, Bcfg2 was added to the Gentoo portage tree. So far
-it's still keyworded for all architectures, but we are actively working
-to get it marked as stable.
-
-If you don't use portage to install Bcfg2, you'll want to make sure you
-have all the prerequisites installed first. For a server, you'll need:
-
-* ``app-admin/gamin``
-* ``dev-python/lxml``
-
-Clients will need at least:
-
-* ``app-portage/gentoolkit``
+Bcfg2 can be installed via portage.
 
 OS X
 ====
diff --git a/doc/server/encryption.txt b/doc/server/encryption.txt
index 28ca149f5..b657deb8c 100644
--- a/doc/server/encryption.txt
+++ b/doc/server/encryption.txt
@@ -12,7 +12,8 @@ Bcfg2 supports encrypting some data on the disk, which can help
 protect sensitive data from other people who need access to the Bcfg2
 repository but are perhaps not authorized to see all data.  It
 supports multiple passphrases, which can be used to enforce
-separations between teams, environments, etc.
+separations between teams, environments, etc.  Use of the encryption
+feature requires M2Crypto 0.18 or newer.
 
 .. note::