Display tasks in the calendar + improve settings

1 files changed, 42 insertions, 0 deletions

diff --git a/docs/calendar-settings.markdown b/docs/calendar-settings.markdown
new file mode 100644
index 00000000..c69c9b85
--- /dev/null
+++ b/docs/calendar-settings.markdown
@@ -0,0 +1,42 @@
+Calendar settings
+=================
+
+Go to the menu **Settings**, then choose **Calendar settings** on the left.
+
+![Calendar settings](http://kanboard.net/screenshots/documentation/calendar-settings.png)
+
+There are two different calendars in Kanboard:
+
+- Project calendar
+- User calendar (available from the dashboard)
+
+Project calendar
+----------------
+
+This calendar show tasks with defined due date and tasks based on the creation date or the start date.
+
+### Show tasks based on the creation date
+
+The start date of the calendar event is the creation date of the task.
+The end date of the event is the date of completion.
+
+### Show tasks based on the start date
+
+The start date of the calendar event is the start date of the task.
+This date can be defined manually.
+The end date of the event is the date of completion.
+If there is no start date the task will not appear on the calendar.
+
+User calendar
+-------------
+
+This calendar show only tasks assigned to the user and optionally subtasks information.
+
+### Show subtasks based on the time tracking
+
+Display subtasks 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)
+
+Display the estimate of future work for subtasks in status "todo" and with a defined "estimate" value.