summary refs log tree commit diff
path: root/docs/admin_api
diff options
context:
space:
mode:
authorBrendan Abolivier <babolivier@matrix.org>2020-02-12 13:24:09 +0000
committerBrendan Abolivier <babolivier@matrix.org>2020-02-12 13:24:09 +0000
commit47acbc519f7961698d3228e3c7bb15c5275ec7e9 (patch)
tree4aa3d9453918afdde72be64550e6ffe52b60a6ac /docs/admin_api
parentUse BSD-compatible in-place editing for sed. (#6887) (diff)
parentMerge tag 'v1.10.0' (diff)
downloadsynapse-47acbc519f7961698d3228e3c7bb15c5275ec7e9.tar.xz
Merge branch 'master' into develop
Diffstat (limited to 'docs/admin_api')
-rw-r--r--docs/admin_api/user_admin_api.rst3
1 files changed, 2 insertions, 1 deletions
diff --git a/docs/admin_api/user_admin_api.rst b/docs/admin_api/user_admin_api.rst
index eb146095de..6b02d963e6 100644
--- a/docs/admin_api/user_admin_api.rst
+++ b/docs/admin_api/user_admin_api.rst
@@ -2,7 +2,8 @@ Create or modify Account
 ========================
 
 This API allows an administrator to create or modify a user account with a
-specific ``user_id``.
+specific ``user_id``. Be aware that ``user_id`` is fully qualified: for example,
+``@user:server.com``.
 
 This api is::