Move Photo module, update Photo model

[friendica.git] / doc / Settings.md

diff --git a/doc/Settings.md b/doc/Settings.md
index 9f54513fbcd23f46a7ae415e9fcb7b62a4712b0e..4795a0402d8e61d125276eab0a48658fc97bb24c 100644 (file)
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -2,18 +2,23 @@
 
 * [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.
+If you are the admin of a Friendica node, you have access to the **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.
-These information include the amount of messages currently being processed in the queues.
-The first number is the number of messages which could not been delivered for various reasons.
-They will be resend later.
-You can have a quick glance into that second queues in the "Inspect Queue" section of the admin panel.
-The second number represents the current number of jobs for the background workers.
-These worker tasks are prioritised and are done accordingly.
+## Overview
+
+In the main page of the admin panel you will see an information summary about your node.
+
+### Queues
+
+The three numbers shown are respectively:
+- The retry queue: These outgoing messages couldn't be received by the remote host, and will be resent at longer intervals before being dropped entirely after 30 days.
+- The deferred queue: These internal tasks failed and will be retried at most 14 times.
+- The task queue: These internal tasks are queued for execution during the next background worker run.
+
+### Additional information
 
 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
+As well as an overview of the currently active addons.
 The list is linked, so you can have quick access to the Addon settings.
 And finally you are informed about the version of Friendica you have installed.
 If you contact the developers with a bug or problem, please also mention the version of your node.
@@ -361,13 +366,13 @@ These are the data base settings, the admin account settings, the path of PHP an
 
 With the following settings, you specify the data base server, the username and password for Friendica and the database to use.
 
-    'database' => [
-        'hostname' => 'localhost',
-        'username' => 'mysqlusername',
-        'password' => 'mysqlpassword',
-        'database' => 'mysqldatabasename',
-        'charset' => 'utf8mb4',
-    ],
+       'database' => [
+               'hostname' => 'localhost',
+               'username' => 'mysqlusername',
+               'password' => 'mysqlpassword',
+               'database' => 'mysqldatabasename',
+               'charset' => 'utf8mb4',
+       ],
 
 ## Admin users
 
@@ -377,17 +382,17 @@ But you can expand the list of email addresses by any used email address you wan
 Registration of new accounts with a listed email address is not possible.
 
        'config' => [
-        'admin_email' => 'you@example.com, buddy@example.com',
-    ],
+               'admin_email' => 'you@example.com, buddy@example.com',
+       ],
 
 ## PHP Path
 
 Some of Friendica's processes are running in the background.
 For this you need to specify the path to the PHP binary to be used.
 
-    'config' => [
-        'php_path' => '/usr/bin/php',
-    ],
+       'config' => [
+               'php_path' => '/usr/bin/php',
+       ],
 
 ## Subdirectory configuration
 
@@ -395,9 +400,9 @@ It is possible to install Friendica into a subdirectory of your web server.
 We strongly discourage you from doing so, as this will break federation to other networks (e.g. Diaspora, GNU Social, Hubzilla)
 Say you have a subdirectory for tests and put Friendica into a further subdirectory, the config would be:
 
-    'system' => [
-        'urlpath' => 'tests/friendica',
-    ],
+       'system' => [
+               'urlpath' => 'tests/friendica',
+       ],
 
 ## Other exceptions