From 8bd9ca4edd7a6f20da3a1d0e4a13854e70f03fa2 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Wed, 6 Feb 2019 12:35:04 -0700
Subject: [PATCH] Prep for r0.1.1 of s2s

---
 changelogs/server_server.rst                           | 10 ++++++++++
 .../server_server/newsfragments/1844.clarification     |  1 -
 .../server_server/newsfragments/1855.clarification     |  1 -
 specification/identity_service_api.rst                 |  2 +-
 specification/rooms/v1.rst                             |  4 ++--
 specification/rooms/v2.rst                             |  2 +-
 specification/rooms/v3.rst                             |  4 ++--
 specification/server_server_api.rst                    |  1 +
 8 files changed, 17 insertions(+), 8 deletions(-)
 delete mode 100644 changelogs/server_server/newsfragments/1844.clarification
 delete mode 100644 changelogs/server_server/newsfragments/1855.clarification

diff --git a/changelogs/server_server.rst b/changelogs/server_server.rst
index 5dabc4ac..a21da177 100644
--- a/changelogs/server_server.rst
+++ b/changelogs/server_server.rst
@@ -1,3 +1,13 @@
+r0.1.1
+======
+
+Spec Clarifications
+-------------------
+
+- Remove legacy references to TLS fingerprints. (`#1844 <https://github.com/matrix-org/matrix-doc/issues/1844>`_)
+- Clarify that servers should not fail to contact servers if ``/.well-known`` fails. (`#1855 <https://github.com/matrix-org/matrix-doc/issues/1855>`_)
+
+
 r0.1.0
 ======
 
diff --git a/changelogs/server_server/newsfragments/1844.clarification b/changelogs/server_server/newsfragments/1844.clarification
deleted file mode 100644
index f80eef51..00000000
--- a/changelogs/server_server/newsfragments/1844.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Remove legacy references to TLS fingerprints.
diff --git a/changelogs/server_server/newsfragments/1855.clarification b/changelogs/server_server/newsfragments/1855.clarification
deleted file mode 100644
index e61e14c6..00000000
--- a/changelogs/server_server/newsfragments/1855.clarification
+++ /dev/null
@@ -1 +0,0 @@
-Clarify that servers should not fail to contact servers if ``/.well-known`` fails.
diff --git a/specification/identity_service_api.rst b/specification/identity_service_api.rst
index ecd2c99f..e00cee81 100644
--- a/specification/identity_service_api.rst
+++ b/specification/identity_service_api.rst
@@ -279,4 +279,4 @@ this isn't possible.
 .. _`Unpadded Base64`:  ../appendices.html#unpadded-base64
 .. _`3PID Types`:  ../appendices.html#pid-types
 .. _`Signing JSON`: ../appendices.html#signing-json
-.. _`/3pid/onbind`: ../server_server/r0.1.0.html#put-matrix-federation-v1-3pid-onbind
+.. _`/3pid/onbind`: ../server_server/r0.1.1.html#put-matrix-federation-v1-3pid-onbind
diff --git a/specification/rooms/v1.rst b/specification/rooms/v1.rst
index 63bb1d7a..f5013194 100644
--- a/specification/rooms/v1.rst
+++ b/specification/rooms/v1.rst
@@ -290,5 +290,5 @@ Events in version 1 rooms have the following structure:
 {{definition_ss_pdu}}
 
 
-.. _`auth events selection`: ../../server_server/r0.1.0.html#auth-events-selection
-.. _`Signing Events`: ../../server_server/r0.1.0.html#signing-events
+.. _`auth events selection`: ../../server_server/r0.1.1.html#auth-events-selection
+.. _`Signing Events`: ../../server_server/r0.1.1.html#signing-events
diff --git a/specification/rooms/v2.rst b/specification/rooms/v2.rst
index b73662ea..7ad7668c 100644
--- a/specification/rooms/v2.rst
+++ b/specification/rooms/v2.rst
@@ -159,7 +159,7 @@ The *resolution* of a set of states is obtained as follows:
    resolved state.
 
 
-.. _`authorization rules`: ../server_server/r0.1.0.html#authorization-rules
+.. _`authorization rules`: ../server_server/r0.1.1.html#authorization-rules
 
 Rejected events
 +++++++++++++++
diff --git a/specification/rooms/v3.rst b/specification/rooms/v3.rst
index 36848519..0915d196 100644
--- a/specification/rooms/v3.rst
+++ b/specification/rooms/v3.rst
@@ -117,5 +117,5 @@ The remaining rules are the same as `room version 1 <v1.html#authorization-rules
 
 .. _`Unpadded Base64`:  ../../appendices.html#unpadded-base64
 .. _`Canonical JSON`: ../../appendices.html#canonical-json
-.. _`Signing Events`: ../../server_server/r0.1.0.html#signing-events
-.. _`reference hash`: ../../server_server/r0.1.0.html#reference-hashes
+.. _`Signing Events`: ../../server_server/r0.1.1.html#signing-events
+.. _`reference hash`: ../../server_server/r0.1.1.html#reference-hashes
diff --git a/specification/server_server_api.rst b/specification/server_server_api.rst
index 9b048d29..b765e36a 100644
--- a/specification/server_server_api.rst
+++ b/specification/server_server_api.rst
@@ -80,6 +80,7 @@ Other versions of this specification
 The following other versions are also available, in reverse chronological order:
 
 - `HEAD <https://matrix.org/docs/spec/server_server/unstable.html>`_: Includes all changes since the latest versioned release.
+- `r0.1.1 <https://matrix.org/docs/spec/server_server/r0.1.1.html>`_
 - `r0.1.0 <https://matrix.org/docs/spec/server_server/r0.1.0.html>`_
 
 Server discovery