diff options
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/development/plugins.txt | 2 | ||||
| -rw-r--r-- | doc/exts/xmlschema.py | 10 | ||||
| -rw-r--r-- | doc/server/encryption.txt | 3 | ||||
| -rw-r--r-- | doc/server/snapshots/index.txt | 5 |
4 files changed, 12 insertions, 8 deletions
diff --git a/doc/development/plugins.txt b/doc/development/plugins.txt index 593c2f83e..3f2a888ac 100644 --- a/doc/development/plugins.txt +++ b/doc/development/plugins.txt @@ -213,4 +213,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/server/encryption.txt b/doc/server/encryption.txt index b56487620..e31124d4b 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:: diff --git a/doc/server/snapshots/index.txt b/doc/server/snapshots/index.txt index 13a9fe2c0..a7e5940ed 100644 --- a/doc/server/snapshots/index.txt +++ b/doc/server/snapshots/index.txt @@ -8,9 +8,8 @@ Bcfg2 Snapshots .. versionadded:: 1.0.0 -This page describes the Snapshots plugin. This plugin is meant to replace -the older :ref:`reports-dynamic`. It stores various aspects of a client's -state when the client checks into the server. +This page describes the Snapshots plugin. Snapshots is deprecated, and +will be removed in a future release. Before you begin ================ |