diff --git a/core/modules/help_topics/help_topics/content_moderation.changing_states.html.twig b/core/modules/help_topics/help_topics/content_moderation.changing_states.html.twig
index 79358c0..c368225 100644
--- a/core/modules/help_topics/help_topics/content_moderation.changing_states.html.twig
+++ b/core/modules/help_topics/help_topics/content_moderation.changing_states.html.twig
@@ -3,17 +3,19 @@ label: 'Moving content between workflow states'
 related:
   - workflows.overview
   - content_moderation.configuring_workflows
+  - core.content_structure
 ---
 {% set workflow_topic = render_var(url('help.help_topic', {'id': 'workflows.overview'})) %}
+{% set entity_topic = render_var(url('help.help_topic', {'id': 'core.content_structure'})) %}
 {% set content_moderation_permissions = render_var(url('user.admin_permissions', {}, {'fragment': 'module-content_moderation'})) %}
 {% set content = render_var(url('system.admin_content')) %}
 <h2>{% trans %}Goal{% endtrans %}</h2>
-<p>{% trans %}Change the workflow state of a particular content item. See <a href="{{ workflow_topic }}">Managing content moderation workflows</a> for an overview of workflows.{% endtrans %}</p>
+<p>{% trans %}Change the workflow state of a particular entity. See <a href="{{ workflow_topic }}">Managing content moderation workflows</a> for an overview of workflows, and <a href="{{ entity_topic }}">Managing content structure</a> for an overview of content entities.{% endtrans %}</p>
 <h2>{% trans %}Who can change workflow states?{% endtrans %}</h2>
 <p>{% trans %}Users with the <a href="{{ content_moderation_permissions }}">content moderation permissions</a> can change workflow states. There are separate permissions for each transition.{% endtrans %}</p>
 <h2>{% trans %}Steps{% endtrans %}</h2>
 <ol>
-  <li>{% trans %}Find the content that you want to moderate in either the content moderation view page, if you created one, or the appropriate administrative page for managing that type of content (such as the <a href="{{ content }}">Content</a> administration page where you can manage content items from the core Node module).{% endtrans %}</li>
-  <li>{% trans %}Click <em>Edit</em> to edit the content.{% endtrans %}</li>
+  <li>{% trans %}Find the entity that you want to moderate in either the content moderation view page, if you created one, or the appropriate administrative page for managing that type of entity (such as the <a href="{{ content }}">Content</a> administration page for content items).{% endtrans %}</li>
+  <li>{% trans %}Click <em>Edit</em> to edit the entity.{% endtrans %}</li>
   <li>{% trans %}At the bottom of the page, select the new workflow state under <em>Change to:</em> and click <em>Save</em>.{% endtrans %}</li>
 </ol>
diff --git a/core/modules/help_topics/help_topics/content_moderation.configuring_workflows.html.twig b/core/modules/help_topics/help_topics/content_moderation.configuring_workflows.html.twig
index 05f444f..881630a 100644
--- a/core/modules/help_topics/help_topics/content_moderation.configuring_workflows.html.twig
+++ b/core/modules/help_topics/help_topics/content_moderation.configuring_workflows.html.twig
@@ -21,25 +21,30 @@ related:
 <ol>
   <li>{% trans %}Make a plan for the new workflow:{% endtrans %}
     <ul>
-      <li>{% trans %}Decide which workflow states you need; for example, <em>Concept</em>, <em>Review</em>, and <em>Final</em>. Also decide which states correspond to published content, which states should become the default revision, and which state content should be created in.{% endtrans %}</li>
-      <li>{% trans %}Decide on the list of allowed transitions between states. For example, you might want a transition between <em>Concept</em> and <em>Review</em>. Also decide which roles should have permissions to make these transitions; see <a href="{{ user_topic }}">Managing user accounts and site visitors</a> for an overview of roles and permissions.{% endtrans %}</li>
-      <li>{% trans %}Decide which <a href="{{ entities_topic }}">entity types</a> and sub-types the workflow should apply to. Only entity types that support revisions are possible to define workflows for.{% endtrans %}</li>
+      <li>{% trans %}Decide which workflow states you need; for example, <em>Concept</em>, <em>Review</em>, and <em>Final</em>.{% endtrans %}</li>
+      <li>{% trans %}Decide on the settings for each state:{% endtrans %}
+        <ul>
+          <li>{% trans %}<em>Label</em>: the state name{% endtrans %}</li>
+          <li>{% trans %}<em>Published</em>: if checked, when content reaches this state it will be made visible on the site (to users with permission).{% endtrans %}</li>
+          <li>{% trans %}<em>Default revision</em>: if checked, when content reaches this state it will become the default revision of the content; published content is automatically the default revision.{% endtrans %}</li>
+        </ul>
+      </li>
+      <li>{% trans %}Decide which state content should be created in.{% endtrans %}</li>
+      <li>{% trans %}Decide on the list of allowed transitions between states. For example, you might want a transition between <em>Concept</em> and <em>Review</em>. Each transition has a label; for example, the Concept to Review transition might be labeled "Review concept".{% endtrans %}</li>
+      <li>{% trans %}Decide which roles should have permissions to make each transition; see <a href="{{ user_topic }}">Managing user accounts and site visitors</a> for an overview of roles and permissions.{% endtrans %}</li>
+      <li>{% trans %}Decide which <a href="{{ entities_topic }}">entity types</a> and subtypes the workflow should apply to. Only entity types that support revisions are possible to define workflows for.{% endtrans %}</li>
     </ul>
   </li>
