From e08de3947c0520ccf1a7b088cd237d326fd05da4 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 21 Feb 2018 15:02:14 +0000 Subject: [PATCH] Mention blocking on pleroma documentation --- doc/EN/app_pleroma.org | 9 ++++++++ website/EN/app_pleroma.html | 41 ++++++++++++++++++++++++++++--------- 2 files changed, 40 insertions(+), 10 deletions(-) diff --git a/doc/EN/app_pleroma.org b/doc/EN/app_pleroma.org index d76147c5..ac2d5ada 100644 --- a/doc/EN/app_pleroma.org +++ b/doc/EN/app_pleroma.org @@ -44,3 +44,12 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y #+BEGIN_CENTER [[file:images/pleromamastodon.jpg]] #+END_CENTER + +* Blocking controls +#+BEGIN_CENTER +[[file:images/controlpanel/control_panel_blocking.jpg]] +#+END_CENTER + +The biggest hazard with Pleroma is that it's part of a public federated communications system. This means that conversations and replies from other servers may end up in your "whole known network" stream. The internet being what it is, some of these could be undesirable. You can block individual users or entire domains by going to the *Administrator control panel* and selecting *Domain or User Blocking*, then adding or removing entries. This blocks domains at the firewall level and also at the level of database and file storage. + +If you want to block a particular user then select *Block a domain or user* and enter the user in the format *username@domaintoblock* (similar to an email address). diff --git a/website/EN/app_pleroma.html b/website/EN/app_pleroma.html index f0872650..1fece384 100644 --- a/website/EN/app_pleroma.html +++ b/website/EN/app_pleroma.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + ‎ @@ -268,9 +268,9 @@ Some general advice about life in the fediverse can b -
-

Installation

-
+
+

Installation

+

Log into your system with:

@@ -290,9 +290,9 @@ Select Add/Remove Apps then pleroma. You will then be asked for a
-
-

Initial setup

-
+
+

Initial setup

+

The first thing you'll need to do is register a new account. You can set your profile details and profile image by selecting the small settings icon to the right of your name.

@@ -303,9 +303,9 @@ Once you have done that then you can disable further registrations from the A
-
-

Mastodon user interface

-
+
+

Mastodon user interface

+

If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once you have registered an account navigate to /yourpleromadomainname/web and log in.

@@ -319,6 +319,27 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y
+ +
+

Blocking controls

+
+
+ +
+

control_panel_blocking.jpg +

+
+
+ +

+The biggest hazard with Pleroma is that it's part of a public federated communications system. This means that conversations and replies from other servers may end up in your "whole known network" stream. The internet being what it is, some of these could be undesirable. You can block individual users or entire domains by going to the Administrator control panel and selecting Domain or User Blocking, then adding or removing entries. This blocks domains at the firewall level and also at the level of database and file storage. +

+ +

+If you want to block a particular user then select Block a domain or user and enter the user in the format username@domaintoblock (similar to an email address). +

+
+