Merge pull request #5283 from aaronraimist/captcha-docs

Specify the type of reCAPTCHA key to use (#5013)
matrix-org · May 29, 2019 · 8541db7 · 8541db7
2 parents 46c8f7a + 2ec2809
commit 8541db7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/changelog.d/5283.misc 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
@@ -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
 ----------------------
-Original file line number
+Diff line change
@@ Expand Up / @@ -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
     ----------------------
@@ Expand Down @@