Merge branch 'master' into develop

This commit is contained in:
Brendan Abolivier 2021-07-15 14:54:45 +01:00
commit 9f497024aa
2 changed files with 5 additions and 2 deletions

1
changelog.d/10395.doc Normal file
View file

@ -0,0 +1 @@
Make deprecation notice of the spam checker doc more obvious.

View file

@ -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