diff --git a/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php b/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
index 1c53b7fcfffb1aa3068af04970c482397aba5932..fcd2591d2fd557b8929c5fbf284af94489a81459 100644
--- a/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
+++ b/core/lib/Drupal/Core/Config/Entity/Query/QueryFactory.php
@@ -62,7 +62,7 @@ public function get($entity_type, $conjunction, EntityManagerInterface $entity_m
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
    public function getAggregate($entity_type, $conjunction, EntityManagerInterface $entity_manager) {
       throw new QueryException('Aggregation over configuration entities is not supported');
diff --git a/core/lib/Drupal/Core/Routing/LazyLoadingRouteCollection.php b/core/lib/Drupal/Core/Routing/LazyLoadingRouteCollection.php
index 3929cabe67700e17c7dec2280a7e9a2963e814dd..c1aa4a2f9319e3d264d592257b0ae80496c53244 100644
--- a/core/lib/Drupal/Core/Routing/LazyLoadingRouteCollection.php
+++ b/core/lib/Drupal/Core/Routing/LazyLoadingRouteCollection.php
@@ -95,7 +95,7 @@ protected function loadNextElements($offset) {
   }
 
   /**
-   * {inheritdoc}
+   * {@inheritdoc}
    */
   public function count() {
     if (!isset($this->count)) {
diff --git a/core/lib/Drupal/Core/Routing/RouteBuilderStatic.php b/core/lib/Drupal/Core/Routing/RouteBuilderStatic.php
index 327621eb0e8dffd50e4f4f3782bfc6288780f3c0..43b535a98ec8b925e504399dc0cce927ec0d8919 100644
--- a/core/lib/Drupal/Core/Routing/RouteBuilderStatic.php
+++ b/core/lib/Drupal/Core/Routing/RouteBuilderStatic.php
@@ -20,7 +20,7 @@ class RouteBuilderStatic implements RouteBuilderInterface {
   protected $rebuildNeeded = FALSE;
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function rebuild() {
     // @todo Add the route for the batch pages when that conversion happens,
@@ -28,7 +28,7 @@ public function rebuild() {
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function rebuildIfNeeded(){
     if ($this->rebuildNeeded && $this->rebuild()) {
@@ -39,7 +39,7 @@ public function rebuildIfNeeded(){
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function setRebuildNeeded() {
     $this->rebuildNeeded = TRUE;
diff --git a/core/lib/Drupal/Core/Theme/ThemeNegotiator.php b/core/lib/Drupal/Core/Theme/ThemeNegotiator.php
index 51f3e67635c97b4aa65953c8f6e01b2f4866fea7..21ba80cead7e9b382cace0d0c255f4fcfb56a552 100644
--- a/core/lib/Drupal/Core/Theme/ThemeNegotiator.php
+++ b/core/lib/Drupal/Core/Theme/ThemeNegotiator.php
@@ -118,7 +118,7 @@ public function getActiveTheme() {
   }
 
   /**
-   * {@inheritdoc
+   * {@inheritdoc}
    */
   public function applies(Request $request) {
     return TRUE;
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
index e327627177c0ddffc8af3df17d54b8de8ed254d6..ea8e28fc1bdba53ac084e89328a98078bb72a292 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Controller/AggregatorController.php
@@ -40,7 +40,7 @@ public function __construct(Connection $database) {
   }
 
   /**
-   * {inheritdoc}
+   * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
index e48e45d9515a454ecb5d9907c260821ba77b8764..9b8883049efbc81f8d0474b69c03bb5a7c7a186d 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Entity/Item.php
@@ -106,98 +106,98 @@ public static function baseFieldDefinitions($entity_type) {
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function getFeedId() {
     return $this->get('fid')->target_id;
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function setFeedId($fid) {
     return $this->set('fid', $fid);
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function getTitle() {
     return $this->get('title')->value;
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function setTitle($title) {
     return $this->set('title', $title);
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function  getLink() {
     return $this->get('link')->value;
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function setLink($link) {
     return $this->set('link', $link);
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function getAuthor() {
     return $this->get('author')->value;
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function setAuthor($author) {
     return $this->set('author', $author);
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function getDescription() {
     return $this->get('description')->value;
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function setDescription($description) {
     return $this->set('description', $description);
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function getPostedTime() {
     return $this->get('timestamp')->value;
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function setPostedTime($timestamp) {
     return $this->set('timestamp', $timestamp);
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function getGuid() {
     return $this->get('guid')->value;
   }
 
   /**
-   * @inheritdoc
+   * {@inheritdoc}
    */
   public function setGuid($guid) {
     return $this->set('guid', $guid);
diff --git a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationListController.php b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationListController.php
index 5d1430a912a9921b0f2703aba922a7cf531e17f4..5ca474da659b46ff1e9dfe3acb31b30a53492498 100644
--- a/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationListController.php
+++ b/core/modules/config_translation/lib/Drupal/config_translation/Controller/ConfigTranslationListController.php
@@ -45,7 +45,7 @@ public function __construct(ConfigMapperManagerInterface $mapper_manager, $confi
   }
 
   /**
-   * {inheritdoc}
+   * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
diff --git a/core/modules/edit/js/models/EntityModel.js b/core/modules/edit/js/models/EntityModel.js
index 593fc7820b99117cad144c8f3efcdd042e0f326d..1b52f7b2ee35f004ab1a63a989f4da31ca477030 100644
--- a/core/modules/edit/js/models/EntityModel.js
+++ b/core/modules/edit/js/models/EntityModel.js
@@ -56,7 +56,7 @@
     },
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     initialize: function () {
       this.set('fields', new Drupal.edit.FieldCollection());
@@ -511,7 +511,7 @@
     },
 
     /**
-     * @inheritdoc
+     * {@inheritdoc}
      */
     destroy: function (options) {
       Drupal.edit.BaseModel.prototype.destroy.call(this, options);
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
index 5b2046b2488bdf91fc6746db7fac13f335cff415..6862e8bac5902bbf04f57f700bd7fd244166ea63 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/DisplayOverview.php
@@ -154,7 +154,7 @@ protected function getDisplayType() {
   }
 
   /**
-   * {@inheritdoc
+   * {@inheritdoc}
    */
   protected function getTableHeader() {
     return array(
diff --git a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
index 8125b89bf1e877472bd92b130e42637932e1c4a2..0f0590718f472b28ab22528ca4f62369567a19f1 100644
--- a/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
+++ b/core/modules/field_ui/lib/Drupal/field_ui/FormDisplayOverview.php
@@ -121,7 +121,7 @@ protected function getDisplayType() {
   }
 
   /**
-   * {@inheritdoc
+   * {@inheritdoc}
    */
   protected function getTableHeader() {
     return array(
diff --git a/core/modules/forum/lib/Drupal/forum/Form/Overview.php b/core/modules/forum/lib/Drupal/forum/Form/Overview.php
index 4505264721d20ccb94438acba902a8251731297e..e821997ef9c5d79c2d1b5e0617e02f755aad3a16 100644
--- a/core/modules/forum/lib/Drupal/forum/Form/Overview.php
+++ b/core/modules/forum/lib/Drupal/forum/Form/Overview.php
@@ -40,7 +40,7 @@ public function __construct(EntityManagerInterface $entity_manager, ModuleHandle
   }
 
   /**
-   * {@inheritdoc}.
+   * {@inheritdoc}
    */
   public static function create(ContainerInterface $container) {
     return new static(
diff --git a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
index 0eeb19733ad8212acf01bf30035881f1ea6cbf2a..74d734702b85059af1d95a420953c2d99285460b 100644
--- a/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
+++ b/core/modules/menu_link/lib/Drupal/menu_link/Entity/MenuLink.php
@@ -537,7 +537,7 @@ public function postSave(EntityStorageControllerInterface $storage_controller, $
   }
 
   /**
-   * @inheritdoc}
+   * {@inheritdoc}
    */
   public static function postLoad(EntityStorageControllerInterface $storage_controller, array &$entities) {
     parent::postLoad($storage_controller, $entities);
diff --git a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php
index 3b39459ffa89feb2d9fc5e6e1c1ef53c8bcc83b3..f72680f43720d42dbafbb88a84b7114116bf4067 100644
--- a/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php
+++ b/core/modules/system/lib/Drupal/system/Plugin/views/field/BulkForm.php
@@ -75,7 +75,7 @@ public function init(ViewExecutable $view, DisplayPluginBase $display, array &$o
   }
 
   /**
-   * {@inheritdoc }
+   * {@inheritdoc}
    */
   protected function defineOptions() {
     $options = parent::defineOptions();
@@ -90,7 +90,7 @@ protected function defineOptions() {
   }
 
   /**
-   * {@inheritdoc }
+   * {@inheritdoc}
    */
   public function buildOptionsForm(&$form, &$form_state) {
     $form['action_title'] = array(
diff --git a/core/modules/system/lib/Drupal/system/Tests/Routing/MockRouteProvider.php b/core/modules/system/lib/Drupal/system/Tests/Routing/MockRouteProvider.php
index 4a6ece5b9ca2b1b46f31588a60bbc24224668910..c011b6d03966f82eb481c2857e3fe9a92c8509b6 100644
--- a/core/modules/system/lib/Drupal/system/Tests/Routing/MockRouteProvider.php
+++ b/core/modules/system/lib/Drupal/system/Tests/Routing/MockRouteProvider.php
@@ -76,14 +76,14 @@ public function getRoutesByPattern($pattern) {
   }
 
   /**
-   * @inheritdoc}
+   * {@inheritdoc}
    */
   public function getAllRoutes() {
     return $this->routes->all();
   }
 
   /**
-   * @inheritdoc}
+   * {@inheritdoc}
    */
   public function reset() {
     $this->routes = array();
diff --git a/core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php b/core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php
index 93f7f10c02494ad0ba9f8314e31b488a0b2c74e9..1acbea5b8067786c369ca2e1a73791778987409d 100644
--- a/core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php
+++ b/core/modules/user/tests/modules/user_form_test/lib/Drupal/user_form_test/Form/TestCurrentPassword.php
@@ -58,7 +58,7 @@ public function buildForm(array $form, array &$form_state, UserInterface $user =
   }
 
   /**
-   * {@inheritdoc}.
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, array &$form_state) {
     drupal_set_message($this->t('The password has been validated and the form submitted successfully.'));
diff --git a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
index 32f6414bbe5b8f186f812fdd5a8b5f2f648a3068..96e1a8fed083f77fc391f0f670b72e286ecc019a 100644
--- a/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/lib/Drupal/views/Plugin/views/wizard/WizardPluginBase.php
@@ -198,7 +198,7 @@ public function getSorts() {
   }
 
   /**
-   * {@inheritdoc} Drupal\views\Plugin\views\wizard\WizardInterface::buildForm().
+   * {@inheritdoc}
    */
   public function buildForm(array $form, array &$form_state) {
     $style_options = views_fetch_plugin_names('style', 'normal', array($this->base_table));