summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-02-09 14:20:15 +0100
committerGitHub <noreply@github.com>2017-02-09 14:20:15 +0100
commit5c3cb8778af7265d277f5b42fc55660dbd8a3bc3 (patch)
tree89e85cf5a46dd3f01ad2919bc0c46769da1f9451
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentUpdate CAPTCHA_SETUP.rst X-Forwarded-For docs (diff)
downloadsynapse-5c3cb8778af7265d277f5b42fc55660dbd8a3bc3.tar.xz
Merge pull request #1896 from DanielDent/patch-1
Update CAPTCHA_SETUP.rst X-Forwarded-For docs
-rw-r--r--docs/CAPTCHA_SETUP.rst5
1 files changed, 2 insertions, 3 deletions
diff --git a/docs/CAPTCHA_SETUP.rst b/docs/CAPTCHA_SETUP.rst
index db621aedfc..19a204d9ce 100644
--- a/docs/CAPTCHA_SETUP.rst
+++ b/docs/CAPTCHA_SETUP.rst
@@ -25,6 +25,5 @@ Configuring IP used for auth
 The ReCaptcha API requires that the IP address of the user who solved the
 captcha is sent. If the client is connecting through a proxy or load balancer,
 it may be required to use the X-Forwarded-For (XFF) header instead of the origin
-IP address. This can be configured as an option on the home server like so::
-
-  captcha_ip_origin_is_x_forwarded: true
+IP address. This can be configured using the x_forwarded directive in the
+listeners section of the homeserver.yaml configuration file.