summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-07-06 14:50:22 +0100
committerErik Johnston <erik@matrix.org>2016-07-06 14:50:22 +0100
commiteef7778af979827ee7e16b7402529780cc424c57 (patch)
tree13dbf63f60d8bc66a826566299e8201d936238fd /synapse
parentMerge branch 'erikj/shared_secret' into erikj/test2 (diff)
parentMerge pull request #909 from matrix-org/erikj/shared_secret (diff)
downloadsynapse-eef7778af979827ee7e16b7402529780cc424c57.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2
Diffstat (limited to '')
-rw-r--r--synapse/config/password.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/password.py b/synapse/config/password.py
index 66f0d93eea..a4bd171399 100644
--- a/synapse/config/password.py
+++ b/synapse/config/password.py
@@ -30,7 +30,7 @@ class PasswordConfig(Config):
         # Enable password for login.
         password_config:
            enabled: true
-           # Change to a secret random string.
+           # Uncomment and change to a secret random string for extra security.
            # DO NOT CHANGE THIS AFTER INITIAL SETUP!
            #pepper: ""
         """