summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2022-02-22 12:05:48 +0000
committerErik Johnston <erik@matrix.org>2022-02-22 12:05:48 +0000
commit79c18e07099e8b886eac35711796a5becf17956e (patch)
tree1bbd17d7737fdfd2a95637d29e4c855185d0cc8e
parentAdd more tests for in-flight state query duplication. (#12033) (diff)
parentRecommend upgrading treq alongside twisted (#11943) (diff)
downloadsynapse-79c18e07099e8b886eac35711796a5becf17956e.tar.xz
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--CHANGES.md2
-rw-r--r--docs/upgrade.md2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGES.md b/CHANGES.md
index 4210d09d2d..576dab74f4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -86,7 +86,7 @@ Note that [Twisted 22.1.0](https://github.com/twisted/twisted/releases/tag/twist
 has recently been released, which fixes a [security issue](https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx)
 within the Twisted library. We do not believe Synapse is affected by this vulnerability,
 though we advise server administrators who installed Synapse via pip to upgrade Twisted
-with `pip install --upgrade Twisted` as a matter of good practice. The Docker image
+with `pip install --upgrade Twisted treq` as a matter of good practice. The Docker image
 `matrixdotorg/synapse` and the Debian packages from `packages.matrix.org` are using the
 updated library.
 
diff --git a/docs/upgrade.md b/docs/upgrade.md
index 9860ae97b9..f9be3ac6bc 100644
--- a/docs/upgrade.md
+++ b/docs/upgrade.md
@@ -166,7 +166,7 @@ Note that [Twisted 22.1.0](https://github.com/twisted/twisted/releases/tag/twist
 has recently been released, which fixes a [security issue](https://github.com/twisted/twisted/security/advisories/GHSA-92x2-jw7w-xvvx)
 within the Twisted library. We do not believe Synapse is affected by this vulnerability,
 though we advise server administrators who installed Synapse via pip to upgrade Twisted
-with `pip install --upgrade Twisted` as a matter of good practice. The Docker image
+with `pip install --upgrade Twisted treq` as a matter of good practice. The Docker image
 `matrixdotorg/synapse` and the Debian packages from `packages.matrix.org` are using the
 updated library.