Merge branch 'develop' into utf8mb4

[friendica.git] / doc / Settings.md

diff --git a/doc/Settings.md b/doc/Settings.md
index 9590ad42d6076924327110fd9357c5093c4091b0..3652562720d440e8f6cb6970cf5e6b4de0005448 100644 (file)
--- a/doc/Settings.md
+++ b/doc/Settings.md
@@ -6,12 +6,10 @@ If you are the admin of a Friendica node, you have access to the so called **Adm
 
 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 being actively sent.
-This number should decrease quickly.
-The second is the messages which could for various reasons not being delivered.
+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 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.
+The second number represents the current number of jobs for the background 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.
@@ -152,13 +150,6 @@ Value is in seconds.
 Default is 60 seconds.
 Set to 0 for unlimited (not recommended).
 
-#### UTF-8 Regular Expressions
-
-During registrations, full names are checked using UTF-8 regular expressions.
-This requires PHP to have been compiled with a special setting to allow UTF-8 expressions.
-If you are completely unable to register accounts, set no_utf to true.
-The default is set to false (meaning UTF8 regular expressions are supported and working).
-
 #### Verify SSL Certitificates
 
 By default Friendica allows SSL communication between websites that have "self-signed" SSL certificates.