diff --git a/help/collaborative-to-do-lists.md b/help/collaborative-to-do-lists.md
index d5af42f459..1b725ee2f8 100644
--- a/help/collaborative-to-do-lists.md
+++ b/help/collaborative-to-do-lists.md
@@ -2,6 +2,61 @@
 
 {!to-do-lists-intro.md!}
 
+## Create a to-do list
+
+{start_tabs}
+
+{!start-composing.md!}
+
+1. Make sure the compose box is empty.
+
+2. Type `/todo` followed by a space, and the title of the to-do list.
+
+3. _(optional)_ Type each task on a new line, with its description, if any, after a <kbd>:</kbd>.
+
+4. Click the **Send** (<i class="zulip-icon zulip-icon-send"></i>) button, or
+   use a [keyboard shortcut](/help/mastering-the-compose-box#toggle-between-ctrl-enter-and-enter-to-send-a-message)
+   to send your message.
+
+!!! tip ""
+
+    You will be able to add tasks after the to-do list is created.
+
+{end_tabs}
+
+## Add tasks to a to-do list
+
+{start_tabs}
+
+1. Fill out the **New task** field and optionally the **Description** field at the bottom of the to-do list.
+
+1. Click **Add task** to add the new task to the to-do list.
+
+{end_tabs}
+
+## Edit the to-do list title
+
+!!! warn ""
+
+    Only the creator of a to-do list can edit the title.
+
+{start_tabs}
+
+1. Click the **pencil** (<i class="fa fa-pencil"></i>) icon
+   to the right of the title.
+
+1. Edit the title as desired.
+
+1. Click the **checkmark** (<i class="fa fa-check"></i>) icon or press
+   <kbd>Enter</kbd> to save your changes.
+
+!!! tip ""
+
+    You can click the <i class="fa fa-remove"></i> icon or press
+    <kbd>Esc</kbd> to discard your changes.
+
+{end_tabs}
+
 ## Examples
 
 {!to-do-lists-examples.md!}
diff --git a/help/include/to-do-lists-examples.md b/help/include/to-do-lists-examples.md
index e56d43320a..45bc4ce2f5 100644
--- a/help/include/to-do-lists-examples.md
+++ b/help/include/to-do-lists-examples.md
@@ -1,17 +1,14 @@
 ### What you type
 
 ```
-/todo
+/todo Today's tasks
+Task 1: This is the first task.
+Task 2: This is the second task.
+Last task
 ```
 
-!!! warn ""
-
-    Any other content in a message starting with `/todo` will be ignored.
-
 ### What it looks like
 
-After two tasks have been added to the shared to-do list:
-
 ![Markdown todo-lists](/static/images/help/markdown-todo.png)
 
 !!! tip ""
diff --git a/help/include/to-do-lists-intro.md b/help/include/to-do-lists-intro.md
index cc47b4ea5f..3aaf997a18 100644
--- a/help/include/to-do-lists-intro.md
+++ b/help/include/to-do-lists-intro.md
@@ -1,3 +1,4 @@
 Zulip supports creating shared to-do lists where any user who can access the
 message can add tasks by entering the task's title and description, and clicking
-**Add task**. Once created, task titles and descriptions cannot be edited.
+**Add task**. Once created, task titles and descriptions cannot be edited. The task
+list title can be edited any time by the to-do list's creator.
diff --git a/static/images/help/markdown-todo.png b/static/images/help/markdown-todo.png
index e3ebcbed10..1e57d77ada 100644
Binary files a/static/images/help/markdown-todo.png and b/static/images/help/markdown-todo.png differ