summary refs log tree commit diff
path: root/docs
diff options
context:
space:
mode:
authorNeil Johnson <neil@matrix.org>2018-08-17 13:58:40 +0100
committerNeil Johnson <neil@matrix.org>2018-08-17 13:58:40 +0100
commit9fd161c6fb93d2ab2d297e5190e1faaebbd7c892 (patch)
treef0439ed7a668a2b0d627b78aaab25b03a2fb6514 /docs
parentserver limits config docs (diff)
parentMerge branch 'develop' into neilj/limit_exceeded_error (diff)
downloadsynapse-9fd161c6fb93d2ab2d297e5190e1faaebbd7c892.tar.xz
Merge branch 'neilj/limit_exceeded_error' of github.com:matrix-org/synapse into neilj/limit_exceeded_error
Diffstat (limited to 'docs')
-rw-r--r--docs/admin_api/register_api.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/admin_api/register_api.rst b/docs/admin_api/register_api.rst

index 209cd140fd..16d65c86b3 100644 --- a/docs/admin_api/register_api.rst +++ b/docs/admin_api/register_api.rst
@@ -33,7 +33,7 @@ As an example:: < { "access_token": "token_here", - "user_id": "@pepper_roni@test", + "user_id": "@pepper_roni:localhost", "home_server": "test", "device_id": "device_id_here" }