Merge pull request #3944 from annando/always-preview

[friendica.git] / doc / Settings.md

diff --git a/doc/Settings.md b/doc/Settings.md
index 13424a5a48acf16e5b70d39959a71317b0d5e67b..a0b33d76d27ee3f41d92b60e48287c83e1b25b8d 100644 (file)
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -130,7 +130,7 @@ By default, any (valid) email address is allowed in registrations.
 
 #### Allow Users to set remote_self
 
-If you enable the `Allow Users to set remote_self` users can select Atom feeds from their contact list being their *remote self* in die advanced contact settings.
+If you enable the `Allow Users to set remote_self` users can select Atom feeds from their contact list being their *remote self* in the advanced contact settings.
 Which means that postings by the remote self are automatically reposted by Friendica in their names.
 
 This feature can be used to let the user mirror e.g. blog postings into their Friendica postings.
@@ -164,6 +164,12 @@ However these aren't looked upon favourably in the security community because th
 If you wish, you can turn on strict certificate checking.
 This will mean you cannot connect (at all) to self-signed SSL sites.
 
+#### Check upstream version
+
+If this option is enabled your Friendica node will check the upstream version once per day from the github repository.
+You can select if the stable version or the development version should be checked out.
+If there is a new version published, you will get notified in the admin panel summary page.
+
 ### Auto Discovered Contact Directory
 
 ### Performance
@@ -212,7 +218,7 @@ To simplify this process there is a button at the top of the page to reload all
 ## Themes
 
 The Themes section of the admin panel works similar to the Plugins section but let you control the themes on your Friendica node.
-Each theme has a dedicated suppage showing the current status, some information about the theme and a screen-shot of the Friendica interface using the theme.
+Each theme has a dedicated subpage showing the current status, some information about the theme and a screen-shot of the Friendica interface using the theme.
 Should the theme offer special settings, admins can set a global default value here.
 
 You can activate and deactivate themes on their dedicated sub-pages thus making them available for the users of the node.
@@ -242,11 +248,24 @@ The receiving end might be off-line, there might be a high system load and so on
 Don't panic!
 Friendica will not queue messages for all time but will sort out *dead* nodes automatically after a while and remove messages from the queue then.
 
+## Server Blocklist
+
+This page allows to block all communications (inbound and outbound) with a specific domain name.
+Each blocked domain entry requires a reason that will be displayed on the [friendica](/friendica) page.
+Matching is exact, blocking a domain doesn't block subdomains.
+
 ## Federation Statistics
 
 The federation statistics page gives you a short summery of the nodes/servers/pods of the decentralized social network federation your node knows.
 These numbers are not compleate and only contain nodes from networks Friendica federates directly with.
 
+## Delete Item
+
+Using this page an admin can delete postings and eventually associated discussion threads from their Friendica node.
+To do so, they need to know the GUID of the posting.
+This can be found on the `/display` page of the posting, it is the last part of the URL displayed in the browsers navigation bar.
+You can get to the `/display` page by following the *Link to source*.
+
 ## Plugin Features
 
 Some of the addons you can install for your Friendica node have settings which have to be set by the admin.