summaryrefslogtreecommitdiffstats
path: root/man/bcfg2.conf.5
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 /man/bcfg2.conf.5
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 '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 b0db91a5b..85e2f4b98 100644
--- a/man/bcfg2.conf.5
+++ b/man/bcfg2.conf.5
@@ -1,4 +1,4 @@
-.TH "BCFG2.CONF" "5" "March 18, 2013" "1.3" "Bcfg2"
+.TH "BCFG2.CONF" "5" "June 19, 2013" "1.3" "Bcfg2"
.SH NAME
bcfg2.conf \- Configuration parameters for Bcfg2
.
@@ -771,6 +771,11 @@ Host for database connections. Not used for sqlite3.
.TP
.B port
Port for database connections. Not used for sqlite3.
+.TP
+.B 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.
.UNINDENT
.UNINDENT
.UNINDENT