Merge branch 'develop' of https://github.com/friendica/friendica into issue/#3039...

[friendica.git] / doc / Settings.md

diff --git a/doc/Settings.md b/doc/Settings.md
index 13f2cc6234b4b1f5c182e2b90cde2580bd89bbe5..a154a307325368edc8429abf635f9e5c411df128 100644 (file)
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -1,5 +1,7 @@
 # Settings
 
+* [Home](help)
+
 If you are the admin of a Friendica node, you have access to the so called **Admin Panel** where you can configure your Friendica node.
 
 On the front page of the admin panel you will see a summary of information about your node.
@@ -9,6 +11,9 @@ This number should decrease quickly.
 The second is the messages which could for various reasons not being delivered.
 They will be resend later.
 You can have a quick glance into that second queus in the "Inspect Queue" section of the admin panel.
+If you have activated the background workers, there is a third number representing the count of jobs queued for the workers.
+These worker tasks are prioritised and are done accordingly.
+
 Then you get an overview of the accounts on your node, which can be moderated in the "Users" section of the panel.
 As well as an overview of the currently active addons
 The list is linked, so you can have quick access to the plugin settings.
@@ -123,7 +128,15 @@ Comma separated list of domains which are allowed in email addresses for registr
 This can lockout those who are not part of this organisation from registering here.
 Wildcards are accepted.
 (Wildcard support on Windows platforms requires PHP5.3).
-By default, any (valid) email address is allowed in registrations.  
+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.
+Which means that postings by the remote self are automatically reposted by Friendica in their names.
+
+As admin of the node you can also set this flag directly in the database.
+Before doing so, you should be sure you know what you do and have a backup of the database.
 
 ### Advanced
 
@@ -239,8 +252,9 @@ The log section of the admin panel is seperated into two pages.
 On the first, following the "log" link, you can configure how much Friendica shall log.
 And on the second you can read the log.
 
-When you are using the default configuration for Apache, you should choose a name for the logfile ending in ``.log`` or ``.out``.
-But don't call it ``friendica.log`` (see [issue 2209](https://github.com/friendica/friendica/issues/2209)).
+You should not place your logs into any directory that is accessible from the web.
+If you have to, and you are using the default configuration from Apache, you should choose a name for the logfile ending in ``.log`` or ``.out``.
+Should you use another web server, please make sure that you have the correct accessrules in place so that your log files are not accessible.
 
 There are five different log levels: Normal, Trace, Debug, Data and All.
 Specifying different verbosities of information and data written out to the log file.
@@ -252,6 +266,8 @@ But due to the volume of information we recommend only enabling this when you ar
 **The amount of data can grow the filesize of the logfile quickly**.
 You should set up some kind of [log rotation](https://en.wikipedia.org/wiki/Log_rotation) to keep the log file from growing too big.
 
+**Known Issues**: The filename ``friendica.log`` can cause problems depending on your server configuration (see [issue 2209](https://github.com/friendica/friendica/issues/2209)).
+
 By default PHP warnings and error messages are supressed.
 If you want to enable those, you have to activate them in the ``.htconfig.php`` file.
 Use the following settings to redirect PHP errors to a file.