Merge remote-tracking branch 'upstream/develop' into 1705-dbclean-advanced

diff --combined doc/htconfig.md
index b424b5af686688c7bb317bff09ef7631a9aba57c,542b42b29ea1a3da842ffd85f6c5c3a0e1a1ce39..7887184d88b580d1cf51f318e83e6180032bab5d
--- 1/doc/htconfig.md
--- 2/doc/htconfig.md
+++ b/doc/htconfig.md
@@@ -14,7 -14,7 +14,7 @@@ Especially don't do that with undocumen
  The header of the section describes the category, the value is the parameter.
  Example: To set the directory value please add this line to your .htconfig.php:
  
-     $a->config['system']['directory'] = 'http://dir.friendi.ca';
+     $a->config['system']['directory'] = 'http://dir.friendica.social';
  
  ## jabber ##
  * **debug** (Boolean) - Enable debug level for the jabber account synchronisation.
@@@ -35,11 -35,10 +35,11 @@@
  * **db_loglimit_index_high** - Number of index rows to be logged anyway (for any index)
  * **db_log_index_blacklist** - Blacklist of indexes that shouldn't be watched
  * **dbclean** (Boolean) - Enable the automatic database cleanup process
 +* **dbclean-expire-days** (Integer) - Days after which remote items will be deleted. Own items, and marked or filed items are kept.
  * **default_service_class** -
  * **delivery_batch_count** - Number of deliveries per process. Default value is 1. (Disabled when using the worker)
  * **diaspora_test** (Boolean) - For development only. Disables the message transfer.
- * **directory** - The path to global directory. If not set then "http://dir.friendi.ca" is used.
+ * **directory** - The path to global directory. If not set then "http://dir.friendica.social" is used.
  * **disable_email_validation** (Boolean) - Disables the check if a mail address is in a valid format and can be resolved via DNS.
  * **disable_url_validation** (Boolean) - Disables the DNS lookup of an URL.
  * **dlogfile - location of the developer log file