aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-11-02 14:46:24 -0800
committerredmatrix <redmatrix@redmatrix.me>2015-11-02 14:46:24 -0800
commit966dd03195c3ad3370bad6e145f8117f6ea2969c (patch)
treef92d1e3512654a7e1fa65410f14ae661b1fd41df /doc
parent5041774fd3b9aaf7bc77b95ef57ab634e320d7a6 (diff)
parentc5453d476d18d95b0efd7950c4a559b326f87f18 (diff)
downloadvolse-hubzilla-966dd03195c3ad3370bad6e145f8117f6ea2969c.tar.gz
volse-hubzilla-966dd03195c3ad3370bad6e145f8117f6ea2969c.tar.bz2
volse-hubzilla-966dd03195c3ad3370bad6e145f8117f6ea2969c.zip
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'doc')
-rw-r--r--doc/hidden_configs.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb
index dc9780aad..f92f23f59 100644
--- a/doc/hidden_configs.bb
+++ b/doc/hidden_configs.bb
@@ -112,7 +112,7 @@ This document assumes you're an administrator.
[b]system > cron_hour[/b]
Specify an hour in which to run cron_daily. By default with no config, this will run at midnight UTC.
[b]system > minimum_feedcheck_minutes[/b]
- The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds will be polled with each cronjob
+ The minimum interval between polling RSS feeds. If this is lower than the cron interval, feeds will be polled with each cronjob. Defaults to 60 if not set. The site setting can also be over-ridden on a channel by channel basis by a service class setting aptly named 'minimum_feedcheck_minutes'.
[b]system > blacklisted_sites[/b]
An array of specific hubs to block from this hub completely.
[b]system > ignore_imagick[/b]