2 commits - plugins/calendar plugins/tasklist

[Thomas Brüderli]

 plugins/calendar/helpdocs/en_US/manage.rst |    6 +++---
 plugins/tasklist/helpdocs/en_US/manage.rst |   18 +++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

New commits:
commit 50d9a2acc59d2093eb4158747038d07b9506ddf5
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Wed Feb 5 16:27:08 2014 +0100

    Describe notifications for tasks; unify wording with s/alarms/reminders/

diff --git a/plugins/calendar/helpdocs/en_US/manage.rst b/plugins/calendar/helpdocs/en_US/manage.rst
index 6f63c8a..36292a5 100644
--- a/plugins/calendar/helpdocs/en_US/manage.rst
+++ b/plugins/calendar/helpdocs/en_US/manage.rst
@@ -113,10 +113,10 @@ Get Notifications
 
     While logged in to the webmail, event reminders will be displayed with pop-up boxes at the specified time
     before the event starts. You can specify if you want to see alarms for every calendar individually.
-    Enable or disable alarms in :ref:`Calendar Settings <calendar-edit-properties>` from the :ref:`calendar-lists`.
+    Enable or disable reminders in :ref:`Calendar Settings <calendar-edit-properties>` from the :ref:`calendar-lists`.
 
-Dismiss or Snooze Alarms
-^^^^^^^^^^^^^^^^^^^^^^^^
+Dismiss or Snooze Reminders
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 When a reminder box pops up, you can either dismiss the notification for all events or each one individually.
 When dismissed, no further reminders will be displayed. Choose a time from the *Snooze* menu to get another
diff --git a/plugins/tasklist/helpdocs/en_US/manage.rst b/plugins/tasklist/helpdocs/en_US/manage.rst
index 28f066e..0695fa4 100644
--- a/plugins/tasklist/helpdocs/en_US/manage.rst
+++ b/plugins/tasklist/helpdocs/en_US/manage.rst
@@ -147,6 +147,18 @@ If you organize your tasks in different lists, dropping a task onto a task list
 moves it (and all child tasks) to that particular list.
 
 
+.. index:: Notifications, Reminders
+.. _tasklist-task-alarms:
+
+Get Notifications
+-----------------
+
+While logged in to the webmail, reminders about soon-to-be due tasks will be displayed with pop-up boxes at
+the specified time before the task is due. You can specify if you want to see reminders for every task list individually.
+Enable or disable reminders in :ref:`Task List Settings <tasklist-edit-list>` from the :ref:`tasklist-lists`.
+
+Read how to :ref:`Dismiss or Snooze Reminders <calendar-event-alarms>` in the calendar section.
+
 
 Delete Tasks
 ------------


commit 070a31406c29c9da6be944912e42c0a4a749799d
Author: Thomas Bruederli <thomas at roundcube.net>
Date:   Wed Feb 5 16:14:44 2014 +0100

    Fix typos

diff --git a/plugins/tasklist/helpdocs/en_US/manage.rst b/plugins/tasklist/helpdocs/en_US/manage.rst
index 0ac8be0..28f066e 100644
--- a/plugins/tasklist/helpdocs/en_US/manage.rst
+++ b/plugins/tasklist/helpdocs/en_US/manage.rst
@@ -78,7 +78,7 @@ used tags will be shown. Use the arrow keys on the keyboard to select one and pr
 
 Remove tags with a click on the *Remove* icon.
 
-**Datg & Drop Tags**
+**Drag & Drop Tags**
 
 Existing tags listed in the tags box on the left can also be assigned to tasks directly in the list view
 by simply dragging the tag from the box and drop it on a task bar.
@@ -137,13 +137,13 @@ Create a Subtask
 Re-organize Groups
 ^^^^^^^^^^^^^^^^^^
 
-Ther hierarchical nesting of tasks and subtasks can be changed at any time. Simple grab a task with the mouse
+The hierarchical nesting of tasks and subtasks can be changed at any time. Simple grab a task with the mouse
 and drop onto another one to make it a subtask. This works for entire subtrees equally well. While dragging,
 a possible drop target is highlighted when moving over it.
 
 Drop a task onto the small bar on top of the tasks list to make it a main task again.
 
-If you organize your tasks in different lists, dropping a task onto a tasklist in the box on the left
+If you organize your tasks in different lists, dropping a task onto a task list in the box on the left
 moves it (and all child tasks) to that particular list.