diff --git a/core/includes/theme.inc b/core/includes/theme.inc
index 54b038b..0f0601e 100644
--- a/core/includes/theme.inc
+++ b/core/includes/theme.inc
@@ -580,6 +580,15 @@ function template_preprocess_datetime_wrapper(&$variables) {
  *
  * Default template: links.html.twig.
  *
+ * Note: Unfortunately links templates duplicate the "active" class handling of l()
+ * and LinkGenerator::generate() because it needs to be able to set the "active"
+ * class not on the links themselves ("a" tags), but on the list items ("li"
+ * tags) that contain the links. This is necessary for CSS to be able to style
+ * list items differently when the link is active, since CSS does not yet allow
+ * one to style list items only if it contains a certain element with a certain
+ * class. I.e. we cannot yet convert this jQuery selector to a CSS selector:
+ * jQuery('li:has("a.is-active")')
+ *
  * @param array $variables
  *   An associative array containing:
  *   - links: An array of links to be themed. Each link should be itself an
@@ -622,15 +631,6 @@ function template_preprocess_datetime_wrapper(&$variables) {
  *     http://juicystudio.com/article/screen-readers-display-none.php and
  *     http://www.w3.org/TR/WCAG-TECHS/H42.html for more information.
  *
- * Unfortunately links templates duplicate the "active" class handling of l()
- * and LinkGenerator::generate() because it needs to be able to set the "active"
- * class not on the links themselves ("a" tags), but on the list items ("li"
- * tags) that contain the links. This is necessary for CSS to be able to style
- * list items differently when the link is active, since CSS does not yet allow
- * one to style list items only if it contains a certain element with a certain
- * class. I.e. we cannot yet convert this jQuery selector to a CSS selector:
- *   jQuery('li:has("a.is-active")')
- *
  * @see \Drupal\Core\Utility\LinkGenerator
  * @see \Drupal\Core\Utility\LinkGenerator::generate()
  * @see system_page_attachments()
diff --git a/core/lib/Drupal/Core/Asset/CssOptimizer.php b/core/lib/Drupal/Core/Asset/CssOptimizer.php
index 168f315..d8e05a8 100644
--- a/core/lib/Drupal/Core/Asset/CssOptimizer.php
+++ b/core/lib/Drupal/Core/Asset/CssOptimizer.php
@@ -241,14 +241,14 @@ protected function processCss($contents, $optimize = FALSE) {
   /**
    * Prefixes all paths within a CSS file for processFile().
    *
-   * @param array $matches
-   *   An array of matches by a preg_replace_callback() call that scans for
-   *   url() references in CSS files, except for external or absolute ones.
-   *
    * Note: the only reason this method is public is so color.module can call it;
    * it is not on the AssetOptimizerInterface, so future refactorings can make
    * it protected.
    *
+   * @param array $matches
+   *   An array of matches by a preg_replace_callback() call that scans for
+   *   url() references in CSS files, except for external or absolute ones.
+   *
    * @return string
    *   The file path.
    */
diff --git a/core/lib/Drupal/Core/Config/StorableConfigBase.php b/core/lib/Drupal/Core/Config/StorableConfigBase.php
index 80a0fb6..ef856e0 100644
--- a/core/lib/Drupal/Core/Config/StorableConfigBase.php
+++ b/core/lib/Drupal/Core/Config/StorableConfigBase.php
@@ -60,13 +60,13 @@
   /**
    * Saves the configuration object.
    *
+   * Must invalidate the cache tags associated with the configuration object.
+   *
    * @param bool $has_trusted_data
    *   Set to TRUE if the configuration data has already been checked to ensure
    *   it conforms to schema. Generally this is only used during module and
    *   theme installation.
    *
-   * Must invalidate the cache tags associated with the configuration object.
-   *
    * @return $this
    *
    * @see \Drupal\Core\Config\ConfigInstaller::createConfiguration()
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index ca1835e..84fd992 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -1262,6 +1262,10 @@ function hook_entity_query_alter(\Drupal\Core\Entity\Query\QueryInterface $query
 /**
  * Act on entities being assembled before rendering.
  *
+ * The module may add elements to $build prior to rendering. The
+ * structure of $build is a renderable array as expected by
+ * drupal_render().
+ *
  * @param &$build
  *   A renderable array representing the entity content.
  * @param \Drupal\Core\Entity\EntityInterface $entity
@@ -1272,10 +1276,6 @@ function hook_entity_query_alter(\Drupal\Core\Entity\Query\QueryInterface $query
  * @param $view_mode
  *   The view mode the entity is rendered in.
  *
- * The module may add elements to $build prior to rendering. The
- * structure of $build is a renderable array as expected by
- * drupal_render().
- *
  * @see hook_entity_view_alter()
  * @see hook_ENTITY_TYPE_view()
  *
@@ -1296,6 +1296,10 @@ function hook_entity_view(array &$build, \Drupal\Core\Entity\EntityInterface $en
 /**
  * Act on entities of a particular type being assembled before rendering.
  *
+ * The module may add elements to $build prior to rendering. The
+ * structure of $build is a renderable array as expected by
+ * drupal_render().
+ *
  * @param &$build
  *   A renderable array representing the entity content.
  * @param \Drupal\Core\Entity\EntityInterface $entity
@@ -1306,10 +1310,6 @@ function hook_entity_view(array &$build, \Drupal\Core\Entity\EntityInterface $en
  * @param $view_mode
  *   The view mode the entity is rendered in.
  *
- * The module may add elements to $build prior to rendering. The
- * structure of $build is a renderable array as expected by
- * drupal_render().
- *
  * @see hook_ENTITY_TYPE_view_alter()
  * @see hook_entity_view()
  *
diff --git a/core/lib/Drupal/Core/Render/Element/Button.php b/core/lib/Drupal/Core/Render/Element/Button.php
index e75c55e..4ccdb2e 100644
--- a/core/lib/Drupal/Core/Render/Element/Button.php
+++ b/core/lib/Drupal/Core/Render/Element/Button.php
@@ -73,9 +73,8 @@ public static function processButton(&$element, FormStateInterface $form_state,
    * @param array $element
    *   An associative array containing the properties of the element.
    *   Properties used: #attributes, #button_type, #name, #value.
-   *
-   * The #button_type property accepts any value, though core themes have CSS that
-   * styles the following button_types appropriately: 'primary', 'danger'.
+   *   The #button_type property accepts any value, though core themes have CSS that
+   *   styles the following button_types appropriately: 'primary', 'danger'.
    *
    * @return array
    *   The $element with prepared variables ready for input.html.twig.
diff --git a/core/lib/Drupal/Core/Render/Element/Date.php b/core/lib/Drupal/Core/Render/Element/Date.php
index e322e71..1b22fb8 100644
--- a/core/lib/Drupal/Core/Render/Element/Date.php
+++ b/core/lib/Drupal/Core/Render/Element/Date.php
@@ -77,10 +77,9 @@ public static function processDate(&$element, FormStateInterface $form_state, &$
    *   An associative array containing the properties of the element.
    *   Properties used: #title, #value, #options, #description, #required,
    *   #attributes, #id, #name, #type, #min, #max, #step, #value, #size.
-   *
-   * Note: The input "name" attribute needs to be sanitized before output, which
-   *       is currently done by initializing Drupal\Core\Template\Attribute with
-   *       all the attributes.
+   *   Note: The input "name" attribute needs to be sanitized before output, which
+   *   is currently done by initializing Drupal\Core\Template\Attribute with
+   *   all the attributes.
    *
    * @return array
    *   The $element with prepared variables ready for #theme 'input__date'.
diff --git a/core/lib/Drupal/Core/Render/Element/Radio.php b/core/lib/Drupal/Core/Render/Element/Radio.php
index 58086fb..442f11e 100644
--- a/core/lib/Drupal/Core/Render/Element/Radio.php
+++ b/core/lib/Drupal/Core/Render/Element/Radio.php
@@ -44,10 +44,9 @@ public function getInfo() {
    *   An associative array containing the properties of the element.
    *   Properties used: #required, #return_value, #value, #attributes, #title,
    *   #description.
-   *
-   * Note: The input "name" attribute needs to be sanitized before output, which
-   *       is currently done by initializing Drupal\Core\Template\Attribute with
-   *       all the attributes.
+   *   Note: The input "name" attribute needs to be sanitized before output, which
+   *   is currently done by initializing Drupal\Core\Template\Attribute with
+   *   all the attributes.
    *
    * @return array
    *   The $element with prepared variables ready for input.html.twig.
diff --git a/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php b/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
index aba617a..6991786 100644
--- a/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
+++ b/core/lib/Drupal/Core/Theme/ThemeManagerInterface.php
@@ -63,6 +63,8 @@ public function resetActiveTheme();
   public function setActiveTheme(ActiveTheme $active_theme);
 
   /**
+   * Execute the alter hook on the current theme.
+   *
    * Passes alterable variables to specific $theme_TYPE_alter() implementations.
    *
    * It also invokes alter hooks for all base themes.
@@ -114,7 +116,6 @@ public function setActiveTheme(ActiveTheme $active_theme);
    *   (optional) An additional variable that is passed by reference. If more
    *   context needs to be provided to implementations, then this should be an
    *   associative array as described above.
-   * Execute the alter hook on the current theme.
    *
    * @see \Drupal\Core\Extension\ModuleHandlerInterface
    */
diff --git a/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
index 6908bc8..8c9ddd1 100644
--- a/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -248,6 +248,12 @@ public static function fromUserInput($user_input, $options = []) {
    * For URLs that have Drupal routes (that is, most pages generated by Drupal),
    * use Url::fromRoute().
    *
+   * You can call access() on the returned object to do access checking.
+   *
+   * Note: the internal: scheme should be avoided except when processing actual
+   * user input that may or may not correspond to a Drupal route. Normally use
+   * Url::fromRoute() for code linking to any any Drupal page.
+   *
    * @param string $uri
    *   The URI of the resource including the scheme. For user input that may
    *   correspond to a Drupal route, use internal: for the scheme. For paths
@@ -272,12 +278,6 @@ public static function fromUserInput($user_input, $options = []) {
    *     defined, the current scheme is used, so the user stays on HTTP or HTTPS
    *     respectively. TRUE enforces HTTPS and FALSE enforces HTTP.
    *
-   * Note: the internal: scheme should be avoided except when processing actual
-   * user input that may or may not correspond to a Drupal route. Normally use
-   * Url::fromRoute() for code linking to any any Drupal page.
-   *
-   * You can call access() on the returned object to do access checking.
-   *
    * @return \Drupal\Core\Url
    *   A new Url object with properties depending on the URI scheme.
    *
diff --git a/core/modules/book/src/BookManagerInterface.php b/core/modules/book/src/BookManagerInterface.php
index 8f21942..65acde5 100644
--- a/core/modules/book/src/BookManagerInterface.php
+++ b/core/modules/book/src/BookManagerInterface.php
@@ -135,11 +135,11 @@ public function bookTreeCollectNodeLinks(&$tree, &$node_links);
   /**
    * Provides book loading, access control and translation.
    *
-   * @param array $link
-   *   A book link.
-   *
    * Note: copied from _menu_link_translate() in menu.inc, but reduced to the
    * minimal code that's used.
+   *
+   * @param array $link
+   *   A book link.
    */
   public function bookLinkTranslate(&$link);
 
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index ba36e83..672ef36 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -231,10 +231,9 @@ class FieldStorageConfig extends ConfigEntityBase implements FieldStorageConfigI
    *     a 'field_name' property can be accepted in place of 'id'.
    *   - entity_type: required.
    *   - type: required.
-   *
-   * In most cases, Field entities are created via
-   * FieldStorageConfig::create($values)), where $values is the same
-   * parameter as in this constructor.
+   *   In most cases, Field entities are created via
+   *   FieldStorageConfig::create($values)), where $values is the same
+   *   parameter as in this constructor.
    *
    * @see entity_create()
    */
diff --git a/core/modules/filter/tests/src/Kernel/FilterUnitTest.php b/core/modules/filter/tests/src/Kernel/FilterUnitTest.php
index c4744bb..01083bd 100644
--- a/core/modules/filter/tests/src/Kernel/FilterUnitTest.php
+++ b/core/modules/filter/tests/src/Kernel/FilterUnitTest.php
@@ -862,16 +862,15 @@ function testUrlFilter() {
    *   each value is again an associative array whose keys are filter output
    *   strings and whose values are Booleans indicating whether the output is
    *   expected or not.
-   *
-   * For example:
-   * @code
-   * $tests = array(
-   *   'Input string' => array(
-   *     '<p>Input string</p>' => TRUE,
-   *     'Input string<br' => FALSE,
-   *   ),
-   * );
-   * @endcode
+   *   For example:
+   *   @code
+   *   $tests = array(
+   *     'Input string' => array(
+   *       '<p>Input string</p>' => TRUE,
+   *       'Input string<br' => FALSE,
+   *     ),
+   *   );
+   *   @endcode
    */
   function assertFilteredString($filter, $tests) {
     foreach ($tests as $source => $tasks) {
diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index 11689c3..e347423 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -208,15 +208,15 @@ function hook_node_access_records(\Drupal\node\NodeInterface $node) {
  *
  * A module may deny all access to a node by setting $grants to an empty array.
  *
+ * The preferred use of this hook is in a module that bridges multiple node
+ * access modules with a configurable behavior, as shown in the example with the
+ * 'is_preview' field.
+ *
  * @param array $grants
  *   The $grants array returned by hook_node_access_records().
  * @param \Drupal\node\NodeInterface $node
  *   The node for which the grants were acquired.
  *
- * The preferred use of this hook is in a module that bridges multiple node
- * access modules with a configurable behavior, as shown in the example with the
- * 'is_preview' field.
- *
  * @see hook_node_access_records()
  * @see hook_node_grants()
  * @see hook_node_grants_alter()
diff --git a/core/modules/user/src/Tests/UserAdminLanguageTest.php b/core/modules/user/src/Tests/UserAdminLanguageTest.php
index 68ebfad..03baa04 100644
--- a/core/modules/user/src/Tests/UserAdminLanguageTest.php
+++ b/core/modules/user/src/Tests/UserAdminLanguageTest.php
@@ -149,11 +149,11 @@ function testActualNegotiation() {
   /**
    * Sets the User interface negotiation detection method.
    *
-   * @param bool $admin_first
-   *   Whether the admin negotiation should be first.
-   *
    * Enables the "Account preference for administration pages" language
    * detection method for the User interface language negotiation type.
+   *
+   * @param bool $admin_first
+   *   Whether the admin negotiation should be first.
    */
   function setLanguageNegotiation($admin_first = FALSE) {
     $edit = array(
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 0e9cedb..577406e 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -447,12 +447,12 @@ function user_template_preprocess_default_variables_alter(&$variables) {
  *
  * Default template: username.html.twig.
  *
+ * Modules that make any changes to variables like 'name' or 'extra' must ensure
+ * that the final string is safe.
+ *
  * @param array $variables
  *   An associative array containing:
  *   - account: The user account (\Drupal\Core\Session\AccountInterface).
- *
- * Modules that make any changes to variables like 'name' or 'extra' must ensure
- * that the final string is safe.
  */
 function template_preprocess_username(&$variables) {
   $account = $variables['account'] ?: new AnonymousUserSession();
diff --git a/core/modules/views/src/Plugin/views/display/Block.php b/core/modules/views/src/Plugin/views/display/Block.php
index 9ab56d8..fe37d91 100644
--- a/core/modules/views/src/Plugin/views/display/Block.php
+++ b/core/modules/views/src/Plugin/views/display/Block.php
@@ -320,7 +320,7 @@ public function blockValidate(ViewsBlock $block, array $form, FormStateInterface
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the form.
    *
-   * * @see \Drupal\views\Plugin\Block\ViewsBlock::blockSubmit()
+   * @see \Drupal\views\Plugin\Block\ViewsBlock::blockSubmit()
    */
   public function blockSubmit(ViewsBlock $block, $form, FormStateInterface $form_state) {
     if ($items_per_page = $form_state->getValue(array('override', 'items_per_page'))) {
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index d55ae56..0995739 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -803,17 +803,16 @@ public function clearFields() {
    *   The comparison operator, such as =, <, or >=. It also accepts more
    *   complex options such as IN, LIKE, LIKE BINARY, or BETWEEN. Defaults to =.
    *   If $field is a string you have to use 'formula' here.
-   *
-   * The $field, $value and $operator arguments can also be passed in with a
-   * single DatabaseCondition object, like this:
-   * @code
+   *   The $field, $value and $operator arguments can also be passed in with a
+   *   single DatabaseCondition object, like this:
+   *   @code
    *   $this->query->addWhere(
    *     $this->options['group'],
    *     db_or()
    *       ->condition($field, $value, 'NOT IN')
    *       ->condition($field, $value, 'IS NULL')
    *   );
-   * @endcode
+   *   @endcode
    *
    * @see \Drupal\Core\Database\Query\ConditionInterface::condition()
    * @see \Drupal\Core\Database\Query\Condition
diff --git a/core/modules/views/tests/src/Kernel/ModuleTest.php b/core/modules/views/tests/src/Kernel/ModuleTest.php
index 74159ab..32c7198 100644
--- a/core/modules/views/tests/src/Kernel/ModuleTest.php
+++ b/core/modules/views/tests/src/Kernel/ModuleTest.php
@@ -115,6 +115,8 @@ public function testViewsGetHandler() {
   /**
    * Defines an error handler which is used in the test.
    *
+   * Because this is registered in set_error_handler(), it has to be public.
+   *
    * @param int $error_level
    *   The level of the error raised.
    * @param string $message
@@ -127,7 +129,6 @@ public function testViewsGetHandler() {
    *   An array that points to the active symbol table at the point the error
    *   occurred.
    *
-   * Because this is registered in set_error_handler(), it has to be public.
    * @see set_error_handler()
    */
   public function customErrorHandler($error_level, $message, $filename, $line, $context) {