summary refs log tree commit diff
path: root/docs/application_services.rst
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-05-12 13:10:42 +0100
committerErik Johnston <erik@matrix.org>2015-05-12 13:10:42 +0100
commitda6a7bbdde73c5182a08a8f6253dc77761d9fc5f (patch)
treede515e4104613e4abbe0f523904f055078fc48af /docs/application_services.rst
parentFix up leak. Add warnings. (diff)
parentMerge pull request #148 from matrix-org/bugs/SYN-377 (diff)
downloadsynapse-da6a7bbdde73c5182a08a8f6253dc77761d9fc5f.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into erikj/logging_context
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