diff --git a/core/lib/Drupal/Core/Entity/EntityTypeBundleInfoInterface.php b/core/lib/Drupal/Core/Entity/EntityTypeBundleInfoInterface.php
index 4425d28..95170de 100644
--- a/core/lib/Drupal/Core/Entity/EntityTypeBundleInfoInterface.php
+++ b/core/lib/Drupal/Core/Entity/EntityTypeBundleInfoInterface.php
@@ -22,7 +22,9 @@ public function getAllBundleInfo();
    *   The entity type.
    *
    * @return array
-   *   Returns the bundle information for the specified entity type.
+   *   Returns an array of bundle information for an entity type.
+   *   Format $bundles[BUNDLE_TYPE][ID] => [LABEL]
+   *   Example: $bundles['comment']['label']
    */
   public function getBundleInfo($entity_type);
 
diff --git a/core/modules/help/help.api.php b/core/modules/help/help.api.php
index aff491c..eb84324 100644
--- a/core/modules/help/help.api.php
+++ b/core/modules/help/help.api.php
@@ -48,7 +48,7 @@ function hook_help($route_name, \Drupal\Core\Routing\RouteMatchInterface $route_
   switch ($route_name) {
     // Main module help for the block module.
     case 'help.page.block':
-      return '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "Sidebar first", "Sidebar second", "Featured", "Content", "Header", "Footer", etc., and a block may appear in any one of these areas. The <a href=":blocks">blocks administration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', array(':blocks' => \Drupal::url('block.admin_display'))) . '</p>';
+      return '<p>' . t('Blocks are boxes of content rendered into an area, or region, of a web page. The default theme Bartik, for example, implements the regions "Sidebar first", "Sidebar second", "Featured", "Content", "Header", "Footer", etc., and a block may appear in any one of these areas. The <a href=":blocks">blocks administration page</a> provides a drag-and-drop interface for assigning a block to a region, and for controlling the order of blocks within regions.', [':blocks' => Url::fromRoute('block.admin_display')->toString()]) . '</p>';
 
     // Help for another path in the block module.
     case 'block.admin_display':