Merge branch 'master' of github.com:matrix-org/synapse into sql_refactor

1 files changed, 2 insertions, 1 deletions

diff --git a/docs/client-server/howto.rst b/docs/client-server/howto.rst

index de096ab60c..57a2d2424c 100644
--- a/docs/client-server/howto.rst
+++ b/docs/client-server/howto.rst
@@ -2,7 +2,8 @@ TODO(kegan): Tweak joinalias API keys/path? Event stream historical > live needs
 a token (currently doesn't). im/sync responses include outdated event formats
 (room membership change messages). Room config (specifically: message history,
 public rooms). /register seems super simplistic compared to /login, maybe it
-would be better if /register used the same technique as /login?
+would be better if /register used the same technique as /login? /register should
+be "user" not "user_id".
 
 
 How to use the client-server API