diff --git a/core/modules/action/action.module b/core/modules/action/action.module
index 58bb4a8..23f89c4 100644
--- a/core/modules/action/action.module
+++ b/core/modules/action/action.module
@@ -11,16 +11,17 @@
 function action_help($path, $arg) {
   switch ($path) {
     case 'admin/help#action':
-      $output = '<p>' . t('Actions are individual tasks that the system can do, such as unpublishing a piece of content or banning a user. Other modules can fire these actions when certain system events happen; for example, when a new post is added or when a user logs in. Modules may also provide additional actions. Visit the <a href="@actions">Actions page</a> to configure actions.', array('@actions' => url('admin/config/system/actions'))) . '</p>';
+      $output = '';
+      $output .= '<h3>' . t('About') . '</h3>';
+      $output .= '<p>' . t('The Action module provides tasks that can be executed by the site such as unpublishing content, sending e-mail messages, or blocking a user. Other modules can trigger these actions when specific system events happen; for example, when new content is posted or when a user logs in. Modules can also provide additional actions. For more information, see the <a href="@documentation">online documentation for the Action module</a>.', array('@documentation' => 'https://drupal.org/documentation/modules/action')) . '</p>';
+      $output .= '<h3>' . t('Uses') . '</h3>';
+      $output .= '<dl>';
+      $output .= '<dt>' . t('Using simple actions') . '</dt>';
+      $output .= '<dd>' . t('<em>Simple actions</em> do not require configuration and are listed automatically as available on the <a href="@actions">Actions page</a>.', array('@actions' => url('admin/config/system/actions'))) . '</dd>';
+      $output .= '<dt>' . t('Creating and configuring advanced actions') . '</dt>';
+      $output .= '<dd>' . t('<em>Advanced actions</em> are user-created and have to be configured individually. Create an advanced action on the <a href="@actions">Actions page</a> by selecting an action type from the drop-down list. Then configure your action, for example by specifying the recipient of an automated e-mail message.', array('@actions' => url('admin/config/system/actions'))) . '</dd>';
+      $output .= '</dl>';
       return $output;
-
-    case 'admin/config/system/actions':
-    case 'admin/config/system/actions/manage':
-      $output = '<p>' . t('There are two types of actions: simple and advanced. Simple actions do not require any additional configuration and are listed here automatically. Advanced actions need to be created and configured before they can be used because they have options that need to be specified; for example, sending an e-mail to a specified address or unpublishing content containing certain words. To create an advanced action, select the action from the drop-down list in the advanced action section below and click the <em>Create</em> button.') . '</p>';
-      return $output;
-
-    case 'admin/config/system/actions/configure':
-      return t('An advanced action offers additional configuration options which may be filled out below. Changing the <em>Description</em> field is recommended in order to better identify the precise action taking place.');
   }
 }
 
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index 5a75c57..2069a54 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -24,10 +24,8 @@ function editor_help($path, $arg) {
       $output .= '<dd>' . t('The Text Editor module does not have its own configuration page. Instead it enhances existing configuration pages with additional options. Text editors are attached to individual text formats, which can be configured on the <a href="@formats">Text formats page</a>. Each text format may be associated with a single text editor. When entering content with that text format, the associated text editor will automatically be enabled.', array('@formats' => url('admin/config/content/formats'))) . '</dd>';
       $output .= '<dt>' . t('Allowing a user to choose a text editor') . '</dt>';
       $output .= '<dd>' . t('Because text editor configurations are bound to a text format, users with access to more than one text format may switch between available text editors by changing the text format for a field. For more information about text formats, see the <a href="@filter">Filter module help page</a>, which describes text formats in more detail.', array('@filter' => url('admin/help/filter'))) . '</dd>';
-      // @todo: Mention the availability of the built-in core WYSIWYG (CKEditor)
-      // when it becomes available. See http://drupal.org/node/1878344.
       $output .= '<dt>' . t('Installing additional text editor libraries') . '</dt>';
-      $output .= '<dd>' . t('The Text Editor module does not provide any text editor libraries itself. Most installations of Drupal include a module that provides a text editor library which may be enabled on the <a href="@modules">Modules page</a>. Additional modules that provide text editor libraries may be <a href="@download">downloaded from Drupal.org</a>.', array('@modules' => url('admin/modules'), '@download' => 'http://drupal.org/search/site/wysiwyg%20module')) . '</dd>';
+      $output .= '<dd>' . t('The Text Editor module does not provide any text editor libraries itself. The CKEditor module is part of Drupal and provides the CKEditor text editor. Most installations of Drupal include a module that provides a text editor library which may be enabled on the <a href="@modules">Modules page</a>. Additional modules that provide text editor libraries may be <a href="@download">downloaded from Drupal.org</a>.', array('@modules' => url('admin/modules'), '@download' => 'http://drupal.org/search/site/wysiwyg%20module')) . '</dd>';
       $output .= '</dl>';
       return $output;
   }