Merge branch 'develop' of github.com:matrix-org/synapse into erikj/test2

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: ""
         """