From 19a97c62e241347a3507d51c7bb617b6922aff5a Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 27 May 2020 07:19:31 -0600
Subject: [PATCH] Client-Server r0.6.1

---
 changelogs/client_server.rst                  | 37 +++++++++++++++++++
 .../newsfragments/2245.clarification          |  1 -
 .../newsfragments/2351.clarification          |  1 -
 .../newsfragments/2369.clarification          |  1 -
 .../newsfragments/2381.clarification          |  1 -
 .../newsfragments/2415.clarification          |  1 -
 .../newsfragments/2430.clarification          |  1 -
 .../client_server/newsfragments/2434.feature  |  1 -
 .../newsfragments/2453.clarification          |  1 -
 .../newsfragments/2492.clarification          |  1 -
 .../newsfragments/2519.clarification          |  1 -
 .../client_server/newsfragments/2523.feature  |  1 -
 .../newsfragments/2524.clarification          |  1 -
 .../newsfragments/2525.clarification          |  1 -
 .../client_server/newsfragments/2532.feature  |  1 -
 .../client_server/newsfragments/2546.feature  |  1 -
 .../newsfragments/2553.clarification          |  1 -
 .../newsfragments/2554.clarification          |  1 -
 .../client_server/newsfragments/2562.feature  |  1 -
 .../client_server/newsfragments/2562.new      |  1 -
 .../newsfragments/2563.clarification          |  1 -
 .../newsfragments/2566.clarification          |  1 -
 .../newsfragments/2569.clarification          |  1 -
 .../newsfragments/2571.clarification          |  1 -
 .../newsfragments/2574.clarification          |  1 -
 specification/client_server_api.rst           |  1 +
 26 files changed, 38 insertions(+), 24 deletions(-)
 delete mode 100644 changelogs/client_server/newsfragments/2245.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2351.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2369.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2381.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2415.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2430.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2434.feature
 delete mode 100644 changelogs/client_server/newsfragments/2453.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2492.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2519.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2523.feature
 delete mode 100644 changelogs/client_server/newsfragments/2524.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2525.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2532.feature
 delete mode 100644 changelogs/client_server/newsfragments/2546.feature
 delete mode 100644 changelogs/client_server/newsfragments/2553.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2554.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2562.feature
 delete mode 100644 changelogs/client_server/newsfragments/2562.new
 delete mode 100644 changelogs/client_server/newsfragments/2563.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2566.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2569.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2571.clarification
 delete mode 100644 changelogs/client_server/newsfragments/2574.clarification

diff --git a/changelogs/client_server.rst b/changelogs/client_server.rst
index bc12da5c..6f8aee1c 100644
--- a/changelogs/client_server.rst
+++ b/changelogs/client_server.rst
@@ -1,3 +1,40 @@
+r0.6.1
+======
+
+New Endpoints
+-------------
+
+- Added ``/rooms/{roomId}/aliases`` for retrieving local aliases for a room. (`#2562 <https://github.com/matrix-org/matrix-doc/issues/2562>`_)
+
+
+Backwards Compatible Changes
+----------------------------
+
+- Added data structures for defining moderation policies in rooms per `MSC2313 <https://github.com/matrix-org/matrix-doc/pull/2313>`_. (`#2434 <https://github.com/matrix-org/matrix-doc/issues/2434>`_)
+- Optionally invalidate other access tokens during password modification per `MSC2457 <https://github.com/matrix-org/matrix-doc/pull/2457>`_. (`#2523 <https://github.com/matrix-org/matrix-doc/issues/2523>`_)
+- Add User-Interactive Authentication for SSO-backed homeserver per `MSC2454 <https://github.com/matrix-org/matrix-doc/pull/2454>`_. (`#2532 <https://github.com/matrix-org/matrix-doc/issues/2532>`_)
+- Add soft-logout support per `MSC1466 <https://github.com/matrix-org/matrix-doc/issues/1466>`_. (`#2546 <https://github.com/matrix-org/matrix-doc/issues/2546>`_)
+- Replaced legacy room alias handling with a more sustainable solution per `MSC2432 <https://github.com/matrix-org/matrix-doc/pull/2432>`_. (`#2562 <https://github.com/matrix-org/matrix-doc/issues/2562>`_)
+
+
+Spec Clarifications
+-------------------
+
+- List available enum values for the room versions capability. (`#2245 <https://github.com/matrix-org/matrix-doc/issues/2245>`_)
+- Fix various spelling errors throughout the specification. (`#2351 <https://github.com/matrix-org/matrix-doc/issues/2351>`_, `#2415 <https://github.com/matrix-org/matrix-doc/issues/2415>`_, `#2453 <https://github.com/matrix-org/matrix-doc/issues/2453>`_, `#2524 <https://github.com/matrix-org/matrix-doc/issues/2524>`_, `#2553 <https://github.com/matrix-org/matrix-doc/issues/2553>`_, `#2569 <https://github.com/matrix-org/matrix-doc/issues/2569>`_)
+- Minor clarifications to token-based User-Interactive Authentication. (`#2369 <https://github.com/matrix-org/matrix-doc/issues/2369>`_)
+- Minor clarification for what the user directory searches. (`#2381 <https://github.com/matrix-org/matrix-doc/issues/2381>`_)
+- Fix key export format example to match the specification. (`#2430 <https://github.com/matrix-org/matrix-doc/issues/2430>`_)
+- Clarify the IV data type for encrypted files. (`#2492 <https://github.com/matrix-org/matrix-doc/issues/2492>`_)
+- Fix the ``.m.rule.contains_user_name`` default push rule to set the highlight tweak. (`#2519 <https://github.com/matrix-org/matrix-doc/issues/2519>`_)
+- Clarify that an ``event_id`` is returned when sending events. (`#2525 <https://github.com/matrix-org/matrix-doc/issues/2525>`_)
+- Fix some numbers in the specification to match their explanation text. (`#2554 <https://github.com/matrix-org/matrix-doc/issues/2554>`_)
+- Move redaction algorithm into the room version specifications. (`#2563 <https://github.com/matrix-org/matrix-doc/issues/2563>`_)
+- Clarify signature object structures for encryption. (`#2566 <https://github.com/matrix-org/matrix-doc/issues/2566>`_)
+- Clarify which events are created as part of ``/createRoom``. (`#2571 <https://github.com/matrix-org/matrix-doc/issues/2571>`_)
+- Remove claims that the homeserver is exclusively responsible for profile information in membership events. (`#2574 <https://github.com/matrix-org/matrix-doc/issues/2574>`_)
+
+
 r0.6.0
 ======
 
