summaryrefslogtreecommitdiff
path: root/doc/calendar-configuration.markdown
diff options
context:
space:
mode:
authorGerardo Zamudio <gerardozamudio@users.noreply.github.com>2016-02-24 23:48:50 -0600
committerGerardo Zamudio <gerardozamudio@users.noreply.github.com>2016-02-24 23:48:50 -0600
commite4de6b3898b64b26d29aff31f21df5fda8055686 (patch)
tree575f8a65440f291d70a070d168eafca8c82a6459 /doc/calendar-configuration.markdown
parentd9ffbea174ea6524d0a22f8375ca8b3aa04a3c96 (diff)
parenta6540bc604c837d92c9368540c145606723e97f7 (diff)
Merge pull request #1 from fguillot/master
Update from upstream
Diffstat (limited to 'doc/calendar-configuration.markdown')
-rw-r--r--doc/calendar-configuration.markdown12
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/calendar-configuration.markdown b/doc/calendar-configuration.markdown
index 95e13e52..438ba37a 100644
--- a/doc/calendar-configuration.markdown
+++ b/doc/calendar-configuration.markdown
@@ -13,7 +13,7 @@ There are two different calendars in Kanboard:
Project calendar
----------------
-This calendar show tasks with defined due date and tasks based on the creation date or the start date.
+This calendar shows tasks with defined due date and tasks based on the creation date or the start date.
### Show tasks based on the creation date
@@ -30,13 +30,13 @@ This calendar show tasks with defined due date and tasks based on the creation d
User calendar
-------------
-This calendar show only tasks assigned to the user and optionally subtasks information.
+This calendar shows only tasks assigned to the user and optionally sub-tasks information.
-### Show subtasks based on the time tracking
+### Show sub-tasks based on the time tracking
-- Display subtasks in the calendar from the information recorded in the time tracking table.
+- Display sub-tasks in the calendar from the information recorded in the time tracking table.
- The intersection with the user timetable is also calculated.
-### Show subtask estimates (forecast of future work)
+### Show sub-task estimates (forecast of future work)
-- Display the estimate of future work for subtasks in status "todo" and with a defined "estimate" value.
+- Display the estimate of future work for sub-tasks in status "todo" and with a defined "estimate" value.