summaryrefslogtreecommitdiffstats
path: root/doc/man/bcfg2.conf.txt
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2015-07-23 12:03:29 -0500
committerSol Jerome <sol.jerome@gmail.com>2015-07-23 12:03:29 -0500
commitc11fcd8110e537db70bf40b91ed14467184b0e1c (patch)
treee2a39e6d2d7b5841cf71c21b07cd0cffb1fe21da /doc/man/bcfg2.conf.txt
parent49ab865657f03795139e95490b1978fcceca2f41 (diff)
parent9d5524f345279a6fb6042ea5acd519549cabe5b7 (diff)
downloadbcfg2-c11fcd8110e537db70bf40b91ed14467184b0e1c.tar.gz
bcfg2-c11fcd8110e537db70bf40b91ed14467184b0e1c.tar.bz2
bcfg2-c11fcd8110e537db70bf40b91ed14467184b0e1c.zip
Merge branch 'fix-date-format' of https://github.com/AlexanderS/bcfg2
Diffstat (limited to 'doc/man/bcfg2.conf.txt')
-rw-r--r--doc/man/bcfg2.conf.txt5
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index 62c4ac1a8..2f014812e 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -718,6 +718,11 @@ Reporting options
Maximum number of children for the reporting collector. Use 0 to
disable the limit. (default is 0)
+ 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.
+
See Also
--------