Merge commit '606805bf0' into anoa/dinsic_release_1_21_x

* commit '606805bf0':
  Fix typo in docs/workers.md (#7992)

3 files changed, 12 insertions, 1 deletions

diff --git a/changelog.d/7992.doc b/changelog.d/7992.doc
new file mode 100644

index 0000000000..3368fb5912
--- /dev/null
+++ b/changelog.d/7992.doc
@@ -0,0 +1 @@
+Fix typo in `docs/workers.md`.
diff --git a/debian/changelog b/debian/changelog

index a6d88906ac..a0af2b78a8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+matrix-synapse-py3 (1.xx.0) stable; urgency=medium
+
+  [ Synapse Packaging team ]
+  * New synapse release 1.xx.0.
+
+  [ Aaron Raimist ]
+  * Fix outdated documentation for SYNAPSE_CACHE_FACTOR
+
+ -- Synapse Packaging team <packages@matrix.org>  XXXXX
+
 matrix-synapse-py3 (1.18.0) stable; urgency=medium
 
   * New synapse release 1.18.0.
diff --git a/docs/workers.md b/docs/workers.md

index 38bd758e57..05d4382403 100644
--- a/docs/workers.md
+++ b/docs/workers.md
@@ -278,7 +278,7 @@ instance_map:
         host: localhost
         port: 8034
 
-streams_writers:
+stream_writers:
     events: event_persister1
 ```