Update images in documentation

docs/editor_manual/administrator_tasks/managing_workflows.rst

@@ -2,11 +2,11 @@ Managing Workflows
 ==================
 
 Workflows allow you to configure how moderation works on your site. Workflows are sequences of tasks, all of which must be approved
-before the workflow completes (by default, this results in the publication of the page, but depends on your site settings TODO: add settings link).
+before the workflow completes (by default, this results in the publication of the page, but depends on your site :ref:`settings<workflow_settings>`).
 
 The workflow management interface is accessed via the `Workflows` item in the `Settings` submenu, found in the left menu bar.
 
-TODO: add screenshot
+.. image:: ../../_static/images/screen45_workflow_index.png
 
 In this interface you can see all of the workflows on your site, and the order of tasks in each. You can click on a workflow to edit it or to assign it
 to part of the page tree, or use the `Add a workflow` button to create a new workflow.
@@ -16,7 +16,7 @@ Editing workflows
 _________________
 
 
-TODO: add screenshot
+.. image:: ../../_static/images/screen44_workflow_edit.png
 
 Under `Tasks`, you can add, remove, or reorder tasks in a workflow. You may also disable the workflow, which will cancel all pages currently
 in moderation on this workflow, and prevent others from starting it.
@@ -29,7 +29,7 @@ the right of each entry, or assign it to a page using the `Add to page` button.
 Creating and editing tasks
 __________________________
 
-TODO: add screenshot
+.. image:: ../../_static/images/screen46_task_index.png
 
 In the tasks interface, accessible via the `Tasks` button in the upper right corner of the workflow management interface, you can see a list of the tasks
 currently available. Similarly to workflows, you can click an existing task to edit it, or the `Add a task` button to create a new task.
@@ -38,6 +38,8 @@ When creating a task, if you have multiple task types available, these will be o
 Creating a `group approval task`, you will be able to select one or multiple groups: members of any of these, as well as administrators, will be able to
 approve or reject moderation for this task.
 
+.. image:: ../../_static/images/screen47_task_create.png
+
 When editing a task, you may find that some fields - including the groups in a `group approval task` are uneditable. This is to ensure workflow history
 remains consistent - if you find yourself needing to change the group, it is recommended that you disable the old task, and create a new one with the groups
 you need. Disabling a task will cause any pages currently in moderation on that task to skip to the next task.

docs/editor_manual/editing_existing_pages.rst

@@ -13,3 +13,16 @@ Here is how you can access the edit screen of an existing page:
 * The current status of the page is displayed in the top-right.
 * You can change the title of the page by clicking into the title field.
 * When you are typing into a field, help text is often displayed on the right-hand side of the screen.
+
+
+Moderation
+__________
+
+If the page is currently in moderation, you'll see a banner at the top of the screen. If the moderation workflow for the current page has more than
+one step, it will tell you which step the page is on. You'll also see an indicator to the right of the page title, showing the name of the moderation workflow, 
+and a set of icons representing completed and incomplete tasks. The name can be clicked to show more information about the current workflow's progress.
+
+.. image:: ../_static/images/screen12.5_edit_screen_in_moderation.png
+
+If you can perform moderation actions (for example, approval or rejection) on the current task, you'll see an additional menu at the bottom of the page
+to the right of the action menu, providing these options.

docs/editor_manual/new_pages/previewing_and_submitting_for_moderation.rst

@@ -4,7 +4,7 @@ Previewing and submitting pages for moderation
 The Save/Preview/Submit for moderation menu is always present at the bottom of the page edit/creation screen. The menu allows you to perform the following actions, dependent on whether you are an editor, moderator or administrator:
 
 * **Save draft:** Saves your current changes but doesn't submit the page for moderation and so won’t be published. (all roles)
-* **Submit for moderation:** Saves your current changes and submits the page for moderation. A moderator will be notified and they will then either publish or reject the page. This button may be missing if the site administrator has :ref:`disabled moderation<wagtail_moderation_enabled>`, or hasn't assigned a workflow to this part of the site.  (all roles)
+* **Submit for moderation:** Saves your current changes and submits the page for moderation. The page will then enter a moderation workflow: a set of tasks which, when all are approved, will publish the page (by default, depending on your site :ref:`settings<workflow_settings>`). This button may be missing if the site administrator has :ref:`disabled moderation<wagtail_moderation_enabled>`, or hasn't assigned a workflow to this part of the site.  (all roles)
 * **Preview:** Opens a new window displaying the page as it would look if published, but does not save your changes or submit the page for moderation. (all roles)
 * **Publish/Unpublish:** Clicking the *Publish* button will publish this page. Clicking the *Unpublish* button will take you to a confirmation screen asking you to confirm that you wish to unpublish this page. If a page is published it will be accessible from its specific URL and will also be displayed in site search results. (moderators and administrators only)
 * **Delete:** Clicking this button will take you to a confirmation screen asking you to confirm that you wish to delete the current page. Be sure that this is actually what you want to do, as deleted pages are not recoverable. In many situations simply unpublishing the page will be enough. (moderators and administrators only)

docs/reference/settings.rst

@@ -564,6 +564,9 @@ When true, HTML tags in form field help text will be rendered unescaped (default
 .. WARNING::
    Enabling this option will allow editors to insert arbitrary HTML into the page, such as scripts that could allow the editor to acquire administrator privileges when another administrator views the page. Do not enable this setting unless your editors are fully trusted.
 
+
+.. _workflow_settings:
+
 Workflow
 ========