Merge remote-tracking branch 'CatoTH/master' into req245

[friendica.git] / htconfig.php

diff --git a/htconfig.php b/htconfig.php
old mode 100755 (executable)
new mode 100644 (file)
index 9d9c8a2..63a40c8
--- a/htconfig.php
+++ b/htconfig.php
@@ -83,5 +83,8 @@ $a->config['system']['no_regfullname'] = true;
 // If set to true the priority settings of ostatus contacts are used
 $a->config['system']['ostatus_use_priority'] = false;
 
-// If enabled all items are cached in the given directory
+// If enabled, all items are cached in the given directory
 $a->config['system']['itemcache'] = "";
+
+// If enabled, the lockpath is used for a lockfile to check if the poller is running
+$a->config['system']['lockpath'] = "";