summary refs log tree commit diff
path: root/synapse/config
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2016-06-23 11:17:48 +0100
committerMark Haines <mark.haines@matrix.org>2016-06-23 11:17:48 +0100
commit05f1a4596a929930c6a4aca11133533f56030688 (patch)
tree9055c7a1731dca915a5f440d2d755450354ac2e1 /synapse/config
parentMerge pull request #892 from matrix-org/dbkr/email_notif_most_recent (diff)
parentMerge pull request #889 from matrix-org/markjh/synctl_workers (diff)
downloadsynapse-05f1a4596a929930c6a4aca11133533f56030688.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'synapse/config')
-rw-r--r--synapse/config/captcha.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/config/captcha.py b/synapse/config/captcha.py
index b54dbabbee..7ba0c2de6a 100644
--- a/synapse/config/captcha.py
+++ b/synapse/config/captcha.py
@@ -27,6 +27,7 @@ class CaptchaConfig(Config):
     def default_config(self, **kwargs):
         return """\
         ## Captcha ##
+        # See docs/CAPTCHA_SETUP for full details of configuring this.
 
         # This Home Server's ReCAPTCHA public key.
         recaptcha_public_key: "YOUR_PUBLIC_KEY"