diff --git a/core/modules/block/block.api.php b/core/modules/block/block.api.php
index 339cdb7..44491df 100644
--- a/core/modules/block/block.api.php
+++ b/core/modules/block/block.api.php
@@ -20,8 +20,8 @@
  * If the module wishes to act on the rendered HTML of the block rather than
  * the structured content array, it may use this hook to add a #post_render
  * callback. Alternatively, it could also implement hook_preprocess_HOOK() for
- * block.html.twig. See drupal_render() documentation respectively
- * for details. @link themeable Default theme implementations topic @link
+ * block.html.twig. See drupal_render() documentation, and
+ * the @link themeable Default theme implementations topic @endlink for details.
  *
  * In addition to hook_block_view_alter(), which is called for all blocks, there
  * is hook_block_view_BASE_BLOCK_ID_alter(), which can be used to target a
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index 81363d2..8ba6fbb 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -816,8 +816,9 @@ function hook_node_view(\Drupal\node\NodeInterface $node, \Drupal\Core\Entity\Di
  * If the module wishes to act on the rendered HTML of the node rather than the
  * structured content array, it may use this hook to add a #post_render
  * callback.  Alternatively, it could also implement hook_preprocess_HOOK() for
- * node.html.twig. See drupal_render() documentation respectively for details.
- * @see themeable
+ * node.html.twig. See drupal_render() documentation, and
+ * the @link themeable Default theme implementations topic @endlink respectively
+ * for details.
  *
  * @param $build
  *   A renderable array representing the node content.
@@ -829,6 +830,7 @@ function hook_node_view(\Drupal\node\NodeInterface $node, \Drupal\Core\Entity\Di
  *
  * @see node_view()
  * @see hook_entity_view_alter()
+ * @see themeable
  *
  * @ingroup node_api_hooks
  */
diff --git a/core/modules/system/entity.api.php b/core/modules/system/entity.api.php
index 0e31c70..3a29144 100644
--- a/core/modules/system/entity.api.php
+++ b/core/modules/system/entity.api.php
@@ -476,8 +476,7 @@ function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\C
  * structured content array, it may use this hook to add a #post_render
  * callback. Alternatively, it could also implement hook_preprocess_HOOK() for
  * the particular entity type template, if there is one (e.g., node.html.twig).
- * See drupal_render() for details.
- * @see themeable
+ * See drupal_render(), and the @link themeable Default theme implementations topic @endlink for details.
  *
  * @param $build
  *   A renderable array representing the entity content.
@@ -487,6 +486,7 @@ function hook_entity_view(\Drupal\Core\Entity\EntityInterface $entity, \Drupal\C
  *   The entity view display holding the display options configured for the
  *   entity components.
  *
+ * @see themeable
  * @see hook_entity_view()
  * @see hook_comment_view_alter()
  * @see hook_node_view_alter()
diff --git a/core/modules/system/system.api.php b/core/modules/system/system.api.php
index 3f75048..a253be7 100644
--- a/core/modules/system/system.api.php
+++ b/core/modules/system/system.api.php
@@ -1025,9 +1025,11 @@ function hook_permission() {
 
 /**
  * Register a module or theme's theme implementations.
- * The implementations declared by this hook specify how a particular render
- * array is to be rendered as HTML.
- * @see themeable
+ * The implementations declared by this hook have several purposes:
+ * - They can specify how a particular render array is to be rendered as HTML.
+ * - They can return HTML for calls to _theme() for a theme suggestion.
+ * See the @link themeable Default theme implementations topic @endlink for
+ * details.
  *
  * @param array $existing
  *   An array of existing implementations that may be used for override
@@ -1053,14 +1055,13 @@ function hook_permission() {
  *
  * @return array
  *   An associative array of information about theme implementations. The keys
- *   on the outer array are known as "theme hooks". For theme suggestions,
- *   instead of the array key being the base theme hook, the key is a theme
- *   suggestion name with the format 'base_hook_name__sub_hook_name'.
+ *   on the outer array are known as "theme hooks".
  *   For render elements, the key is the machine name of the render element.
  *   The array values are themselves arrays containing information about the
  *   theme hook and its implementation. Each information array must contain
- *   a 'render element' element.
- *   @link themeable Default theme implementations topic @link
+ *   a 'render element' element. See @link themeable Default theme implementations topic @endlink
+ *   for details.
+ *
  *   The following elements may be part of each information array:
  *   - render element: Used for render element items only: the name of the
  *     renderable element or element tree to pass to the theme function. This
@@ -1092,10 +1093,13 @@ function hook_permission() {
  *     set, this can be set to true. Please keep in mind that when this is used
  *     by a theme, that theme becomes responsible for making sure necessary
  *     variables are set.
+ *   - type: (automatically derived) Where the theme hook is defined:
+ *     'module', 'theme_engine', or 'theme'.
  *   - theme path: (automatically derived) The directory path of the theme or
  *     module, so that it doesn't need to be looked up.
  *
  * @see hook_theme_registry_alter()
+ * @see themeable
  */
 function hook_theme($existing, $type, $theme, $path) {
   return array(
diff --git a/core/modules/taxonomy/taxonomy.api.php b/core/modules/taxonomy/taxonomy.api.php
index ff25a86..afb8bb1 100644
--- a/core/modules/taxonomy/taxonomy.api.php
+++ b/core/modules/taxonomy/taxonomy.api.php
@@ -282,8 +282,8 @@ function hook_taxonomy_term_view(\Drupal\taxonomy\Entity\Term $term, \Drupal\Cor
  * structured content array, it may use this hook to add a #post_render
  * callback. Alternatively, it could also implement
  * hook_preprocess_HOOK() for taxonomy-term.html.twig. See drupal_render()
- * documentation respectively for details.
- * @link themeable Default theme implementations topic @link
+ * documentation, and the @link themeable Default theme implementations topic @endlink
+ * respectively for details.
  *
  * @param $build
  *   A renderable array representing the taxonomy term content.
diff --git a/core/modules/user/user.api.php b/core/modules/user/user.api.php
index 262ea18..763bc0a 100644
--- a/core/modules/user/user.api.php
+++ b/core/modules/user/user.api.php
@@ -343,8 +343,8 @@ function hook_user_view(\Drupal\user\UserInterface $account, \Drupal\Core\Entity
  * If the module wishes to act on the rendered HTML of the user rather than the
  * structured content array, it may use this hook to add a #post_render callback.
  * Alternatively, it could also implement hook_preprocess_HOOK() for
- * user.html.twig. See drupal_render() documentation for details.
- * @link themeable Default theme implementations topic @link
+ * user.html.twig. See drupal_render() documentation, and the
+ * @link themeable Default theme implementations topic @endlink for details.
  *
  * @param $build
  *   A renderable array representing the user.