free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mention blocking on pleroma documentation

This commit is contained in:
Bob Mottram 2018-02-21 15:02:14 +00:00
parent 59746d376a
commit e08de3947c
2 changed files with 40 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/EN/app_pleroma.org
View File

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

41
website/EN/app_pleroma.html
View File

@ -3,7 +3,7 @@
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
<head>
<!-- 2018-02-21 Wed 14:59 -->
<!-- 2018-02-21 Wed 15:01 -->
<meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<title>&lrm;</title>
@ -268,9 +268,9 @@ Some general advice about life in the fediverse <a href="./fediverse.html">can b
</div>
</div>
<div id="outline-container-org06e6248" class="outline-2">
<h2 id="org06e6248">Installation</h2>
<div class="outline-text-2" id="text-org06e6248">
<div id="outline-container-org816a3b7" class="outline-2">
<h2 id="org816a3b7">Installation</h2>
<div class="outline-text-2" id="text-org816a3b7">
<p>
Log into your system with:
</p>
@ -290,9 +290,9 @@ Select <b>Add/Remove Apps</b> then <b>pleroma</b>. You will then be asked for a
</div>
</div>
<div id="outline-container-orgcf8ad56" class="outline-2">
<h2 id="orgcf8ad56">Initial setup</h2>
<div class="outline-text-2" id="text-orgcf8ad56">
<div id="outline-container-org45a79f8" class="outline-2">
<h2 id="org45a79f8">Initial setup</h2>
<div class="outline-text-2" id="text-org45a79f8">
<p>
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.
</p>
@ -303,9 +303,9 @@ Once you have done that then you can disable further registrations from the <b>A
</div>
</div>
<div id="outline-container-org293d783" class="outline-2">
<h2 id="org293d783">Mastodon user interface</h2>
<div class="outline-text-2" id="text-org293d783">
<div id="outline-container-org083f41f" class="outline-2">
<h2 id="org083f41f">Mastodon user interface</h2>
<div class="outline-text-2" id="text-org083f41f">
<p>
If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once you have registered an account navigate to <b>/yourpleromadomainname/web</b> and log in.
</p>
@ -319,6 +319,27 @@ If you prefer a Tweetdeck-style user interface, similar to Mastodon, then once y
</div>
</div>
</div>
<div id="outline-container-orgc24d811" class="outline-2">
<h2 id="orgc24d811">Blocking controls</h2>
<div class="outline-text-2" id="text-orgc24d811">
<div class="org-center">
<div class="figure">
<p><img src="images/controlpanel/control_panel_blocking.jpg" alt="control_panel_blocking.jpg" />
</p>
</div>
</div>
<p>
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 <b>Administrator control panel</b> and selecting <b>Domain or User Blocking</b>, then adding or removing entries. This blocks domains at the firewall level and also at the level of database and file storage.
</p>
<p>
If you want to block a particular user then select <b>Block a domain or user</b> and enter the user in the format <b>username@domaintoblock</b> (similar to an email address).
</p>
</div>
</div>
</div>
<div id="postamble" class="status">