diff --git a/changelogs/client_server/newsfragments/2245.clarification b/changelogs/client_server/newsfragments/2245.clarification
deleted file mode 100644
index 31e5c2df..00000000
--- a/changelogs/client_server/newsfragments/2245.clarification
+++ /dev/null
@@ -1 +0,0 @@
-List available enum values for the room versions capability.
diff --git a/changelogs/client_server/newsfragments/2351.clarification b/changelogs/client_server/newsfragments/2351.clarification
deleted file mode 100644
index 902a9c3f..00000000
--- a/changelogs/client_server/newsfragments/2351.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling errors throughout the specification.
diff --git a/changelogs/client_server/newsfragments/2369.clarification b/changelogs/client_server/newsfragments/2369.clarification
deleted file mode 100644
index c7fd0fd9..00000000
--- a/changelogs/client_server/newsfragments/2369.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Minor clarifications to token-based User-Interactive Authentication.
diff --git a/changelogs/client_server/newsfragments/2381.clarification b/changelogs/client_server/newsfragments/2381.clarification
deleted file mode 100644
index 70bd6d18..00000000
--- a/changelogs/client_server/newsfragments/2381.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Minor clarification for what the user directory searches.
diff --git a/changelogs/client_server/newsfragments/2415.clarification b/changelogs/client_server/newsfragments/2415.clarification
deleted file mode 100644
index 902a9c3f..00000000
--- a/changelogs/client_server/newsfragments/2415.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling errors throughout the specification.
diff --git a/changelogs/client_server/newsfragments/2430.clarification b/changelogs/client_server/newsfragments/2430.clarification
deleted file mode 100644
index 56be0c1a..00000000
--- a/changelogs/client_server/newsfragments/2430.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix key export format example to match the specification.
diff --git a/changelogs/client_server/newsfragments/2434.feature b/changelogs/client_server/newsfragments/2434.feature
deleted file mode 100644
index 2b8f36f5..00000000
--- a/changelogs/client_server/newsfragments/2434.feature
+++ /dev/null
@@ -1 +0,0 @@
-Added data structures for defining moderation policies in rooms per `MSC2313 <https://github.com/matrix-org/matrix-doc/pull/2313>`_.
diff --git a/changelogs/client_server/newsfragments/2453.clarification b/changelogs/client_server/newsfragments/2453.clarification
deleted file mode 100644
index 902a9c3f..00000000
--- a/changelogs/client_server/newsfragments/2453.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling errors throughout the specification.
diff --git a/changelogs/client_server/newsfragments/2492.clarification b/changelogs/client_server/newsfragments/2492.clarification
deleted file mode 100644
index 88c478ec..00000000
--- a/changelogs/client_server/newsfragments/2492.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify the IV data type for encrypted files.
diff --git a/changelogs/client_server/newsfragments/2519.clarification b/changelogs/client_server/newsfragments/2519.clarification
deleted file mode 100644
index 4b32da1e..00000000
--- a/changelogs/client_server/newsfragments/2519.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix the ``.m.rule.contains_user_name`` default push rule to set the highlight tweak.
diff --git a/changelogs/client_server/newsfragments/2523.feature b/changelogs/client_server/newsfragments/2523.feature
deleted file mode 100644
index e45d1c2f..00000000
--- a/changelogs/client_server/newsfragments/2523.feature
+++ /dev/null
@@ -1 +0,0 @@
-Optionally invalidate other access tokens during password modification per `MSC2457 <https://github.com/matrix-org/matrix-doc/pull/2457>`_.
diff --git a/changelogs/client_server/newsfragments/2524.clarification b/changelogs/client_server/newsfragments/2524.clarification
deleted file mode 100644
index 902a9c3f..00000000
--- a/changelogs/client_server/newsfragments/2524.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling errors throughout the specification.
diff --git a/changelogs/client_server/newsfragments/2525.clarification b/changelogs/client_server/newsfragments/2525.clarification
deleted file mode 100644
index df1fc538..00000000
--- a/changelogs/client_server/newsfragments/2525.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that an ``event_id`` is returned when sending events.
diff --git a/changelogs/client_server/newsfragments/2532.feature b/changelogs/client_server/newsfragments/2532.feature
deleted file mode 100644
index cf74a289..00000000
--- a/changelogs/client_server/newsfragments/2532.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add User-Interactive Authentication for SSO-backed homeserver per `MSC2454 <https://github.com/matrix-org/matrix-doc/pull/2454>`_.
diff --git a/changelogs/client_server/newsfragments/2546.feature b/changelogs/client_server/newsfragments/2546.feature
deleted file mode 100644
index 40c066f4..00000000
--- a/changelogs/client_server/newsfragments/2546.feature
+++ /dev/null
@@ -1 +0,0 @@
-Add soft-logout support per `MSC1466 <https://github.com/matrix-org/matrix-doc/issues/1466>`_.
diff --git a/changelogs/client_server/newsfragments/2553.clarification b/changelogs/client_server/newsfragments/2553.clarification
deleted file mode 100644
index 902a9c3f..00000000
--- a/changelogs/client_server/newsfragments/2553.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling errors throughout the specification.
diff --git a/changelogs/client_server/newsfragments/2554.clarification b/changelogs/client_server/newsfragments/2554.clarification
deleted file mode 100644
index 826fafd8..00000000
--- a/changelogs/client_server/newsfragments/2554.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix some numbers in the specification to match their explanation text.
diff --git a/changelogs/client_server/newsfragments/2562.feature b/changelogs/client_server/newsfragments/2562.feature
deleted file mode 100644
index 556018da..00000000
--- a/changelogs/client_server/newsfragments/2562.feature
+++ /dev/null
@@ -1 +0,0 @@
-Replaced legacy room alias handling with a more sustainable solution per `MSC2432 <https://github.com/matrix-org/matrix-doc/pull/2432>`_.
diff --git a/changelogs/client_server/newsfragments/2562.new b/changelogs/client_server/newsfragments/2562.new
deleted file mode 100644
index c7b3e4ca..00000000
--- a/changelogs/client_server/newsfragments/2562.new
+++ /dev/null
@@ -1 +0,0 @@
-Added ``/rooms/{roomId}/aliases`` for retrieving local aliases for a room.
diff --git a/changelogs/client_server/newsfragments/2563.clarification b/changelogs/client_server/newsfragments/2563.clarification
deleted file mode 100644
index a8805f4a..00000000
--- a/changelogs/client_server/newsfragments/2563.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Move redaction algorithm into the room version specifications.
diff --git a/changelogs/client_server/newsfragments/2566.clarification b/changelogs/client_server/newsfragments/2566.clarification
deleted file mode 100644
index 15e29b2f..00000000
--- a/changelogs/client_server/newsfragments/2566.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify signature object structures for encryption.
diff --git a/changelogs/client_server/newsfragments/2569.clarification b/changelogs/client_server/newsfragments/2569.clarification
deleted file mode 100644
index 902a9c3f..00000000
--- a/changelogs/client_server/newsfragments/2569.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Fix various spelling errors throughout the specification.
diff --git a/changelogs/client_server/newsfragments/2571.clarification b/changelogs/client_server/newsfragments/2571.clarification
deleted file mode 100644
index e9437f3c..00000000
--- a/changelogs/client_server/newsfragments/2571.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify which events are created as part of ``/createRoom``.
diff --git a/changelogs/client_server/newsfragments/2574.clarification b/changelogs/client_server/newsfragments/2574.clarification
deleted file mode 100644
index d771d374..00000000
--- a/changelogs/client_server/newsfragments/2574.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Remove claims that the homeserver is exclusively responsible for profile information in membership events.
diff --git a/specification/client_server_api.rst b/specification/client_server_api.rst
index ad8539cb..574999be 100644
--- a/specification/client_server_api.rst
+++ b/specification/client_server_api.rst
@@ -45,6 +45,7 @@ Other versions of this specification
 The following other versions are also available, in reverse chronological order:
 
 - `HEAD <https://matrix.org/docs/spec/client_server/unstable.html>`_: Includes all changes since the latest versioned release.
+- `r0.6.1 <https://matrix.org/docs/spec/client_server/r0.6.1.html>`_
 - `r0.6.0 <https://matrix.org/docs/spec/client_server/r0.6.0.html>`_
 - `r0.5.0 <https://matrix.org/docs/spec/client_server/r0.5.0.html>`_
 - `r0.4.0 <https://matrix.org/docs/spec/client_server/r0.4.0.html>`_