diff --git a/doc/EN/app_gnusocial.org b/doc/EN/app_gnusocial.org index f1cdd83b..429dc85f 100644 --- a/doc/EN/app_gnusocial.org +++ b/doc/EN/app_gnusocial.org @@ -90,3 +90,9 @@ And as a quick reference the main keys are: | CTRL-c CTRL-h | Highlight | | CTRL-c CTRL-r | Show replies | | CTRL-c CTRL-f | Friends timeline | + + +* Blocking controls +The biggest hazard with GNU Social 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 and 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/doc/EN/app_postactiv.org b/doc/EN/app_postactiv.org index b879870a..0af1dede 100644 --- a/doc/EN/app_postactiv.org +++ b/doc/EN/app_postactiv.org @@ -37,3 +37,8 @@ If you have just obtained a Lets Encrypt certificate as above then go to *About* To see the login password for your site go to *Passwords* on the *Administrator control panel* and select the appropriate username and app. The passwords will be different for each user and may not be the same as the password which you used to originally ssh into the system. Navigate to your PostActiv domain name and log in. + +* Blocking controls +The biggest hazard with PostActiv 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 and 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_gnusocial.html b/website/EN/app_gnusocial.html index 5d1a790e..beb91695 100644 --- a/website/EN/app_gnusocial.html +++ b/website/EN/app_gnusocial.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -270,9 +270,9 @@ You should regard anything posted to GNU Social as being public communication -
-

Installation

-
+
+

Installation

+

Log into your system with:

@@ -297,9 +297,9 @@ After the install has completed go to Security settings and select Cre
-
-

Initial setup

-
+
+

Initial setup

+

If you have just obtained a Lets Encrypt certificate as above then go to About on the administrator control panel and you should see your GNU Social domain listed there along with an onion address. You can then navigate to your site in a browser.

@@ -327,9 +327,9 @@ GNU Social has a clutter-free mobile user interface which can be accessed via a
-
-

Using with Emacs

-
+
+

Using with Emacs

+
@@ -419,6 +419,20 @@ And as a quick reference the main keys are:
+ + +
+

Blocking controls

+
+

+The biggest hazard with GNU Social 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 and 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_postactiv.html b/website/EN/app_postactiv.html index 3247c462..b21fc8bc 100644 --- a/website/EN/app_postactiv.html +++ b/website/EN/app_postactiv.html @@ -3,7 +3,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - + @@ -71,6 +71,7 @@ pre.src-fortran:before { content: 'Fortran'; } pre.src-gnuplot:before { content: 'gnuplot'; } pre.src-haskell:before { content: 'Haskell'; } + pre.src-hledger:before { content: 'hledger'; } pre.src-java:before { content: 'Java'; } pre.src-js:before { content: 'Javascript'; } pre.src-latex:before { content: 'LaTeX'; } @@ -188,7 +189,7 @@ @licstart The following is the entire license notice for the JavaScript code in this tag. -Copyright (C) 2012-2013 Free Software Foundation, Inc. +Copyright (C) 2012-2017 Free Software Foundation, Inc. The JavaScript code in this tag is free software: you can redistribute it and/or modify it under the terms of the GNU @@ -251,16 +252,16 @@ for the JavaScript code in this tag. PostActiv is a fork of GNU Social which includes some extra fixes and optimisations to improve performance. It federates just like GNU Social does and so whether you choose GNU Social or PostActiv is really just down to personal prefernce.

-
-

Installation

-
+
+

Installation

+

Log into your system with:

-
ssh myusername@mydomain -p 2222
-
+
ssh myusername@mydomain -p 2222
+

@@ -277,27 +278,35 @@ After the install has completed go to Security settings and select Cre

-
-

Initial setup

-
+
+

Initial setup

+

If you have just obtained a Lets Encrypt certificate as above then go to About on the administrator control panel and you should see your Postactiv domain listed there along with an onion address. You can then navigate to your site in a browser.

-If you installed the system using a disk image then you can log in using the username and password which was originally shown when you installed the system. If you didn't install from a disk image then a new random password will be generated for each site and stored within a readme file. If you need to view that file then exit to the user control panel, select Exit to the command line and then run: +To see the login password for your site go to Passwords on the Administrator control panel and select the appropriate username and app. The passwords will be different for each user and may not be the same as the password which you used to originally ssh into the system.

-
-
editor README
-
-
-

Navigate to your PostActiv domain name and log in.

+ +
+

Blocking controls

+
+

+The biggest hazard with PostActiv 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 and 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). +

+
+