diff options
author | Sol Jerome <sol.jerome@gmail.com> | 2013-07-08 16:29:33 -0500 |
---|---|---|
committer | Sol Jerome <sol.jerome@gmail.com> | 2013-07-08 16:29:33 -0500 |
commit | f24ee0bb658d2102c731960a78478687c22cc517 (patch) | |
tree | d9825dcc873f7adcdf615a96ab8f67881265a595 /doc/man | |
parent | 8bc0d778d5792e89451bd986831ca4ea10bfa39b (diff) | |
parent | a0f20bdde06ccb7be85f59e1b8fbf57e1c492e64 (diff) | |
download | bcfg2-f24ee0bb658d2102c731960a78478687c22cc517.tar.gz bcfg2-f24ee0bb658d2102c731960a78478687c22cc517.tar.bz2 bcfg2-f24ee0bb658d2102c731960a78478687c22cc517.zip |
Merge branch 'maint'
Conflicts:
src/lib/Bcfg2/settings.py
src/sbin/bcfg2-crypt
Diffstat (limited to 'doc/man')
-rw-r--r-- | doc/man/bcfg2.conf.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/man/bcfg2.conf.txt b/doc/man/bcfg2.conf.txt index f5516cbbd..012eb721b 100644 --- a/doc/man/bcfg2.conf.txt +++ b/doc/man/bcfg2.conf.txt @@ -719,6 +719,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 ----------------- |