diff -u b/core/includes/common.inc b/core/includes/common.inc
--- b/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -349,7 +349,7 @@
  *   An associative array of attributes such as 'rel'.
  *
  * @return
- *   A ; separated string ready for insertion in a HTTP header. No escaping is
+ *   A ; separated string ready for insertion in an HTTP header. No escaping is
  *   performed for HTML entities, so this string is not safe to be printed.
  */
 function drupal_http_header_attributes(array $attributes = []) {
diff -u b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
--- b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/sqlite/Schema.php
@@ -143,7 +143,7 @@
   }
 
   /**
-   * Create an SQL string for a field to be used in table creation or alteration.
+   * Create a SQL string for a field to be used in table creation or alteration.
    *
    * Before passing a field out of a schema definition into this function it has
    * to be processed by db_processField().
diff -u b/core/lib/Drupal/Core/Database/Query/Query.php b/core/lib/Drupal/Core/Database/Query/Query.php
--- b/core/lib/Drupal/Core/Database/Query/Query.php
+++ b/core/lib/Drupal/Core/Database/Query/Query.php
@@ -139,7 +139,7 @@
    * Adds a comment to the query.
    *
    * By adding a comment to a query, you can more easily find it in your
-   * query log or the list of active queries on an SQL server. This allows
+   * query log or the list of active queries on a SQL server. This allows
    * for easier debugging and allows you to more easily find where a query
    * with a performance problem is being generated.
    *
diff -u b/core/lib/Drupal/Core/Database/Schema.php b/core/lib/Drupal/Core/Database/Schema.php
--- b/core/lib/Drupal/Core/Database/Schema.php
+++ b/core/lib/Drupal/Core/Database/Schema.php
@@ -175,7 +175,7 @@
    * Finds all tables that are like the specified base table name.
    *
    * @param string $table_expression
-   *   An SQL expression, for example "cache_%" (without the quotes).
+   *   A SQL expression, for example "cache_%" (without the quotes).
    *
    * @return array
    *   Both the keys and the values are the matching tables.
diff -u b/core/lib/Drupal/Core/Url.php b/core/lib/Drupal/Core/Url.php
--- b/core/lib/Drupal/Core/Url.php
+++ b/core/lib/Drupal/Core/Url.php
@@ -242,7 +242,7 @@
    *     Do not include the leading '#' character.
    *   - 'absolute': Defaults to FALSE. Whether to force the output to be an
    *     absolute link (beginning with http:). Useful for links that will be
-   *     displayed outside the site, such as in an RSS feed.
+   *     displayed outside the site, such as in a RSS feed.
    *   - 'attributes': An associative array of HTML attributes that will be
    *     added to the anchor tag if you use the \Drupal\Core\Link class to make
    *     the link.
diff -u b/core/modules/page_cache/src/StackMiddleware/PageCache.php b/core/modules/page_cache/src/StackMiddleware/PageCache.php
--- b/core/modules/page_cache/src/StackMiddleware/PageCache.php
+++ b/core/modules/page_cache/src/StackMiddleware/PageCache.php
@@ -276,7 +276,7 @@
     // 403 and 404 responses can fill non-LRU cache backends and generally are
     // likely to have a low cache hit rate. So do not cache them permanently.
     if ($response->isClientError()) {
-      // Cache for an hour by default. If the 'cache_ttl_4xx' setting is
+      // Cache for a hour by default. If the 'cache_ttl_4xx' setting is
       // set to 0 then do not cache the response.
       $cache_ttl_4xx = Settings::get('cache_ttl_4xx', 3600);
       if ($cache_ttl_4xx > 0) {
diff -u b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
--- b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
+++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php
@@ -548,7 +548,7 @@
    * Tests the live preview output for json output.
    */
   public function testLivePreview() {
-    // We set up a request so it looks like an request in the live preview.
+    // We set up a request so it looks like a request in the live preview.
     $request = new Request();
     $request->query->add([MainContentViewSubscriber::WRAPPER_FORMAT => 'drupal_ajax']);
     /** @var \Symfony\Component\HttpFoundation\RequestStack $request_stack */
diff -u b/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
--- b/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -801,7 +801,7 @@
    * @param $curlHandler
    *   The cURL handler.
    * @param $header
-   *   An header.
+   *   A header.
    *
    * @see _drupal_log_error()
    */
@@ -973,7 +973,7 @@
   }
 
   /**
-   * Requests a Drupal path or an absolute path as if it is a XMLHttpRequest.
+   * Requests a Drupal path or an absolute path as if it is an XMLHttpRequest.
    *
    * @param \Drupal\Core\Url|string $path
    *   Drupal path or URL to request from.
@@ -1989,7 +1989,7 @@
   }
 
   /**
-   * Check if a HTTP response header exists and has the expected value.
+   * Check if an HTTP response header exists and has the expected value.
    *
    * @param string $header
    *   The header key, example: Content-Type
diff -u b/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
--- b/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -18,7 +18,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 
 /**
- * Views query plugin for an SQL query.
+ * Views query plugin for a SQL query.
  *
  * @ingroup views_query_plugins
  *
diff -u b/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
--- b/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -2196,7 +2196,7 @@
   }
 
   /**
-   * Generates a unique ID for an handler instance.
+   * Generates a unique ID for a handler instance.
    *
    * These handler instances are typically fields, filters, sort criteria, or
    * arguments.
diff -u b/core/tests/Drupal/Tests/BrowserTestBase.php b/core/tests/Drupal/Tests/BrowserTestBase.php
--- b/core/tests/Drupal/Tests/BrowserTestBase.php
+++ b/core/tests/Drupal/Tests/BrowserTestBase.php
@@ -1127,7 +1127,7 @@
   }
 
   /**
-   * Logs a HTML output message in a text file.
+   * Logs an HTML output message in a text file.
    *
    * The link to the HTML output message will be printed by the results printer.
    *
@@ -1239,7 +1239,7 @@
   }
 
   /**
-   * Performs an xpath search on the contents of the internal browser.
+   * Performs a xpath search on the contents of the internal browser.
    *
    * The search is relative to the root element (HTML tag normally) of the page.
    *
only in patch2:
unchanged:
--- a/core/includes/database.inc
+++ b/core/includes/database.inc
@@ -522,7 +522,7 @@ function db_and() {
  *   A new Condition object, set to "XOR" all conditions together.
  *
  * @deprecated as of Drupal 8.0.x, will be removed in Drupal 9.0.0. Create
- *   a \Drupal\Core\Database\Query\Condition object, specifying an XOR
+ *   a \Drupal\Core\Database\Query\Condition object, specifying a XOR
  *   conjunction: new Condition('XOR');
  *
  * @see \Drupal\Core\Database\Query\Condition
@@ -673,7 +673,7 @@ function db_field_exists($table, $field) {
  * Finds all tables that are like the specified base table name.
  *
  * @param string $table_expression
- *   An SQL expression, for example "simpletest%" (without the quotes).
+ *   A SQL expression, for example "simpletest%" (without the quotes).
  *
  * @return array
  *   Array, both the keys and the values are the matching tables.
only in patch2:
unchanged:
--- a/core/includes/install.core.inc
+++ b/core/includes/install.core.inc
@@ -1360,7 +1360,7 @@ function install_download_translation(&$install_state) {
 }
 
 /**
- * Attempts to get a file using a HTTP request and to store it locally.
+ * Attempts to get a file using an HTTP request and to store it locally.
  *
  * @param string $uri
  *   The URI of the file to grab.
only in patch2:
unchanged:
--- a/core/includes/pager.inc
+++ b/core/includes/pager.inc
@@ -55,7 +55,7 @@ function pager_find_page($element = 0) {
  * paged through, then you should call this function in preparation.
  *
  * The following example shows how this function can be used in a controller
- * that invokes an external datastore with an SQL-like syntax:
+ * that invokes an external datastore with a SQL-like syntax:
  * @code
  *   // First find the total number of items and initialize the pager.
  *   $where = "status = 1";
only in patch2:
unchanged:
--- a/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
+++ b/core/lib/Drupal/Component/Diff/Engine/HWLDFWordAccumulator.php
@@ -47,7 +47,7 @@ protected function _flushLine($new_tag) {
       array_push($this->lines, $this->line);
     }
     else {
-      // make empty lines visible by inserting an NBSP
+      // make empty lines visible by inserting a NBSP
       array_push($this->lines, $this::NBSP);
     }
     $this->line = '';
only in patch2:
unchanged:
--- a/core/lib/Drupal/Component/Gettext/PoStreamReader.php
+++ b/core/lib/Drupal/Component/Gettext/PoStreamReader.php
@@ -234,7 +234,7 @@ private function readHeader() {
    * An internal state machine is maintained in this reader using
    * $this->_context as the reading state. PO items are in between COMMENT
    * states (when items have at least one line or comment in between them) or
-   * indicated by MSGSTR or MSGSTR_ARR followed immediately by an MSGID or
+   * indicated by MSGSTR or MSGSTR_ARR followed immediately by a MSGID or
    * MSGCTXT (when items closely follow each other).
    *
    * @return
@@ -299,7 +299,7 @@ private function readLine() {
         // A plural form for the current source string.
 
         if ($this->_context != 'MSGID') {
-          // A plural form can only be added to an msgid directly.
+          // A plural form can only be added to a msgid directly.
           $this->_errors[] = SafeMarkup::format('The translation stream %uri contains an error: "msgid_plural" was expected but not found on line %line.', $log_vars);
           return FALSE;
         }
@@ -430,7 +430,7 @@ private function readLine() {
         return;
       }
       elseif (!strncmp("msgstr", $line, 6)) {
-        // A string pair for an msgid (with optional context).
+        // A string pair for a msgid (with optional context).
 
         if (($this->_context != 'MSGID') && ($this->_context != 'MSGCTXT')) {
           // Strings are only valid within an id or context scope.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Component/Utility/Html.php
+++ b/core/lib/Drupal/Component/Utility/Html.php
@@ -45,7 +45,7 @@ class Html {
    *   <command> tag anymore.
    *  See https://developer.mozilla.org/en-US/docs/Web/HTML/Element/command.
    * - The 'manifest' attribute is omitted because it only exists for the <html>
-   *   tag. That tag only makes sense in a HTML-served-as-HTML context, in which
+   *   tag. That tag only makes sense in an HTML-served-as-HTML context, in which
    *   case relative URLs are guaranteed to work.
    *
    * @see https://developer.mozilla.org/en-US/docs/Web/HTML/Attributes
only in patch2:
unchanged:
--- a/core/lib/Drupal/Component/Utility/Xss.php
+++ b/core/lib/Drupal/Component/Utility/Xss.php
@@ -214,7 +214,7 @@ protected static function attributes($attributes) {
             $skip = ($attribute_name == 'style' || substr($attribute_name, 0, 2) == 'on');
 
             // Values for attributes of type URI should be filtered for
-            // potentially malicious protocols (for example, an href-attribute
+            // potentially malicious protocols (for example, a href-attribute
             // starting with "javascript:"). However, for some non-URI
             // attributes performing this filtering causes valid and safe data
             // to be mangled. We prevent this by skipping protocol filtering on
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Ajax/RedirectCommand.php
+++ b/core/lib/Drupal/Core/Ajax/RedirectCommand.php
@@ -17,7 +17,7 @@ class RedirectCommand implements CommandInterface {
   protected $url;
 
   /**
-   * Constructs an RedirectCommand object.
+   * Constructs a RedirectCommand object.
    *
    * @param string $url
    *   The URL that will be loaded into window.location. This should be a full
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Config/Entity/Query/Query.php
+++ b/core/lib/Drupal/Core/Config/Entity/Query/Query.php
@@ -59,7 +59,7 @@ public function __construct(EntityTypeInterface $entity_type, $conjunction, Conf
    * Overrides \Drupal\Core\Entity\Query\QueryBase::condition().
    *
    * Additional to the syntax defined in the QueryInterface you can use
-   * placeholders (*) to match all keys of an subarray. Let's take the follow
+   * placeholders (*) to match all keys of a subarray. Let's take the follow
    * yaml file as example:
    * @code
    *  level1:
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Database/Connection.php
+++ b/core/lib/Drupal/Core/Database/Connection.php
@@ -252,7 +252,7 @@ public function destroy() {
    *   any place in them will cause an exception. This reduces the chance of SQL
    *   injection attacks that terminate the original query and add one or more
    *   additional queries (such as inserting new user accounts). In rare cases,
-   *   such as creating an SQL function, a ; is needed and can be allowed by
+   *   such as creating a SQL function, a ; is needed and can be allowed by
    *   changing this option to TRUE.
    *
    * @return array
@@ -558,7 +558,7 @@ protected function filterComment($comment = '') {
    *
    * @param string|\Drupal\Core\Database\StatementInterface $query
    *   The query to execute. In most cases this will be a string containing
-   *   an SQL query with placeholders. An already-prepared instance of
+   *   a SQL query with placeholders. An already-prepared instance of
    *   StatementInterface may also be passed in order to allow calling
    *   code to manually bind variables to a query. If a
    *   StatementInterface is passed, the $args array will be ignored.
@@ -1222,7 +1222,7 @@ protected function popCommittableTransactions() {
    * injection attacks.
    *
    * @param string $query
-   *   A string containing an SQL query.
+   *   A string containing a SQL query.
    * @param int $from
    *   The first result row to return.
    * @param int $count
@@ -1435,7 +1435,7 @@ public function prepare($statement, array $driver_options = []) {
    *   quoting styles. Defaults to \PDO::PARAM_STR.
    *
    * @return string|bool
-   *   A quoted string that is theoretically safe to pass into an SQL statement.
+   *   A quoted string that is theoretically safe to pass into a SQL statement.
    *   Returns FALSE if the driver does not support quoting in this way.
    *
    * @see \PDO::quote()
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/mysql/Schema.php
@@ -134,7 +134,7 @@ protected function createTableSql($name, $table) {
   }
 
   /**
-   * Create an SQL string for a field to be used in table creation or alteration.
+   * Create a SQL string for a field to be used in table creation or alteration.
    *
    * Before passing a field out of a schema definition into this function it has
    * to be processed by _db_process_field().
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
+++ b/core/lib/Drupal/Core/Database/Driver/pgsql/Schema.php
@@ -290,7 +290,7 @@ protected function createTableSql($name, $table) {
   }
 
   /**
-   * Create an SQL string for a field to be used in table creation or
+   * Create a SQL string for a field to be used in table creation or
    * alteration.
    *
    * Before passing a field out of a schema definition into this
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Database/Query/SelectInterface.php
+++ b/core/lib/Drupal/Core/Database/Query/SelectInterface.php
@@ -465,7 +465,7 @@ public function range($start = NULL, $length = NULL);
    * Note: All queries UNIONed together must have the same
    * field structure, in the same order. It is up to the
    * caller to ensure that they match properly. If they do
-   * not, an SQL syntax error will result.
+   * not, a SQL syntax error will result.
    *
    * @param $query
    *   The query to UNION to this query.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Entity/Entity/EntityViewMode.php
+++ b/core/lib/Drupal/Core/Entity/Entity/EntityViewMode.php
@@ -10,7 +10,7 @@
  *
  * View modes let entities be displayed differently depending on the context.
  * For instance, a node can be displayed differently on its own page ('full'
- * mode), on the home page or taxonomy listings ('teaser' mode), or in an RSS
+ * mode), on the home page or taxonomy listings ('teaser' mode), or in a RSS
  * feed ('rss' mode). Modules taking part in the display of the entity (notably
  * the Field API) can adjust their behavior depending on the requested view
  * mode. An additional 'default' view mode is available for all entity types.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
+++ b/core/lib/Drupal/Core/Entity/Plugin/Derivative/DefaultSelectionDeriver.php
@@ -26,7 +26,7 @@ class DefaultSelectionDeriver extends DeriverBase implements ContainerDeriverInt
   protected $entityManager;
 
   /**
-   * Creates an SelectionBase object.
+   * Creates a SelectionBase object.
    *
    * @param \Drupal\Core\Entity\EntityManagerInterface $entity_manager
    *   The entity manager.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
+++ b/core/lib/Drupal/Core/Entity/Query/Sql/Tables.php
@@ -345,7 +345,7 @@ protected function addJoin($type, $table, $join_condition, $langcode, $delta = N
       $entity_type_id = $this->sqlQuery->getMetaData('entity_type');
       $entity_type = $this->entityManager->getDefinition($entity_type_id);
       // Only the data table follows the entity language key, dedicated field
-      // tables have an hard-coded 'langcode' column.
+      // tables have a hard-coded 'langcode' column.
       $langcode_key = $entity_type->getDataTable() == $table ? $entity_type->getKey('langcode') : 'langcode';
       $placeholder = ':langcode' . $this->sqlQuery->nextPlaceholder();
       $join_condition .= ' AND %alias.' . $langcode_key . ' = ' . $placeholder;
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
+++ b/core/lib/Drupal/Core/Entity/Sql/SqlContentEntityStorageSchema.php
@@ -93,7 +93,7 @@ class SqlContentEntityStorageSchema implements DynamicallyFieldableEntityStorage
    * @param \Drupal\Core\Entity\ContentEntityTypeInterface $entity_type
    *   The entity type.
    * @param \Drupal\Core\Entity\Sql\SqlContentEntityStorage $storage
-   *   The storage of the entity type. This must be an SQL-based storage.
+   *   The storage of the entity type. This must be a SQL-based storage.
    * @param \Drupal\Core\Database\Connection $database
    *   The database connection to be used.
    */
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Extension/Extension.php
+++ b/core/lib/Drupal/Core/Extension/Extension.php
@@ -29,7 +29,7 @@ class Extension implements \Serializable {
   protected $filename;
 
   /**
-   * An SplFileInfo instance for the extension's info file.
+   * A SplFileInfo instance for the extension's info file.
    *
    * Note that SplFileInfo is a PHP resource and resources cannot be serialized.
    *
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php
+++ b/core/lib/Drupal/Core/Field/Plugin/Field/FieldFormatter/TimestampFormatter.php
@@ -168,7 +168,7 @@ public function viewElements(FieldItemListInterface $items, $langcode) {
     $timezone = $this->getSetting('timezone') ?: NULL;
     $langcode = NULL;
 
-    // If an RFC2822 date format is requested, then the month and day have to
+    // If a RFC2822 date format is requested, then the month and day have to
     // be in English. @see http://www.faqs.org/rfcs/rfc2822.html
     if ($date_format === 'custom' && ($custom_date_format = $this->getSetting('custom_date_format')) === 'r') {
       $langcode = 'en';
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Image/ImageInterface.php
+++ b/core/lib/Drupal/Core/Image/ImageInterface.php
@@ -228,7 +228,7 @@ public function desaturate();
    * @param float $degrees
    *   The number of (clockwise) degrees to rotate the image.
    * @param string|null $background
-   *   (optional) An hexadecimal integer specifying the background color to use
+   *   (optional) A hexadecimal integer specifying the background color to use
    *   for the uncovered area of the image after the rotation; for example,
    *   0x000000 for black, 0xff00ff for magenta, and 0xffffff for white. When
    *   NULL (the default) is specified, for images that support transparency,
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/core/lib/Drupal/Core/Menu/menu.api.php
@@ -461,7 +461,7 @@ function hook_system_breadcrumb_alter(\Drupal\Core\Breadcrumb\Breadcrumb &$bread
  *       append to the URL.
  *     - absolute: Whether to force the output to be an absolute link (beginning
  *       with http:). Useful for links that will be displayed outside the site,
- *       such as in an RSS feed. Defaults to FALSE.
+ *       such as in a RSS feed. Defaults to FALSE.
  *     - language: An optional language object. May affect the rendering of
  *       the anchor tag, such as by adding a language prefix to the path.
  *     - attributes: An associative array of HTML attributes to apply to the
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
+++ b/core/lib/Drupal/Core/PathProcessor/OutboundPathProcessorInterface.php
@@ -24,7 +24,7 @@
    *     Do not include the leading '#' character.
    *   - 'absolute': Defaults to FALSE. Whether to force the output to be an
    *     absolute link (beginning with http:). Useful for links that will be
-   *     displayed outside the site, such as in an RSS feed.
+   *     displayed outside the site, such as in a RSS feed.
    *   - 'language': An optional language object used to look up the alias
    *     for the URL. If $options['language'] is omitted, it defaults to the
    *     current language for the language type LanguageInterface::TYPE_URL.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Render/Element/Email.php
+++ b/core/lib/Drupal/Core/Render/Element/Email.php
@@ -9,7 +9,7 @@
  * Provides a form input element for entering an email address.
  *
  * Properties:
- * - #default_value: An RFC-compliant email address.
+ * - #default_value: A RFC-compliant email address.
  * - #size: The size of the input element in characters.
  *
  * Example usage:
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Render/theme.api.php
+++ b/core/lib/Drupal/Core/Render/theme.api.php
@@ -601,7 +601,7 @@ function hook_preprocess(&$variables, $hook) {
  *   The variables array (modify in place).
  */
 function hook_preprocess_HOOK(&$variables) {
-  // This example is from rdf_preprocess_image(). It adds an RDF attribute
+  // This example is from rdf_preprocess_image(). It adds a RDF attribute
   // to the image hook's variables.
   $variables['attributes']['typeof'] = ['foaf:Image'];
 }
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
+++ b/core/lib/Drupal/Core/Routing/UrlGeneratorInterface.php
@@ -46,7 +46,7 @@ public function getPathFromRoute($name, $parameters = []);
    *     Do not include the leading '#' character.
    *   - 'absolute': Defaults to FALSE. Whether to force the output to be an
    *     absolute link (beginning with http:). Useful for links that will be
-   *     displayed outside the site, such as in an RSS feed.
+   *     displayed outside the site, such as in a RSS feed.
    *   - 'language': An optional language object used to look up the alias
    *     for the URL. If $options['language'] is omitted, it defaults to the
    *     current language for the language type LanguageInterface::TYPE_URL.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/SitePathFactory.php
+++ b/core/lib/Drupal/Core/SitePathFactory.php
@@ -15,7 +15,7 @@ class SitePathFactory {
   protected $drupalKernel;
 
   /**
-   * Constructs an SitePathFactory instance.
+   * Constructs a SitePathFactory instance.
    *
    * @param \Drupal\Core\DrupalKernelInterface $drupal_kernel
    *   The Drupal kernel.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Template/TwigExtension.php
+++ b/core/lib/Drupal/Core/Template/TwigExtension.php
@@ -541,7 +541,7 @@ protected function bubbleArgMetadata($arg) {
    *   RenderableInterface or toString().
    *
    * @return mixed
-   *   The rendered output or an Twig_Markup object.
+   *   The rendered output or a Twig_Markup object.
    *
    * @see render
    * @see TwigNodeVisitor
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/TypedData/OptionsProviderInterface.php
+++ b/core/lib/Drupal/Core/TypedData/OptionsProviderInterface.php
@@ -10,7 +10,7 @@
  * While possible values specify which values existing data might have, settable
  * values define the values that are allowed to be set by a user.
  *
- * For example, in an workflow scenario, the settable values for a state field
+ * For example, in a workflow scenario, the settable values for a state field
  * might depend on the currently set state, while possible values are all
  * states. Thus settable values would be used in an editing context, while
  * possible values would be used for presenting filtering options in a search.
only in patch2:
unchanged:
--- a/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
+++ b/core/lib/Drupal/Core/Utility/UnroutedUrlAssemblerInterface.php
@@ -36,7 +36,7 @@
    *     Do not include the leading '#' character.
    *   - 'absolute': Defaults to FALSE. Whether to force the output to be an
    *     absolute link (beginning with http:). Useful for links that will be
-   *     displayed outside the site, such as in an RSS feed.
+   *     displayed outside the site, such as in a RSS feed.
    *   - 'https': Whether this URL should point to a secure location. If not
    *     defined, the current scheme is used, so the user stays on HTTP or HTTPS
    *     respectively. TRUE enforces HTTPS and FALSE enforces HTTP.
only in patch2:
unchanged:
--- a/core/modules/big_pipe/src/Render/BigPipe.php
+++ b/core/modules/big_pipe/src/Render/BigPipe.php
@@ -23,7 +23,7 @@
 /**
  * Service for sending an HTML response in chunks (to get faster page loads).
  *
- * At a high level, BigPipe sends a HTML response in chunks:
+ * At a high level, BigPipe sends an HTML response in chunks:
  * 1. one chunk: everything until just before </body> — this contains BigPipe
  *    placeholders for the personalized parts of the page. Hence this sends the
  *    non-personalized parts of the page. Let's call it The Skeleton.
@@ -58,7 +58,7 @@
  * the logic though, we choose to call this "no-JS BigPipe".
  *
  * However, there is also a tangible benefit: some dynamic/expensive content is
- * not HTML, but for example a HTML attribute value (or part thereof). It's not
+ * not HTML, but for example an HTML attribute value (or part thereof). It's not
  * possible to efficiently replace such content using JavaScript, so "classic"
  * BigPipe is out of the question. For example: CSRF tokens in URLs.
  *
@@ -68,7 +68,7 @@
  * Finally, a closer look at the implementation, and how it supports and reuses
  * existing Drupal concepts:
  * 1. BigPipe placeholders: 1 HtmlResponse + N embedded AjaxResponses.
- *   - Before a BigPipe response is sent, it is just a HTML response that
+ *   - Before a BigPipe response is sent, it is just an HTML response that
  *     contains BigPipe placeholders. Those placeholders look like
  *     <span data-big-pipe-placeholder-id="…"></span>. JavaScript is used to
  *     replace those placeholders.
@@ -76,7 +76,7 @@
  *   - The Skeleton of course has attachments, including most notably asset
  *     libraries. And those we track in drupalSettings.ajaxPageState.libraries —
  *     so that when we load new content through AJAX, we don't load the same
- *     asset libraries again. A HTML page can have multiple AJAX responses, each
+ *     asset libraries again. An HTML page can have multiple AJAX responses, each
  *     of which should take into account the combined AJAX page state of the
  *     HTML document and all preceding AJAX responses.
  *   - BigPipe does not make use of multiple AJAX requests/responses. It uses a
@@ -94,13 +94,13 @@
  *     into account the cumulative AJAX page state of the HTML document and all
  *     preceding Embedded AJAX responses.
  * 2. No-JS BigPipe placeholders: 1 HtmlResponse + N embedded HtmlResponses.
- *   - Before a BigPipe response is sent, it is just a HTML response that
+ *   - Before a BigPipe response is sent, it is just an HTML response that
  *     contains no-JS BigPipe placeholders. Those placeholders can take two
  *     different forms:
  *     1. <span data-big-pipe-nojs-placeholder-id="…"></span> if it's a
  *        placeholder that will be replaced by HTML
  *     2. big_pipe_nojs_placeholder_attribute_safe:… if it's a placeholder
- *        inside a HTML attribute, in which 1. would be invalid (angle brackets
+ *        inside an HTML attribute, in which 1. would be invalid (angle brackets
  *        are not allowed inside HTML attributes)
  *     No-JS BigPipe placeholders are not replaced using JavaScript, they must
  *     be replaced upon sending the BigPipe response. So, while the response is
@@ -531,7 +531,7 @@ protected function sendPlaceholders(array $placeholders, array $placeholder_orde
     // Send the start signal.
     $this->sendChunk("\n" . static::START_SIGNAL . "\n");
 
-    // A BigPipe response consists of a HTML response plus multiple embedded
+    // A BigPipe response consists of an HTML response plus multiple embedded
     // AJAX responses. To process the attachments of those AJAX responses, we
     // need a fake request that is identical to the master request, but with
     // one change: it must have the right Accept header, otherwise the work-
@@ -622,7 +622,7 @@ protected function sendPlaceholders(array $placeholders, array $placeholder_orde
    *   A fake subrequest that contains the cumulative AJAX page state of the
    *   HTML document and all preceding Embedded HTML or AJAX responses.
    * @param \Symfony\Component\HttpFoundation\Response|\Drupal\Core\Render\HtmlResponse|\Drupal\Core\Ajax\AjaxResponse $embedded_response
-   *   Either a HTML response or an AJAX response that will be embedded in the
+   *   Either an HTML response or an AJAX response that will be embedded in the
    *   overall HTML response.
    *
    * @return \Symfony\Component\HttpFoundation\Response
only in patch2:
unchanged:
--- a/core/modules/book/src/BookManagerInterface.php
+++ b/core/modules/book/src/BookManagerInterface.php
@@ -32,7 +32,7 @@
    *   $link, in which case $max_depth should be greater than $link['depth'].
    *
    * @return array
-   *   An tree of menu links in an array, in the order they should be rendered.
+   *   A tree of menu links in an array, in the order they should be rendered.
    */
   public function bookTreeAllData($bid, $link = NULL, $max_depth = NULL);
 
only in patch2:
unchanged:
--- a/core/modules/color/color.module
+++ b/core/modules/color/color.module
@@ -748,7 +748,7 @@ function _color_blend($img, $hex1, $hex2, $alpha) {
 }
 
 /**
- * Converts a hex color into an RGB triplet.
+ * Converts a hex color into a RGB triplet.
  */
 function _color_unpack($hex, $normalize = FALSE) {
   if (strlen($hex) == 4) {
@@ -763,7 +763,7 @@ function _color_unpack($hex, $normalize = FALSE) {
 }
 
 /**
- * Converts an RGB triplet to a hex color.
+ * Converts a RGB triplet to a hex color.
  */
 function _color_pack($rgb, $normalize = FALSE) {
   $out = 0;
@@ -775,7 +775,7 @@ function _color_pack($rgb, $normalize = FALSE) {
 }
 
 /**
- * Converts an HSL triplet into RGB.
+ * Converts a HSL triplet into RGB.
  */
 function _color_hsl2rgb($hsl) {
   $h = $hsl[0];
@@ -804,7 +804,7 @@ function _color_hue2rgb($m1, $m2, $h) {
 }
 
 /**
- * Converts an RGB triplet to HSL.
+ * Converts a RGB triplet to HSL.
  */
 function _color_rgb2hsl($rgb) {
   $r = $rgb[0];
only in patch2:
unchanged:
--- a/core/modules/comment/src/Tests/CommentRssTest.php
+++ b/core/modules/comment/src/Tests/CommentRssTest.php
@@ -8,7 +8,7 @@
 use Drupal\system\Tests\Cache\AssertPageCacheContextsAndTagsTrait;
 
 /**
- * Tests comments as part of an RSS feed.
+ * Tests comments as part of a RSS feed.
  *
  * @group comment
  */
@@ -40,7 +40,7 @@ protected function setUp() {
   }
 
   /**
-   * Tests comments as part of an RSS feed.
+   * Tests comments as part of a RSS feed.
    */
   public function testCommentRss() {
     // Find comment in RSS feed.
only in patch2:
unchanged:
--- a/core/modules/config/src/Tests/ConfigExportImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigExportImportUITest.php
@@ -168,7 +168,7 @@ public function testExportImport() {
     $this->assertText($this->contentType->label());
 
     $this->drupalPostForm(NULL, [], 'Import all');
-    // After importing the snapshot has been updated an there are no warnings.
+    // After importing the snapshot has been updated a there are no warnings.
     $this->assertNoText(t('Warning message'));
     $this->assertText(t('There are no configuration changes to import.'));
 
only in patch2:
unchanged:
--- a/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
+++ b/core/modules/file/tests/src/Kernel/Migrate/d6/MigrateFileTest.php
@@ -136,7 +136,7 @@ public function testFiles() {
 
     // File 6, created in static::migrateDumpAlter(), shares a path with
     // file 4, which means it should be skipped entirely. If it was migrated
-    // then it would have an fid of 9.
+    // then it would have a fid of 9.
     $this->assertNull(File::load(9));
 
     $this->assertEquals(8, count(File::loadMultiple()));
only in patch2:
unchanged:
--- a/core/modules/forum/src/ForumManager.php
+++ b/core/modules/forum/src/ForumManager.php
@@ -274,7 +274,7 @@ public function getTopics($tid, AccountInterface $account) {
    *
    * @return array
    *   An array with the following values:
-   *   - field: A field for an SQL query.
+   *   - field: A field for a SQL query.
    *   - sort: 'asc' or 'desc'.
    */
   protected function getTopicOrder($sortby) {
only in patch2:
unchanged:
--- a/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
+++ b/core/modules/image/tests/src/Kernel/ImageFormatterTest.php
@@ -157,7 +157,7 @@ public function testImageFormatterSvg() {
     $this->assertTrue(strpos($build[$this->fieldName][0]['#markup'], 'width="220"') !== FALSE);
     $this->assertTrue(strpos($build[$this->fieldName][0]['#markup'], 'height="220"') !== FALSE);
 
-    // The second image is an SVG, which is not supported by the GD toolkit.
+    // The second image is a SVG, which is not supported by the GD toolkit.
     // The image style should still be applied with its cache tags, but image
     // derivative will not be available so <img> tag will point to the original
     // image.
only in patch2:
unchanged:
--- a/core/modules/locale/src/Form/TranslationStatusForm.php
+++ b/core/modules/locale/src/Form/TranslationStatusForm.php
@@ -274,7 +274,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     $options = _locale_translation_default_update_options();
 
     // If the status was updated recently we can immediately start fetching the
-    // translation updates. If the status is expired we clear it an run a batch to
+    // translation updates. If the status is expired we clear it a run a batch to
     // update the status and then fetch the translation updates.
     $last_checked = $this->state->get('locale.translation_last_checked');
     if ($last_checked < REQUEST_TIME - LOCALE_TRANSLATION_STATUS_TTL) {
only in patch2:
unchanged:
--- a/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php
+++ b/core/modules/locale/tests/src/Kernel/LocaleStringIsSafeTest.php
@@ -38,7 +38,7 @@ public function testLocaleStringIsSafe() {
     $result = locale_string_is_safe($string);
     $this->assertFalse($result);
 
-    // Check a translatable string which includes a token in an href attribute.
+    // Check a translatable string which includes a token in a href attribute.
     $string = 'Hi <a href="[current-user:url]">user</a>';
     $result = locale_string_is_safe($string);
     $this->assertTrue($result);
only in patch2:
unchanged:
--- a/core/modules/migrate/src/Event/MigrateRollbackEvent.php
+++ b/core/modules/migrate/src/Event/MigrateRollbackEvent.php
@@ -18,7 +18,7 @@ class MigrateRollbackEvent extends Event {
   protected $migration;
 
   /**
-   * Constructs an rollback event object.
+   * Constructs a rollback event object.
    *
    * @param \Drupal\migrate\Plugin\MigrationInterface $migration
    *   Migration entity.
only in patch2:
unchanged:
--- a/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
+++ b/core/modules/migrate/src/Plugin/migrate/id_map/Sql.php
@@ -139,7 +139,7 @@ class Sql extends PluginBase implements MigrateIdMapInterface, ContainerFactoryP
   protected $currentKey = [];
 
   /**
-   * Constructs an SQL object.
+   * Constructs a SQL object.
    *
    * Sets up the tables and builds the maps,
    *
@@ -180,7 +180,7 @@ public static function create(ContainerInterface $container, array $configuratio
    *   The source identifiers
    *
    * @return string
-   *   An hash containing the hashed values of the source identifiers.
+   *   A hash containing the hashed values of the source identifiers.
    */
   public function getSourceIDsHash(array $source_id_values) {
     // When looking up the destination ID we require an array with both the
only in patch2:
unchanged:
--- a/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
+++ b/core/modules/migrate/tests/src/Unit/MigrateTestCase.php
@@ -95,7 +95,7 @@ protected function getMigration() {
   }
 
   /**
-   * Gets an SQLite database connection object for use in tests.
+   * Gets a SQLite database connection object for use in tests.
    *
    * @param array $database_contents
    *   The database contents faked as an array. Each key is a table name, each
only in patch2:
unchanged:
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -892,7 +892,7 @@ function node_form_system_themes_admin_form_submit($form, FormStateInterface $fo
  * access to the node.
  *
  * In node listings (lists of nodes generated from a select query, such as the
- * default home page at path 'node', an RSS feed, a recent content block, etc.),
+ * default home page at path 'node', a RSS feed, a recent content block, etc.),
  * the process above is followed except that hook_node_access() is not called on
  * each node for performance reasons and for proper functioning of the pager
  * system. When adding a node listing to your module, be sure to use an entity
only in patch2:
unchanged:
--- a/core/modules/node/src/Plugin/views/row/Rss.php
+++ b/core/modules/node/src/Plugin/views/row/Rss.php
@@ -7,7 +7,7 @@
 
 /**
  * Plugin which performs a node_view on the resulting object
- * and formats it as an RSS item.
+ * and formats it as a RSS item.
  *
  * @ViewsRow(
  *   id = "node_rss",
only in patch2:
unchanged:
--- a/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
+++ b/core/modules/node/tests/src/Functional/NodeRSSContentTest.php
@@ -33,7 +33,7 @@ protected function setUp() {
   }
 
   /**
-   * Ensures that a new node includes the custom data when added to an RSS feed.
+   * Ensures that a new node includes the custom data when added to a RSS feed.
    */
   public function testNodeRSSContent() {
     // Create a node.
only in patch2:
unchanged:
--- a/core/modules/node/tests/src/Kernel/Views/NidArgumentTest.php
+++ b/core/modules/node/tests/src/Kernel/Views/NidArgumentTest.php
@@ -61,7 +61,7 @@ public function testNidArgument() {
     $view->preview();
     $this->assertEqual(count($view->result), 2, 'Found the expected number of results.');
 
-    // Set an the second node id as an argument.
+    // Set a the second node id as an argument.
     $view->destroy();
     $view->preview('default', [$node2->id()]);
     // Verify that the title is overridden.
only in patch2:
unchanged:
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -263,7 +263,7 @@ function rdf_theme() {
  * Implements hook_preprocess_HOOK() for HTML document templates.
  */
 function rdf_preprocess_html(&$variables) {
-  // Adds RDF namespace prefix bindings in the form of an RDFa 1.1 prefix
+  // Adds RDF namespace prefix bindings in the form of a RDFa 1.1 prefix
   // attribute inside the html element.
   if (!isset($variables['html_attributes']['prefix'])) {
     $variables['html_attributes']['prefix'] = [];
only in patch2:
unchanged:
--- a/core/modules/rdf/src/RdfMappingInterface.php
+++ b/core/modules/rdf/src/RdfMappingInterface.php
@@ -5,7 +5,7 @@
 use Drupal\Core\Config\Entity\ConfigEntityInterface;
 
 /**
- * Provides an interface defining an RDF mapping entity.
+ * Provides an interface defining a RDF mapping entity.
  */
 interface RdfMappingInterface extends ConfigEntityInterface {
 
only in patch2:
unchanged:
--- a/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
+++ b/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
@@ -156,7 +156,7 @@ protected function parseContent($content) {
   }
 
   /**
-   * Performs an xpath search on a certain content.
+   * Performs a xpath search on a certain content.
    *
    * The search is relative to the root element of the $content variable.
    *
only in patch2:
unchanged:
--- a/core/modules/simpletest/src/AssertContentTrait.php
+++ b/core/modules/simpletest/src/AssertContentTrait.php
@@ -151,9 +151,9 @@ protected function getUrl() {
   }
 
   /**
-   * Builds an XPath query.
+   * Builds a XPath query.
    *
-   * Builds an XPath query by replacing placeholders in the query by the value
+   * Builds a XPath query by replacing placeholders in the query by the value
    * of the arguments.
    *
    * XPath 1.0 (the version supported by libxml2, the underlying XML library
@@ -161,14 +161,14 @@ protected function getUrl() {
    * simplifies the building of XPath expression.
    *
    * @param string $xpath
-   *   An XPath query, possibly with placeholders in the form ':name'.
+   *   A XPath query, possibly with placeholders in the form ':name'.
    * @param array $args
    *   An array of arguments with keys in the form ':name' matching the
    *   placeholders in the query. The values may be either strings or numeric
    *   values.
    *
    * @return string
-   *   An XPath query with arguments replaced.
+   *   A XPath query with arguments replaced.
    */
   protected function buildXPathQuery($xpath, array $args = []) {
     // Replace placeholders.
@@ -204,7 +204,7 @@ protected function buildXPathQuery($xpath, array $args = []) {
   }
 
   /**
-   * Performs an xpath search on the contents of the internal browser.
+   * Performs a xpath search on the contents of the internal browser.
    *
    * The search is relative to the root element (HTML tag normally) of the page.
    *
@@ -244,7 +244,7 @@ protected function xpath($xpath, array $arguments = []) {
    *
    * @return \SimpleXMLElement[]
    *   The return value of the XPath search performed after converting the CSS
-   *   selector to an XPath selector.
+   *   selector to a XPath selector.
    */
   protected function cssSelect($selector) {
     return $this->xpath((new CssSelectorConverter())->toXPath($selector));
@@ -1478,7 +1478,7 @@ protected function assertNoDuplicateIds($message = '', $group = 'Other', $ids_to
   }
 
   /**
-   * Helper: Constructs an XPath for the given set of attributes and value.
+   * Helper: Constructs a XPath for the given set of attributes and value.
    *
    * @param string $attribute
    *   Field attributes.
only in patch2:
unchanged:
--- a/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
+++ b/core/modules/statistics/src/Plugin/Block/StatisticsPopularBlock.php
@@ -50,7 +50,7 @@ class StatisticsPopularBlock extends BlockBase implements ContainerFactoryPlugin
   protected $renderer;
 
   /**
-   * Constructs an StatisticsPopularBlock object.
+   * Constructs a StatisticsPopularBlock object.
    *
    * @param array $configuration
    *   A configuration array containing information about the plugin instance.
only in patch2:
unchanged:
--- a/core/modules/system/src/Tests/Render/HtmlResponseAttachmentsTest.php
+++ b/core/modules/system/src/Tests/Render/HtmlResponseAttachmentsTest.php
@@ -99,7 +99,7 @@ protected function assertTeapotHeaders() {
   }
 
   /**
-   * Helper function to make assertions about the presence of an RSS feed.
+   * Helper function to make assertions about the presence of a RSS feed.
    */
   protected function assertFeed() {
     // Discover the DOM element for the feed link.
only in patch2:
unchanged:
--- a/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
+++ b/core/modules/system/tests/src/Functional/Entity/EntityViewControllerTest.php
@@ -106,7 +106,7 @@ public function testFieldItemAttributes() {
     \Drupal::service('module_installer')->install(['rdf']);
     $this->resetAll();
 
-    // Set an RDF mapping for the field_test_text field. This RDF mapping will
+    // Set a RDF mapping for the field_test_text field. This RDF mapping will
     // be turned into RDFa attributes in the field item output.
     $mapping = rdf_get_mapping('entity_test', 'entity_test');
     $mapping->setFieldMapping('field_test_text', [
only in patch2:
unchanged:
--- a/core/modules/user/src/Form/UserLoginForm.php
+++ b/core/modules/user/src/Form/UserLoginForm.php
@@ -246,7 +246,7 @@ public function validateFinal(array &$form, FormStateInterface $form_state) {
     }
     elseif ($flood_control_user_identifier = $form_state->get('flood_control_user_identifier')) {
       // Clear past failures for this user so as not to block a user who might
-      // log in and out more than once in an hour.
+      // log in and out more than once in a hour.
       $this->flood->clear('user.failed_login_user', $flood_control_user_identifier);
     }
   }
only in patch2:
unchanged:
--- a/core/modules/views/src/Plugin/Block/ViewsBlockBase.php
+++ b/core/modules/views/src/Plugin/Block/ViewsBlockBase.php
@@ -180,7 +180,7 @@ public function blockSubmit($form, FormStateInterface $form_state) {
    * Converts Views block content to a renderable array with contextual links.
    *
    * @param string|array $output
-   *   An string|array representing the block. This will be modified to be a
+   *   A string|array representing the block. This will be modified to be a
    *   renderable array, containing the optional '#contextual_links' property (if
    *   there are any contextual links associated with the block).
    * @param string $block_type
only in patch2:
unchanged:
--- a/core/modules/views/src/Plugin/Derivative/ViewsEntityArgumentValidator.php
+++ b/core/modules/views/src/Plugin/Derivative/ViewsEntityArgumentValidator.php
@@ -41,7 +41,7 @@ class ViewsEntityArgumentValidator extends DeriverBase implements ContainerDeriv
   protected $derivatives = [];
 
   /**
-   * Constructs an ViewsEntityArgumentValidator object.
+   * Constructs a ViewsEntityArgumentValidator object.
    *
    * @param string $base_plugin_id
    *   The base plugin ID.
only in patch2:
unchanged:
--- a/core/modules/views/src/Plugin/views/display/Feed.php
+++ b/core/modules/views/src/Plugin/views/display/Feed.php
@@ -17,7 +17,7 @@
  * @ViewsDisplay(
  *   id = "feed",
  *   title = @Translation("Feed"),
- *   help = @Translation("Display the view as a feed, such as an RSS feed."),
+ *   help = @Translation("Display the view as a feed, such as a RSS feed."),
  *   uses_route = TRUE,
  *   admin = @Translation("Feed"),
  *   returns_response = TRUE
only in patch2:
unchanged:
--- a/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
+++ b/core/modules/views/src/Plugin/views/join/JoinPluginBase.php
@@ -304,7 +304,7 @@ public function buildJoin($select_query, $table, $view_query) {
             $info['value'] = array_shift($info['value']);
           }
           if (is_array($info['value'])) {
-            // We use an SA-CORE-2014-005 conformant placeholder for our array
+            // We use a SA-CORE-2014-005 conformant placeholder for our array
             // of values. Also, note that the 'IN' operator is implicit.
             // @see https://www.drupal.org/node/2401615.
             $operator = !empty($info['operator']) ? $info['operator'] : 'IN';
only in patch2:
unchanged:
--- a/core/modules/views/src/Plugin/views/join/JoinPluginInterface.php
+++ b/core/modules/views/src/Plugin/views/join/JoinPluginInterface.php
@@ -15,7 +15,7 @@
    * When possible, try to use table alias instead of table names.
    *
    * @param $select_query
-   *   An select query object.
+   *   A select query object.
    * @param $table
    *   The base table to join.
    * @param \Drupal\views\Plugin\views\query\QueryPluginBase $view_query
only in patch2:
unchanged:
--- a/core/modules/views/src/Plugin/views/row/RssFields.php
+++ b/core/modules/views/src/Plugin/views/row/RssFields.php
@@ -6,7 +6,7 @@
 use Drupal\Core\Url;
 
 /**
- * Renders an RSS item based on fields.
+ * Renders a RSS item based on fields.
  *
  * @ViewsRow(
  *   id = "rss_fields",
only in patch2:
unchanged:
--- a/core/modules/views/src/Plugin/views/row/RssPluginBase.php
+++ b/core/modules/views/src/Plugin/views/row/RssPluginBase.php
@@ -49,7 +49,7 @@ public static function create(ContainerInterface $container, array $configuratio
   }
 
   /**
-   * The ID of the entity type for which this is an RSS row plugin.
+   * The ID of the entity type for which this is a RSS row plugin.
    *
    * @var string
    */
only in patch2:
unchanged:
--- a/core/modules/views/src/Plugin/views/style/Rss.php
+++ b/core/modules/views/src/Plugin/views/style/Rss.php
@@ -6,14 +6,14 @@
 use Drupal\Core\Url;
 
 /**
- * Default style plugin to render an RSS feed.
+ * Default style plugin to render a RSS feed.
  *
  * @ingroup views_style_plugins
  *
  * @ViewsStyle(
  *   id = "rss",
  *   title = @Translation("RSS Feed"),
- *   help = @Translation("Generates an RSS feed from a view."),
+ *   help = @Translation("Generates a RSS feed from a view."),
  *   theme = "views_view_rss",
  *   display_types = {"feed"}
  * )
only in patch2:
unchanged:
--- a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
@@ -159,7 +159,7 @@ protected function parseContent($content) {
   }
 
   /**
-   * Performs an xpath search on a certain content.
+   * Performs a xpath search on a certain content.
    *
    * The search is relative to the root element of the $content variable.
    *
only in patch2:
unchanged:
--- a/core/modules/views/tests/src/Functional/ViewsEscapingTest.php
+++ b/core/modules/views/tests/src/Functional/ViewsEscapingTest.php
@@ -74,7 +74,7 @@ public function testViewsFieldHeaderEscaping() {
     // Assert that there are no escaped '<'s characters.
     $this->assertNoEscaped('<');
 
-    // Test with a field header label having a XSS test as a wrapper.
+    // Test with a field header label having an XSS test as a wrapper.
     $this->drupalGet('test_field_header_xss');
 
     // Assert that XSS test is escaped.
only in patch2:
unchanged:
--- a/core/modules/workflows/src/Annotation/WorkflowType.php
+++ b/core/modules/workflows/src/Annotation/WorkflowType.php
@@ -5,7 +5,7 @@
 use Drupal\Component\Annotation\Plugin;
 
 /**
- * Defines an Workflow type annotation object.
+ * Defines a Workflow type annotation object.
  *
  * Plugin Namespace: Plugin\WorkflowType
  *
only in patch2:
unchanged:
--- a/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
+++ b/core/tests/Drupal/FunctionalTests/AssertLegacyTrait.php
@@ -746,9 +746,9 @@ protected function assertHeader($name, $value) {
   abstract public function assertSession($name = NULL);
 
   /**
-   * Builds an XPath query.
+   * Builds a XPath query.
    *
-   * Builds an XPath query by replacing placeholders in the query by the value
+   * Builds a XPath query by replacing placeholders in the query by the value
    * of the arguments.
    *
    * XPath 1.0 (the version supported by libxml2, the underlying XML library
@@ -756,14 +756,14 @@ protected function assertHeader($name, $value) {
    * simplifies the building of XPath expression.
    *
    * @param string $xpath
-   *   An XPath query, possibly with placeholders in the form ':name'.
+   *   A XPath query, possibly with placeholders in the form ':name'.
    * @param array $args
    *   An array of arguments with keys in the form ':name' matching the
    *   placeholders in the query. The values may be either strings or numeric
    *   values.
    *
    * @return string
-   *   An XPath query with arguments replaced.
+   *   A XPath query with arguments replaced.
    *
    * @deprecated Scheduled for removal in Drupal 9.0.0.
    *   Use $this->assertSession()->buildXPathQuery() instead.
only in patch2:
unchanged:
--- a/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/EntityTranslationTest.php
@@ -650,7 +650,7 @@ protected function doTestLanguageFallback($entity_type) {
 
     // Check that if the entity has no translation no fallback is applied.
     $entity2 = $controller->create([$langcode_key => $default_langcode]);
-    // Get an view builder.
+    // Get a view builder.
     $controller = $this->entityManager->getViewBuilder($entity_type);
     $entity2_build = $controller->view($entity2);
     $entity2_output = (string) $renderer->renderRoot($entity2_build);
only in patch2:
unchanged:
--- a/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
+++ b/core/tests/Drupal/Tests/Core/Form/FormStateTest.php
@@ -120,7 +120,7 @@ public function providerTestSetErrorByName() {
     return [
       // Only validate the 'options' element.
       [[['options']], ['options' => '']],
-      // Do not limit an validation, and, ensuring the first error is returned
+      // Do not limit a validation, and, ensuring the first error is returned
       // for the 'test' element.
       [NULL, ['test' => 'Fail 1', 'options' => '']],
       // Limit all validation.
only in patch2:
unchanged:
--- a/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
+++ b/core/tests/Drupal/Tests/Core/Utility/LinkGeneratorTest.php
@@ -572,7 +572,7 @@ public static function assertLink(array $properties, MarkupInterface $html, $cou
     // Provide default values.
     $properties += ['attributes' => []];
 
-    // Create an XPath query that selects a link element.
+    // Create a XPath query that selects a link element.
     $query = '//a';
 
     // Append XPath predicates for the attributes and content text.
only in patch2:
unchanged:
--- a/core/tests/Drupal/Tests/WebAssert.php
+++ b/core/tests/Drupal/Tests/WebAssert.php
@@ -297,9 +297,9 @@ public function linkByHrefNotExists($href, $message = '') {
   }
 
   /**
-   * Builds an XPath query.
+   * Builds a XPath query.
    *
-   * Builds an XPath query by replacing placeholders in the query by the value
+   * Builds a XPath query by replacing placeholders in the query by the value
    * of the arguments.
    *
    * XPath 1.0 (the version supported by libxml2, the underlying XML library
@@ -307,14 +307,14 @@ public function linkByHrefNotExists($href, $message = '') {
    * simplifies the building of XPath expression.
    *
    * @param string $xpath
-   *   An XPath query, possibly with placeholders in the form ':name'.
+   *   A XPath query, possibly with placeholders in the form ':name'.
    * @param array $args
    *   An array of arguments with keys in the form ':name' matching the
    *   placeholders in the query. The values may be either strings or numeric
    *   values.
    *
    * @return string
-   *   An XPath query with arguments replaced.
+   *   A XPath query with arguments replaced.
    */
   public function buildXPathQuery($xpath, array $args = []) {
     // Replace placeholders.