summaryrefslogtreecommitdiffstats
path: root/doc/man/bcfg2.conf.txt
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2014-11-10 09:34:39 -0600
committerSol Jerome <sol.jerome@gmail.com>2014-11-10 09:34:39 -0600
commitf6b3d6dc89e4ba5c2ec643931394db45b8c7f176 (patch)
treedaf3ca518bb1cfe78049a8b451ef2bd6635528cf /doc/man/bcfg2.conf.txt
parent0bfc5a946a10712a5d82daa6ae0d1cd50fbb4ba8 (diff)
parent257eb0c174ef2fdaa2015975c5919979afa8da90 (diff)
downloadbcfg2-f6b3d6dc89e4ba5c2ec643931394db45b8c7f176.tar.gz
bcfg2-f6b3d6dc89e4ba5c2ec643931394db45b8c7f176.tar.bz2
bcfg2-f6b3d6dc89e4ba5c2ec643931394db45b8c7f176.zip
Merge branch 'fix-django-db-options-parsing' into maint
Diffstat (limited to 'doc/man/bcfg2.conf.txt')
-rw-r--r--doc/man/bcfg2.conf.txt5
1 files changed, 2 insertions, 3 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt
index 6faf48a1a..f55540968 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -736,9 +736,8 @@ control the database connection of the server.
Port for database connections. Not used for sqlite3.
options
- Various options for the database connection. The value is
- expected as multiple key=value pairs, separated with commas.
- The concrete value depends on the database engine.
+ Various options for the database connection. The value expected
+ is the literal value of the django OPTIONS setting.
Reporting options
-----------------