summaryrefslogtreecommitdiffstats
path: root/doc/source
diff options
context:
space:
mode:
authorlong-wang <long.wang@bj.cs2c.com.cn>2012-10-13 21:38:03 +0800
committerlong-wang <long.wang@bj.cs2c.com.cn>2012-10-13 21:38:03 +0800
commitf7169c11270dbdeabc56f942b47bc698b54afde5 (patch)
treedcdf1381f40be7d9ecc1d261b09cb991f34cbaae /doc/source
parentd05d1128490377e4c50311c40d0901aa5b63c4bc (diff)
Add --config-dir=DIR in OPTIONS
Change-Id: I51c426bdc0610b59aeecc4512c797e709021eb14
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/man/keystone-manage.rst6
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/source/man/keystone-manage.rst b/doc/source/man/keystone-manage.rst
index a4eae1ae..a9b8c1a7 100644
--- a/doc/source/man/keystone-manage.rst
+++ b/doc/source/man/keystone-manage.rst
@@ -56,6 +56,12 @@ Options:
--config-file=PATH Path to a config file to use. Multiple config files
can be specified, with values in later files taking
precedence. The default files used are: []
+ --config-dir=DIR Path to a config directory to pull *.conf files from.
+ This file set is sorted, so as to provide a
+ predictable parse order if individual options are
+ over-ridden. The set is parsed after the file(s), if
+ any, specified via --config-file, hence over-ridden
+ options in the directory take precedence.
-d, --debug Print debugging output
--nodebug The inverse of --debug
-v, --verbose Print more verbose output