diff -u b/core/modules/help/config/install/help.help.help_module.yml b/core/modules/help/config/install/help.help.help_module.yml
--- b/core/modules/help/config/install/help.help.help_module.yml
+++ b/core/modules/help/config/install/help.help.help_module.yml
@@ -2,7 +2,7 @@
 status: true
 dependencies: {  }
 id: help_module
-label: 'Help Module'
+label: 'Help module'
 body:
   value: "<h3>About</h3>\r\n\r\n<p>The Help module provides <a href=\"[[help.main]]\">Help reference pages</a> to guide you through the use and configuration of modules. It is a starting point for <a href=\"https://www.drupal.org/documentation\">Drupal.org online documentation</a> pages that contain more extensive and up-to-date information, are annotated with user-contributed comments, and serve as the definitive reference point for all Drupal documentation. For more information, see the <a href=\"https://www.drupal.org/documentation/modules/help/\">online documentation for the Help module</a>.</p>\r\n\r\n<h3>Uses</h3>\r\n\r\n<dl>\r\n\t<dt>Providing a help reference</dt>\r\n\t<dd>The Help module displays both static module-provided help and configured help topics on the main <a href=\"[[help.main]]\">Help page</a>.</dd>\r\n\t<dt>Configuring help topics</dt>\r\n\t<dd>You can add, edit, delete, and translate configured help topics on the <a href=\"[[help.topic_admin]]\">Help topics</a> administration page. The help topics that are listed in the Module help section of the main Help page cannot be edited or deleted.</dd>\r\n</dl>\r\n"
   format: full_html
diff -u b/core/modules/help/help.routing.yml b/core/modules/help/help.routing.yml
--- b/core/modules/help/help.routing.yml
+++ b/core/modules/help/help.routing.yml
@@ -15,7 +15,7 @@
     _permission: 'access administration pages'
 
 help.topic_view:
-  path: 'admin/help_topic/{id}'
+  path: 'admin/help-topic/{id}'
   defaults:
     _content: '\Drupal\help\Controller\HelpController::helpEntityView'
     _title: 'Help'
diff -u b/core/modules/help/src/Entity/Help.php b/core/modules/help/src/Entity/Help.php
--- b/core/modules/help/src/Entity/Help.php
+++ b/core/modules/help/src/Entity/Help.php
@@ -18,13 +18,16 @@
  * Help module installed), and then exporting them into their config/install
  * directories. Topics marked as "top_level" will be listed on admin/help,
  * and when viewing a help topic, "related" topics will be listed. Conventions:
- * - Module overview help topics should have titles like "Foo Bar Module";
- *   similar for overviews for themes, install profiles, etc.
+ * - Module overview help topics should have titles like "Foo Bar module";
+ *   similar for overview topics for themes, install profiles, etc.
  * - Module overview topics should follow
  *   @link https://drupal.org/node/632280 the standard help template. @endlink
- * - Other provided help topics should usually not be top-level topics; instead,
+ * - Non-overview help topics should usually not be top-level topics; instead,
  *   make an overview topic and list other topics in the "related" section.
  * - All topic machine names should be prefixed by the extension machine name.
