Merge develop into 20180425_-_fix_help_aside

[friendica.git] / doc / htconfig.md

diff --git a/doc/htconfig.md b/doc/htconfig.md
index 3f21dccbaf6d6e03eef797e07809d92d7fc715f4..977bf1dbcc096be124af8d07d3444e7d2fee1a91 100644 (file)
--- a/doc/htconfig.md
+++ b/doc/htconfig.md
@@ -25,8 +25,9 @@ Example: To set the automatic database cleanup process add this line to your .ht
 
 * **allowed_link_protocols** (Array) - Allowed protocols in links URLs, add at your own risk. http is always allowed.
 * **always_show_preview** (Boolean) - Only show small preview picures. Default value is false.
-* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users.
+* **archival_days** (Integer) - Number of days that we try to deliver content before we archive a contact. Defaults to 32.
 * **auth_cookie_lifetime** (Integer) - Number of days that should pass without any activity before a user who chose "Remember me" when logging in is considered logged out. Defaults to 7.
+* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users.
 * **config_adapter** (jit|preload) - Allow to switch the configuration adapter to improve performances at the cost of memory consumption. Default value is "jit"
 * **curl_range_bytes** - Maximum number of bytes that should be fetched. Default is 0, which mean "no limit".
 * **db_log** - Name of a logfile to log slow database queries
@@ -85,11 +86,6 @@ Example: To set the automatic database cleanup process add this line to your .ht
 * **proxy_cache_time** - Time after which the cache is cleared. Default value is one day.
 * **pushpoll_frequency** -
 * **qsearch_limit** - Default value is 100.
-* **relay_server** - Experimental Diaspora feature. Address of the relay server where public posts should be send to. For example https://podrelay.net
-* **relay_subscribe** (Boolean) - Enables the receiving of public posts from the relay. They will be included in the search and on the community page when it is set up to show all public items.
-* **relay_scope** - Can be "all" or "tags". "all" means that every public post should be received. "tags" means that only posts with selected tags should be received.
-* **relay_server_tags** - Comma separated list of tags for the "tags" subscription (see "relay_scrope")
-* **relay_user_tags** (Boolean) - If enabled, the tags from the saved searches will used for the "tags" subscription in addition to the "relay_server_tags".
 * **remove_multiplicated_lines** (Boolean) - If enabled, multiple linefeeds in items are stripped to a single one.
 * **show_unsupported_addons** (Boolean) - Show all addons including the unsupported ones.
 * **show_unsupported_themes** (Boolean) - Show all themes including the unsupported ones.