summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-08-25 17:37:21 +0100
committerErik Johnston <erik@matrix.org>2015-08-25 17:37:21 +0100
commit3f6f74686a564face040bb0b4daf57a3112161e2 (patch)
treefbeadcdfe556d1385d7012f6064b37a39415290b /synapse/config
parents/--generated-directory/--keys-directory/ (diff)
downloadsynapse-3f6f74686a564face040bb0b4daf57a3112161e2.tar.xz
Update config doc
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/_base.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py
index 93433c0756..e92a6c779a 100644
--- a/synapse/config/_base.py
+++ b/synapse/config/_base.py
@@ -148,7 +148,8 @@ class Config(object):
             "--keys-directory",
             metavar="DIRECTORY",
             help="Used with 'generate-*' options to specify where files such as"
-                 " certs and signing keys should be stored in."
+                 " certs and signing keys should be stored in, unless explicitly"
+                 " specified in the config."
         )
         config_parser.add_argument(
             "-H", "--server-name",