aboutsummaryrefslogtreecommitdiffstats
path: root/mod/admin.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-01-21 21:40:29 -0500
committerAndrew Manning <tamanning@zoho.com>2016-01-21 21:40:29 -0500
commitb368e0a1f9715c6360748e9107f47bb5b117f04b (patch)
treedfc3d91e4fad927c12ddb6fcedf5cacc32a402bb /mod/admin.php
parentdff2cdc650cd3e0fc706640c01492fce2d9640f7 (diff)
parentdcaef756e7f9531bc4d1353b04ff44736032ffda (diff)
downloadvolse-hubzilla-b368e0a1f9715c6360748e9107f47bb5b117f04b.tar.gz
volse-hubzilla-b368e0a1f9715c6360748e9107f47bb5b117f04b.tar.bz2
volse-hubzilla-b368e0a1f9715c6360748e9107f47bb5b117f04b.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into activitystreams
Diffstat (limited to 'mod/admin.php')
-rw-r--r--mod/admin.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/mod/admin.php b/mod/admin.php
index 2d859399b..b537992d7 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -492,7 +492,7 @@ function admin_page_site(&$a) {
'$delivery_batch_count' => array('delivery_batch_count', t('Deliveries per process'),(x(get_config('system','delivery_batch_count'))?get_config('system','delivery_batch_count'):1), t("Number of deliveries to attempt in a single operating system process. Adjust if necessary to tune system performance. Recommend: 1-5.")),
'$poll_interval' => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
'$maxloadavg' => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
- '$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (matrix/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
+ '$default_expire_days' => array('default_expire_days', t('Expiration period in days for imported (grid/network) content'), intval(get_config('system','default_expire_days')), t('0 for no expiration of imported content')),
'$form_security_token' => get_form_security_token("admin_site"),
));
}