summary refs log tree commit diff
path: root/docs/application_services.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-10 10:56:46 +0100
committerErik Johnston <erik@matrix.org>2015-05-10 10:56:46 +0100
commitd38862a080849488130b1d89f7e547ebb4e4d725 (patch)
treeb299149745a8e0bf9631ae933b94bb7e4de16aa5 /docs/application_services.rst
parentMerge branch 'master' of github.com:matrix-org/synapse into develop (diff)
parentMerge pull request #145 from matrix-org/hotfixes-v0.9.0-r3 (diff)
downloadsynapse-d38862a080849488130b1d89f7e547ebb4e4d725.tar.xz
Merge branch 'master' of github.com:matrix-org/synapse into develop
Diffstat (limited to 'docs/application_services.rst')
-rw-r--r--docs/application_services.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/application_services.rst b/docs/application_services.rst

index a57bae6194..7e87ac9ad6 100644 --- a/docs/application_services.rst +++ b/docs/application_services.rst
@@ -20,7 +20,7 @@ The format of the AS configuration file is as follows: url: <base url of AS> as_token: <token AS will add to requests to HS> - hs_token: <token HS will ad to requests to AS> + hs_token: <token HS will add to requests to AS> sender_localpart: <localpart of AS user> namespaces: users: # List of users we're interested in