From 3ab4334f1ca2d6bddb51bb9441b6caa646341284 Mon Sep 17 00:00:00 2001
From: Richard van der Hoff <richard@matrix.org>
Date: Mon, 23 Oct 2017 00:50:45 +0100
Subject: [PATCH] changelog

---
 changelogs/client_server.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index 03cd2fdda..546bf37a8 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -92,6 +92,9 @@
   - Add some clarifying notes on the behaviour of rooms with no
     ``m.room.power_levels`` event
     (`#1026 <https://github.com/matrix-org/matrix-doc/pull/1026>`_).
+  - Clarify the relationship between ``username`` and ``user_id`` in the
+    ``/register`` API
+    (`#1032 <https://github.com/matrix-org/matrix-doc/pull/1032>`_).
 
 r0.2.0
 ======