diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index 52f574212a..d42dea14f0 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -105,7 +105,7 @@
 const DRUPAL_PHP_FUNCTION_PATTERN = '[a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*';
 
 /**
- * $config_directories key for active directory.
+ * Key in $config_directories for active directory.
  *
  * @see config_get_config_directory()
  *
@@ -117,14 +117,14 @@
 const CONFIG_ACTIVE_DIRECTORY = 'active';
 
 /**
- * $config_directories key for sync directory.
+ * Key in $config_directories for sync directory.
  *
  * @see config_get_config_directory()
  */
 const CONFIG_SYNC_DIRECTORY = 'sync';
 
 /**
- * $config_directories key for staging directory.
+ * Key in $config_directories for staging directory.
  *
  * @see config_get_config_directory()
  * @see CONFIG_SYNC_DIRECTORY
diff --git a/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php b/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php
index 9f2e7d4092..ad2227626c 100644
--- a/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php
+++ b/core/lib/Drupal/Core/Access/RouteProcessorCsrf.php
@@ -61,7 +61,7 @@ public function processOutbound($route_name, Route $route, array &$parameters, B
   }
 
   /**
-   * #lazy_builder callback; gets a CSRF token for the given path.
+   * Callback for #lazy_builder. Gets a CSRF token for the given path.
    *
    * @param string $path
    *   The path to get a CSRF token for.
diff --git a/core/lib/Drupal/Core/Field/FieldConfigBase.php b/core/lib/Drupal/Core/Field/FieldConfigBase.php
index e53e84b6c8..84d3cee95c 100644
--- a/core/lib/Drupal/Core/Field/FieldConfigBase.php
+++ b/core/lib/Drupal/Core/Field/FieldConfigBase.php
@@ -380,7 +380,7 @@ public function isRequired() {
   }
 
   /**
-   * [@inheritdoc}
+   * {@inheritdoc}
    */
   public function setRequired($required) {
     $this->required = $required;
diff --git a/core/lib/Drupal/Core/Form/FormBuilder.php b/core/lib/Drupal/Core/Form/FormBuilder.php
index be000dcc25..4ede41554d 100644
--- a/core/lib/Drupal/Core/Form/FormBuilder.php
+++ b/core/lib/Drupal/Core/Form/FormBuilder.php
@@ -635,7 +635,7 @@ public function processForm($form_id, &$form, FormStateInterface &$form_state) {
   }
 
   /**
-   * #lazy_builder callback; renders a form action URL.
+   * Callback for #lazy_builder. Renders a form action URL.
    *
    * @return array
    *   A renderable array representing the form action.
@@ -649,7 +649,7 @@ public function renderPlaceholderFormAction() {
   }
 
   /**
-   * #lazy_builder callback; renders form CSRF token.
+   * Callback for #lazy_builder. Renders form CSRF token.
    *
    * @param string $placeholder
    *   A string containing a placeholder, matching the value of the form's
diff --git a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
index eeaf510ea2..52d288306e 100644
--- a/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
+++ b/core/lib/Drupal/Core/KeyValueStore/KeyValueFactory.php
@@ -40,7 +40,7 @@ class KeyValueFactory implements KeyValueFactoryInterface {
   protected $stores = [];
 
   /**
-   * var \Symfony\Component\DependencyInjection\ContainerInterface
+   * @var \Symfony\Component\DependencyInjection\ContainerInterface
    */
   protected $container;
 
diff --git a/core/lib/Drupal/Core/ProxyBuilder/ProxyBuilder.php b/core/lib/Drupal/Core/ProxyBuilder/ProxyBuilder.php
index a718a958e2..1187441666 100644
--- a/core/lib/Drupal/Core/ProxyBuilder/ProxyBuilder.php
+++ b/core/lib/Drupal/Core/ProxyBuilder/ProxyBuilder.php
@@ -10,7 +10,7 @@
 class ProxyBuilder extends BaseProxyBuilder {
 
   /**
-   * {@inheritdoc{
+   * {@inheritdoc}
    */
   protected function buildUseStatements() {
     $output = parent::buildUseStatements();
diff --git a/core/lib/Drupal/Core/Render/Element/Actions.php b/core/lib/Drupal/Core/Render/Element/Actions.php
index 2e7516548e..4ae18125ce 100644
--- a/core/lib/Drupal/Core/Render/Element/Actions.php
+++ b/core/lib/Drupal/Core/Render/Element/Actions.php
@@ -63,7 +63,7 @@ public static function processActions(&$element, FormStateInterface $form_state,
   }
 
   /**
-   * #pre_render callback for #type 'actions'.
+   * Callback for #pre_render that handles #type 'actions'.
    *
    * This callback iterates over all child elements of the #type 'actions'
    * container to look for elements with a #dropbutton property, so as to group
diff --git a/core/lib/Drupal/Core/Render/Element/FormElement.php b/core/lib/Drupal/Core/Render/Element/FormElement.php
index 0168d2beb9..0114419e21 100644
--- a/core/lib/Drupal/Core/Render/Element/FormElement.php
+++ b/core/lib/Drupal/Core/Render/Element/FormElement.php
@@ -92,7 +92,7 @@ public static function valueCallback(&$element, $input, FormStateInterface $form
   }
 
   /**
-   * #process callback for #pattern form element property.
+   * Callback for #process that handles #pattern form element property.
    *
    * @param array $element
    *   An associative array containing the properties and children of the
@@ -115,7 +115,7 @@ public static function processPattern(&$element, FormStateInterface $form_state,
   }
 
   /**
-   * #element_validate callback for #pattern form element property.
+   * Callback for #element_validate that handles #pattern form element property.
    *
    * @param $element
    *   An associative array containing the properties and children of the
diff --git a/core/lib/Drupal/Core/Render/Element/Pager.php b/core/lib/Drupal/Core/Render/Element/Pager.php
index 6ba3dff757..897c0c904c 100644
--- a/core/lib/Drupal/Core/Render/Element/Pager.php
+++ b/core/lib/Drupal/Core/Render/Element/Pager.php
@@ -58,7 +58,7 @@ public function getInfo() {
   }
 
   /**
-   * #pre_render callback to associate the appropriate cache context.
+   * Callback for #pre_render to associate the appropriate cache context.
    *
    *
    * @param array $pager
diff --git a/core/lib/Drupal/Core/Render/Element/StatusMessages.php b/core/lib/Drupal/Core/Render/Element/StatusMessages.php
index 530457fd90..702c4c10be 100644
--- a/core/lib/Drupal/Core/Render/Element/StatusMessages.php
+++ b/core/lib/Drupal/Core/Render/Element/StatusMessages.php
@@ -36,7 +36,7 @@ public function getInfo() {
   }
 
   /**
-   * #pre_render callback to generate a placeholder.
+   * Callback for #pre_render to generate a placeholder.
    *
    * @param array $element
    *   A renderable array.
@@ -57,7 +57,7 @@ public static function generatePlaceholder(array $element) {
   }
 
   /**
-   * #lazy_builder callback; replaces placeholder with messages.
+   * Callback for #lazy_builder to replace placeholder with messages.
    *
    * @param string|null $type
    *   Limit the messages returned by type. Defaults to NULL, meaning all types.
diff --git a/core/lib/Drupal/Core/Render/Element/StatusReport.php b/core/lib/Drupal/Core/Render/Element/StatusReport.php
index d913066134..16571605a0 100644
--- a/core/lib/Drupal/Core/Render/Element/StatusReport.php
+++ b/core/lib/Drupal/Core/Render/Element/StatusReport.php
@@ -29,7 +29,7 @@ public function getInfo() {
   }
 
   /**
-   * #pre_render callback to group requirements.
+   * Callback for #pre_render to group requirements.
    */
   public static function preRenderGroupRequirements($element) {
     $severities = static::getSeverities();
diff --git a/core/lib/Drupal/Core/Render/Element/Table.php b/core/lib/Drupal/Core/Render/Element/Table.php
index c6c08b1066..67ef5370c6 100644
--- a/core/lib/Drupal/Core/Render/Element/Table.php
+++ b/core/lib/Drupal/Core/Render/Element/Table.php
@@ -119,7 +119,9 @@ public static function valueCallback(&$element, $input, FormStateInterface $form
   }
 
   /**
-   * #process callback for #type 'table' to add tableselect support.
+   * Callback for #process that handles #type 'table'.
+   *
+   * Adds tableselect support.
    *
    * @param array $element
    *   An associative array containing the properties and children of the
@@ -245,7 +247,7 @@ public static function processTable(&$element, FormStateInterface $form_state, &
   }
 
   /**
-   * #element_validate callback for #type 'table'.
+   * Callback for #element_validate that handles #type 'table'.
    *
    * @param array $element
    *   An associative array containing the properties and children of the
@@ -273,7 +275,9 @@ public static function validateTable(&$element, FormStateInterface $form_state,
   }
 
   /**
-   * #pre_render callback to transform children of an element of #type 'table'.
+   * Callback for #pre_render.
+   *
+   * Transforms children of an element of #type 'table'.
    *
    * This function converts sub-elements of an element of #type 'table' to be
    * suitable for table.html.twig:
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_regression_test/src/BigPipeRegressionTestController.php b/core/modules/big_pipe/tests/modules/big_pipe_regression_test/src/BigPipeRegressionTestController.php
index 50e618bee1..a6115e0e26 100644
--- a/core/modules/big_pipe/tests/modules/big_pipe_regression_test/src/BigPipeRegressionTestController.php
+++ b/core/modules/big_pipe/tests/modules/big_pipe_regression_test/src/BigPipeRegressionTestController.php
@@ -32,7 +32,7 @@ public function regression2802923() {
   }
 
   /**
-   * #lazy_builder callback; builds <time> markup with current time.
+   * Callback for #lazy_builder to build <time> markup with current time.
    *
    * @return array
    */
diff --git a/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
index 22307708fd..13ea52331e 100644
--- a/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
+++ b/core/modules/big_pipe/tests/modules/big_pipe_test/src/BigPipeTestController.php
@@ -83,7 +83,7 @@ public function multiOccurrence() {
   }
 
   /**
-   * #lazy_builder callback; builds <time> markup with current time.
+   * Callback for #lazy_builder to build <time> markup with current time.
    *
    * Note: does not actually use current time, that would complicate testing.
    *
@@ -97,7 +97,7 @@ public static function currentTime() {
   }
 
   /**
-   * #lazy_builder callback; says "hello" or "yarhar".
+   * Callback for #lazy_builder to say "hello" or "yarhar".
    *
    * @return array
    */
@@ -112,7 +112,7 @@ public static function helloOrYarhar() {
   }
 
   /**
-   * #lazy_builder callback; throws exception.
+   * Callback for #lazy_builder to throw an exception.
    *
    * @throws \Exception
    */
@@ -121,7 +121,7 @@ public static function exception() {
   }
 
   /**
-   * #lazy_builder callback; returns content that will trigger an exception.
+   * Callback for #lazy_builder. Returns content that will trigger an exception.
    *
    * @see \Drupal\big_pipe_test\EventSubscriber\BigPipeTestSubscriber::onRespondTriggerException()
    *
@@ -132,7 +132,7 @@ public static function responseException() {
   }
 
   /**
-   * #lazy_builder callback; returns the current count.
+   * Callback for #lazy_builder to return the current count.
    *
    * @see \Drupal\big_pipe\Tests\BigPipeTest::testBigPipeMultipleOccurrencePlaceholders()
    *
diff --git a/core/modules/block/src/BlockViewBuilder.php b/core/modules/block/src/BlockViewBuilder.php
index 3b20d7b25c..8be720728e 100644
--- a/core/modules/block/src/BlockViewBuilder.php
+++ b/core/modules/block/src/BlockViewBuilder.php
@@ -176,7 +176,7 @@ protected static function buildPreRenderableBlock($entity, ModuleHandlerInterfac
   }
 
   /**
-   * #lazy_builder callback; builds a #pre_render-able block.
+   * Callback for #lazy_builder to build a #pre_render-able block.
    *
    * @param $entity_id
    *   A block config entity ID.
@@ -191,7 +191,7 @@ public static function lazyBuilder($entity_id, $view_mode) {
   }
 
   /**
-   * #pre_render callback for building a block.
+   * Callback for #pre_render to build a block.
    *
    * Renders the content using the provided block plugin, and then:
    * - if there is no content, aborts rendering, and makes sure the block won't
diff --git a/core/modules/block/tests/modules/block_test/block_test.module b/core/modules/block/tests/modules/block_test/block_test.module
index 7ea8bb4d6f..0497939add 100644
--- a/core/modules/block/tests/modules/block_test/block_test.module
+++ b/core/modules/block/tests/modules/block_test/block_test.module
@@ -54,7 +54,7 @@ function block_test_block_build_test_cache_alter(array &$build, BlockPluginInter
 }
 
 /**
- * #pre_render callback for a block to alter its content.
+ * Callback for #pre_render for a block to alter its content.
  */
 function block_test_pre_render_alter_content($build) {
   $build['#prefix'] = 'Hiya!<br>';
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
index 587cf85e78..7c7e505677 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/DrupalImage.php
@@ -71,7 +71,7 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor
   }
 
   /**
-   * #element_validate handler for the "image_upload" element in settingsForm().
+   * Handler for #element_validate for "image_upload" element in settingsForm().
    *
    * Moves the text editor's image upload settings from the DrupalImage plugin's
    * own settings into $editor->image_upload.
diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
index 7b3386efe0..3e91b1e683 100644
--- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
+++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/StylesCombo.php
@@ -93,7 +93,7 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor
   }
 
   /**
-   * #element_validate handler for the "styles" element in settingsForm().
+   * Callback for #element_validate for the "styles" element in settingsForm().
    */
   public function validateStylesValue(array $element, FormStateInterface $form_state) {
     $styles_setting = $this->generateStylesSetSetting($element['#value']);
diff --git a/core/modules/color/color.module b/core/modules/color/color.module
index 20d099abcf..90c5a76304 100644
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -115,7 +115,7 @@ function color_block_view_system_branding_block_alter(array &$build, BlockPlugin
 }
 
 /**
- * #pre_render callback: Sets color preset logo.
+ * Callback for #pre_render to set color preset logo.
  */
 function color_block_view_pre_render(array $build) {
   $theme_key = \Drupal::theme()->getActiveTheme()->getName();
diff --git a/core/modules/comment/src/CommentLazyBuilders.php b/core/modules/comment/src/CommentLazyBuilders.php
index 730c840897..e30bea7013 100644
--- a/core/modules/comment/src/CommentLazyBuilders.php
+++ b/core/modules/comment/src/CommentLazyBuilders.php
@@ -84,7 +84,7 @@ public function __construct(EntityManagerInterface $entity_manager, EntityFormBu
   }
 
   /**
-   * #lazy_builder callback; builds the comment form.
+   * Callback for #lazy_builder to build the comment form.
    *
    * @param string $commented_entity_type_id
    *   The commented entity type ID.
@@ -111,7 +111,7 @@ public function renderForm($commented_entity_type_id, $commented_entity_id, $fie
   }
 
   /**
-   * #lazy_builder callback; builds a comment's links.
+   * Callback for #lazy_builder to build a comment's links.
    *
    * @param string $comment_entity_id
    *   The comment entity ID.
diff --git a/core/modules/comment/src/Tests/CommentTranslationUITest.php b/core/modules/comment/src/Tests/CommentTranslationUITest.php
index 4613d66ecc..1c9530038d 100644
--- a/core/modules/comment/src/Tests/CommentTranslationUITest.php
+++ b/core/modules/comment/src/Tests/CommentTranslationUITest.php
@@ -28,7 +28,7 @@ class CommentTranslationUITest extends ContentTranslationUITestBase {
   protected $adminUser;
 
   /**
-   * {inheritdoc}
+   * {@inheritdoc}
    */
   protected $defaultCacheContexts = [
     'languages:language_interface',
diff --git a/core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeWidgetBase.php b/core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeWidgetBase.php
index e99374c20f..ff18588bdb 100644
--- a/core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeWidgetBase.php
+++ b/core/modules/datetime_range/src/Plugin/Field/FieldWidget/DateRangeWidgetBase.php
@@ -118,7 +118,7 @@ public function massageFormValues(array $values, array $form, FormStateInterface
   }
 
   /**
-   * #element_validate callback to ensure that the start date <= the end date.
+   * Callback for #element_validate to ensure that start date <= end date.
    *
    * @param array $element
    *   An associative array containing the properties and children of the
diff --git a/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php b/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php
index 949ffda667..e11f8ca6a1 100644
--- a/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php
+++ b/core/modules/field/tests/modules/field_test/src/Form/NestedEntityTestForm.php
@@ -14,14 +14,14 @@
 class NestedEntityTestForm extends FormBase {
 
   /**
-   * {@inheritdoc]
+   * {@inheritdoc}
    */
   public function getFormId() {
     return 'field_test_entity_nested_form';
   }
 
   /**
-   * {@inheritdoc]
+   * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state, EntityInterface $entity_1 = NULL, EntityInterface $entity_2 = NULL) {
     // First entity.
@@ -64,7 +64,7 @@ public function buildForm(array $form, FormStateInterface $form_state, EntityInt
   }
 
   /**
-   * {@inheritdoc]
+   * {@inheritdoc}
    */
   public function validateForm(array &$form, FormStateInterface $form_state) {
     $entity_1 = $form_state->get('entity_1');
@@ -90,7 +90,7 @@ public function validateForm(array &$form, FormStateInterface $form_state) {
   }
 
   /**
-   * {@inheritdoc]
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
     /** @var \Drupal\Core\Entity\EntityInterface $entity_1 */
diff --git a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
index 32cf6e4c5b..a4588fab29 100644
--- a/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
+++ b/core/modules/field/tests/modules/field_test/src/Plugin/Field/FieldWidget/TestFieldWidgetMultiple.php
@@ -94,6 +94,7 @@ public static function multipleValidate($element, FormStateInterface $form_state
 
   /**
    * {@inheritdoc}
+   *
    * Used in \Drupal\field\Tests\EntityReference\EntityReferenceAdminTest::testAvailableFormatters().
    */
   public static function isApplicable(FieldDefinitionInterface $field_definition) {
diff --git a/core/modules/file/src/Element/ManagedFile.php b/core/modules/file/src/Element/ManagedFile.php
index ca4e887a1b..008f7b169d 100644
--- a/core/modules/file/src/Element/ManagedFile.php
+++ b/core/modules/file/src/Element/ManagedFile.php
@@ -152,7 +152,7 @@ public static function valueCallback(&$element, $input, FormStateInterface $form
   }
 
   /**
-   * #ajax callback for managed_file upload forms.
+   * Callback for #ajax that handles managed_file upload forms.
    *
    * This ajax callback takes care of the following things:
    *   - Ensures that broken requests due to too big files are caught.
diff --git a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
index 989eb15900..6e6e8bf8ae 100644
--- a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
@@ -11,7 +11,7 @@
 use Drupal\Tests\migrate_drupal\Kernel\d6\MigrateDrupal6TestBase;
 
 /**
- * file migration.
+ * File migration.
  *
  * @group migrate_drupal_6
  */
diff --git a/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php
index c6d03000f9..e52d2e3907 100644
--- a/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php
+++ b/core/modules/filter/tests/filter_test/src/Plugin/Filter/FilterTestPlaceholders.php
@@ -28,7 +28,9 @@ public function process($text, $langcode) {
   }
 
   /**
-   * #lazy_builder callback; builds a render array containing the dynamic thing.
+   * Callback for #lazy_builder to build a render array.
+   *
+   * The render array contains the dynamic thing.
    *
    * @param string $thing
    *   A "thing" string.
diff --git a/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php b/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
index 0eabbda56b..b9285740c4 100644
--- a/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
+++ b/core/modules/help/tests/src/Functional/ExperimentalHelpTest.php
@@ -29,7 +29,7 @@ class ExperimentalHelpTest extends BrowserTestBase {
   protected $adminUser;
 
   /**
-   * {@inheritoc}
+   * {@inheritdoc}
    */
   protected function setUp() {
     parent::setUp();
diff --git a/core/modules/history/history.module b/core/modules/history/history.module
index f36121ef51..2ffc7f4ef2 100644
--- a/core/modules/history/history.module
+++ b/core/modules/history/history.module
@@ -179,7 +179,7 @@ function history_user_delete($account) {
 }
 
 /**
- * #lazy_builder callback; attaches the last read timestamp for a node.
+ * Callback for #lazy_builder to attach the last read timestamp for a node.
  *
  * @param int $node_id
  *   The node ID for which to attach the last read timestamp.
diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index b1298e4b67..b1092d7a8b 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -1243,7 +1243,7 @@ function _locale_invalidate_js($langcode = NULL) {
 }
 
 /**
- * (Re-)Creates the JavaScript translation file for a language.
+ * Creates / recreates the JavaScript translation file for a language.
  *
  * @param $langcode
  *   The language, the translation file should be (re)created for.
diff --git a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
index a2ba9930fc..8ee6a59909 100644
--- a/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
+++ b/core/modules/menu_link_content/tests/src/Functional/MenuLinkContentTranslationUITest.php
@@ -13,7 +13,7 @@
 class MenuLinkContentTranslationUITest extends ContentTranslationUITestBase {
 
   /**
-   * {inheritdoc}
+   * {@inheritdoc}
    */
   protected $defaultCacheContexts = ['languages:language_interface', 'session', 'theme', 'url.path', 'url.query_args', 'user.permissions', 'user.roles:authenticated'];
 
diff --git a/core/modules/node/src/NodeViewBuilder.php b/core/modules/node/src/NodeViewBuilder.php
index f96302bef3..05d7327452 100644
--- a/core/modules/node/src/NodeViewBuilder.php
+++ b/core/modules/node/src/NodeViewBuilder.php
@@ -66,7 +66,7 @@ protected function getBuildDefaults(EntityInterface $entity, $view_mode) {
   }
 
   /**
-   * #lazy_builder callback; builds a node's links.
+   * Callback for #lazy_builder to build a node's links.
    *
    * @param string $node_entity_id
    *   The node entity ID.
diff --git a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
index a44bea131e..6cd22941b9 100644
--- a/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
+++ b/core/modules/node/tests/src/Functional/NodeTranslationUITest.php
@@ -17,7 +17,7 @@
 class NodeTranslationUITest extends ContentTranslationUITestBase {
 
   /**
-   * {inheritdoc}
+   * {@inheritdoc}
    */
   protected $defaultCacheContexts = [
     'languages:language_interface',
diff --git a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
index c7c2b16e9b..b7a440b66d 100644
--- a/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
+++ b/core/modules/options/src/Plugin/Field/FieldType/ListItemBase.php
@@ -120,7 +120,7 @@ public function storageSettingsForm(array &$form, FormStateInterface $form_state
   abstract protected function allowedValuesDescription();
 
   /**
-   * #element_validate callback for options field allowed values.
+   * Callback for #element_validate that handles options field allowed values.
    *
    * @param $element
    *   An associative array containing the properties and children of the
diff --git a/core/modules/rest/src/Entity/RestResourceConfig.php b/core/modules/rest/src/Entity/RestResourceConfig.php
index 12bd846ea6..c4918bcdc0 100644
--- a/core/modules/rest/src/Entity/RestResourceConfig.php
+++ b/core/modules/rest/src/Entity/RestResourceConfig.php
@@ -208,7 +208,7 @@ public function getPluginCollections() {
   }
 
   /**
-   * (@inheritdoc)
+   * {@inheritdoc}
    */
   public function calculateDependencies() {
     parent::calculateDependencies();
diff --git a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
index 300ca3b722..b3b590ba10 100644
--- a/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
+++ b/core/modules/shortcut/src/Tests/ShortcutTranslationUITest.php
@@ -14,7 +14,7 @@
 class ShortcutTranslationUITest extends ContentTranslationUITestBase {
 
   /**
-   * {inheritdoc}
+   * {@inheritdoc}
    */
   protected $defaultCacheContexts = ['languages:language_interface', 'session', 'theme', 'user', 'url.path', 'url.query_args', 'url.site'];
 
diff --git a/core/modules/system/src/Element/StatusReportPage.php b/core/modules/system/src/Element/StatusReportPage.php
index 1d8421b35a..1be128e323 100644
--- a/core/modules/system/src/Element/StatusReportPage.php
+++ b/core/modules/system/src/Element/StatusReportPage.php
@@ -29,7 +29,7 @@ public function getInfo() {
   }
 
   /**
-   * #pre_render callback to get general info out of requirements.
+   * Callback for #pre_render to get general info out of requirements.
    */
   public static function preRenderGeneralInfo($element) {
     $element['#general_info'] = [
@@ -69,7 +69,7 @@ public static function preRenderGeneralInfo($element) {
   }
 
   /**
-   * #pre_render callback to create counter elements.
+   * Callback for #pre_render to create counter elements.
    */
   public static function preRenderCounters($element) {
     // Count number of items with different severity for summary.
@@ -125,7 +125,7 @@ public static function preRenderCounters($element) {
   }
 
   /**
-   * #pre_render callback to create status report requirements.
+   * Callback for #pre_render to create status report requirements.
    */
   public static function preRenderRequirements($element) {
     $element['#requirements'] = [
diff --git a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php
index e3c09af92c..544b3eabdf 100644
--- a/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php
+++ b/core/modules/system/tests/modules/ajax_forms_test/src/Form/AjaxFormsTestCommandsForm.php
@@ -11,14 +11,14 @@
 class AjaxFormsTestCommandsForm extends FormBase {
 
   /**
-   * {@inheritdoc}.
+   * {@inheritdoc}
    */
   public function getFormId() {
     return 'ajax_forms_test_ajax_commands_form';
   }
 
   /**
-   * {@inheritdoc}.
+   * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
     $form = [];
@@ -198,7 +198,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
   }
 
   /**
-   * {@inheritdoc}.
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, FormStateInterface $form_state) {
   }
diff --git a/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php b/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
index 1964f740fe..5eeac4d4a2 100644
--- a/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
+++ b/core/modules/system/tests/modules/pager_test/src/Controller/PagerTestController.php
@@ -115,7 +115,9 @@ public function multiplePagers() {
   }
 
   /**
-   * #pre_render callback for #type => pager that shows the pager cache context.
+   * Callback for #pre_render that handles #type => pager.
+   *
+   * Shows the pager cache context.
    */
   public static function showPagerCacheContext(array $pager) {
     drupal_set_message(\Drupal::service('cache_contexts_manager')->convertTokensToKeys(['url.query_args.pagers:' . $pager['#element']])->getKeys()[0]);
diff --git a/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php b/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php
index 7b0850e564..b1e89f6083 100644
--- a/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php
+++ b/core/modules/system/tests/modules/render_placeholder_message_test/src/RenderPlaceholderMessageTestController.php
@@ -80,7 +80,7 @@ protected function build(array $placeholder_order) {
   }
 
   /**
-   * #lazy_builder callback; sets and prints a message.
+   * Callback for #lazy_builder to set and print a message.
    *
    * @param string $message
    *   The message to send.
diff --git a/core/modules/toolbar/toolbar.module b/core/modules/toolbar/toolbar.module
index 16983d63dc..3f5486b2a2 100644
--- a/core/modules/toolbar/toolbar.module
+++ b/core/modules/toolbar/toolbar.module
@@ -311,7 +311,7 @@ function toolbar_get_rendered_subtrees() {
 }
 
 /**
- * #pre_render callback for toolbar_get_rendered_subtrees().
+ * Callback for #pre_render for toolbar_get_rendered_subtrees().
  */
 function _toolbar_do_get_rendered_subtrees(array $data) {
   $menu_tree = \Drupal::service('toolbar.menu_tree');
diff --git a/core/modules/user/src/Plugin/Block/UserLoginBlock.php b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
index a9341f9b7f..f7491bf03a 100644
--- a/core/modules/user/src/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
@@ -144,7 +144,9 @@ public function build() {
   }
 
   /**
-   * #lazy_builder callback; renders a form action URL including destination.
+   * Callback for #lazy_builder.
+   *
+   * Renders a form action URL including destination.
    *
    * @return array
    *   A renderable array representing the form action.
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
index f8630af08f..6ad92451ff 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginInterface.php
@@ -395,7 +395,7 @@ public function renderMoreLink();
   public function render();
 
   /**
-   * #pre_render callback for view display rendering.
+   * Callback for #pre_render to render view display.
    *
    * @see self::render()
    *
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index d71db329e6..e651583a7b 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -743,7 +743,7 @@ protected function renderFields(array $result) {
   }
 
   /**
-   * #pre_render callback for view row field rendering.
+   * Callback for #pre_render to render view row field.
    *
    * @see self::render()
    *
diff --git a/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc b/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc
index dd69f4c95f..5e8d36a0f4 100644
--- a/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc
+++ b/core/modules/views/tests/modules/views_test_data/views_test_data.views_execution.inc
@@ -62,7 +62,7 @@ function views_test_data_views_pre_render(ViewExecutable $view) {
 }
 
 /**
- * #lazy_builder callback; for testing purposes only.
+ * Callback for #lazy_builder for testing purposes only.
  */
 function views_test_data_placeholders() {
   // No-op.
diff --git a/core/modules/views_ui/admin.inc b/core/modules/views_ui/admin.inc
index a2d9fedcbc..8ff965b21d 100644
--- a/core/modules/views_ui/admin.inc
+++ b/core/modules/views_ui/admin.inc
@@ -298,7 +298,9 @@ function views_ui_build_form_url(FormStateInterface $form_state) {
 }
 
 /**
- * #process callback for a button; determines if a button is the form's triggering element.
+ * Callback for #process that handles a button.
+ *
+ * Determines if a button is the form's triggering element.
  *
  * The Form API has logic to determine the form's triggering element based on
  * the data in POST. However, it only checks buttons based on a single #value
diff --git a/core/phpcs.xml.dist b/core/phpcs.xml.dist
index a593e62c7d..5e0efffb78 100644
--- a/core/phpcs.xml.dist
+++ b/core/phpcs.xml.dist
@@ -31,7 +31,6 @@
     <exclude name="Drupal.Commenting.DocComment.ParamNotFirst"/>
     <exclude name="Drupal.Commenting.DocComment.SpacingBeforeTags"/>
     <exclude name="Drupal.Commenting.DocComment.LongFullStop"/>
-    <exclude name="Drupal.Commenting.DocComment.ShortNotCapital"/>
     <exclude name="Drupal.Commenting.DocComment.ShortFullStop"/>
     <!-- TagsNotGrouped and ParamGroup have false-positives.
       @see https://www.drupal.org/node/2060925 -->
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
index 0666367c21..2bbea4b9b1 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererBubblingTest.php
@@ -593,7 +593,7 @@ public function testOverWriteCacheKeys() {
 class BubblingTest {
 
   /**
-   * #pre_render callback for testBubblingWithPrerender().
+   * Callback for #pre_render for testBubblingWithPrerender().
    */
   public static function bubblingPreRender($elements) {
     $elements += [
@@ -632,7 +632,7 @@ public static function bubblingPreRender($elements) {
   }
 
   /**
-   * #pre_render callback for testBubblingWithPrerender().
+   * Callback for #pre_render for testBubblingWithPrerender().
    */
   public static function bubblingNestedPreRenderUncached($elements) {
     \Drupal::state()->set('bubbling_nested_pre_render_uncached', TRUE);
@@ -641,7 +641,7 @@ public static function bubblingNestedPreRenderUncached($elements) {
   }
 
   /**
-   * #pre_render callback for testBubblingWithPrerender().
+   * Callback for #pre_render for testBubblingWithPrerender().
    */
   public static function bubblingNestedPreRenderCached($elements) {
     \Drupal::state()->set('bubbling_nested_pre_render_cached', TRUE);
@@ -649,7 +649,7 @@ public static function bubblingNestedPreRenderCached($elements) {
   }
 
   /**
-   * #lazy_builder callback for testBubblingWithPrerender().
+   * Callback for #lazy_builder for testBubblingWithPrerender().
    */
   public static function bubblingPlaceholder($foo, $baz) {
     return [
@@ -658,7 +658,7 @@ public static function bubblingPlaceholder($foo, $baz) {
   }
 
   /**
-   * #pre_render callback for testOverWriteCacheKeys().
+   * Callback for #pre_render for testOverWriteCacheKeys().
    */
   public static function bubblingCacheOverwritePrerender($elements) {
     // Overwrite the #cache entry with new data.
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
index a92c363619..da7212e434 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererPlaceholdersTest.php
@@ -1133,7 +1133,7 @@ protected function setupThemeManagerForDetails() {
 class RecursivePlaceholdersTest {
 
   /**
-   * #lazy_builder callback; bubbles another placeholder.
+   * Callback for #lazy_builder to bubble another placeholder.
    *
    * @param string $animal
    *   An animal.
diff --git a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
index 964898cb30..5abe4bf4b7 100644
--- a/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
+++ b/core/tests/Drupal/Tests/Core/Render/RendererTestBase.php
@@ -255,7 +255,7 @@ protected function assertRenderCacheItem($cid, $data, $bin = 'render') {
 class PlaceholdersTest {
 
   /**
-   * #lazy_builder callback; attaches setting, generates markup.
+   * Callback for #lazy_builder to attach setting and generate markup.
    *
    * @param string $animal
    *   An animal.
@@ -279,7 +279,9 @@ public static function callback($animal, $use_animal_as_array_key = FALSE) {
   }
 
   /**
-   * #lazy_builder callback; attaches setting, generates markup, user-specific.
+   * Callback for #lazy_builder.
+   *
+   * Attaches setting, generates markup, adds user-specific cache tag.
    *
    * @param string $animal
    *   An animal.
@@ -294,7 +296,9 @@ public static function callbackPerUser($animal) {
   }
 
   /**
-   * #lazy_builder callback; attaches setting, generates markup, cache tag.
+   * Callback for #lazy_builder.
+   *
+   * Attaches setting, generates markup, adds cache tag.
    *
    * @param string $animal
    *   An animal.