From 1b37107cac28b9f5de695d0c2788f13faf3f14b4 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 20 Jan 2021 10:52:50 -0500
Subject: Add upgrade notes about chain cover.

---
 UPGRADE.rst | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/UPGRADE.rst b/UPGRADE.rst
index 706701ec59..c5565fb814 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -104,25 +104,29 @@ back to v1.25.0 you need to:
 
       UPDATE schema_version SET version = 58;
 
-3. Delete the ignored users data:
+3. Delete the ignored users & chain cover data:
 
-  If using PostgreSQL:
+   .. code:: sql
 
-  .. code:: sql
+      DROP TABLE IF EXISTS ignored_users;
+      UPDATE rooms SET has_auth_chain_index = false;
 
-      TRUNCATE TABLE ignored_users;
+   For PostgreSQL run:
 
-  If using SQLite:
+      TRUNCATE event_auth_chain_links;
+      TRUNCATE event_auth_chains;
 
-  .. code:: sql
+   For SQLite run:
 
-      DELETE FROM ignored_users;
+      DELETE FROM event_auth_chain_links;
+      DELETE FROM event_auth_chains;
 
-4. Mark the ignored user delta as not run (so it will re-run on upgrade).
+4. Mark the deltas as not run (so they will re-run on upgrade).
 
   .. code:: sql
 
       DELETE FROM applied_schema_deltas WHERE version = 59 AND file = "59/01ignored_user.py";
+      DELETE FROM applied_schema_deltas WHERE version = 59 AND file = "59/06chain_cover_index.sql";
 
 5. Downgrade Synapse by following the instructions for your installation method
    in the "Rolling back to older versions" section above.
-- 
cgit 1.5.1


From d5349959f4422a15c5a9a56ffab1a2fd1b0b0629 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 20 Jan 2021 10:53:39 -0500
Subject: SQL formatting in UPGRADE.

---
 UPGRADE.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/UPGRADE.rst b/UPGRADE.rst
index c5565fb814..e38824df14 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -113,11 +113,15 @@ back to v1.25.0 you need to:
 
    For PostgreSQL run:
 
+   .. code:: sql
+
       TRUNCATE event_auth_chain_links;
       TRUNCATE event_auth_chains;
 
    For SQLite run:
 
+   .. code:: sql
+
       DELETE FROM event_auth_chain_links;
       DELETE FROM event_auth_chains;
 
-- 
cgit 1.5.1


From 933f258967d17d656f241149489e328ea5fc3dad Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 20 Jan 2021 10:54:06 -0500
Subject: Formatting.

---
 UPGRADE.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/UPGRADE.rst b/UPGRADE.rst
index e38824df14..d09dbd4e21 100644
--- a/UPGRADE.rst
+++ b/UPGRADE.rst
@@ -127,7 +127,7 @@ back to v1.25.0 you need to:
 
 4. Mark the deltas as not run (so they will re-run on upgrade).
 
-  .. code:: sql
+   .. code:: sql
 
       DELETE FROM applied_schema_deltas WHERE version = 59 AND file = "59/01ignored_user.py";
       DELETE FROM applied_schema_deltas WHERE version = 59 AND file = "59/06chain_cover_index.sql";
-- 
cgit 1.5.1


From adabf328ac75beaab550cd4ea6451ccdf24f9e05 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 20 Jan 2021 11:01:04 -0500
Subject: Point people to the upgrade notes.

---
 CHANGES.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index fa6c67489f..608965040d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,6 +1,10 @@
 Synapse 1.26.0rc1 (2021-01-20)
 ==============================
 
+This release brings a new schema version for Synapse and rolling back to a previous
+verious is not trivial.  Please review [UPGRADE.rst](UPGRADE.rst) for more details
+on these changes  and for general upgrade guidance.
+
 Features
 --------
 
-- 
cgit 1.5.1


From 4c37d2acd58f9cbcdc262d25a75f8b38c50ed7f9 Mon Sep 17 00:00:00 2001
From: Patrick Cloke <patrickc@matrix.org>
Date: Wed, 20 Jan 2021 11:10:00 -0500
Subject: Fix reStructuredText formatting.

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index af914d71a8..d872b11f57 100644
--- a/README.rst
+++ b/README.rst
@@ -286,7 +286,7 @@ We recommend using the demo which starts 3 federated instances running on ports
 
 (to stop, you can use `./demo/stop.sh`)
 
-If you just want to start a single instance of the app and run it directly:
+If you just want to start a single instance of the app and run it directly::
 
     # Create the homeserver.yaml config once
     python -m synapse.app.homeserver \
-- 
cgit 1.5.1