diff --git a/core/lib/Drupal/Core/Config/ConfigCollectionInfo.php b/core/lib/Drupal/Core/Config/ConfigCollectionInfo.php
index 7132145..ca526cd 100644
--- a/core/lib/Drupal/Core/Config/ConfigCollectionInfo.php
+++ b/core/lib/Drupal/Core/Config/ConfigCollectionInfo.php
@@ -30,7 +30,7 @@ class ConfigCollectionInfo extends Event {
    *
    * @throws \InvalidArgumentException
    *   Exception thrown if $collection is equal to
-   *   \Drupal\Core\Config\StorageInterface::DEFAULT_COLLECTION
+   *   \Drupal\Core\Config\StorageInterface::DEFAULT_COLLECTION.
    */
   public function addCollection($collection, ConfigFactoryOverrideInterface $override_service = NULL) {
     if ($collection == StorageInterface::DEFAULT_COLLECTION) {
diff --git a/core/lib/Drupal/Core/Config/DatabaseStorage.php b/core/lib/Drupal/Core/Config/DatabaseStorage.php
index 30d3fa9..ace3dfc 100644
--- a/core/lib/Drupal/Core/Config/DatabaseStorage.php
+++ b/core/lib/Drupal/Core/Config/DatabaseStorage.php
@@ -252,7 +252,8 @@ public function encode($data) {
    * Implements Drupal\Core\Config\StorageInterface::decode().
    *
    * @throws ErrorException
-   *   unserialize() triggers E_NOTICE if the string cannot be unserialized.
+   *   The unserialize() call will trigger E_NOTICE if the string cannot
+   *   be unserialized.
    */
   public function decode($raw) {
     $data = @unserialize($raw);
diff --git a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
index 387e563..5823ba8 100644
--- a/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
+++ b/core/lib/Drupal/Core/DependencyInjection/YamlFileLoader.php
@@ -124,7 +124,8 @@ private function parseDefinitions($content, $file)
      * @param array $service
      * @param string $file
      *
-     * @throws InvalidArgumentException When tags are invalid
+     * @throws InvalidArgumentException
+     *   When tags are invalid.
      */
     private function parseDefinition($id, $service, $file)
     {
@@ -318,7 +319,8 @@ private function parseDefinition($id, $service, $file)
      *
      * @return array The file content
      *
-     * @throws InvalidArgumentException when the given file is not a local file or when it does not exist
+     * @throws InvalidArgumentException
+     *   When the given file is not a local file or when it does not exist.
      */
     protected function loadFile($file)
     {
@@ -341,7 +343,8 @@ protected function loadFile($file)
      *
      * @return array
      *
-     * @throws InvalidArgumentException When service file is not valid
+     * @throws InvalidArgumentException
+     *   When service file is not valid.
      */
     private function validate($content, $file)
     {
diff --git a/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php b/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
index 3b89047..33ad502 100644
--- a/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
+++ b/core/lib/Drupal/Core/Extension/ThemeHandlerInterface.php
@@ -21,7 +21,7 @@
    *   Whether any of the given themes have been installed.
    *
    * @throws \Drupal\Core\Extension\ExtensionNameLengthException
-   *   Thrown when the theme name is to long
+   *   Thrown when the theme name is to long.
    *
    * @deprecated in Drupal 8.0.x-dev and will be removed before Drupal 9.0.0.
    *   Use the theme_installer service instead.
diff --git a/core/lib/Drupal/Core/Extension/ThemeInstallerInterface.php b/core/lib/Drupal/Core/Extension/ThemeInstallerInterface.php
index 3e5096f..ad80762 100644
--- a/core/lib/Drupal/Core/Extension/ThemeInstallerInterface.php
+++ b/core/lib/Drupal/Core/Extension/ThemeInstallerInterface.php
@@ -21,7 +21,7 @@
    *   Whether any of the given themes have been installed.
    *
    * @throws \Drupal\Core\Extension\ExtensionNameLengthException
-   *   Thrown when the theme name is to long
+   *   Thrown when the theme name is to long.
    */
   public function install(array $theme_list, $install_dependencies = TRUE);
 
diff --git a/core/lib/Drupal/Core/Render/RendererInterface.php b/core/lib/Drupal/Core/Render/RendererInterface.php
index a7516b4..5f8802d 100644
--- a/core/lib/Drupal/Core/Render/RendererInterface.php
+++ b/core/lib/Drupal/Core/Render/RendererInterface.php
@@ -319,8 +319,8 @@ public function renderPlaceholder($placeholder, array $elements);
    *   The rendered HTML.
    *
    * @throws \LogicException
-   *   When called outside of a render context. (i.e. outside of a renderRoot(),
-   *   renderPlain() or executeInRenderContext() call.)
+   *   When called outside of a render context (i.e. outside of a renderRoot(),
+   *   renderPlain() or executeInRenderContext() call).
    * @throws \Exception
    *   If a #pre_render callback throws an exception, it is caught to mark the
    *   renderer as no longer being in a root render call, if any. Then the
diff --git a/core/lib/Drupal/Core/Routing/UrlGenerator.php b/core/lib/Drupal/Core/Routing/UrlGenerator.php
index af0ad30..772bf49 100644
--- a/core/lib/Drupal/Core/Routing/UrlGenerator.php
+++ b/core/lib/Drupal/Core/Routing/UrlGenerator.php
@@ -158,10 +158,10 @@ public function getPathFromRoute($name, $parameters = array()) {
    *   The url path, without any base path, including possible query string.
    *
    * @throws MissingMandatoryParametersException
-   *   When some parameters are missing that are mandatory for the route
+   *   When some parameters are missing that are mandatory for the route.
    * @throws InvalidParameterException
    *   When a parameter value for a placeholder is not correct because it does
-   *   not match the requirement
+   *   not match the requirement.
    */
   protected function doGenerate(array $variables, array $defaults, array $tokens, array $parameters, array $query_params, $name) {
     $variables = array_flip($variables);
diff --git a/core/modules/field/src/Entity/FieldStorageConfig.php b/core/modules/field/src/Entity/FieldStorageConfig.php
index d04454e..00883d6 100644
--- a/core/modules/field/src/Entity/FieldStorageConfig.php
+++ b/core/modules/field/src/Entity/FieldStorageConfig.php
@@ -298,7 +298,8 @@ public function preSave(EntityStorageInterface $storage) {
    * @param \Drupal\Core\Entity\EntityStorageInterface $storage
    *   The entity storage.
    *
-   * @throws \Drupal\Core\Field\FieldException If the field definition is invalid.
+   * @throws \Drupal\Core\Field\FieldException
+   *   If the field definition is invalid.
    */
   protected function preSaveNew(EntityStorageInterface $storage) {
     $entity_manager = \Drupal::entityManager();
diff --git a/core/modules/locale/src/StreamWrapper/TranslationsStream.php b/core/modules/locale/src/StreamWrapper/TranslationsStream.php
index 7797ad1..a261aed 100644
--- a/core/modules/locale/src/StreamWrapper/TranslationsStream.php
+++ b/core/modules/locale/src/StreamWrapper/TranslationsStream.php
@@ -42,7 +42,8 @@ function getDirectoryPath() {
 
   /**
    * Implements Drupal\Core\StreamWrapper\StreamWrapperInterface::getExternalUrl().
-   * @throws \LogicException PO files URL should not be public.
+   * @throws \LogicException
+   *   PO files URL should not be public.
    */
   function getExternalUrl() {
     throw new \LogicException('PO files URL should not be public.');