diff --git a/manual/manual.epub b/manual/manual.epub index dc9c7c8b1..eea0112f6 100644 Binary files a/manual/manual.epub and b/manual/manual.epub differ diff --git a/manual/manual.html b/manual/manual.html index d49177e49..807a2ebb4 100644 --- a/manual/manual.html +++ b/manual/manual.html @@ -880,6 +880,12 @@ enter the thing that you wish to block and then select the

When creating a block you can also add a space followed by any text describing the reason for the block. Such as:

annoyingdomain.com A spam instance
+

You can also use wildcards when blocking nicknames or domains. To +block a nickname, regardless of what instance it comes from:

+
trollnickname@* Some comment about the reason for the block
+

Or if a troll is using the same nickname followed by some random +number then you can add an extra wildcard:

+
trollnickname*@* Some comment about the reason for the block

If you want to see what is being blocked at the instance level then select the Info button.

Web crawlers and search bots

diff --git a/manual/manual.md b/manual/manual.md index c485113b5..2120d3b86 100644 --- a/manual/manual.md +++ b/manual/manual.md @@ -628,6 +628,18 @@ When creating a block you can also add a space followed by any text describing t annoyingdomain.com A spam instance ``` +You can also use wildcards when blocking nicknames or domains. To block a nickname, regardless of what instance it comes from: + +``` text +trollnickname@* Some comment about the reason for the block +``` + +Or if a troll is using the same nickname followed by some random number then you can add an extra wildcard: + +``` text +trollnickname*@* Some comment about the reason for the block +``` + If you want to see what is being blocked at the instance level then select the **Info** button. ### Web crawlers and search bots