summaryrefslogtreecommitdiffstats
path: root/man
diff options
context:
space:
mode:
Diffstat (limited to 'man')
-rw-r--r--man/bcfg2.12
-rw-r--r--man/bcfg2.conf.59
2 files changed, 8 insertions, 3 deletions
diff --git a/man/bcfg2.1 b/man/bcfg2.1
index 5b9449fda..73985abc0 100644
--- a/man/bcfg2.1
+++ b/man/bcfg2.1
@@ -109,7 +109,7 @@ bundles.
Cache a copy of the configuration in cachefile.
.TP
.BI \-\-ca\-cert\fB= cacert
-Specifiy the path to the SSL CA certificate.
+Specify the path to the SSL CA certificate.
.TP
.B \-d
Enable debugging output.
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index 13000a719..87a710760 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -286,7 +286,7 @@ a Mercurial version control backend. Currently, it enables you to get
revision information out of your repository for reporting purposes.
.SS Ldap Plugin
.sp
-The Ldap plugin makes it possible to fetch data from an LDAP directory,
+The Ldap plugin makes it possible to fetch data from a LDAP directory,
process it and attach it to your metadata.
.SS Metadata Plugin
.sp
@@ -661,7 +661,7 @@ private key is stored unencrypted.
.TP
.B chaincert
Specifies the location of your ssl chaining certificate. This is
-used when pre\-existing certifcate hostfiles are found, so that
+used when pre\-existing certificate hostfiles are found, so that
they can be validated and only regenerated if they no longer
meet the specification. If you’re using a self signing CA this
would be the CA cert that you generated.
@@ -778,6 +778,11 @@ Turn on Django debugging.
.B max_children
Maximum number of children for the reporting collector. Use 0 to
disable the limit. (default is 0)
+.TP
+.B django_settings
+Arbitrary options for the Django installation. The value expected
+is a literal python dictionary, that is merged with the already set
+django settings.
.UNINDENT
.UNINDENT
.UNINDENT