-  <li>{% trans %}In the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Workflow</em> &gt; <a href="{{ workflows_url}}"><em>Workflows</em></a>. A list of workflows is shown, including the default workflow <em>Editorial</em> that you can adapt.{% endtrans %}</li>
+  <li>{% trans %}To implement your plan, in the <em>Manage</em> administrative menu, navigate to <em>Configuration</em> &gt; <em>Workflow</em> &gt; <a href="{{ workflows_url}}"><em>Workflows</em></a>. A list of workflows is shown, including the default workflow <em>Editorial</em> that you can adapt.{% endtrans %}</li>
   <li>{% trans %}Click <em>Add workflow</em>.{% endtrans %}</li>
   <li>{% trans %}Enter a name in the <em>Label</em> field, select <em>Content moderation</em> from the <em>Workflow type</em> field, and click <em>Save</em>.{% endtrans %}</li>
-  <li>{% trans %}Verify each entry in the <em>States</em> list by clicking <em>Edit</em> under <em>Operations</em>. Verify or update the state's <em>State label</em>, and verify that the checkboxes for <em>Published</em> and <em>Default revision</em> are correct. If <em>Published</em> is checked, when content reaches this state it will be made visible on the site (to users with permission). If <em>Default revision</em> is checked, when content reaches this state it will become the default revision of the content; published content is automatically the default revision. Click <em>Save</em> to return to the workflow.{% endtrans %}</li>
-  <li>{% trans %}If there are entries in the list of <em>States</em> that you do not want, you can delete them by clicking <em>Delete</em> under <em>Operations</em>. If the <em>Delete</em> option is not available, you will first need to delete any <em>Transitions</em> to or from this state.{% endtrans %}</li>
-  <li>{% trans %}If there are missing states, click <em>Add a new state</em> to add them (see above for information on the settings for each state).{% endtrans %}</li>
-  <li>{% trans %}When the list of states is correct, verify the entries in the list of <em>Transitions</em>. For each entry, click <em>Edit</em>. Verify or update the states that the transition goes <em>From</em> and <em>To</em>, and then verify that the <em>Transition label</em> makes sense for a transition between these states. Click <em>Save</em> to return to the workflow.{% endtrans %}</li>
-  <li>{% trans %}If there are entries in the list of <em>Transitions</em> that you do not want, click the <em>Delete</em> link under <em>Operations</em> to delete them.{% endtrans %}</li>
-  <li>{% trans %}If there are missing transitions, click <em>Add a new transition</em> to add them (see above for information on the settings for each transition).{% endtrans %}</li>
+  <li>{% trans %}Verify that the <em>States</em> list matches your planned states. You can add missing states by clicking <em>Add a new state</em>. You can edit or delete states by clicking <em>Edit</em> or <em>Delete</em> under <em>Operations</em> (if the <em>Delete</em> option is not available, you will first need to delete any <em>Transitions</em> to or from this state).{% endtrans %}</li>
+  <li>{% trans %}Verify that the <em>Transitions</em> list matches your plan. You can add missing transitions by clicking <em>Add a new transition</em>. You can edit or delete transitions by clicking <em>Edit</em> or <em>Delete</em> under <em>Operations</em>.{% endtrans %}</li>
   <li>{% trans %}Under <em>This workflow applies to:</em>, find the entity type that you want this workflow to apply to, such as Content revisions, Custom block revisions, or Taxonomy term revisions. Click <em>Select</em>.{% endtrans %}</li>
-  <li>{% trans %}Check the entity sub-types that you want to apply the workflow to. For example, you might choose to apply your workflow to the <em>Page</em> content type, but not to <em>Article</em>.{% endtrans %}</li>
+  <li>{% trans %}Check the entity subtypes that you want to apply the workflow to. For example, you might choose to apply your workflow to the <em>Page</em> content type, but not to <em>Article</em>.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save</em>.{% endtrans %}</li>
   <li>{% trans %}Under <em>Workflow settings</em>, select the <em>Default moderation state</em> for new content.{% endtrans %}</li>
   <li>{% trans %}Click <em>Save</em> to save your workflow.{% endtrans %}</li>
   <li>{% trans %}Follow the steps in <a href="{{ permissions_topic }}">Modifying the permissions for a role</a> to assign permissions for each transition to roles. The permissions are listed under the <em><a href="{{ content_moderation_permissions }}">Content Moderation</a></em> section; there is one permission for each transition in each workflow.{% endtrans %}</li>
-  <li>{% trans %}Optionally (recommended), create a view for your custom workflow, to provide a page for content editors to see what content needs to be moderated. You can do this if the Views UI module is installed, by following the steps in the related <em>Creating a new view</em> topic listed below under <em>Related topics</em>. When creating the view, under <em>View settings</em> &gt; <em>Show</em>, select the revision data type you configured the workflow for, and be sure to display the Workflow State field in your view.{% endtrans %}</li>
+  <li>{% trans %}Optionally (recommended), create a view for your custom workflow, to provide a page for content editors to see what content needs to be moderated. You can do this if the Views UI module is installed, by following the steps in the related <em>Creating a new view</em> topic listed below under <em>Related topics</em>. When creating the view, under <em>View settings</em> &gt; <em>Show</em>, select the revision data type you configured the workflow for, and be sure to display the <em>Workflow State</em> field in your view.{% endtrans %}</li>
 </ol>
