Merge branch 'master' into develop

2 files changed, 5 insertions, 2 deletions

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

index 0000000000..4bdaea76c5
--- /dev/null
+++ b/changelog.d/10395.doc
@@ -0,0 +1 @@
+Make deprecation notice of the spam checker doc more obvious.
diff --git a/docs/spam_checker.md b/docs/spam_checker.md

index c16914e61d..1b6d814937 100644
--- a/docs/spam_checker.md
+++ b/docs/spam_checker.md
@@ -1,6 +1,8 @@
-**Note: this page of the Synapse documentation is now deprecated. For up to date
+<h2 style="color:red">
+This page of the Synapse documentation is now deprecated. For up to date
 documentation on setting up or writing a spam checker module, please see
-[this page](https://matrix-org.github.io/synapse/develop/modules.html).**
+<a href="modules.md">this page</a>.
+</h2>
 
 # Handling spam in Synapse