summary refs log tree commit diff
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-30 18:10:19 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-30 18:10:19 +0100
commit345995fcde82cd69ed04277d55a14d32b6dbe589 (patch)
treefc6995646670bd375615179a009a7e83b3480ab4
parentUpdate key.py (diff)
downloadsynapse-345995fcde82cd69ed04277d55a14d32b6dbe589.tar.xz
Remove the ~, comment the lines instead
-rw-r--r--synapse/config/captcha.py2
-rw-r--r--synapse/config/server.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py
index ee5c238314..d8fe577e34 100644
--- a/synapse/config/captcha.py
+++ b/synapse/config/captcha.py
@@ -47,5 +47,5 @@ class CaptchaConfig(Config):
         captcha_ip_origin_is_x_forwarded: False
 
         # A secret key used to bypass the captcha test entirely.
-        captcha_bypass_secret: ~
+        #captcha_bypass_secret: "YOUR_SECRET_HERE"
         """
diff --git a/synapse/config/server.py b/synapse/config/server.py
index fe1b63469a..cd9ca56158 100644
--- a/synapse/config/server.py
+++ b/synapse/config/server.py
@@ -83,7 +83,7 @@ class ServerConfig(Config):
 
         # Turn on the twisted telnet manhole service on localhost on the given
         # port.
-        manhole: ~
+        #manhole: 9000
         """ % locals()
 
     def read_arguments(self, args):