diff --git a/core/core.api.php b/core/core.api.php
index ef04faf..6f7f2cd 100644
--- a/core/core.api.php
+++ b/core/core.api.php
@@ -2069,7 +2069,7 @@ function hook_mail_backend_info_alter(&$info) {
  * @param $countries
  *   The associative array of countries keyed by two-letter country code.
  *
- * @see \Drupal\Core\Locale\CountryManager::getList().
+ * @see \Drupal\Core\Locale\CountryManager::getList()
  */
 function hook_countries_alter(&$countries) {
   // Elbonia is now independent, so add it to the country list.
diff --git a/core/includes/bootstrap.inc b/core/includes/bootstrap.inc
index ce872d4..cdc560b 100644
--- a/core/includes/bootstrap.inc
+++ b/core/includes/bootstrap.inc
@@ -301,6 +301,7 @@ function t($string, array $args = array(), array $options = array()) {
  *
  * @see \Drupal\Component\Utility\SafeMarkup::format()
  * @see t()
+ *
  * @ingroup sanitization
  *
  * @deprecated in Drupal 8.0.0, will be removed before Drupal 9.0.0.
@@ -939,6 +940,7 @@ function drupal_placeholder($text) {
  *   Array of shutdown functions to be executed.
  *
  * @see register_shutdown_function()
+ *
  * @ingroup php_wrappers
  */
 function &drupal_register_shutdown_function($callback = NULL) {
diff --git a/core/includes/install.inc b/core/includes/install.inc
index c9fd75d..1def7e0 100644
--- a/core/includes/install.inc
+++ b/core/includes/install.inc
@@ -363,12 +363,13 @@ function drupal_rewrite_settings($settings = array(), $settings_file = NULL) {
  *
  * @param int $type
  *   The token type
- *   @see token_name().
  * @param string $value
  *   The value of the token.
  *
  * @return bool
  *   TRUE if this token represents a scalar or NULL.
+ *
+ * @see token_name()
  */
 function _drupal_rewrite_settings_is_simple($type, $value) {
   $is_integer = $type == T_LNUMBER;
@@ -387,10 +388,11 @@ function _drupal_rewrite_settings_is_simple($type, $value) {
  *
  * @param int $type
  *   The token type
- *   @see token_name().
  *
  * @return bool
  *   TRUE if this token represents a number or a string.
+ *
+ * @see token_name()
  */
 function _drupal_rewrite_settings_is_array_index($type) {
   $is_integer = $type == T_LNUMBER;
diff --git a/core/lib/Drupal/Component/Datetime/DateTimePlus.php b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
index 4540b3b..705c3f2 100644
--- a/core/lib/Drupal/Component/Datetime/DateTimePlus.php
+++ b/core/lib/Drupal/Component/Datetime/DateTimePlus.php
@@ -107,7 +107,8 @@ class DateTimePlus {
    * @param \DateTime $datetime
    *   A DateTime object.
    * @param array $settings
-   *   @see __construct()
+   *
+   * @see \Drupal\Component\Datetime\DateTimePlus::__construct()
    */
   public static function createFromDateTime(\DateTime $datetime, $settings = array()) {
     return new static($datetime->format(static::FORMAT), $datetime->getTimezone(), $settings);
@@ -156,9 +157,9 @@ public static function createFromArray(array $date_parts, $timezone = NULL, $set
    * @param int $timestamp
    *   A UNIX timestamp.
    * @param mixed $timezone
-   *   @see __construct()
    * @param array $settings
-   *   @see __construct()
+   *
+   * @see \Drupal\Component\Datetime\DateTimePlus::__construct()
    */
   public static function createFromTimestamp($timestamp, $timezone = NULL, $settings = array()) {
     if (!is_numeric($timestamp)) {
@@ -177,11 +178,8 @@ public static function createFromTimestamp($timestamp, $timezone = NULL, $settin
    *   to use things like negative years, which php's parser fails on, or
    *   any other specialized input with a known format. If provided the
    *   date will be created using the createFromFormat() method.
-   *   @see http://us3.php.net/manual/en/datetime.createfromformat.php
    * @param mixed $time
-   *   @see __construct()
    * @param mixed $timezone
-   *   @see __construct()
    * @param array $settings
    *   - validate_format: (optional) Boolean choice to validate the
    *     created date using the input format. The format used in
@@ -190,7 +188,9 @@ public static function createFromTimestamp($timestamp, $timezone = NULL, $settin
    *     possible to a validation step to confirm that the date created
    *     from a format string exactly matches the input. This option
    *     indicates the format can be used for validation. Defaults to TRUE.
-   *   @see __construct()
+   *
+   * @see http://us3.php.net/manual/en/datetime.createfromformat.php
+   * @see \Drupal\Component\Datetime\DateTimePlus::__construct()
    */
   public static function createFromFormat($format, $time, $timezone = NULL, $settings = array()) {
     if (!isset($settings['validate_format'])) {
diff --git a/core/lib/Drupal/Component/Gettext/PoHeader.php b/core/lib/Drupal/Component/Gettext/PoHeader.php
index ebd366f..a5bc7fb 100644
--- a/core/lib/Drupal/Component/Gettext/PoHeader.php
+++ b/core/lib/Drupal/Component/Gettext/PoHeader.php
@@ -478,6 +478,7 @@ private function tokenizeFormula($formula) {
    *   Number of the plural string to be used for the given plural value.
    *
    * @see parseArithmetic()
+   *
    * @throws Exception
    */
   protected function evaluatePlural($element_stack, $n) {
diff --git a/core/lib/Drupal/Component/Gettext/PoItem.php b/core/lib/Drupal/Component/Gettext/PoItem.php
index f673752..c0aa045 100644
--- a/core/lib/Drupal/Component/Gettext/PoItem.php
+++ b/core/lib/Drupal/Component/Gettext/PoItem.php
@@ -11,6 +11,7 @@
  * PoItem handles one translation.
  *
  * @todo: This class contains some really old legacy code.
+ *
  * @see https://www.drupal.org/node/1637662
  */
 class PoItem {
@@ -33,7 +34,8 @@ class PoItem {
    * The source string or array of strings if it has plurals.
    *
    * @var string or array
-   * @see $_plural
+   *
+   * @see \Drupal\Component\Gettext::_plural
    */
   private $_source;
 
@@ -55,7 +57,8 @@ class PoItem {
    * The translation string or array of strings if it has plurals.
    *
    * @var string or array
-   * @see $_plural
+   *
+   * @see \Drupal\Component\Gettext::_plural
    */
   private $_translation;
 
diff --git a/core/lib/Drupal/Component/Plugin/Exception/InvalidPluginDefinitionException.php b/core/lib/Drupal/Component/Plugin/Exception/InvalidPluginDefinitionException.php
index 99ebd98..a76fe64 100644
--- a/core/lib/Drupal/Component/Plugin/Exception/InvalidPluginDefinitionException.php
+++ b/core/lib/Drupal/Component/Plugin/Exception/InvalidPluginDefinitionException.php
@@ -25,7 +25,7 @@ class InvalidPluginDefinitionException extends PluginException {
    * @param string $plugin_id
    *   The plugin ID of the mapper.
    *
-   * @see \Exception for the remaining parameters.
+   * @see \Exception
    */
   public function __construct($plugin_id, $message = '', $code = 0, \Exception $previous = NULL) {
     $this->pluginId = $plugin_id;
diff --git a/core/lib/Drupal/Component/Plugin/Exception/PluginNotFoundException.php b/core/lib/Drupal/Component/Plugin/Exception/PluginNotFoundException.php
index cb511d7..0c8c72d 100644
--- a/core/lib/Drupal/Component/Plugin/Exception/PluginNotFoundException.php
+++ b/core/lib/Drupal/Component/Plugin/Exception/PluginNotFoundException.php
@@ -18,7 +18,7 @@ class PluginNotFoundException extends PluginException {
    * @param string $plugin_id
    *   The plugin ID that was not found.
    *
-   * @see \Exception for remaining parameters.
+   * @see \Exception
    */
   public function __construct($plugin_id, $message = '', $code = 0, \Exception $previous = NULL) {
     if (empty($message)) {
diff --git a/core/lib/Drupal/Core/Archiver/ArchiveTar.php b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
index ecd7f25..02f59eb 100644
--- a/core/lib/Drupal/Core/Archiver/ArchiveTar.php
+++ b/core/lib/Drupal/Core/Archiver/ArchiveTar.php
@@ -325,7 +325,8 @@ function_exists('dl') === false ||
      *              blank space.
      *
      * @return true on success, false on error.
-     * @see    createModify()
+     *
+     * @see \Drupal\Core\Archiver\ArchiveTar::createModify()
      */
     public function create($p_filelist)
     {
@@ -345,7 +346,9 @@ public function create($p_filelist)
      *              blank space.
      *
      * @return true on success, false on error.
-     * @see    createModify()
+     *
+     * @see \Drupal\Core\Archiver\ArchiveTar::createModify()
+     *
      * @access public
      */
     public function add($p_filelist)
@@ -414,7 +417,8 @@ public function listContent()
      *                             element in the list, when relevant.
      *
      * @return boolean true on success, false on error.
-     * @see addModify()
+     *
+     * @see \Drupal\Core\Archiver\ArchiveTar::addModify()
      */
     public function createModify($p_filelist, $p_add_dir, $p_remove_dir = '')
     {
@@ -603,7 +607,8 @@ public function addString($p_filename, $p_string, $p_datetime = false, $p_params
      * @param boolean $p_preserve Preserve user/group ownership of files
      *
      * @return boolean true on success, false on error.
-     * @see    extractList()
+     *
+     * @see \Drupal\Core\Archiver\ArchiveTar::extractList()
      */
     public function extractModify($p_path, $p_remove_path, $p_preserve = false)
     {
@@ -663,7 +668,8 @@ public function extractInString($p_filename)
      * @param boolean $p_preserve Preserve user/group ownership of files
      *
      * @return true on success, false on error.
-     * @see    extractModify()
+     *
+     * @see \Drupal\Core\Archiver\ArchiveTar::extractModify()
      */
     public function extractList($p_filelist, $p_path = '', $p_remove_path = '', $p_preserve = false)
     {
diff --git a/core/lib/Drupal/Core/Command/DbDumpCommand.php b/core/lib/Drupal/Core/Command/DbDumpCommand.php
index 95e9906..74c645b 100644
--- a/core/lib/Drupal/Core/Command/DbDumpCommand.php
+++ b/core/lib/Drupal/Core/Command/DbDumpCommand.php
@@ -25,8 +25,8 @@
  *   ability to retrieve table schema information. Note that using a raw
  *   SQL dump file here (eg, generated from mysqldump or pg_dump) is not an
  *   option since these tend to still be database-backend specific.
- * @see https://www.drupal.org/node/301038
  *
+ * @see https://www.drupal.org/node/301038
  * @see \Drupal\Core\Command\DbDumpApplication
  */
 class DbDumpCommand extends DbCommandBase {
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
index 3404957..800db89 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityStorage.php
@@ -87,6 +87,7 @@ class ConfigEntityStorage extends EntityStorageBase implements ConfigEntityStora
    * states of config overrides.
    *
    * @var array
+   *
    * @see \Drupal\Core\Config\ConfigFactoryInterface::getCacheKeys().
    */
   protected $entities = array();
diff --git a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
index 785b314..b1ab34d 100644
--- a/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
+++ b/core/lib/Drupal/Core/Config/Entity/ConfigEntityType.php
@@ -132,7 +132,7 @@ public function getConfigDependencyKey() {
   /**
    * {@inheritdoc}
    *
-   * @see \Drupal\Core\Config\Entity\ConfigEntityStorage.
+   * @see \Drupal\Core\Config\Entity\ConfigEntityStorage
    *
    * @throws \Drupal\Core\Config\Entity\Exception\ConfigEntityStorageClassException
    *   Exception thrown when the provided class is not an instance of
diff --git a/core/lib/Drupal/Core/Config/StorageComparerInterface.php b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
index 293d9db..4703aad 100644
--- a/core/lib/Drupal/Core/Config/StorageComparerInterface.php
+++ b/core/lib/Drupal/Core/Config/StorageComparerInterface.php
@@ -72,7 +72,7 @@ public function reset();
    *
    * Until the changelist has been calculated this will always be FALSE.
    *
-   * @see \Drupal\Core\Config\StorageComparerInterface::createChangelist().
+   * @see \Drupal\Core\Config\StorageComparerInterface::createChangelist()
    *
    * @return bool
    *   TRUE if there are changes to process and FALSE if not.
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
index 81aeabc..60bf582 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Connection.php
@@ -348,7 +348,7 @@ public function getFullQualifiedTableName($table) {
    *   A string representing the savepoint name. By default,
    *   "mimic_implicit_commit" is used.
    *
-   * @see Drupal\Core\Database\Connection::pushTransaction().
+   * @see Drupal\Core\Database\Connection::pushTransaction()
    */
   public function addSavepoint($savepoint_name = 'mimic_implicit_commit') {
     if ($this->inTransaction()) {
@@ -363,7 +363,7 @@ public function addSavepoint($savepoint_name = 'mimic_implicit_commit') {
    *   A string representing the savepoint name. By default,
    *   "mimic_implicit_commit" is used.
    *
-   * @see Drupal\Core\Database\Connection::popTransaction().
+   * @see Drupal\Core\Database\Connection::popTransaction()
    */
   public function releaseSavepoint($savepoint_name = 'mimic_implicit_commit') {
     if (isset($this->transactionLayers[$savepoint_name])) {
diff --git a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
index d12788f..d125ac1 100644
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -29,6 +29,7 @@ class Schema extends DatabaseSchema {
    * by introspecting the database.
    *
    * @see DatabaseConnection_pgsql->queryTableInformation()
+   *
    * @var array
    */
   protected $tableInformation = array();
diff --git a/core/lib/Drupal/Core/Entity/ContentEntityType.php b/core/lib/Drupal/Core/Entity/ContentEntityType.php
index 8894f33..8a2a5e6 100644
--- a/core/lib/Drupal/Core/Entity/ContentEntityType.php
+++ b/core/lib/Drupal/Core/Entity/ContentEntityType.php
@@ -33,7 +33,7 @@ public function getConfigDependencyKey() {
   /**
    * {@inheritdoc}
    *
-   * @see \Drupal\Core\Entity\ContentEntityStorageInterface.
+   * @see \Drupal\Core\Entity\ContentEntityStorageInterface
    *
    * @throws \InvalidArgumentException
    *   If the provided class does not implement
diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
index 882681b..64087ba 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionAggregateInterface.php
@@ -31,6 +31,7 @@ public function getConjunction();
    *
    * @return \Drupal\Core\Entity\Query\ConditionAggregateInterface
    *   The called object.
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::condition()
    */
   public function condition($field, $function = NULL, $value = NULL, $operator = NULL, $langcode = NULL);
@@ -41,6 +42,7 @@ public function condition($field, $function = NULL, $value = NULL, $operator = N
    * @param $field
    * @param string $langcode
    * @return ConditionInterface
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::exists()
    */
   public function exists($field, $function, $langcode = NULL);
@@ -50,6 +52,7 @@ public function exists($field, $function, $langcode = NULL);
    *
    * @param string $field
    * @return ConditionInterface;
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::notexists()
    */
   public function notExists($field, $function, $langcode = NULL);
diff --git a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
index c90e7ee..ab69852 100644
--- a/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/ConditionInterface.php
@@ -37,6 +37,7 @@ public function count();
    * @param string $operator
    * @param string $langcode
    * @return ConditionInterface
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::condition()
    */
   public function condition($field, $value = NULL, $operator = NULL, $langcode = NULL);
@@ -47,6 +48,7 @@ public function condition($field, $value = NULL, $operator = NULL, $langcode = N
    * @param $field
    * @param string $langcode
    * @return ConditionInterface
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::exists()
    */
   public function exists($field, $langcode = NULL);
@@ -56,6 +58,7 @@ public function exists($field, $langcode = NULL);
    *
    * @param string $field
    * @return ConditionInterface;
+   *
    * @see \Drupal\Core\Entity\Query\QueryInterface::notexists()
    */
   public function notExists($field, $langcode = NULL);
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
index 0e43387..d066a56 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryAggregateInterface.php
@@ -70,7 +70,7 @@ public function groupBy($field);
    * @return \Drupal\Core\Entity\Query\QueryAggregateInterface
    *   The called object.
    *
-   * @see \Drupal\Core\Entity\Query\QueryInterface::condition().
+   * @see \Drupal\Core\Entity\Query\QueryInterface::condition()
    */
   public function conditionAggregate($field, $function = NULL, $value = NULL, $operator = '=', $langcode = NULL);
 
diff --git a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
index e0beb78..1283a77 100644
--- a/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
+++ b/core/lib/Drupal/Core/Entity/Query/QueryInterface.php
@@ -73,6 +73,7 @@ public function getEntityTypeId();
    *   translation.
    *
    * @return \Drupal\Core\Entity\Query\QueryInterface
+   *
    * @see \Drupal\Core\Entity\Query\andConditionGroup
    * @see \Drupal\Core\Entity\Query\orConditionGroup
    */
diff --git a/core/lib/Drupal/Core/Entity/entity.api.php b/core/lib/Drupal/Core/Entity/entity.api.php
index d33b422..c3333dd 100644
--- a/core/lib/Drupal/Core/Entity/entity.api.php
+++ b/core/lib/Drupal/Core/Entity/entity.api.php
@@ -789,6 +789,7 @@ function hook_entity_bundle_delete($entity_type_id, $bundle) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_create()
  */
 function hook_entity_create(\Drupal\Core\Entity\EntityInterface $entity) {
@@ -804,6 +805,7 @@ function hook_entity_create(\Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_create()
  */
 function hook_ENTITY_TYPE_create(\Drupal\Core\Entity\EntityInterface $entity) {
@@ -825,6 +827,7 @@ function hook_ENTITY_TYPE_create(\Drupal\Core\Entity\EntityInterface $entity) {
  *   The type of entities being loaded (i.e. node, user, comment).
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_load()
  */
 function hook_entity_load(array $entities, $entity_type_id) {
@@ -840,6 +843,7 @@ function hook_entity_load(array $entities, $entity_type_id) {
  *   The entities keyed by entity ID.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_load()
  */
 function hook_ENTITY_TYPE_load($entities) {
@@ -889,6 +893,7 @@ function hook_ENTITY_TYPE_storage_load(array $entities) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_presave()
  */
 function hook_entity_presave(Drupal\Core\Entity\EntityInterface $entity) {
@@ -905,6 +910,7 @@ function hook_entity_presave(Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_presave()
  */
 function hook_ENTITY_TYPE_presave(Drupal\Core\Entity\EntityInterface $entity) {
@@ -924,6 +930,7 @@ function hook_ENTITY_TYPE_presave(Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_insert()
  */
 function hook_entity_insert(Drupal\Core\Entity\EntityInterface $entity) {
@@ -948,6 +955,7 @@ function hook_entity_insert(Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_insert()
  */
 function hook_ENTITY_TYPE_insert(Drupal\Core\Entity\EntityInterface $entity) {
@@ -971,6 +979,7 @@ function hook_ENTITY_TYPE_insert(Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_update()
  */
 function hook_entity_update(Drupal\Core\Entity\EntityInterface $entity) {
@@ -994,6 +1003,7 @@ function hook_entity_update(Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_update()
  */
 function hook_ENTITY_TYPE_update(Drupal\Core\Entity\EntityInterface $entity) {
@@ -1016,6 +1026,7 @@ function hook_ENTITY_TYPE_update(Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_translation_create()
  */
 function hook_entity_translation_create(\Drupal\Core\Entity\EntityInterface $translation) {
@@ -1032,6 +1043,7 @@ function hook_entity_translation_create(\Drupal\Core\Entity\EntityInterface $tra
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_translation_create()
  */
 function hook_ENTITY_TYPE_translation_create(\Drupal\Core\Entity\EntityInterface $translation) {
@@ -1048,6 +1060,7 @@ function hook_ENTITY_TYPE_translation_create(\Drupal\Core\Entity\EntityInterface
  *   The entity object of the translation just stored.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_translation_insert()
  */
 function hook_entity_translation_insert(\Drupal\Core\Entity\EntityInterface $translation) {
@@ -1068,6 +1081,7 @@ function hook_entity_translation_insert(\Drupal\Core\Entity\EntityInterface $tra
  *   The entity object of the translation just stored.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_translation_insert()
  */
 function hook_ENTITY_TYPE_translation_insert(\Drupal\Core\Entity\EntityInterface $translation) {
@@ -1087,6 +1101,7 @@ function hook_ENTITY_TYPE_translation_insert(\Drupal\Core\Entity\EntityInterface
  *   The original entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_translation_delete()
  */
 function hook_entity_translation_delete(\Drupal\Core\Entity\EntityInterface $translation) {
@@ -1106,6 +1121,7 @@ function hook_entity_translation_delete(\Drupal\Core\Entity\EntityInterface $tra
  *   The original entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_translation_delete()
  */
 function hook_ENTITY_TYPE_translation_delete(\Drupal\Core\Entity\EntityInterface $translation) {
@@ -1123,6 +1139,7 @@ function hook_ENTITY_TYPE_translation_delete(\Drupal\Core\Entity\EntityInterface
  *   The entity object for the entity that is about to be deleted.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_predelete()
  */
 function hook_entity_predelete(Drupal\Core\Entity\EntityInterface $entity) {
@@ -1151,6 +1168,7 @@ function hook_entity_predelete(Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object for the entity that is about to be deleted.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_predelete()
  */
 function hook_ENTITY_TYPE_predelete(Drupal\Core\Entity\EntityInterface $entity) {
@@ -1181,6 +1199,7 @@ function hook_ENTITY_TYPE_predelete(Drupal\Core\Entity\EntityInterface $entity)
  *   The entity object for the entity that has been deleted.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_delete()
  */
 function hook_entity_delete(Drupal\Core\Entity\EntityInterface $entity) {
@@ -1200,6 +1219,7 @@ function hook_entity_delete(Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object for the entity that has been deleted.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_delete()
  */
 function hook_ENTITY_TYPE_delete(Drupal\Core\Entity\EntityInterface $entity) {
@@ -1219,6 +1239,7 @@ function hook_ENTITY_TYPE_delete(Drupal\Core\Entity\EntityInterface $entity) {
  *   The entity object for the entity revision that has been deleted.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_revision_delete()
  */
 function hook_entity_revision_delete(Drupal\Core\Entity\EntityInterface $entity) {
@@ -1237,6 +1258,7 @@ function hook_entity_revision_delete(Drupal\Core\Entity\EntityInterface $entity)
  *   The entity object for the entity revision that has been deleted.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_revision_delete()
  */
 function hook_ENTITY_TYPE_revision_delete(Drupal\Core\Entity\EntityInterface $entity) {
@@ -1922,6 +1944,7 @@ function hook_entity_field_access_alter(array &$grants, array $context) {
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_ENTITY_TYPE_field_values_init()
  */
 function hook_entity_field_values_init(\Drupal\Core\Entity\FieldableEntityInterface $entity) {
@@ -1941,6 +1964,7 @@ function hook_entity_field_values_init(\Drupal\Core\Entity\FieldableEntityInterf
  *   The entity object.
  *
  * @ingroup entity_crud
+ *
  * @see hook_entity_field_values_init()
  */
 function hook_ENTITY_TYPE_field_values_init(\Drupal\Core\Entity\FieldableEntityInterface $entity) {
diff --git a/core/lib/Drupal/Core/Extension/module.api.php b/core/lib/Drupal/Core/Extension/module.api.php
index 6dda3cc..2a9ed26 100644
--- a/core/lib/Drupal/Core/Extension/module.api.php
+++ b/core/lib/Drupal/Core/Extension/module.api.php
@@ -81,7 +81,7 @@
  *
  * See system_hook_info() for all hook groups defined by Drupal core.
  *
- * @see hook_hook_info_alter().
+ * @see hook_hook_info_alter()
  */
 function hook_hook_info() {
   $hooks['token_info'] = array(
diff --git a/core/lib/Drupal/Core/Field/FieldItemBase.php b/core/lib/Drupal/Core/Field/FieldItemBase.php
index 033b82e..14ba551 100644
--- a/core/lib/Drupal/Core/Field/FieldItemBase.php
+++ b/core/lib/Drupal/Core/Field/FieldItemBase.php
@@ -20,6 +20,7 @@
  * the static method propertyDefinitions().
  *
  * @see \Drupal\Core\Field\FieldItemInterface
+ *
  * @ingroup field_types
  */
 abstract class FieldItemBase extends Map implements FieldItemInterface {
diff --git a/core/lib/Drupal/Core/Field/FieldItemInterface.php b/core/lib/Drupal/Core/Field/FieldItemInterface.php
index 1053811..61cf0ce 100644
--- a/core/lib/Drupal/Core/Field/FieldItemInterface.php
+++ b/core/lib/Drupal/Core/Field/FieldItemInterface.php
@@ -21,6 +21,7 @@
  *
  * @see \Drupal\Core\Field\FieldItemListInterface
  * @see \Drupal\Core\Field\FieldItemBase
+ *
  * @ingroup field_types
  */
 interface FieldItemInterface extends ComplexDataInterface {
diff --git a/core/lib/Drupal/Core/File/FileSystemInterface.php b/core/lib/Drupal/Core/File/FileSystemInterface.php
index 8b283a3..bbeaab9 100644
--- a/core/lib/Drupal/Core/File/FileSystemInterface.php
+++ b/core/lib/Drupal/Core/File/FileSystemInterface.php
@@ -30,6 +30,7 @@
    *
    * @see move_uploaded_file()
    * @see https://www.drupal.org/node/515192
+   *
    * @ingroup php_wrappers
    */
   public function moveUploadedFile($filename, $uri);
@@ -77,6 +78,7 @@ public function chmod($uri, $mode = NULL);
    *   Boolean TRUE on success, or FALSE on failure.
    *
    * @see unlink()
+   *
    * @ingroup php_wrappers
    */
   public function unlink($uri, $context = NULL);
@@ -100,6 +102,7 @@ public function unlink($uri, $context = NULL);
    *
    * @see \Drupal\Core\StreamWrapper\StreamWrapperInterface::realpath()
    * @see http://php.net/manual/function.realpath.php
+   *
    * @ingroup php_wrappers
    */
   public function realpath($uri);
@@ -121,6 +124,7 @@ public function realpath($uri);
    *
    * @see dirname()
    * @see https://www.drupal.org/node/515192
+   *
    * @ingroup php_wrappers
    */
   public function dirname($uri);
@@ -162,6 +166,7 @@ public function basename($uri, $suffix = NULL);
    *
    * @see mkdir()
    * @see https://www.drupal.org/node/515192
+   *
    * @ingroup php_wrappers
    *
    * @todo Update with open_basedir compatible recursion logic from
@@ -184,6 +189,7 @@ public function mkdir($uri, $mode = NULL, $recursive = FALSE, $context = NULL);
    *   Boolean TRUE on success, or FALSE on failure.
    *
    * @see rmdir()
+   *
    * @ingroup php_wrappers
    */
   public function rmdir($uri, $context = NULL);
@@ -208,6 +214,7 @@ public function rmdir($uri, $context = NULL);
    *
    * @see tempnam()
    * @see https://www.drupal.org/node/515192
+   *
    * @ingroup php_wrappers
    */
   public function tempnam($directory, $prefix);
diff --git a/core/lib/Drupal/Core/Form/FormStateInterface.php b/core/lib/Drupal/Core/Form/FormStateInterface.php
index 798d12c..a47d6f3 100644
--- a/core/lib/Drupal/Core/Form/FormStateInterface.php
+++ b/core/lib/Drupal/Core/Form/FormStateInterface.php
@@ -24,6 +24,7 @@
  * @see \Drupal\Core\Form\FormBuilderInterface
  * @see \Drupal\Core\Form\FormValidatorInterface
  * @see \Drupal\Core\Form\FormSubmitterInterface
+ *
  * @ingroup form_api
  */
 interface FormStateInterface {
diff --git a/core/lib/Drupal/Core/Installer/InstallerKernel.php b/core/lib/Drupal/Core/Installer/InstallerKernel.php
index a00febf..ee59eaa 100644
--- a/core/lib/Drupal/Core/Installer/InstallerKernel.php
+++ b/core/lib/Drupal/Core/Installer/InstallerKernel.php
@@ -32,7 +32,7 @@ protected function initializeContainer() {
    * re-instantiated during a single install request. Most drivers will not
    * need this method.
    *
-   * @see \Drupal\Core\Database\Install\Tasks::runTasks().
+   * @see \Drupal\Core\Database\Install\Tasks::runTasks()
    */
   public function resetConfigStorage() {
     $this->configStorage = NULL;
diff --git a/core/lib/Drupal/Core/Logger/RfcLogLevel.php b/core/lib/Drupal/Core/Logger/RfcLogLevel.php
index ba31938..bb78f57 100644
--- a/core/lib/Drupal/Core/Logger/RfcLogLevel.php
+++ b/core/lib/Drupal/Core/Logger/RfcLogLevel.php
@@ -91,6 +91,7 @@ class RfcLogLevel {
    *   Array of the possible severity levels for log messages.
    *
    * @see http://tools.ietf.org/html/rfc5424
+   *
    * @ingroup logging_severity_levels
    */
   public static function getLevels() {
diff --git a/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php b/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
index 6608cbb..29b63e0 100644
--- a/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
+++ b/core/lib/Drupal/Core/Menu/MenuTreeStorageInterface.php
@@ -142,9 +142,11 @@ public function delete($id);
    *
    * @return array
    *   An array with 2 elements:
-   *   - tree: A fully built menu tree containing an array.
-   *     @see static::treeDataRecursive()
+   *   - tree: A fully built menu tree containing an array. See
+   *     \Drupal\Core\Menu\MenuTreeStorage::treeDataRecursive().
    *   - route_names: An array of all route names used in the tree.
+   *
+   * @see \Drupal\Core\Menu\MenuTreeStorage::treeDataRecursive()
    */
   public function loadTreeData($menu_name, MenuTreeParameters $parameters);
 
diff --git a/core/lib/Drupal/Core/Render/Element/Table.php b/core/lib/Drupal/Core/Render/Element/Table.php
index 393daa6..e52907c 100644
--- a/core/lib/Drupal/Core/Render/Element/Table.php
+++ b/core/lib/Drupal/Core/Render/Element/Table.php
@@ -52,6 +52,7 @@
  *   );
  * }
  * @endcode
+ *
  * @see \Drupal\Core\Render\Element\Tableselect
  *
  * @FormElement("table")
diff --git a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
index 95553af..3b58df8 100644
--- a/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
+++ b/core/lib/Drupal/Core/Routing/LinkGeneratorTrait.php
@@ -34,8 +34,8 @@
   /**
    * Renders a link to a route given a route name and its parameters.
    *
-   * @see \Drupal\Core\Utility\LinkGeneratorInterface::generate() for details
-   *   on the arguments, usage, and possible exceptions.
+   * \Drupal\Core\Utility\LinkGeneratorInterface::generate() has details on the
+   * arguments, usage, and possible exceptions.
    *
    * @return \Drupal\Core\GeneratedLink
    *   A GeneratedLink object containing a link to the given route and
@@ -43,6 +43,8 @@
    *
    * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
    *   Use \Drupal\Core\Link instead.
+   *
+   * @see \Drupal\Core\Utility\LinkGeneratorInterface::generate()
    */
   protected function l($text, Url $url) {
     return $this->getLinkGenerator()->generate($text, $url);
diff --git a/core/lib/Drupal/Core/Routing/RedirectDestinationInterface.php b/core/lib/Drupal/Core/Routing/RedirectDestinationInterface.php
index ac2612b..e302988 100644
--- a/core/lib/Drupal/Core/Routing/RedirectDestinationInterface.php
+++ b/core/lib/Drupal/Core/Routing/RedirectDestinationInterface.php
@@ -29,6 +29,7 @@
    *     request is returned.
    *
    * @see \Drupal\Core\EventSubscriber\RedirectResponseSubscriber::checkRedirectUrl()
+   *
    * @ingroup form_api
    */
   public function getAsArray();
diff --git a/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php b/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
index 31dd286..b97844b 100644
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorTrait.php
@@ -32,14 +32,16 @@
   /**
    * Generates a URL or path for a specific route based on the given parameters.
    *
-   * @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute() for
-   *   details on the arguments, usage, and possible exceptions.
+   * \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute() has details
+   * on the arguments, usage, and possible exceptions.
    *
    * @return string
    *   The generated URL for the given route.
    *
    * @deprecated in Drupal 8.0.0 and will be removed before Drupal 9.0.0.
    *   Use \Drupal\Core\Url instead.
+   *
+   * @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute()
    */
   protected function url($route_name, $route_parameters = array(), $options = array()) {
     return $this->getUrlGenerator()->generateFromRoute($route_name, $route_parameters, $options);
diff --git a/core/lib/Drupal/Core/Session/SessionManager.php b/core/lib/Drupal/Core/Session/SessionManager.php
index 7a2e23d..86ae10e 100644
--- a/core/lib/Drupal/Core/Session/SessionManager.php
+++ b/core/lib/Drupal/Core/Session/SessionManager.php
@@ -85,7 +85,8 @@ class SessionManager extends NativeSessionStorage implements SessionManagerInter
    *   The session configuration interface.
    * @param \Symfony\Component\HttpFoundation\Session\Storage\Proxy\AbstractProxy|Symfony\Component\HttpFoundation\Session\Storage\Handler\NativeSessionHandler|\SessionHandlerInterface|NULL $handler
    *   The object to register as a PHP session handler.
-   *   @see \Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage::setSaveHandler()
+   *
+   * @see \Symfony\Component\HttpFoundation\Session\Storage\NativeSessionStorage::setSaveHandler()
    */
   public function __construct(RequestStack $request_stack, Connection $connection, MetadataBag $metadata_bag, SessionConfigurationInterface $session_configuration, $handler = NULL) {
     $options = array();
diff --git a/core/lib/Drupal/Core/Template/TwigExtension.php b/core/lib/Drupal/Core/Template/TwigExtension.php
index 5f225d3..2ab8f72 100644
--- a/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -216,10 +216,11 @@ public function getName() {
    * @param array $options
    *   (optional) An associative array of additional options. The 'absolute'
    *   option is forced to be FALSE.
-   *   @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute().
    *
    * @return string
    *   The generated URL path (relative URL) for the given route.
+   *
+   * @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute()
    */
   public function getPath($name, $parameters = array(), $options = array()) {
     $options['absolute'] = FALSE;
diff --git a/core/lib/Drupal/Core/Transliteration/PhpTransliteration.php b/core/lib/Drupal/Core/Transliteration/PhpTransliteration.php
index fe699dd..1c5ef16 100644
--- a/core/lib/Drupal/Core/Transliteration/PhpTransliteration.php
+++ b/core/lib/Drupal/Core/Transliteration/PhpTransliteration.php
@@ -14,6 +14,7 @@
  * Enhances PhpTransliteration with an alter hook.
  *
  * @ingroup transliteration
+ *
  * @see hook_transliteration_overrides_alter()
  */
 class PhpTransliteration extends BaseTransliteration {
diff --git a/core/tests/Drupal/KernelTests/KernelTestBase.php b/core/tests/Drupal/KernelTests/KernelTestBase.php
index f1a1414..b0f7ddd 100644
--- a/core/tests/Drupal/KernelTests/KernelTestBase.php
+++ b/core/tests/Drupal/KernelTests/KernelTestBase.php
@@ -229,6 +229,7 @@ protected function setUp() {
    * tests.
    *
    * @see \Drupal\system\Tests\DrupalKernel\DrupalKernelTest
+   *
    * @internal
    */
   protected function bootEnvironment() {
diff --git a/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
index 56a03b3..5d85ca4 100644
--- a/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
+++ b/core/tests/Drupal/Tests/Component/Datetime/DateTimePlusTest.php
@@ -118,11 +118,11 @@ public function testTimestamp($input, array $initial, array $transform) {
    * @param string $input
    *   Input argument for DateTimePlus().
    * @param array $initial
-   *   @see testTimestamp()
    * @param array $transform
-   *   @see testTimestamp()
    *
    * @dataProvider providerTestDateTimestamp
+   *
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testTimestamp()
    */
   public function testDateTimestamp($input, array $initial, array $transform) {
     // Initialize a new date object.
@@ -139,9 +139,9 @@ public function testDateTimestamp($input, array $initial, array $transform) {
    * @input mixed $input
    *   The original input passed to the test method.
    * @param array $initial
-   *   @see testTimestamp()
    * @param array $transform
-   *   @see testTimestamp()
+   *
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testTimestamp()
    */
   public function assertDateTimestamp($date, $input, $initial, $transform) {
     // Check format.
@@ -255,7 +255,7 @@ public function testDateTimezoneWithDateTimeObject() {
    *   An array of arrays, each containing the input parameters for
    *   DateTimePlusTest::testDates().
    *
-   * @see DateTimePlusTest::testDates().
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testDates()
    */
   public function providerTestDates() {
     return array(
@@ -282,7 +282,7 @@ public function providerTestDates() {
    *   An array of arrays, each containing the input parameters for
    *   DateTimePlusTest::testDates().
    *
-   * @see DateTimePlusTest::testDates().
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testDates()
    */
   public function providerTestDateArrays() {
     return array(
@@ -309,7 +309,7 @@ public function providerTestDateArrays() {
    *   - 'format_date' - Date format for use in $date->format() method.
    *   - 'expected' - The expected return from DateTimePlus.
    *
-   * @see testDateFormats()
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testDateFormat()
    */
   public function providerTestDateFormat() {
     return array(
@@ -334,7 +334,7 @@ public function providerTestDateFormat() {
    *   - 'format' - Format for DateTimePlus.
    *   - 'message' - Message to display on failure.
    *
-   * @see testInvalidDates
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testInvalidDates()
    */
   public function providerTestInvalidDates() {
     return array(
@@ -361,7 +361,7 @@ public function providerTestInvalidDates() {
    *   - 'input' - Input for DateTimePlus.
    *   - 'timezone' - Timezone for DateTimePlus.
    *
-   * @see testInvalidDateArrays
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testInvalidDateArrays()
    */
   public function providerTestInvalidDateArrays() {
     return array(
@@ -390,7 +390,7 @@ public function providerTestInvalidDateArrays() {
    *   - 'expected' - Expected return from DateTimePlus::getTimezone()::getName().
    *   - 'message' - Message to display on test failure.
    *
-   * @see testDateTimezone
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testDateTimezone()
    */
   public function providerTestDateTimezone() {
     // Use a common date for most of the tests.
@@ -419,7 +419,7 @@ public function providerTestDateTimezone() {
    *   An array of arrays, each containing the arguments required for
    *   self::testTimestamp().
    *
-   * @see testTimestamp()
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testTimestamp()
    */
   public function providerTestTimestamp() {
     return array(
@@ -471,7 +471,7 @@ public function providerTestTimestamp() {
    *   An array of arrays, each containing the arguments required for
    *   self::testDateTimestamp().
    *
-   * @see testDateTimestamp()
+   * @see \Drupal\Tests\Component\Datetime\DateTimePlusTest::testDateTimestamp()
    */
   public function providerTestDateTimestamp() {
     return array(
diff --git a/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php b/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php
index c7490b9..ea6c8e6 100644
--- a/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php
+++ b/core/tests/Drupal/Tests/Core/Asset/JsOptimizerUnitTest.php
@@ -36,7 +36,7 @@ protected function setUp() {
   /**
    * Provides data for the JS asset cleaning test.
    *
-   * @see \Drupal\Core\Asset\JsOptimizer::clean().
+   * @see \Drupal\Core\Asset\JsOptimizer::clean()
    *
    * @returns array
    *   An array of test data.
@@ -83,7 +83,7 @@ function testClean($js_asset, $expected) {
   /**
    * Provides data for the JS asset optimize test.
    *
-   * @see \Drupal\Core\Asset\JsOptimizer::optimize().
+   * @see \Drupal\Core\Asset\JsOptimizer::optimize()
    *
    * @returns array
    *   An array of test data.
diff --git a/core/tests/Drupal/Tests/Core/Block/BlockBaseTest.php b/core/tests/Drupal/Tests/Core/Block/BlockBaseTest.php
index b943412..8ddbcf4 100644
--- a/core/tests/Drupal/Tests/Core/Block/BlockBaseTest.php
+++ b/core/tests/Drupal/Tests/Core/Block/BlockBaseTest.php
@@ -19,7 +19,7 @@ class BlockBaseTest extends UnitTestCase {
   /**
    * Tests the machine name suggestion.
    *
-   * @see \Drupal\Core\Block\BlockBase::getMachineNameSuggestion().
+   * @see \Drupal\Core\Block\BlockBase::getMachineNameSuggestion()
    */
   public function testGetMachineNameSuggestion() {
     $module_handler = $this->getMock('Drupal\Core\Extension\ModuleHandlerInterface');
diff --git a/core/tests/Drupal/Tests/Core/DrupalTest.php b/core/tests/Drupal/Tests/Core/DrupalTest.php
index d22ed78..f4c2831 100644
--- a/core/tests/Drupal/Tests/Core/DrupalTest.php
+++ b/core/tests/Drupal/Tests/Core/DrupalTest.php
@@ -319,6 +319,7 @@ public function testUrlGenerator() {
    * Tests the url() method.
    *
    * @covers ::url
+   *
    * @see \Drupal\Core\Routing\UrlGeneratorInterface::generateFromRoute()
    */
   public function testUrl() {
@@ -348,6 +349,7 @@ public function testLinkGenerator() {
    * Tests the l() method.
    *
    * @covers ::l
+   *
    * @see \Drupal\Core\Utility\LinkGeneratorInterface::generate()
    */
   public function testL() {
diff --git a/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php b/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
index 0afeef9..9f61749 100644
--- a/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
+++ b/core/tests/Drupal/Tests/Core/ParamConverter/ParamConverterManagerTest.php
@@ -70,7 +70,7 @@ public function testGetConverterException() {
    *   An array of arrays, each containing the input parameters for
    *   providerTestResolvers::testAddConverter().
    *
-   * @see ParamConverterManagerTest::testAddConverter().
+   * @see ParamConverterManagerTest::testAddConverter()
    */
   public function providerTestAddConverter() {
     $converters[0]['unsorted'] = array(
@@ -113,7 +113,7 @@ public function providerTestAddConverter() {
    *   An array of arrays, each containing the input parameters for
    *   providerTestResolvers::testGetConverter().
    *
-   * @see ParamConverterManagerTest::testGetConverter().
+   * @see ParamConverterManagerTest::testGetConverter()
    */
   public function providerTestGetConverter() {
     return array(
diff --git a/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php b/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
index 70d01ec..223de4e 100644
--- a/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Plugin/Discovery/DerivativeDiscoveryDecoratorTest.php
@@ -34,7 +34,7 @@ protected function setUp() {
   /**
    * Tests the getDerivativeFetcher method.
    *
-   * @see  \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDerivativeFetcher().
+   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDerivativeFetcher()
    */
   public function testGetDerivativeFetcher() {
     $definitions = array();
@@ -90,7 +90,7 @@ public function testGetDerivativeFetcherWithAnnotationObjects() {
   /**
    * Tests the getDerivativeFetcher method with a non-existent class.
    *
-   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDeriver().\
+   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDeriver()
    *
    * @expectedException \Drupal\Component\Plugin\Exception\InvalidDeriverException
    * @expectedExceptionMessage Plugin (non_existent_discovery) deriver "\Drupal\system\Tests\Plugin\NonExistentDeriver" does not exist.
@@ -113,7 +113,7 @@ public function testNonExistentDerivativeFetcher() {
   /**
    * Tests the getDerivativeFetcher method with an invalid class.
    *
-   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDeriver().\
+   * @see \Drupal\Component\Plugin\Discovery\DerivativeDiscoveryDecorator::getDeriver()
    *
    * @expectedException \Drupal\Component\Plugin\Exception\InvalidDeriverException
    * @expectedExceptionMessage Plugin (invalid_discovery) deriver "\Drupal\system\Tests\Plugin\DerivativeTest" must implement \Drupal\Component\Plugin\Derivative\DeriverInterface.
diff --git a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
index ee531ef..afcb2f1 100644
--- a/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
+++ b/core/tests/Drupal/Tests/Core/Session/UserSessionTest.php
@@ -140,7 +140,7 @@ protected function setUp() {
    *
    * @dataProvider providerTestHasPermission
    *
-   * @see \Drupal\Core\Session\UserSession::hasPermission().
+   * @see \Drupal\Core\Session\UserSession::hasPermission()
    */
   public function testHasPermission($permission, array $sessions_with_access, array $sessions_without_access) {
     foreach ($sessions_with_access as $name) {
diff --git a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php b/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php
index c8000bf..df8ab0f 100644
--- a/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php
+++ b/core/tests/Drupal/Tests/Core/StringTranslation/StringTranslationTraitTest.php
@@ -26,6 +26,7 @@ class StringTranslationTraitTest extends UnitTestCase {
    * The mock under test that uses StringTranslationTrait.
    *
    * @var object
+   *
    * @see PHPUnit_Framework_MockObject_Generator::getObjectForTrait()
    */
   protected $translation;