From df202dd493252b053c2c5841dde0431b2ecadbca Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 6 Nov 2019 12:37:46 -0700
Subject: [PATCH 1/2] Identity Service r0.3.0 release

---
 changelogs/identity_service.rst                 | 17 +++++++++++++++++
 .../identity_service/newsfragments/2254.feature |  1 -
 .../identity_service/newsfragments/2255.new     |  1 -
 .../identity_service/newsfragments/2258.new     |  1 -
 .../identity_service/newsfragments/2287.new     |  1 -
 5 files changed, 17 insertions(+), 4 deletions(-)
 delete mode 100644 changelogs/identity_service/newsfragments/2254.feature
 delete mode 100644 changelogs/identity_service/newsfragments/2255.new
 delete mode 100644 changelogs/identity_service/newsfragments/2258.new
 delete mode 100644 changelogs/identity_service/newsfragments/2287.new

diff --git a/changelogs/identity_service.rst b/changelogs/identity_service.rst
index cb06709d..7cccc0cf 100644
--- a/changelogs/identity_service.rst
+++ b/changelogs/identity_service.rst
@@ -1,3 +1,20 @@
+r0.3.0
+======
+
+New Endpoints
+-------------
+
+- Add ``/account``, ``/account/register``, and ``/account/logout`` to authenticate with the identity server. (`#2255 <https://github.com/matrix-org/matrix-doc/issues/2255>`_)
+- Add endpoints for accepting and handling terms of service. (`#2258 <https://github.com/matrix-org/matrix-doc/issues/2258>`_)
+- Add ``/hash_details`` and a new ``/lookup`` endpoint for performing hashed association lookups. (`#2287 <https://github.com/matrix-org/matrix-doc/issues/2287>`_)
+
+
+Backwards Compatible Changes
+----------------------------
+
+- Deprecate the v1 API in favour of an authenticated v2 API. (`#2254 <https://github.com/matrix-org/matrix-doc/issues/2254>`_)
+
+
 r0.2.1
 ======
 
diff --git a/changelogs/identity_service/newsfragments/2254.feature b/changelogs/identity_service/newsfragments/2254.feature
deleted file mode 100644
index 089d01fe..00000000
--- a/changelogs/identity_service/newsfragments/2254.feature
+++ /dev/null
@@ -1 +0,0 @@
-Deprecate the v1 API in favour of an authenticated v2 API.
diff --git a/changelogs/identity_service/newsfragments/2255.new b/changelogs/identity_service/newsfragments/2255.new
deleted file mode 100644
index fcb6ba88..00000000
--- a/changelogs/identity_service/newsfragments/2255.new
+++ /dev/null
@@ -1 +0,0 @@
-Add ``/account``, ``/account/register``, and ``/account/logout`` to authenticate with the identity server.
diff --git a/changelogs/identity_service/newsfragments/2258.new b/changelogs/identity_service/newsfragments/2258.new
deleted file mode 100644
index 06b9efff..00000000
--- a/changelogs/identity_service/newsfragments/2258.new
+++ /dev/null
@@ -1 +0,0 @@
-Add endpoints for accepting and handling terms of service.
diff --git a/changelogs/identity_service/newsfragments/2287.new b/changelogs/identity_service/newsfragments/2287.new
deleted file mode 100644
index 7d575bc9..00000000
--- a/changelogs/identity_service/newsfragments/2287.new
+++ /dev/null
@@ -1 +0,0 @@
-Add ``/hash_details`` and a new ``/lookup`` endpoint for performing hashed association lookups.

From 7351c0cd1e552e691ef338887d7112b72f6849c9 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 6 Nov 2019 12:47:09 -0700
Subject: [PATCH 2/2] Add missing versions to identity spec

---
 specification/identity_service_api.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/specification/identity_service_api.rst b/specification/identity_service_api.rst
index f389cbc7..7e5a0f02 100644
--- a/specification/identity_service_api.rst
+++ b/specification/identity_service_api.rst
@@ -51,6 +51,8 @@ Other versions of this specification
 The following other versions are also available, in reverse chronological order:
 
 - `HEAD <https://matrix.org/docs/spec/identity_service/unstable.html>`_: Includes all changes since the latest versioned release.
+- `r0.3.0 <https://matrix.org/docs/spec/identity_service/r0.3.0.html>`_
+- `r0.2.1 <https://matrix.org/docs/spec/identity_service/r0.2.1.html>`_
 - `r0.2.0 <https://matrix.org/docs/spec/identity_service/r0.2.0.html>`_
 - `r0.1.0 <https://matrix.org/docs/spec/identity_service/r0.1.0.html>`_