summaryrefslogtreecommitdiffstats
path: root/man/bcfg2.conf.5
diff options
context:
space:
mode:
Diffstat (limited to 'man/bcfg2.conf.5')
-rw-r--r--man/bcfg2.conf.57
1 files changed, 6 insertions, 1 deletions
diff --git a/man/bcfg2.conf.5 b/man/bcfg2.conf.5
index 13000a719..43a28bad0 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
@@ -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