From 6868403383b1ab4684c63d30ac02f3a99e880be5 Mon Sep 17 00:00:00 2001
From: Andrew Manning <tamanning@zoho.com>
Date: Sun, 14 Aug 2016 13:34:52 -0400
Subject: Context help for settings/features page

---
 doc/context/en/settings/features/help.html | 12 ++++++++++++
 include/features.php                       |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 doc/context/en/settings/features/help.html

diff --git a/doc/context/en/settings/features/help.html b/doc/context/en/settings/features/help.html
new file mode 100644
index 000000000..86e4f5dae
--- /dev/null
+++ b/doc/context/en/settings/features/help.html
@@ -0,0 +1,12 @@
+<dl class="dl-horizontal">
+  <dt>General</dt>
+  <dd>This page allows you to configure settings for the many additional features of Hubzilla.</dd>
+  <dt><a href='#' onclick='$("#general-settings-title h3 a").click(); setTimeout((function() {contextualHelpFocus("#general-settings-title", 0)}), 1000); return false;' title="Click to highlight element...">General Features</a></dt>
+  <dd>General feature settings include options relevant to your channel, such as webpage and wiki hosting.</dd>
+	<dt><a href='#' onclick='$("#composition-settings-title h3 a").click(); setTimeout((function() {contextualHelpFocus("#composition-settings-title", 0)}), 1000); return false;' title="Click to highlight element...">Post Composition Features</a></dt>
+  <dd>The post composition features provide extra options and capabilities when composing new posts.</dd>
+	<dt><a href='#' onclick='$("#net_module-settings-title h3 a").click(); setTimeout((function() {contextualHelpFocus("#net_module-settings-title", 0)}), 1000); return false;' title="Click to highlight element...">Network and Stream Filtering</a></dt>
+  <dd>These settings modify features associated with filtering and controlling your view of incoming posts.</dd>
+	<dt><a href='#' onclick='$("#tools-settings-title h3 a").click(); setTimeout((function() {contextualHelpFocus("#tools-settings-title", 0)}), 1000); return false;' title="Click to highlight element...">Post/Comment Tools</a></dt>
+  <dd>These provide additional tools for categorizing posts and allowing additional commenting methods such as emoji or community tagging.</dd>
+</dl>
\ No newline at end of file
diff --git a/include/features.php b/include/features.php
index f9001d7be..356de35a2 100644
--- a/include/features.php
+++ b/include/features.php
@@ -74,7 +74,7 @@ function get_features($filtered = true) {
 			array('channel_sources', t('Channel Sources'),          t('Automatically import channel content from other channels or feeds'),false,get_config('feature_lock','channel_sources')),
 			array('content_encrypt', t('Even More Encryption'),          t('Allow optional encryption of content end-to-end with a shared secret key'),false,get_config('feature_lock','content_encrypt')),
 			array('consensus_tools', t('Enable Voting Tools'),      t('Provide a class of post which others can vote on'),false,get_config('feature_lock','consensus_tools')),
-			array('disable_comments', t('Enable Disabling Comments'),      t('Provide the option to disable comments for a post'),false,get_config('feature_lock','disable_comments')),
+			array('disable_comments', t('Disable Comments'),      t('Provide the option to disable comments for a post'),false,get_config('feature_lock','disable_comments')),
 			array('delayed_posting', t('Delayed Posting'),      t('Allow posts to be published at a later date'),false,get_config('feature_lock','delayed_posting')),
 			array('suppress_duplicates', t('Suppress Duplicate Posts/Comments'),  t('Prevent posts with identical content to be published with less than two minutes in between submissions.'),true,get_config('feature_lock','suppress_duplicates')),
 
-- 
cgit v1.2.3