diff --git a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/Role.php b/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/Role.php
index 0b87a18..d80eaf3 100644
--- a/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/Role.php
+++ b/core/modules/user/lib/Drupal/user/Plugin/Core/Entity/Role.php
@@ -62,7 +62,7 @@ class Role extends ConfigEntityBase {
   public $weight;
 
   /**
-   * Overrides \Drupal\Core\Entity\Entity::uri().
+   * {@inheritdoc}
    */
   public function uri() {
     return array(
diff --git a/core/modules/user/lib/Drupal/user/RoleFormController.php b/core/modules/user/lib/Drupal/user/RoleFormController.php
index a7c0d37..1ee9b83 100644
--- a/core/modules/user/lib/Drupal/user/RoleFormController.php
+++ b/core/modules/user/lib/Drupal/user/RoleFormController.php
@@ -16,7 +16,7 @@
 class RoleFormController extends EntityFormController {
 
   /**
-   * Overrides EntityFormController::form().
+   * {@inheritdoc}
    */
   public function form(array $form, array &$form_state, EntityInterface $entity) {
     $form['label'] = array(
@@ -48,7 +48,7 @@ public function form(array $form, array &$form_state, EntityInterface $entity) {
   }
 
   /**
-   * Overrides EntityFormController::actions().
+   * {@inheritdoc}
    */
   protected function actions(array $form, array &$form_state) {
     $entity = $this->getEntity($form_state);
@@ -59,7 +59,7 @@ protected function actions(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides EntityFormController::save().
+   * {@inheritdoc}
    */
   public function save(array $form, array &$form_state) {
     $entity = $this->getEntity($form_state);
@@ -79,7 +79,7 @@ public function save(array $form, array &$form_state) {
   }
 
   /**
-   * Overrides EntityFormController::delete().
+   * {@inheritdoc}
    */
   public function delete(array $form, array &$form_state) {
     $entity = $this->getEntity($form_state);
diff --git a/core/modules/user/lib/Drupal/user/RoleListController.php b/core/modules/user/lib/Drupal/user/RoleListController.php
index d3c0d3e..177b2d6 100644
--- a/core/modules/user/lib/Drupal/user/RoleListController.php
+++ b/core/modules/user/lib/Drupal/user/RoleListController.php
@@ -17,14 +17,14 @@
 class RoleListController extends ConfigEntityListController implements FormInterface {
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::getFormID().
+   * {@inheritdoc}
    */
   public function getFormID() {
     return 'user_admin_roles_form';
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityListController::buildHeader().
+   * {@inheritdoc}
    */
   public function buildHeader() {
     $row = parent::buildHeader();
@@ -35,7 +35,7 @@ public function buildHeader() {
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityListController::getOperations().
+   * {@inheritdoc}
    */
   public function getOperations(EntityInterface $entity) {
     $operations = parent::getOperations($entity);
@@ -54,7 +54,7 @@ public function getOperations(EntityInterface $entity) {
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityListController::buildRow().
+   * {@inheritdoc}
    */
   public function buildRow(EntityInterface $entity) {
     $row = parent::buildRow($entity);
@@ -79,14 +79,14 @@ public function buildRow(EntityInterface $entity) {
   }
 
   /**
-   * Overrides \Drupal\Core\Entity\EntityListController::render().
+   * {@inheritdoc}
    */
   public function render() {
     return drupal_get_form($this);
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::buildForm().
+   * {@inheritdoc}
    */
   public function buildForm(array $form, array &$form_state) {
     $form['entities'] = array(
@@ -113,14 +113,14 @@ public function buildForm(array $form, array &$form_state) {
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::validateForm().
+   * {@inheritdoc}
    */
   public function validateForm(array &$form, array &$form_state) {
     // No validation.
   }
 
   /**
-   * Implements \Drupal\Core\Form\FormInterface::submitForm().
+   * {@inheritdoc}
    */
   public function submitForm(array &$form, array &$form_state) {
     $values = $form_state['values']['entities'];
diff --git a/core/modules/user/lib/Drupal/user/RoleStorageController.php b/core/modules/user/lib/Drupal/user/RoleStorageController.php
index f5f6575..680b412 100644
--- a/core/modules/user/lib/Drupal/user/RoleStorageController.php
+++ b/core/modules/user/lib/Drupal/user/RoleStorageController.php
@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains Drupal\user\RoleStorageController.
+ * Contains \Drupal\user\RoleStorageController.
  */
 
 namespace Drupal\user;
@@ -16,7 +16,7 @@
 class RoleStorageController extends ConfigStorageController {
 
   /**
-   * Overrides ConfigStorageController::preSave().
+   * {@inheritdoc}
    */
   public function preSave(EntityInterface $entity) {
     if (!isset($entity->weight) && $roles = entity_load_multiple('user_role')) {
@@ -30,7 +30,7 @@ public function preSave(EntityInterface $entity) {
   }
 
   /**
-   * Overrides ConfigStorageController::resetCache().
+   * {@inheritdoc}
    */
   public function resetCache(array $ids = NULL) {
     parent::resetCache($ids);
@@ -41,7 +41,7 @@ public function resetCache(array $ids = NULL) {
   }
 
   /**
-   * Overrides ConfigStorageController::postDelete().
+   * {@inheritdoc}
    */
   protected function postDelete($entities) {
     $rids = array_keys($entities);
@@ -57,7 +57,7 @@ protected function postDelete($entities) {
   }
 
   /**
-   * Overrides ConfigStorageController::attachLoad().
+   * {@inheritdoc}
    */
   protected function attachLoad(&$queried_entities, $revision_id = FALSE) {
     // Sort the queried roles by their weight.