Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

7 files changed, 48 insertions, 3 deletions

diff --git a/doc/context/en/admin/logs/help.html b/doc/context/en/admin/logs/help.html
new file mode 100644
index 000000000..708ec9bde
--- /dev/null
+++ b/doc/context/en/admin/logs/help.html
@@ -0,0 +1,8 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+    <dd>This page allows you to adjust log settings and to view and existing log.</dd>
+    <dt>Log Settings</dt>
+    <dd>When you enable the Debugging option, system log information will begin appending to the file specified in the "Log File" box (path is relative to the hub root, for example /var/www). Note that this file must be writable by the web server.</dd>
+    <dt>Log Level</dt>
+    <dd>The log level option allows you to set how much information is appended to the log file. Warning: Increasing this level can quickly inflate the size of the log file to >100MB, especially on hubs with more than a few members.</dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/admin/queue/help.html b/doc/context/en/admin/queue/help.html
new file mode 100644
index 000000000..28885a154
--- /dev/null
+++ b/doc/context/en/admin/queue/help.html
@@ -0,0 +1,4 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+    <dd>The queue statistics display how many posts are in the queue for delivery to other hubs. The priority is related to how many times the delivery has been unsuccessfully attempted.</dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/admin/security/help.html b/doc/context/en/admin/security/help.html
index e9a741a5e..bfe81b132 100644
--- a/doc/context/en/admin/security/help.html
+++ b/doc/context/en/admin/security/help.html
@@ -1,3 +1,4 @@
-<h3>Security Settings</h3>
-<p>This page contains various administrator settings related to security.</p>
-<p>To save any changes you make to these settings, you must press the Submit button.</p>
\ No newline at end of file
+<dl class="dl-horizontal">
+    <dt>General</dt>
+    <dd>This page contains various administrator settings related to security. To save any changes you make to these settings, you must press the Submit button.</dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/chat/help.html b/doc/context/en/chat/help.html
new file mode 100644
index 000000000..cc71686d8
--- /dev/null
+++ b/doc/context/en/chat/help.html
@@ -0,0 +1,8 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+    <dd>Create and use chat rooms to communicate in real-time, using the standard Hubzilla permissions system for chat room access control.</dd>
+    <dt>Create new chat room</dt>
+    <dd>Use the "Create New" button to create a new chat room. Enter a name and how long messages should be retained.</dd>
+    <dt>Chatting</dt>
+    <dd>Enter your message in the message box and press Submit. You can set a status by selecting the chat room menu button beside the Submit button. Other people "in the room" are visible in the side panel in the "Chat Members" panel.</dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/connections/help.html b/doc/context/en/connections/help.html
new file mode 100644
index 000000000..0f95fde63
--- /dev/null
+++ b/doc/context/en/connections/help.html
@@ -0,0 +1,8 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+    <dd>This page displays a list of all this channel's connections. The list can be <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">sorted and filtered using the menu button beside the search button</a>. </dd>
+    <dt>Connection Details</dt>
+    <dd>Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.</dd>
+    <dt>Connection Status</dt>
+    <dd>A connection can be in different states: <ul><li>Archived</li><li>Ignored</li><li>Blocked</li><li>Hidden</li></ul></dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/connections/ifpending/help.html b/doc/context/en/connections/ifpending/help.html
new file mode 100644
index 000000000..0f95fde63
--- /dev/null
+++ b/doc/context/en/connections/ifpending/help.html
@@ -0,0 +1,8 @@
+<dl class="dl-horizontal">
+    <dt>General</dt>
+    <dd>This page displays a list of all this channel's connections. The list can be <a href='#' onclick='contextualHelpFocus(".section-title-wrapper", 0); return false;' title="Click to highlight element...">sorted and filtered using the menu button beside the search button</a>. </dd>
+    <dt>Connection Details</dt>
+    <dd>Each list entry shows the details of a specific connection. A translucent avatar image indicates an archived connection.</dd>
+    <dt>Connection Status</dt>
+    <dd>A connection can be in different states: <ul><li>Archived</li><li>Ignored</li><li>Blocked</li><li>Hidden</li></ul></dd>
+</dl>
\ No newline at end of file
diff --git a/doc/context/en/events/help.html b/doc/context/en/events/help.html
new file mode 100644
index 000000000..8c0b1d4ab
--- /dev/null
+++ b/doc/context/en/events/help.html
@@ -0,0 +1,8 @@
+<dl class="dl-horizontal">
+  <dt>General</dt>
+  <dd>This page displays a calendar of events both owned by you and shared with you from other channels.</dd>
+  <dt><a href='#' onclick='contextualHelpFocus("#title", 0); return false;' title="Click to highlight element...">Calendar View</a></dt>
+  <dd>The calendar can be displayed in month, week, or day mode using the options in the side panel.</dd>
+  <dt>Export/Import</dt>
+  <dd>Export or import calendar events using standard iCalendar format (.ics) files.</dd>
+</dl>
\ No newline at end of file