Merge develop into 1404_reworked_autocomplete

[friendica.git] / doc / htconfig.md

diff --git a/doc/htconfig.md b/doc/htconfig.md
index 5d98f55a7682fe44a5961a8a232067a4e0ac8412..a36e0bef22a8ab7bc40e646dd09e5dac97e3d960 100644 (file)
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -34,6 +34,7 @@ line to your .htconfig.php:
 * like_no_comment (Boolean) - Don't update the "commented" value of an item when it is liked.
 * local_block (Boolean) - Used in conjunction with "block_public".
 * local_search (Boolean) - Blocks the search for not logged in users to prevent crawlers from blocking your system.
+* max_connections - The poller process isn't started when 3/4 of the possible database connections are used. When the system can't detect the maximum numbers of connection then this value can be used.
 * max_contact_queue - Default value is 500.
 * max_batch_queue - Default value is 1000.
 * no_oembed (Boolean) - Don't use OEmbed to fetch more information about a link.
@@ -44,6 +45,8 @@ line to your .htconfig.php:
 * ostatus_poll_timeframe - Defines how old an item can be to try to complete the conversation with it.
 * paranoia (Boolean) - Log out users if their IP address changed.
 * permit_crawling (Boolean) - Restricts the search for not logged in users to one search per minute.
+* free_crawls - Number of "free" searches when "permit_crawling" is activated (Default value is 10)
+* crawl_permit_period - Period in seconds between allowed searches when the number of free searches is reached and "permit_crawling" is activated (Default value is 60)
 * png_quality - Default value is 8.
 * proc_windows (Boolean) - Should be enabled if Friendica is running under Windows.
 * proxy_cache_time - Time after which the cache is cleared. Default value is one day.
@@ -61,9 +64,6 @@ line to your .htconfig.php:
 * throttle_limit_week - Maximum number of posts that a user can send per week with the API.
 * throttle_limit_month - Maximum number of posts that a user can send per month with the API.
 * wall-to-wall_share (Boolean) - Displays forwarded posts like "wall-to-wall" posts.
-* worker (Boolean) - (Experimental) Use the worker system instead of calling several background processes. Reduces the overall load and speeds up item delivery.
-* worker_dont_fork (Boolean) - if enabled, the workers are only called from the poller process. Useful on systems that permit the use of "proc_open".
-* worker_queues - Number of parallel workers. Default value is 10 queues.
 * xrd_timeout - Timeout for fetching the XRD links. Default value is 20 seconds.
 
 ## service_class ##
@@ -77,3 +77,22 @@ line to your .htconfig.php:
 ## theme ##
 
 * hide_eventlist (Boolean) - Don't show the birthdays and events on the profile and network page
+
+# Administrator Options #
+
+Enabling the admin panel for an account, and thus making the account holder
+admin of the node, is done by setting the variable
+
+    $a->config['admin_email'] = "someone@example.com";
+
+where you have to match the email address used for the account with the one you
+enter to the .htconfig file. If more then one account should be able to access
+the admin panel, seperate the email addresses with a comma.
+
+    $a->config['admin_email'] = "someone@example.com,someonelese@example.com";
+
+If you want to have a more personalized closing line for the notification
+emails you can set a variable for the admin_name.
+
+    $a->config['admin_name'] = "Marvin";
+