summaryrefslogtreecommitdiffstats
path: root/doc/man/bcfg2.conf.txt
diff options
context:
space:
mode:
authorSol Jerome <sol.jerome@gmail.com>2013-06-29 18:58:30 -0500
committerSol Jerome <sol.jerome@gmail.com>2013-06-29 18:58:30 -0500
commit049ff41ca5b333b602b4adf19a7630ba7f2be754 (patch)
tree3df7450b4fa4771e6e24dcba93b4dad620818af1 /doc/man/bcfg2.conf.txt
parent3346f2ea0f00e62a30ca38d680abdb47f8440259 (diff)
parent58f4b311bfa9f192c9d4d4a418e9f0db5bce1897 (diff)
downloadbcfg2-049ff41ca5b333b602b4adf19a7630ba7f2be754.tar.gz
bcfg2-049ff41ca5b333b602b4adf19a7630ba7f2be754.tar.bz2
bcfg2-049ff41ca5b333b602b4adf19a7630ba7f2be754.zip
Merge branch 'django-db-options' of https://github.com/AlexanderS/bcfg2 into maint
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 3a0217aef..12f66f64f 100644
--- a/doc/man/bcfg2.conf.txt
+++ b/doc/man/bcfg2.conf.txt
@@ -729,6 +729,11 @@ control the database connection of the server.
port
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.
+
Reporting options
-----------------