summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2019-05-29 19:02:27 +0100
committerGitHub <noreply@github.com>2019-05-29 19:02:27 +0100
commit8541db741a4d8372018177cb28aa5e03151c8f1f (patch)
tree9417322fe1986db9a3978aff261aae688d732de3
parentImplement the SHHS complexity API (#5216) (diff)
parentAdd changelog (diff)
downloadsynapse-8541db741a4d8372018177cb28aa5e03151c8f1f.tar.xz
Merge pull request #5283 from aaronraimist/captcha-docs
Specify the type of reCAPTCHA key to use (#5013)
-rw-r--r--changelog.d/5283.misc1
-rw-r--r--docs/CAPTCHA_SETUP.rst1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/5283.misc b/changelog.d/5283.misc
new file mode 100644
index 0000000000..002721e566
--- /dev/null
+++ b/changelog.d/5283.misc
@@ -0,0 +1 @@
+Specify the type of reCAPTCHA key to use.
diff --git a/docs/CAPTCHA_SETUP.rst b/docs/CAPTCHA_SETUP.rst
index 19a204d9ce..0c22ee4ff6 100644
--- a/docs/CAPTCHA_SETUP.rst
+++ b/docs/CAPTCHA_SETUP.rst
@@ -7,6 +7,7 @@ Requires a public/private key pair from:
 
 https://developers.google.com/recaptcha/
 
+Must be a reCAPTCHA v2 key using the "I'm not a robot" Checkbox option
 
 Setting ReCaptcha Keys
 ----------------------