From 345995fcde82cd69ed04277d55a14d32b6dbe589 Mon Sep 17 00:00:00 2001
From: Mark Haines <mark.haines@matrix.org>
Date: Thu, 30 Apr 2015 18:10:19 +0100
Subject: [PATCH] Remove the ~, comment the lines instead

---
 synapse/config/captcha.py | 2 +-
 synapse/config/server.py  | 2 +-
 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):