+ *   The main topic for an extension should have machine name "name_type",
+ *   where name is the machine name of the extension, and type is the type of
+ *   extension (module, theme, etc.).
  * - Keep in mind that help topics are usually meant for administrative Drupal
  *   users, such as site builders and content editors, rather than programmers.
  *
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/help/help.services.yml
@@ -0,0 +1,6 @@
+services:
+  help.breadcrumb:
+    class: Drupal\help\HelpBreadcrumbBuilder
+    arguments: ['@string_translation']
+    tags:
+      - { name: breadcrumb_builder, priority: 900 }
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/help/src/HelpBreadcrumbBuilder.php
@@ -0,0 +1,51 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\help\HelpBreadcrumbBuilder.
+ */
+
+namespace Drupal\help;
+
+use Drupal\Core\Breadcrumb\BreadcrumbBuilderInterface;
+use Drupal\Core\Link;
+use Drupal\Core\Routing\RouteMatchInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
+use Drupal\Core\StringTranslation\TranslationInterface;
+
+/**
+ * Provides a breadcrumb builder for help topic pages.
+ */
+class HelpBreadcrumbBuilder implements BreadcrumbBuilderInterface {
+  use StringTranslationTrait;
+
+  /**
+   * Constructs the BookBreadcrumbBuilder.
+   *
+   * @param \Drupal\Core\StringTranslation\TranslationInterface $string_translation
+   *   The translation service.
+   */
+  public function __construct(TranslationInterface $string_translation) {
+    $this->stringTranslation = $string_translation;
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function applies(RouteMatchInterface $route_match) {
+    return $route_match->getRouteName() == 'help.topic_view';
+  }
+
+  /**
+   * {@inheritdoc}
+   */
+  public function build(RouteMatchInterface $route_match) {
+    $links = array(
+      Link::createFromRoute($this->t('Home'), '<front>'),
+      Link::createFromRoute($this->t('Administration'), 'system.admin'),
+      Link::createFromRoute($this->t('Help'), 'help.main'),
+    );
+
+    return $links;
+  }
+}
only in patch2:
unchanged:
--- a/core/modules/help/src/Tests/HelpTest.php
+++ b/core/modules/help/src/Tests/HelpTest.php
@@ -16,15 +16,16 @@
  */
 class HelpTest extends WebTestBase {
 
+  // Install with the standard profile, because it has the help block
+  // enabled and admin theme, etc.
+  protected $profile = 'standard';
+
   /**
    * Modules to enable.
    *
    * @var array.
    */
-  public static $modules = array('shortcut');
-
-  // Tests help implementations of many arbitrary core modules.
-  protected $profile = 'standard';
+  public static $modules = array('help_test');
 
   /**
    * The admin user that will be created.
@@ -39,8 +40,6 @@ class HelpTest extends WebTestBase {
   protected function setUp() {
     parent::setUp();
 
-    $this->getModuleList();
-
     // Create users.
     $this->adminUser = $this->drupalCreateUser(array('access administration pages', 'view the administration theme', 'administer permissions'));
     $this->anyUser = $this->drupalCreateUser(array());
@@ -67,12 +66,18 @@ public function testHelp() {
     $this->assertRaw(t('For more information, refer to the subjects listed in the Help Topics section or to the <a href="!docs">online documentation</a> and <a href="!support">support</a> pages at <a href="!drupal">drupal.org</a>.', array('!docs' => 'https://drupal.org/documentation', '!support' => 'https://drupal.org/support', '!drupal' => 'https://drupal.org')), 'Help intro text correctly appears.');
 
     // Verify that help topics text appears.
-    $this->assertRaw('<h2>' . t('Help topics') . '</h2><p>' . t('Help is available on the following items:') . '</p>', 'Help topics text correctly appears.');
+    $this->assertRaw('<h2>' . t('Module help') . '</h2><p>' . t('Help pages are available for the following modules:') . '</p>', 'Help module topics text correctly appears.');
+    $this->assertRaw('<h2>' . t('Configured topics') . '</h2><p>' . t('Additional help topics configured on your site:') . '</p>', 'Help configured topics text correctly appears.');
 
     // Make sure links are properly added for modules implementing hook_help().
     foreach ($this->getModuleList() as $module => $name) {
       $this->assertLink($name, 0, format_string('Link properly added to @name (admin/help/@module)', array('@module' => $module, '@name' => $name)));
     }
+
+    // Make sure links are properly added for topics.
+    foreach ($this->getTopicList() as $topic => $name) {
+      $this->assertLink($name, 0, format_string('Link properly added to @name (admin/help-topic/@topic)', array('@topic' => $topic, '@name' => $name)));
+    }
   }
 
   /**
@@ -100,20 +105,40 @@ protected function verifyHelp($response = 200) {
         $this->assertRaw('<h1 class="page-title">' . t($name) . '</h1>', format_string('%module heading was displayed', array('%module' => $module)));
       }
     }
+
+    foreach ($this->getTopicList() as $topic => $name) {
+      // View module help node.
+      $this->drupalGet('admin/help-topic/' . $topic);
+      $this->assertResponse($response);
+      if ($response == 200) {
+        $this->assertTitle($name . ' | Drupal', format_string('%topic title was displayed', array('%topic' => $topic)));
+        $this->assertRaw('<h1 class="page-title">' . t($name) . '</h1>', format_string('%topic heading was displayed', array('%topic' => $topic)));
+      }
+    }
   }
 
   /**
-   * Gets the list of enabled modules that implement hook_help().
+   * Gets a list of modules to test for hook_help() pages.
    *
    * @return array
-   *   A list of enabled modules.
+   *   A list of modules to test, machine name => displayed name.
    */
   protected function getModuleList() {
-    $modules = array();
-    $module_data = system_rebuild_module_data();
-    foreach (\Drupal::moduleHandler()->getImplementations('help') as $module) {
-      $modules[$module] = $module_data[$module]->info['name'];
-    }
-    return $modules;
+    return array(
+      'help_test' => 'Help Test',
+    );
+  }
+
+  /**
+   * Gets a list of topic IDs to test.
+   *
+   * @return array
+   *   A list of topics to test, machine name => displayed name.
+   */
+  protected function getTopicList() {
+    return array(
+      'help_module' => t('Help module'),
+    );
   }
+
 }
only in patch2:
unchanged:
--- a/core/modules/help/src/Tests/NoHelpTest.php
+++ b/core/modules/help/src/Tests/NoHelpTest.php
@@ -43,7 +43,7 @@ public function testMainPageNoHelp() {
 
     $this->drupalGet('admin/help');
     $this->assertResponse(200);
-    $this->assertText('Help is available on the following items', 'Help page is found.');
+    $this->assertText('Help pages are available for the following modules', 'Help page is found.');
     $this->assertNoText('Hook menu tests', 'Making sure the test module menu_test does not display a help link on admin/help.');
   }
 }
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/help/test/modules/help_test/help_test.info.yml
@@ -0,0 +1,6 @@
+name: 'Help Test'
+type: module
+description: 'Support module for help testing.'
+package: Testing
+version: VERSION
+core: 8.x
only in patch2:
unchanged:
--- /dev/null
+++ b/core/modules/help/test/modules/help_test/help_test.module
@@ -0,0 +1,18 @@
+<?php
+
+/**
+ * @file
+ * Test module for help.
+ */
+
+use Drupal\Core\Routing\RouteMatchInterface;
+
+/**
+ * Implements hook_help().
+ */
+function help_test_help($route_name, RouteMatchInterface $route_match) {
+  switch ($route_name) {
+    case 'help.page.help_test':
+      return 'Some kind of non-empty output for testing';
+  }
+}