From bc21fca34567ca0fb57eba6b2e2c38fb1b77462c Mon Sep 17 00:00:00 2001 From: Michael Vogel Date: Fri, 11 Mar 2016 23:44:46 +0100 Subject: [PATCH] Remove the setting description from the documentation since it isn't a hidden one anymore. --- doc/htconfig.md | 3 --- mod/admin.php | 1 + view/templates/admin_site.tpl | 3 ++- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/doc/htconfig.md b/doc/htconfig.md index f9c92bfa08..a36e0bef22 100644 --- a/doc/htconfig.md +++ b/doc/htconfig.md @@ -64,9 +64,6 @@ line to your .htconfig.php: * throttle_limit_week - Maximum number of posts that a user can send per week with the API. * throttle_limit_month - Maximum number of posts that a user can send per month with the API. * wall-to-wall_share (Boolean) - Displays forwarded posts like "wall-to-wall" posts. -* worker (Boolean) - (Experimental) Use the worker system instead of calling several background processes. Reduces the overall load and speeds up item delivery. -* worker_dont_fork (Boolean) - if enabled, the workers are only called from the poller process. Useful on systems that permit the use of "proc_open". -* worker_queues - Number of parallel workers. Default value is 10 queues. * xrd_timeout - Timeout for fetching the XRD links. Default value is 20 seconds. ## service_class ## diff --git a/mod/admin.php b/mod/admin.php index 57a004f51a..28c8ed15c2 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -909,6 +909,7 @@ function admin_page_site(&$a) { '$advanced' => t('Advanced'), '$portable_contacts' => t('Auto Discovered Contact Directory'), '$performance' => t('Performance'), + '$worker_title' => t('Worker'), '$relocate'=> t('Relocate - WARNING: advanced function. Could make this server unreachable.'), '$baseurl' => $a->get_baseurl(true), // name, label, value, help string, extra data... diff --git a/view/templates/admin_site.tpl b/view/templates/admin_site.tpl index d43c6a8c4a..f22319b695 100644 --- a/view/templates/admin_site.tpl +++ b/view/templates/admin_site.tpl @@ -152,11 +152,12 @@ {{include file="field_input.tpl" field=$max_comments}} {{include file="field_checkbox.tpl" field=$proxy_disabled}} {{include file="field_checkbox.tpl" field=$old_pager}} +
+

{{$worker_title}}

{{include file="field_checkbox.tpl" field=$worker}} {{include file="field_input.tpl" field=$worker_queues}} {{include file="field_checkbox.tpl" field=$worker_dont_fork}} -
-- 2.39.5