diff --git a/core/modules/node/node.api.php b/core/modules/node/node.api.php
index 823e1ca..7bb6f0f 100644
--- a/core/modules/node/node.api.php
+++ b/core/modules/node/node.api.php
@@ -120,7 +120,7 @@ function hook_node_grants(\Drupal\Core\Session\AccountInterface $account, $op) {
  *   of this gid within this realm can delete this node.
  * - langcode: (optional) The language code of a specific translation of the
  *   node, if any. Modules may add this key to grant different access to
- *   different translations of a node, such that (e.g.) a particular group is
+ *   different translations of a node; for example, a particular group is
  *   granted access to edit the Catalan version of the node, but not the
  *   Hungarian version. If no value is provided, the langcode is set
  *   automatically from the $node parameter and the node's original language (if
@@ -303,9 +303,9 @@ function hook_node_grants_alter(&$grants, \Drupal\Core\Session\AccountInterface
  * equaling TRUE. Blindly returning an object with isForbidden() equaling TRUE
  * will break other node access modules.
  *
- * Also note that this function isn't called for node listings (e.g., RSS feeds,
- * the default home page at path 'node', a recent content block, etc.) See
- * @link node_access Node access rights @endlink for a full explanation.
+ * Also note that this function isn't called for node listings (for example, RSS
+ * feeds, the default home page at path 'node', a recent content block, etc.).
+ * See @link node_access Node access rights @endlink for a full explanation.
  *
  * @param \Drupal\node\NodeInterface|string $node
  *   Either a node entity or the machine name of the content type on which to
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 593c263..3673423 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -569,7 +569,7 @@ function node_theme_suggestions_node(array $variables) {
  *   An associative array containing:
  *   - elements: An array of elements to display in view mode.
  *   - node: The node object.
- *   - view_mode: View mode; e.g., 'full', 'teaser', etc.
+ *   - view_mode: View mode; for example, 'full', 'teaser', etc.
  */
 function template_preprocess_node(&$variables) {
   $variables['view_mode'] = $variables['elements']['#view_mode'];
@@ -606,9 +606,10 @@ function template_preprocess_node(&$variables) {
   $variables['display_submitted'] = $node_type->displaySubmitted();
   if ($variables['display_submitted']) {
     if (theme_get_setting('features.node_user_picture')) {
-      // To change user picture settings (e.g. image style), edit the 'compact'
-      // view mode on the User entity. Note that the 'compact' view mode might
-      // not be configured, so remember to always check the theme setting first.
+      // To change user picture settings (for example, image style), edit the
+      // 'compact' view mode on the User entity. Note that the 'compact' view
+      // mode might not be configured, so remember to always check the theme
+      // setting first.
       $variables['author_picture'] = user_view($node->getOwner(), 'compact');
     }
   }
@@ -772,7 +773,8 @@ function node_get_recent($number = 10) {
  * @param \Drupal\node\NodeInterface $node
  *   A node entity.
  * @param $view_mode
- *   (optional) View mode, e.g., 'full', 'teaser', etc. Defaults to 'full.'
+ *   (optional) View mode; for example, 'full', 'teaser', etc. Defaults to
+ *   'full.'
  * @param $langcode
  *   (optional) A language code to use for rendering. Defaults to NULL which is
  *   the global content language of the current request.
@@ -790,7 +792,8 @@ function node_view(NodeInterface $node, $view_mode = 'full', $langcode = NULL) {
  * @param $nodes
  *   An array of nodes as returned by Node::loadMultiple().
  * @param $view_mode
- *   (optional) View mode, e.g., 'full', 'teaser', etc. Defaults to 'teaser.'
+ *   (optional) View mode; for example, 'full', 'teaser', etc. Defaults to
+ *   'teaser.'
  * @param $langcode
  *   (optional) A language code to use for rendering. Defaults to the global
  *   content language of the current request.
diff --git a/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php b/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
index 767d286..a5e3f46 100644
--- a/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
+++ b/core/modules/node/src/Cache/NodeAccessGrantsCacheContext.php
@@ -15,7 +15,7 @@
  * Defines the node access view cache context service.
  *
  * Cache context ID: 'user.node_grants' (to vary by all operations' grants).
- * Calculated cache context ID: 'user.node_grants:%operation', e.g.
+ * Calculated cache context ID: 'user.node_grants:%operation'; for example,
  * 'user.node_grants:view' (to vary by the view operation's grants).
  *
  * This allows for node access grants-sensitive caching when listing nodes.
@@ -67,7 +67,7 @@ public function getContext($operation = NULL) {
    */
   protected function checkNodeGrants($operation) {
     // When checking the grants for the 'view' operation and the current user
-    // has a global view grant (i.e. a view grant for node ID 0) — note that
+    // has a global view grant (that is, a view grant for node ID 0) — note that
     // this is automatically the case if no node access modules exist (no
     // hook_node_grants() implementations) then we don't need to determine the
     // exact node view grants for the current user.
diff --git a/core/modules/node/src/Plugin/Condition/NodeType.php b/core/modules/node/src/Plugin/Condition/NodeType.php
index 77f9a3f..06dd2ee 100644
--- a/core/modules/node/src/Plugin/Condition/NodeType.php
+++ b/core/modules/node/src/Plugin/Condition/NodeType.php
@@ -40,9 +40,9 @@ class NodeType extends ConditionPluginBase implements ContainerFactoryPluginInte
    * @param \Drupal\Core\Entity\EntityStorageInterface $entity_storage
    *   The entity storage.
    * @param array $configuration
-   *   The plugin configuration, i.e. an array with configuration values keyed
-   *   by configuration option name. The special key 'context' may be used to
-   *   initialize the defined contexts by setting it to an array of context
+   *   The plugin configuration; that is, an array with configuration values
+   *   keyed by configuration option name. The special key 'context' may be used
+   *   to initialize the defined contexts by setting it to an array of context
    *   values keyed by context names.
    * @param string $plugin_id
    *   The plugin_id for the plugin instance.
diff --git a/core/modules/node/src/Plugin/views/wizard/Node.php b/core/modules/node/src/Plugin/views/wizard/Node.php
index 5f560c5..c88de21 100644
--- a/core/modules/node/src/Plugin/views/wizard/Node.php
+++ b/core/modules/node/src/Plugin/views/wizard/Node.php
@@ -219,9 +219,9 @@ protected function buildFilters(&$form, FormStateInterface $form_state) {
     // uses to choose).
 
     // Find all "tag-like" taxonomy fields associated with the view's
-    // entities. If a particular entity type (i.e., bundle) has been
-    // selected above, then we only search for taxonomy fields associated
-    // with that bundle. Otherwise, we use all bundles.
+    // entities. If a particular entity type (bundle) has been selected above,
+    // then we only search for taxonomy fields associated with that bundle.
+    // Otherwise, we use all bundles.
     $bundles = array_keys(entity_get_bundles($this->entityTypeId));
     // Double check that this is a real bundle before using it (since above
     // we added a dummy option 'all' to the bundle list on the form).
diff --git a/core/modules/node/src/Tests/NodeTestBase.php b/core/modules/node/src/Tests/NodeTestBase.php
index 1640a79..26c6186 100644
--- a/core/modules/node/src/Tests/NodeTestBase.php
+++ b/core/modules/node/src/Tests/NodeTestBase.php
@@ -53,9 +53,9 @@ protected function setUp() {
    *
    * @param array $ops
    *   An associative array of the expected node access grants for the node
-   *   and account, with each key as the name of an operation (e.g. 'view',
-   *   'delete') and each value a Boolean indicating whether access to that
-   *   operation should be granted.
+   *   and account, with each key as the name of an operation (for example,
+   *   'view', 'delete') and each value a Boolean indicating whether access to
+   *   that operation should be granted.
    * @param \Drupal\node\NodeInterface $node
    *   The node object to check.
    * @param \Drupal\Core\Session\AccountInterface $account
diff --git a/core/modules/options/options.api.php b/core/modules/options/options.api.php
index f17f102..1660a8a 100644
--- a/core/modules/options/options.api.php
+++ b/core/modules/options/options.api.php
@@ -72,8 +72,8 @@ function hook_options_list_alter(array &$options, array $context) {
  *   The array of allowed values. Keys of the array are the raw stored values
  *   (number or text), values of the array are the display labels. If $entity
  *   is NULL, you should return the list of all the possible allowed values in
- *   any context so that other code (e.g. Views filters) can support the allowed
- *   values for all possible entities and bundles.
+ *   any context so that other code (for example, Views filters) can support the
+ *   allowed values for all possible entities and bundles.
  *
  * @ingroup callbacks
  * @see options_allowed_values()
diff --git a/core/modules/page_cache/src/StackMiddleware/PageCache.php b/core/modules/page_cache/src/StackMiddleware/PageCache.php
index f25c685..62c9d99 100644
--- a/core/modules/page_cache/src/StackMiddleware/PageCache.php
+++ b/core/modules/page_cache/src/StackMiddleware/PageCache.php
@@ -215,9 +215,9 @@ protected function fetch(Request $request, $type = self::MASTER_REQUEST, $catch
     // entity should have cache tags, to allow for instant cache invalidation
     // when that data is updated. However, HTTP does not standardize how to
     // encode cache tags in a response. Different CDNs implement their own
-    // approaches, and configurable reverse proxies (e.g., Varnish) allow for
-    // custom implementations. To keep Drupal's internal page cache simple, we
-    // only cache CacheableResponseInterface responses, since those provide a
+    // approaches, and configurable reverse proxies (for example, Varnish) allow
+    // for custom implementations. To keep Drupal's internal page cache simple,
+    // we only cache CacheableResponseInterface responses, since those provide a
     // defined API for retrieving cache tags. For responses that do not
     // implement CacheableResponseInterface, there's no easy way to distinguish
     // responses that truly don't depend on any site data from responses that
@@ -300,7 +300,7 @@ protected function get(Request $request, $allow_invalid = FALSE) {
    *   - CacheBackendInterface::CACHE_PERMANENT: Indicates that the item should
    *     not be removed unless it is deleted explicitly.
    *   - A Unix timestamp: Indicates that the item will be considered invalid
-   *     after this time, i.e. it will not be returned by get() unless
+   *     after this time; that is, it will not be returned by get() unless
    *     $allow_invalid has been set to TRUE. When the item has expired, it may
    *     be permanently deleted by the garbage collector at any time.
    * @param array $tags
diff --git a/core/modules/quickedit/js/models/EntityModel.js b/core/modules/quickedit/js/models/EntityModel.js
index f444fbb..3a31694 100644
--- a/core/modules/quickedit/js/models/EntityModel.js
+++ b/core/modules/quickedit/js/models/EntityModel.js
@@ -37,8 +37,8 @@
       /**
        * An entity instance ID.
        *
-       * The first instance of a specific entity (i.e. with a given entity ID)
-       * is assigned 0, the second 1, and so on.
+       * The first instance of a specific entity (that is, with a given entity
+       * ID) is assigned 0, the second 1, and so on.
        *
        * @type {number}
        */
diff --git a/core/modules/quickedit/js/models/FieldModel.js b/core/modules/quickedit/js/models/FieldModel.js
index 8aeff10..1a0a393 100644
--- a/core/modules/quickedit/js/models/FieldModel.js
+++ b/core/modules/quickedit/js/models/FieldModel.js
@@ -61,9 +61,9 @@
 
       /**
        * A logical field ID, of the form
-       * `<entity type>/<id>/<field name>/<language>`, i.e. the fieldID without
-       * the view mode, to be able to identify other instances of the same
-       * field on the page but rendered in a different view mode.
+       * `<entity type>/<id>/<field name>/<language>`; that is, the fieldID
+       * without the view mode, to be able to identify other instances of the
+       * same field on the page but rendered in a different view mode.
        *
        * @example
        * "node/1/field_tags/und".
@@ -272,7 +272,7 @@
       // - Trigger: user.
       // - Guarantees: see 'candidate'.
       // - Expected behavior: loading indicator, in-place editor is loading
-      //   remote data (e.g. retrieve form from back-end). Upon retrieval of
+      //   remote data (that is, retrieve form from back-end). Upon retrieval of
       //   remote data, the in-place editor transitions the field's state to
       //   'active'.
       'activating',
diff --git a/core/modules/quickedit/js/quickedit.js b/core/modules/quickedit/js/quickedit.js
index 40bdd3e..2d78faa 100644
--- a/core/modules/quickedit/js/quickedit.js
+++ b/core/modules/quickedit/js/quickedit.js
@@ -486,7 +486,7 @@
    *
    * @param {function} callback
    *   Callback function to be called when the missing in-place editors (if any)
-   *   have been inserted into the DOM. i.e. they may still be loading.
+   *   have been inserted into the DOM.
    */
   function loadMissingEditors(callback) {
     var loadedEditors = _.keys(Drupal.quickedit.editors);
@@ -532,11 +532,11 @@
    *
    * @param {object} contextualLink
    *   An object with the following properties:
-   *     - String entityID: a Quick Edit entity identifier, e.g. "node/1" or
-   *       "block_content/5".
-   *     - String entityInstanceID: a Quick Edit entity instance identifier,
-   *       e.g. 0, 1 or n (depending on whether it's the first, second, or n+1st
-   *       instance of this entity).
+   *     - String entityID: a Quick Edit entity identifier; for example,
+   *       "node/1" or "block_content/5".
+   *     - String entityInstanceID: a Quick Edit entity instance identifier;
+   *       such as 0, 1 or n (depending on whether it's the first, second, or
+   *       n+1st instance of this entity).
    *     - DOM el: element pointing to the contextual links placeholder for this
    *       entity.
    *     - DOM region: element pointing to the contextual region of this entity.
@@ -636,8 +636,8 @@
    *
    * After EntityModels, FieldModels must also be deleted, because it is
    * possible in Drupal for a field DOM element to exist outside of the entity
-   * DOM element, e.g. when viewing the full node, the title of the node is not
-   * rendered within the node (the entity) but as the page title.
+   * DOM element; for instance, when viewing the full node, the title of the
+   * node is not rendered within the node (the entity) but as the page title.
    *
    * Note: this will not delete an entity that is actively being in-place
    * edited.
diff --git a/core/modules/quickedit/js/views/EditorView.js b/core/modules/quickedit/js/views/EditorView.js
index 5e041db..aae6788 100644
--- a/core/modules/quickedit/js/views/EditorView.js
+++ b/core/modules/quickedit/js/views/EditorView.js
@@ -60,8 +60,8 @@
      * not in-place edit (and hence decorate) the DOM element with the
      * data-quickedit-field-id attribute (which is the field's wrapper), but a
      * specific element within the field's wrapper.
-     * e.g. using a WYSIWYG editor on a body field should happen on the DOM
-     * element containing the text itself, not on the field wrapper.
+     * For example, using a WYSIWYG editor on a body field should happen on the
+     * DOM element containing the text itself, not on the field wrapper.
      *
      * @return {jQuery}
      *   A jQuery-wrapped DOM element.
diff --git a/core/modules/quickedit/js/views/FieldDecorationView.js b/core/modules/quickedit/js/views/FieldDecorationView.js
index 966e2b9..ab897eb 100644
--- a/core/modules/quickedit/js/views/FieldDecorationView.js
+++ b/core/modules/quickedit/js/views/FieldDecorationView.js
@@ -117,8 +117,8 @@
 
     /**
      * Adds a class to the edited element that indicates whether the field has
-     * been changed by the user (i.e. locally) or the field has already been
-     * changed and stored before by the user (i.e. remotely, stored in
+     * been changed by the user (that is, locally) or the field has already been
+     * changed and stored before by the user (that is, remotely, stored in
      * PrivateTempStore).
      */
     renderChanged: function () {
diff --git a/core/modules/quickedit/src/QuickEditController.php b/core/modules/quickedit/src/QuickEditController.php
index ed26a09..e307e1f 100644
--- a/core/modules/quickedit/src/QuickEditController.php
+++ b/core/modules/quickedit/src/QuickEditController.php
@@ -208,7 +208,7 @@ public function fieldForm(EntityInterface $entity, $field_name, $langcode, $view
       // Re-render the updated field.
       $output = $render_field_in_view_mode($view_mode_id);
 
-      // Re-render the updated field for other view modes (i.e. for other
+      // Re-render the updated field for other view modes (that is, for other
       // instances of the same logical field on the user's page).
       $other_view_mode_ids = $request->request->get('other_view_modes') ?: array();
       $other_view_modes = array_map($render_field_in_view_mode, array_combine($other_view_mode_ids, $other_view_mode_ids));
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 0c7cf5c..4a80b0b 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -297,8 +297,8 @@ function _rdf_set_field_rel_attribute(&$variables) {
 function rdf_preprocess_node(&$variables) {
   // Adds RDFa markup to the node container. The about attribute specifies the
   // URI of the resource described within the HTML element, while the @typeof
-  // attribute indicates its RDF type (e.g., foaf:Document, sioc:Person, and so
-  // on.)
+  // attribute indicates its RDF type (for example, foaf:Document, sioc:Person,
+  // and so on.).
   $bundle = $variables['node']->bundle();
   $mapping = rdf_get_mapping('node', $bundle);
   $bundle_mapping = $mapping->getPreparedBundleMapping('node', $bundle);
@@ -307,7 +307,7 @@ function rdf_preprocess_node(&$variables) {
 
   // Adds RDFa markup for the node title as metadata because wrapping the title
   // with markup is not reliable and the title output is different depending on
-  // the view mode (e.g. full vs. teaser).
+  // the view mode (for example, full vs. teaser).
   $title_mapping = $mapping->getPreparedFieldMapping('title');
   if ($title_mapping) {
     $title_attributes['property'] = empty($title_mapping['properties']) ? NULL : $title_mapping['properties'];
@@ -449,8 +449,8 @@ function rdf_preprocess_comment(&$variables) {
   if (!empty($bundle_mapping['types']) && !isset($comment->in_preview)) {
     // Adds RDFa markup to the comment container. The about attribute specifies
     // the URI of the resource described within the HTML element, while the
-    // typeof attribute indicates its RDF type (e.g., sioc:Post, foaf:Document,
-    // and so on.)
+    // typeof attribute indicates its RDF type (for example, sioc:Post,
+    // foaf:Document, and so on.)
     $variables['attributes']['about'] = $comment->url();
     $variables['attributes']['typeof'] = $bundle_mapping['types'];
   }
@@ -542,7 +542,7 @@ function rdf_preprocess_taxonomy_term(&$variables) {
   // Adds RDFa markup to the taxonomy term container.
   // The @about attribute specifies the URI of the resource described within
   // the HTML element, while the @typeof attribute indicates its RDF type
-  // (e.g., schema:Thing, skos:Concept, and so on).
+  // (for example, schema:Thing, skos:Concept, and so on).
   $term = $variables['term'];
   $mapping = rdf_get_mapping('taxonomy_term', $term->bundle());
   $bundle_mapping = $mapping->getPreparedBundleMapping();
diff --git a/core/modules/rdf/src/SchemaOrgDataConverter.php b/core/modules/rdf/src/SchemaOrgDataConverter.php
index 99fe670..561025b 100644
--- a/core/modules/rdf/src/SchemaOrgDataConverter.php
+++ b/core/modules/rdf/src/SchemaOrgDataConverter.php
@@ -18,8 +18,8 @@ class SchemaOrgDataConverter {
    * @param array $arguments
    *   An array of arguments defined in the mapping.
    *   Expected keys are:
-   *     - interaction_type: The string to use for the type of interaction
-   *       (e.g. UserComments).
+   *     - interaction_type: The string to use for the type of interaction; for
+   *       example, UserComments.
    *
    * @return string
    *   The formatted string.
diff --git a/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php b/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
index 30f9cd1..2387e3a 100644
--- a/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
+++ b/core/modules/rdf/tests/src/Kernel/Field/FieldRdfaTestBase.php
@@ -82,9 +82,10 @@ protected function setUp() {
    *   An associative array describing the expected value of the property
    *   containing:
    *   - value: The actual value of the string or URI.
-   *   - type: The type of RDF value, e.g. 'literal' for a string, or 'uri'.
-   *   Defaults to 'literal'.
-   *   - datatype: (optional) The datatype of the value (e.g. xsd:dateTime).
+   *   - type: The type of RDF value; for example, 'literal' for a string, or
+   *     'uri'. Defaults to 'literal'.
+   *   - datatype: (optional) The datatype of the value; for example,
+   *     xsd:dateTime.
    */
   protected function assertFormatterRdfa($formatter, $property, $expected_rdf_value) {
     $expected_rdf_value += array('type' => 'literal');
diff --git a/core/modules/rest/src/LinkManager/RelationLinkManager.php b/core/modules/rest/src/LinkManager/RelationLinkManager.php
index 89e2488..60939ac 100644
--- a/core/modules/rest/src/LinkManager/RelationLinkManager.php
+++ b/core/modules/rest/src/LinkManager/RelationLinkManager.php
@@ -71,9 +71,9 @@ public function getRelationUri($entity_type, $bundle, $field_name, $context = ar
     // not take into account unclean URLs, language prefixing, or anything else
     // that would be required for Drupal to be able to respond with content
     // at this URL. If a module is installed that adds such content, but
-    // requires this URL to be different (e.g., include a language prefix),
-    // then the module must also override the RelationLinkManager class/service
-    // to return the desired URL.
+    // requires this URL to be different (for example, include a language
+    // prefix), then the module must also override the RelationLinkManager
+    // class/service to return the desired URL.
     $uri = $this->getLinkDomain() . "/rest/relation/$entity_type/$bundle/$field_name";
     $this->moduleHandler->alter('rest_relation_uri', $uri, $context);
     return $uri;
diff --git a/core/modules/rest/src/LinkManager/TypeLinkManager.php b/core/modules/rest/src/LinkManager/TypeLinkManager.php
index 27fdf3f..1aa40c1 100644
--- a/core/modules/rest/src/LinkManager/TypeLinkManager.php
+++ b/core/modules/rest/src/LinkManager/TypeLinkManager.php
@@ -61,9 +61,9 @@ public function getTypeUri($entity_type, $bundle, $context = array()) {
     // take into account unclean URLs, language prefixing, or anything else
     // that would be required for Drupal to be able to respond with content
     // at this URL. If a module is installed that adds such content, but
-    // requires this URL to be different (e.g., include a language prefix),
-    // then the module must also override the TypeLinkManager class/service to
-    // return the desired URL.
+    // requires this URL to be different (for example, include a language
+    // prefix), then the module must also override the TypeLinkManager
+    // class/service to return the desired URL.
     $uri = $this->getLinkDomain() . "/rest/type/$entity_type/$bundle";
     $this->moduleHandler->alter('rest_type_uri', $uri, $context);
     return $uri;
diff --git a/core/modules/rest/src/RequestHandler.php b/core/modules/rest/src/RequestHandler.php
index d6b3dcf..1fc4817 100644
--- a/core/modules/rest/src/RequestHandler.php
+++ b/core/modules/rest/src/RequestHandler.php
@@ -104,11 +104,11 @@ public function handle(RouteMatchInterface $route_match, Request $request) {
 
     if ($response instanceof ResourceResponse) {
       $data = $response->getResponseData();
-      // Serialization can invoke rendering (e.g., generating URLs), but the
-      // serialization API does not provide a mechanism to collect the
-      // bubbleable metadata associated with that (e.g., language and other
-      // contexts), so instead, allow those to "leak" and collect them here in
-      // a render context.
+      // Serialization can invoke rendering (for example, generating URLs), but
+      // the serialization API does not provide a mechanism to collect the
+      // bubbleable metadata associated with that (for instance, language and
+      // other contexts), so instead, allow those to "leak" and collect them
+      // here in a render context.
       // @todo Add test coverage for language negotiation contexts in
       //   https://www.drupal.org/node/2135829.
       $context = new RenderContext();
diff --git a/core/modules/rest/src/Tests/RESTTestBase.php b/core/modules/rest/src/Tests/RESTTestBase.php
index 87d18bd..1a6c887 100644
--- a/core/modules/rest/src/Tests/RESTTestBase.php
+++ b/core/modules/rest/src/Tests/RESTTestBase.php
@@ -243,9 +243,9 @@ protected function entityValues($entity_type) {
    *   The resource type that should get REST API enabled or FALSE to disable all
    *   resource types.
    * @param string $method
-   *   The HTTP method to enable, e.g. GET, POST etc.
+   *   The HTTP method to enable; for example, GET, POST etc.
    * @param string $format
-   *   (Optional) The serialization format, e.g. hal_json.
+   *   (Optional) The serialization format; for example, hal_json.
    * @param array $auth
    *   (Optional) The list of valid authentication methods.
    */
diff --git a/core/modules/search/search.module b/core/modules/search/search.module
index 0bd22ab..3b2d6cb 100644
--- a/core/modules/search/search.module
+++ b/core/modules/search/search.module
@@ -273,7 +273,7 @@ function search_simplify($text, $langcode = NULL) {
   // To improve searching for numerical data such as dates, IP addresses
   // or version numbers, we consider a group of numerical characters
   // separated only by punctuation characters to be one piece.
-  // This also means that searching for e.g. '20/03/1984' also returns
+  // This also means that searching for date, like '20/03/1984', also returns
   // results with '20-03-1984' in them.
   // Readable regexp: ([number]+)[punctuation]+(?=[number])
   $text = preg_replace('/([' . PREG_CLASS_NUMBERS . ']+)[' . PREG_CLASS_PUNCTUATION . ']+(?=[' . PREG_CLASS_NUMBERS . '])/u', '\1', $text);
@@ -419,7 +419,7 @@ function search_invoke_preprocess(&$text, $langcode = NULL) {
  *   The plugin ID or other machine-readable type of this item,
  *   which should be less than 64 bytes.
  * @param int $sid
- *   An ID number identifying this particular item (e.g., node ID).
+ *   An ID number identifying this particular item; for example, node ID.
  * @param string $langcode
  *   Language code for the language of the text being indexed.
  * @param string $text
@@ -501,8 +501,9 @@ function search_index($type, $sid, $langcode, $text) {
               $scored_words[$word] = 0;
             }
             $scored_words[$word] += $score * $focus;
-            // Focus is a decaying value in terms of the amount of unique words up to this point.
-            // From 100 words and more, it decays, to e.g. 0.5 at 500 words and 0.3 at 1000 words.
+            // Focus is a decaying value in terms of the amount of unique words
+            // up to this point. For instance, from 100 words and more, it
+            // decays to 0.5 at 500 words and 0.3 at 1000 words.
             $focus = min(1, .01 + 3.5 / (2 + count($scored_words) * .015));
           }
           $tagwords++;
@@ -563,8 +564,9 @@ function search_index($type, $sid, $langcode, $text) {
  *   omitted, the entire search index is marked for reindexing, and $sid and
  *   $langcode are ignored.
  * @param int $sid
- *   (optional) An ID number identifying this particular item (e.g., node ID).
- *   If omitted, everything matching $type is marked, and $langcode is ignored.
+ *   (optional) An ID number identifying this particular item; for example, node
+ *   ID. If omitted, everything matching $type is marked, and $langcode is
+ *   ignored.
  * @param string $langcode
  *   (optional) The language code to clear. If omitted, everything matching
  *   $type and $sid is marked.
@@ -601,7 +603,7 @@ function search_mark_for_reindex($type = NULL, $sid = NULL, $langcode = NULL) {
  * There are two ways to interact with the search system:
  * - Specifically for searching nodes, you can implement
  *   hook_node_update_index() and hook_node_search_result(). However, note that
- *   the search system already indexes all visible output of a node; i.e.,
+ *   the search system already indexes all visible output of a node; that is,
  *   everything displayed normally during node viewing. This is
  *   usually sufficient. You should only use this mechanism if you want
  *   additional, non-visible data to be indexed.
@@ -616,8 +618,8 @@ function search_mark_for_reindex($type = NULL, $sid = NULL, $langcode = NULL) {
  *
  * If your module needs to provide a more complicated search form, then you
  * need to implement it yourself. In that case, you may wish to define it as a
- * local task (tab) under the /search page (e.g. /search/mymodule) so that users
- * can easily find it.
+ * local task (tab) under the /search page (for example, /search/mymodule) so
+ * that users can easily find it.
  *
  * @see plugin_api
  * @see annotation
diff --git a/core/modules/serialization/src/EntityResolver/EntityResolverInterface.php b/core/modules/serialization/src/EntityResolver/EntityResolverInterface.php
index 883bb8b..75ee336 100644
--- a/core/modules/serialization/src/EntityResolver/EntityResolverInterface.php
+++ b/core/modules/serialization/src/EntityResolver/EntityResolverInterface.php
@@ -16,10 +16,10 @@
    *
    * Drupal entities are loaded by and internally referenced by a local ID.
    * Because different websites can use the same local ID to refer to different
-   * entities (e.g., node "1" can be a different node on foo.com and bar.com, or
-   * on example.com and staging.example.com), it is generally unsuitable for use
-   * in hypermedia data exchanges. Instead, UUIDs, URIs, or other globally
-   * unique IDs are preferred.
+   * entities (for example, node "1" can be a different node on foo.com and
+   * bar.com, or on example.com and staging.example.com), it is generally
+   * unsuitable for use in hypermedia data exchanges. Instead, UUIDs, URIs, or
+   * other globally unique IDs are preferred.
    *
    * This function takes a $data array representing partially deserialized data
    * for an entity reference, and resolves it to a local entity ID. For example,
@@ -33,7 +33,7 @@
    * @param array $data
    *   The data passed into the calling Normalizer.
    * @param string $entity_type
-   *   The type of entity being resolved; e.g., 'node' or 'user'.
+   *   The type of entity being resolved; for example, 'node' or 'user'.
    *
    * @return string|null
    *   Returns the local entity ID, if found. Otherwise, returns NULL.
diff --git a/core/modules/shortcut/shortcut.api.php b/core/modules/shortcut/shortcut.api.php
index c60e456..3fd98c6 100644
--- a/core/modules/shortcut/shortcut.api.php
+++ b/core/modules/shortcut/shortcut.api.php
@@ -21,8 +21,8 @@
  * shortcut set explicitly assigned to them.
  *
  * Note that only one default shortcut set can exist per user, so when multiple
- * modules implement this hook, the last (i.e., highest weighted) module which
- * returns a valid shortcut set name will prevail.
+ * modules implement this hook, the last (that is, highest weighted) module
+ * which returns a valid shortcut set name will prevail.
  *
  * @param $account
  *   The user account whose default shortcut set is being requested.
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index 4dc7544..6e6d3df 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -490,7 +490,8 @@ function simpletest_log_read($test_id, $database_prefix, $test_class) {
  * is cached and stored in a static variable.
  *
  * @param string $extension
- *   (optional) The name of an extension to limit discovery to; e.g., 'node'.
+ *   (optional) The name of an extension to limit discovery to; for example,
+ *   'node'.
  * @param string[] $types
  *   An array of included test types.
  *
@@ -593,8 +594,8 @@ function simpletest_clean_database() {
   $schema = drupal_get_module_schema('simpletest');
   $count = 0;
   foreach (array_diff_key($tables, $schema) as $table) {
-    // Strip the prefix and skip tables without digits following "simpletest",
-    // e.g. {simpletest_test_id}.
+    // Strip the prefix and skip tables without digits following "simpletest";
+    // for example, {simpletest_test_id}.
     if (preg_match('/simpletest\d+.*/', $table, $matches)) {
       db_drop_table($matches[0]);
       $count++;
diff --git a/core/modules/simpletest/src/AssertContentTrait.php b/core/modules/simpletest/src/AssertContentTrait.php
index 00898be..1401dcc 100644
--- a/core/modules/simpletest/src/AssertContentTrait.php
+++ b/core/modules/simpletest/src/AssertContentTrait.php
@@ -57,7 +57,7 @@ protected function getRawContent() {
   }
 
   /**
-   * Sets the raw content (e.g. HTML).
+   * Sets the raw content; for example, HTML.
    *
    * @param string $content
    *   The raw content to set.
@@ -92,8 +92,8 @@ protected function getTextContent() {
    * between HTML tags.
    *
    * Use this (once) after performing an operation that sets new raw content,
-   * and when you want to use e.g. assertText() but ignore potential white-space
-   * caused by HTML output templates.
+   * and when you want to use methods like assertText(), but ignore potential
+   * white-space caused by HTML output templates.
    */
   protected function removeWhiteSpace() {
     $this->content = preg_replace('@>\s+<@', '><', $this->content);
@@ -853,7 +853,8 @@ protected function assertNoTitle($title, $message = '', $group = 'Other') {
    * Asserts themed output.
    *
    * @param string $callback
-   *   The name of the theme hook to invoke; e.g. 'links' for links.html.twig.
+   *   The name of the theme hook to invoke; for example, 'links' for
+   *   links.html.twig.
    * @param string $variables
    *   An array of variables to pass to the theme function.
    * @param string $expected
diff --git a/core/modules/simpletest/src/BrowserTestBase.php b/core/modules/simpletest/src/BrowserTestBase.php
index eab1c0f..36cb6aa 100644
--- a/core/modules/simpletest/src/BrowserTestBase.php
+++ b/core/modules/simpletest/src/BrowserTestBase.php
@@ -482,8 +482,8 @@ protected function prepareRequest() {
   protected function drupalGet($path, array $options = array()) {
     $options['absolute'] = TRUE;
 
-    // The URL generator service is not necessarily available yet; e.g., in
-    // interactive installer tests.
+    // The URL generator service is not necessarily available yet; for instance,
+    // in interactive installer tests.
     if ($this->container->has('url_generator')) {
       if (UrlHelper::isExternal($path)) {
         $url = Url::fromUri($path, $options)->toString();
@@ -682,8 +682,9 @@ protected function checkPermissions(array $permissions) {
    * Please note that neither the current user nor the passed-in user object is
    * populated with data of the logged in user. If you need full access to the
    * user object after logging in, it must be updated manually. If you also need
-   * access to the plain-text password of the user (set by drupalCreateUser()),
-   * e.g. to log in the same user again, then it must be re-assigned manually.
+   * access to the plain-text password of the user (set by drupalCreateUser())
+   * (for example, to log in the same user again), then it must be re-assigned
+   * manually.
    * For example:
    * @code
    *   // Create a user.
@@ -947,7 +948,7 @@ public function installDrupal() {
     // Reset/rebuild all data structures after enabling the modules, primarily
     // to synchronize all data structures and caches between the test runner and
     // the child site.
-    // Affects e.g. StreamWrapperManagerInterface::getWrappers().
+    // This effects, for example, StreamWrapperManagerInterface::getWrappers().
     // @see \Drupal\Core\DrupalKernel::bootCode()
     // @todo Test-specific setUp() methods may set up further fixtures; find a
     //   way to execute this after setUp() is done, or to eliminate it entirely.
diff --git a/core/modules/simpletest/src/KernelTestBase.php b/core/modules/simpletest/src/KernelTestBase.php
index 681e75c..bb77fb8 100644
--- a/core/modules/simpletest/src/KernelTestBase.php
+++ b/core/modules/simpletest/src/KernelTestBase.php
@@ -506,7 +506,7 @@ protected function installEntitySchema($entity_type_id) {
    * to your settings.php.
    *
    * @param array $modules
-   *   A list of modules to enable. Dependencies are not resolved; i.e.,
+   *   A list of modules to enable. Dependencies are not resolved; that is,
    *   multiple modules have to be specified with dependent modules first.
    *   The new modules are only added to the active module list and loaded.
    */
@@ -552,7 +552,7 @@ protected function enableModules(array $modules) {
    * Disables modules for this test.
    *
    * @param array $modules
-   *   A list of modules to disable. Dependencies are not resolved; i.e.,
+   *   A list of modules to disable. Dependencies are not resolved; that is,
    *   multiple modules have to be specified with dependent modules first.
    *   Code of previously active modules is still loaded. The modules are only
    *   removed from the active module list.
diff --git a/core/modules/simpletest/src/RandomGeneratorTrait.php b/core/modules/simpletest/src/RandomGeneratorTrait.php
index 70087ce..cb26c0f 100644
--- a/core/modules/simpletest/src/RandomGeneratorTrait.php
+++ b/core/modules/simpletest/src/RandomGeneratorTrait.php
@@ -24,12 +24,12 @@
   /**
    * Generates a pseudo-random string of ASCII characters of codes 32 to 126.
    *
-   * Do not use this method when special characters are not possible (e.g., in
-   * machine or file names that have already been validated); instead, use
-   * \Drupal\simpletest\TestBase::randomMachineName(). If $length is greater
-   * than 3 the random string will include at least one ampersand ('&') and
-   * at least one greater than ('>') character to ensure coverage for special
-   * characters and avoid the introduction of random test failures.
+   * Do not use this method when special characters are not possible (for
+   * example, in machine or file names that have already been validated);
+   * instead, use \Drupal\simpletest\TestBase::randomMachineName(). If $length
+   * is greater than 3 the random string will include at least one ampersand
+   * ('&') and at least one greater than ('>') character to ensure coverage for
+   * special characters and avoid the introduction of random test failures.
    *
    * @param int $length
    *   Length of random string to generate.
diff --git a/core/modules/simpletest/src/TestBase.php b/core/modules/simpletest/src/TestBase.php
index 517afb8..2fb91d0 100644
--- a/core/modules/simpletest/src/TestBase.php
+++ b/core/modules/simpletest/src/TestBase.php
@@ -974,10 +974,10 @@ protected function verbose($message) {
    * starting with "test" are executed.
    *
    * @param $methods
-   *   (optional) A list of method names in the test case class to run; e.g.,
-   *   array('testFoo', 'testBar'). By default, all methods of the class are
-   *   taken into account, but it can be useful to only run a few selected test
-   *   methods during debugging.
+   *   (optional) A list of method names in the test case class to run; for
+   *   example, array('testFoo', 'testBar'). By default, all methods of the
+   *   class are taken into account, but it can be useful to only run a few
+   *   selected test methods during debugging.
    */
   public function run(array $methods = array()) {
     $class = get_class($this);
@@ -1181,9 +1181,9 @@ private function changeDatabasePrefix() {
   /**
    * Act on global state information before the environment is altered for a test.
    *
-   * Allows e.g. KernelTestBase to prime system/extension info from the
-   * parent site (and inject it into the test environment so as to improve
-   * performance).
+   * Allows classes (for example, KernelTestBase) to prime system/extension info
+   * from the parent site (and inject it into the test environment so as to
+   * improve performance).
    */
   protected function beforePrepareEnvironment() {
   }
@@ -1242,7 +1242,7 @@ private function prepareEnvironment() {
     $this->originalUser = isset($user) ? clone $user : NULL;
 
     // Prevent that session data is leaked into the UI test runner by closing
-    // the session and then setting the session-name (i.e. the name of the
+    // the session and then setting the session-name (that is, the name of the
     // session cookie) to a random value. If a test starts a new session, then
     // it will be associated with a different session-name. After the test-run
     // it can be safely destroyed.
diff --git a/core/modules/simpletest/src/TestDiscovery.php b/core/modules/simpletest/src/TestDiscovery.php
index 3538934..b0ba0a0 100644
--- a/core/modules/simpletest/src/TestDiscovery.php
+++ b/core/modules/simpletest/src/TestDiscovery.php
@@ -72,7 +72,7 @@ class TestDiscovery {
    *   The app root.
    * @param $class_loader
    *   The class loader. Normally Composer's ClassLoader, as included by the
-   *   front controller, but may also be decorated; e.g.,
+   *   front controller, but may also be decorated; for example,
    *   \Symfony\Component\ClassLoader\ApcClassLoader.
    * @param \Drupal\Core\Extension\ModuleHandlerInterface $module_handler
    *   The module handler.
@@ -137,7 +137,8 @@ public function registerTestNamespaces() {
    * Discovers all available tests in all extensions.
    *
    * @param string $extension
-   *   (optional) The name of an extension to limit discovery to; e.g., 'node'.
+   *   (optional) The name of an extension to limit discovery to; for example,
+   *   'node'.
    * @param string[] $types
    *   An array of included test types.
    *
@@ -232,10 +233,11 @@ public function getTestClasses($extension = NULL, array $types = []) {
    * Discovers all class files in all available extensions.
    *
    * @param string $extension
-   *   (optional) The name of an extension to limit discovery to; e.g., 'node'.
+   *   (optional) The name of an extension to limit discovery to; for example,
+   *   'node'.
    *
    * @return array
-   *   A classmap containing all discovered class files; i.e., a map of
+   *   A classmap containing all discovered class files; that is, a map of
    *   fully-qualified classnames to pathnames.
    */
   public function findAllClassFiles($extension = NULL) {
@@ -415,7 +417,7 @@ public static function parseTestClassSummary($doc_comment) {
    *   An associative array that contains all annotations on the test class;
    *   typically including:
    *   - group: A list of @group values.
-   *   - requires: An associative array of @requires values; e.g.:
+   *   - requires: An associative array of @requires values; for example:
    *     - module: A list of Drupal module dependencies that are required to
    *       exist.
    *
diff --git a/core/modules/simpletest/src/WebTestBase.php b/core/modules/simpletest/src/WebTestBase.php
index e9b6376..b6b7b00 100644
--- a/core/modules/simpletest/src/WebTestBase.php
+++ b/core/modules/simpletest/src/WebTestBase.php
@@ -437,8 +437,9 @@ protected function drupalCompareFiles($file1, $file2) {
    * Please note that neither the current user nor the passed-in user object is
    * populated with data of the logged in user. If you need full access to the
    * user object after logging in, it must be updated manually. If you also need
-   * access to the plain-text password of the user (set by drupalCreateUser()),
-   * e.g. to log in the same user again, then it must be re-assigned manually.
+   * access to the plain-text password of the user (set by drupalCreateUser())
+   * (for example, to log in the same user again) then it must be re-assigned
+   * manually.
    * For example:
    * @code
    *   // Create a user.
@@ -1362,7 +1363,7 @@ protected function curlClose() {
   /**
    * Returns whether the test is being executed from within a test site.
    *
-   * Mainly used by recursive tests (i.e. to test the testing framework).
+   * Mainly used by recursive tests; that is, to test the testing framework.
    *
    * @return bool
    *   TRUE if this test was instantiated in a request within the test site,
@@ -1575,7 +1576,7 @@ protected function drupalGetXHR($path, array $options = array(), array $headers
    *   This can be used to add POST data for which there are no HTML fields, as
    *   is done by drupalPostAjaxForm(). This string is literally appended to the
    *   POST data, so it must already be urlencoded and contain a leading "&"
-   *   (e.g., "&extra_var1=hello+world&extra_var2=you%26me").
+   *   (for example, "&extra_var1=hello+world&extra_var2=you%26me").
    */
   protected function drupalPostForm($path, $edit, $submit, array $options = array(), array $headers = array(), $form_html_id = NULL, $extra_post = NULL) {
     if (is_object($submit)) {
@@ -1698,7 +1699,8 @@ protected function drupalPostForm($path, $edit, $submit, array $options = array(
    *   The name of the form element that is responsible for triggering the Ajax
    *   functionality to test. May be a string or, if the triggering element is
    *   a button, an associative array where the key is the name of the button
-   *   and the value is the button label. i.e.) array('op' => t('Refresh')).
+   *   and the value is the button label; for example,
+   *   array('op' => t('Refresh')).
    * @param $ajax_path
    *   (optional) Override the path set by the Ajax settings of the triggering
    *   element.
@@ -2694,8 +2696,8 @@ protected function buildUrl($path, array $options = array()) {
       $path->setOptions($options);
       return $path->setAbsolute()->toString();
     }
-    // The URL generator service is not necessarily available yet; e.g., in
-    // interactive installer tests.
+    // The URL generator service is not necessarily available yet; for instance,
+    // in interactive installer tests.
     elseif ($this->container->has('url_generator')) {
       $force_internal = isset($options['external']) && $options['external'] == FALSE;
       if (!$force_internal && UrlHelper::isExternal($path)) {
diff --git a/core/modules/system/src/Plugin/Block/SystemMenuBlock.php b/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
index 83a2f85..7b79ce3 100644
--- a/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
+++ b/core/modules/system/src/Plugin/Block/SystemMenuBlock.php
@@ -192,7 +192,7 @@ public function getCacheContexts() {
     // to generate menu tree parameters, and those take the active menu trail
     // into account. Therefore, we must vary the rendered menu by the active
     // trail of the rendered menu.
-    // Additional cache contexts, e.g. those that determine link text or
+    // Additional cache contexts; for example, those that determine link text or
     // accessibility of a menu, will be bubbled automatically.
     $menu_name = $this->getDerivativeId();
     return Cache::mergeContexts(parent::getCacheContexts(), ['route.menu_active_trails:' . $menu_name]);
diff --git a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
index 3314623..527e455 100644
--- a/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
+++ b/core/modules/system/src/Plugin/ImageToolkit/GDToolkit.php
@@ -36,7 +36,9 @@ class GDToolkit extends ImageToolkitBase {
   protected $resource = NULL;
 
   /**
-   * Image type represented by a PHP IMAGETYPE_* constant (e.g. IMAGETYPE_JPEG).
+   * Image type represented by a PHP IMAGETYPE_* constant.
+   *
+   * For example, IMAGETYPE_JPEG, IMAGETYPE_PNG, etc.
    *
    * @var int
    */
@@ -333,7 +335,7 @@ public function getHeight() {
    * Gets the PHP type of the image.
    *
    * @return int
-   *   The image type represented by a PHP IMAGETYPE_* constant (e.g.
+   *   The image type represented by a PHP IMAGETYPE_* constant (for example,
    *   IMAGETYPE_JPEG).
    */
   public function getType() {
@@ -344,7 +346,7 @@ public function getType() {
    * Sets the PHP type of the image.
    *
    * @param int $type
-   *   The image type represented by a PHP IMAGETYPE_* constant (e.g.
+   *   The image type represented by a PHP IMAGETYPE_* constant (for example,
    *   IMAGETYPE_JPEG).
    *
    * @return $this
@@ -431,7 +433,7 @@ public function extensionToImageType($extension) {
    *
    * @return array
    *   An array of available image types. An image type is represented by a PHP
-   *   IMAGETYPE_* constant (e.g. IMAGETYPE_JPEG, IMAGETYPE_PNG, etc.).
+   *   IMAGETYPE_* constant (for example, IMAGETYPE_JPEG, IMAGETYPE_PNG, etc.).
    */
   protected static function supportedTypes() {
     return array(IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF);
diff --git a/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php b/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php
index 9cc3976..d068eff 100644
--- a/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php
+++ b/core/modules/system/src/Tests/Cache/ApcuBackendUnitTest.php
@@ -91,7 +91,7 @@ public function testSetGet() {
     }
     parent::testSetGet();
 
-    // Make sure entries are permanent (i.e. no TTL).
+    // Make sure entries are permanent (that is, no TTL).
     $backend = $this->getCacheBackend($this->getTestBin());
     $key = $backend->getApcuKey('TEST8');
 
diff --git a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
index 99c8829..7784dc9 100644
--- a/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
+++ b/core/modules/system/src/Tests/Common/AttachedAssetsTest.php
@@ -15,7 +15,7 @@
 /**
  * Tests #attached assets: attached asset libraries and JavaScript settings.
  *
- * i.e. tests:
+ * That is, tests:
  *
  * @code
  * $build['#attached']['library'] = …
diff --git a/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php b/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php
index a3fcf9a..f544a72 100644
--- a/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php
+++ b/core/modules/system/src/Tests/Common/NoJavaScriptAnonymousTest.php
@@ -52,8 +52,8 @@ public function testNoJavaScript() {
   /**
    * Passes if no JavaScript is found on the page except the HTML5 shiv.
    *
-   * The HTML5 shiv is necessary for e.g. the <article> tag which Drupal 8 uses
-   * to work in older browsers like Internet Explorer 8.
+   * The HTML5 shiv is necessary for tags, such as <article>, which Drupal 8
+   * uses to work in older browsers like Internet Explorer 8.
    */
   protected function assertNoJavaScriptExceptHtml5Shiv() {
     // Ensure drupalSettings is not set.
diff --git a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php b/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
index e8e35a6..90e7c33 100644
--- a/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
+++ b/core/modules/system/src/Tests/DrupalKernel/DrupalKernelTest.php
@@ -117,7 +117,7 @@ public function testCompileDIC() {
     $this->assertTrue($refClass->hasMethod('loadClass'), 'Container has a class loader');
 
     // We make this assertion here purely to show that the new container below
-    // is functioning correctly, i.e. we get a brand new ContainerBuilder
+    // is functioning correctly; that is, we get a brand new ContainerBuilder
     // which has the required new services, after changing the list of enabled
     // modules.
     $this->assertFalse($container->has('service_provider_test_class'));
diff --git a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
index 2c712b1..8235738 100644
--- a/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
+++ b/core/modules/system/src/Tests/Entity/EntityCacheTagsTestBase.php
@@ -191,8 +191,8 @@ protected function getAdditionalCacheContextsForEntityListing() {
   /**
    * Returns the additional cache tags for the tested entity's listing by type.
    *
-   * Necessary when there are unavoidable default entities of this type, e.g.
-   * the anonymous and administrator User entities always exist.
+   * Necessary when there are unavoidable default entities of this type; for
+   * example, the anonymous and administrator User entities always exist.
    *
    * @return array
    *   An array of the additional cache tags.
diff --git a/core/modules/system/src/Tests/File/HtaccessUnitTest.php b/core/modules/system/src/Tests/File/HtaccessUnitTest.php
index 4b7f39d..95d5e1d 100644
--- a/core/modules/system/src/Tests/File/HtaccessUnitTest.php
+++ b/core/modules/system/src/Tests/File/HtaccessUnitTest.php
@@ -79,7 +79,7 @@ function testHtaccessSave() {
    * @param string $uri
    *   The URI of the file to check.
    * @param int $expected
-   *   The expected file permissions; e.g., 0444.
+   *   The expected file permissions; for example, 0444.
    *
    * @return bool
    *   Whether the actual file permissions match the expected.
diff --git a/core/modules/system/src/Tests/File/UrlRewritingTest.php b/core/modules/system/src/Tests/File/UrlRewritingTest.php
index dd37222..6a6a113 100644
--- a/core/modules/system/src/Tests/File/UrlRewritingTest.php
+++ b/core/modules/system/src/Tests/File/UrlRewritingTest.php
@@ -27,7 +27,7 @@ class UrlRewritingTest extends FileTestBase {
    * Tests the rewriting of shipped file URLs by hook_file_url_alter().
    */
   function testShippedFileURL()  {
-    // Test generating a URL to a shipped file (i.e. a file that is part of
+    // Test generating a URL to a shipped file (that is, a file which is part of
     // Drupal core, a module or a theme, for example a JavaScript file).
 
     // Test alteration of file URLs to use a CDN.
diff --git a/core/modules/system/src/Tests/Image/ToolkitTestBase.php b/core/modules/system/src/Tests/Image/ToolkitTestBase.php
index 21a514c..5e8c1ea 100644
--- a/core/modules/system/src/Tests/Image/ToolkitTestBase.php
+++ b/core/modules/system/src/Tests/Image/ToolkitTestBase.php
@@ -77,8 +77,8 @@ protected function getImage() {
    * exactly once once, other values result in failure.
    *
    * @param $expected
-   *   Array with string containing with the operation name, e.g. 'load',
-   *   'save', 'crop', etc.
+   *   Array with string containing with the operation name; for example,
+   *   'load', 'save', 'crop', etc.
    */
   function assertToolkitOperationsCalled(array $expected) {
     // If one of the image operations is expected, apply should be expected as
diff --git a/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php b/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php
index c97899c..32d9fdb 100644
--- a/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php
+++ b/core/modules/system/src/Tests/Installer/InstallerExistingDatabaseSettingsTest.php
@@ -38,8 +38,8 @@ protected function setUp() {
    * {@inheritdoc}
    *
    * @todo The database settings form is not supposed to appear if settings.php
-   *   contains a valid database connection already (but e.g. no config
-   *   directories yet).
+   *   contains a valid database connection already (but no config directories
+   *   yet).
    */
   protected function setUpSettings() {
     // All database settings should be pre-configured, except password.
diff --git a/core/modules/system/src/Tests/Menu/BreadcrumbTest.php b/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
index 6548208..e8ef519 100644
--- a/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
+++ b/core/modules/system/src/Tests/Menu/BreadcrumbTest.php
@@ -151,9 +151,11 @@ function testBreadCrumbs() {
     $nid1 = $node1->id();
     $trail = $home;
     $this->assertBreadcrumb("node/$nid1", $trail);
-    // Also verify that the node does not appear elsewhere (e.g., menu trees).
+    // Also verify that the node does not appear elsewhere (for example, menu
+    // trees).
     $this->assertNoLink($node1->getTitle());
-    // Also verify that the node does not appear elsewhere (e.g., menu trees).
+    // Also verify that the node does not appear elsewhere (for example, menu
+    // trees).
     $this->assertNoLink($node1->getTitle());
 
     $trail += array(
@@ -286,7 +288,7 @@ function testBreadCrumbs() {
       $this->assertBreadcrumb($link_path, $trail, $term->getName(), $tree);
       $this->assertEscaped($parent->getTitle(), 'Tagged node found.');
 
-      // Additionally make sure that this link appears only once; i.e., the
+      // Additionally make sure that this link appears only once; that is, the
       // untranslated menu links automatically generated from menu router items
       // ('taxonomy/term/%') should never be translated and appear in any menu
       // other than the breadcrumb trail.
diff --git a/core/modules/system/src/Tests/Session/SessionTest.php b/core/modules/system/src/Tests/Session/SessionTest.php
index 037054c..46de0ca 100644
--- a/core/modules/system/src/Tests/Session/SessionTest.php
+++ b/core/modules/system/src/Tests/Session/SessionTest.php
@@ -232,7 +232,7 @@ function testSessionWrite() {
     $this->assertEqual($times2->access, $times1->access, 'Users table was not updated.');
     $this->assertNotEqual($times2->timestamp, $times1->timestamp, 'Sessions table was updated.');
 
-    // Write the same value again, i.e. do not modify the session.
+    // Write the same value again; that is, do not modify the session.
     sleep(1);
     $this->drupalGet('session-test/set/foo');
     $times3 = db_query($sql, array(':uid' => $user->id()))->fetchObject();
diff --git a/core/modules/system/templates/html.html.twig b/core/modules/system/templates/html.html.twig
index 39702c2..4fd925d 100644
--- a/core/modules/system/templates/html.html.twig
+++ b/core/modules/system/templates/html.html.twig
@@ -5,7 +5,8 @@
  *
  * Variables:
  * - logged_in: A flag indicating if user is logged in.
- * - root_path: The root path of the current page (e.g., node, admin, user).
+ * - root_path: The root path of the current page; for example, node, admin,
+     user, etc.
  * - node_type: The content type for the current node, if the page is a node.
  * - head_title: List of text elements that make up the head_title variable.
  *   May contain or more of the following:
diff --git a/core/modules/system/templates/links.html.twig b/core/modules/system/templates/links.html.twig
index 77e7260..6c1f17f 100644
--- a/core/modules/system/templates/links.html.twig
+++ b/core/modules/system/templates/links.html.twig
@@ -15,7 +15,7 @@
  *     tag if no 'href' is supplied.
  * - heading: (optional) A heading to precede the links.
  *   - text: The heading text.
- *   - level: The heading level (e.g. 'h2', 'h3').
+ *   - level: The heading level; for example, 'h2', 'h3'.
  *   - attributes: (optional) A keyed list of attributes for the heading.
  *   If the heading is a string, it will be used as the text of the heading and
  *   the level will default to 'h2'.
diff --git a/core/modules/system/templates/page.html.twig b/core/modules/system/templates/page.html.twig
index 032b724..9e32a92 100644
--- a/core/modules/system/templates/page.html.twig
+++ b/core/modules/system/templates/page.html.twig
@@ -24,8 +24,8 @@
  * - messages: Status and error messages. Should be displayed prominently.
  * - node: Fully loaded node, if there is an automatically-loaded node
  *   associated with the page and the node ID is the second argument in the
- *   page's path (e.g. node/12345 and node/12345/revisions, but not
- *   comment/reply/12345).
+ *   page's path; for example, node/12345 and node/12345/revisions, but not
+ *   comment/reply/12345.
  *
  * Regions:
  * - page.header: Items for the header region.
diff --git a/core/modules/system/templates/system-themes-page.html.twig b/core/modules/system/templates/system-themes-page.html.twig
index 6e65d76..468859e 100644
--- a/core/modules/system/templates/system-themes-page.html.twig
+++ b/core/modules/system/templates/system-themes-page.html.twig
@@ -8,7 +8,7 @@
  * - theme_groups: A list of theme groups. Each theme group contains:
  *   - attributes: HTML attributes specific to this theme group.
  *   - title: Title for the theme group.
- *   - state: State of the theme group, e.g. installed or uninstalled.
+ *   - state: State of the theme group; installed or uninstalled.
  *   - themes: A list of themes within the theme group. Each theme contains:
  *     - attributes: HTML attributes specific to this theme.
  *     - screenshot: A screenshot representing the theme.
@@ -19,11 +19,12 @@
  *       or not.
  *     - is_admin: Boolean indicating whether the theme is the admin theme or
  *       not.
- *     - notes: Identifies what context this theme is being used in, e.g.,
- *       default theme, admin theme.
+ *     - notes: Identifies what context this theme is being used in; for
+ *       example, default theme or admin theme.
  *     - incompatible: Text describing any compatibility issues.
- *     - operations: A list of operation links, e.g., Settings, Enable, Disable,
- *       etc. these links should only be displayed if the theme is compatible.
+ *     - operations: A list of operation links; for example, Settings, Enable,
+ *       Disable, etc. These links should only be displayed if the theme is
+ *       compatible.
  *
  * @see template_preprocess_system_themes_page()
  *
diff --git a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php
index a018b3c..047e477 100644
--- a/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php
+++ b/core/modules/system/tests/modules/image_test/src/Plugin/ImageToolkit/TestToolkit.php
@@ -34,7 +34,9 @@ class TestToolkit extends ImageToolkitBase {
   protected $state;
 
   /**
-   * Image type represented by a PHP IMAGETYPE_* constant (e.g. IMAGETYPE_JPEG).
+   * Image type represented by a PHP IMAGETYPE_* constant.
+   *
+   * For example, IMAGETYPE_JPEG, IMAGETYPE_PNG, etc.
    *
    * @var int
    */
@@ -200,7 +202,7 @@ public function getHeight() {
    * Returns the type of the image.
    *
    * @return int
-   *   The image type represented by a PHP IMAGETYPE_* constant (e.g.
+   *   The image type represented by a PHP IMAGETYPE_* constant (for example,
    *   IMAGETYPE_JPEG).
    */
   public function getType() {
@@ -211,7 +213,7 @@ public function getType() {
    * Sets the PHP type of the image.
    *
    * @param int $type
-   *   The image type represented by a PHP IMAGETYPE_* constant (e.g.
+   *   The image type represented by a PHP IMAGETYPE_* constant (for example,
    *   IMAGETYPE_JPEG).
    *
    * @return $this
@@ -253,7 +255,7 @@ public static function getSupportedExtensions() {
    *
    * @return array
    *   An array of available image types. An image type is represented by a PHP
-   *   IMAGETYPE_* constant (e.g. IMAGETYPE_JPEG, IMAGETYPE_PNG, etc.).
+   *   IMAGETYPE_* constant (for example, IMAGETYPE_JPEG, IMAGETYPE_PNG, etc.).
    */
   protected static function supportedTypes() {
     return array(IMAGETYPE_PNG, IMAGETYPE_JPEG, IMAGETYPE_GIF);
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
index b31a2bf..c7ba0eb 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/MockBlockManager.php
@@ -114,8 +114,8 @@ public function __construct() {
     // can use one of the factory classes included with the plugin system, or
     // create their own. ReflectionFactory is a general purpose, flexible
     // factory suitable for many kinds of plugin types. Factories need access to
-    // the plugin definitions (e.g., since that's where the plugin's class is
-    // specified), so we provide it the discovery object.
+    // the plugin definitions (for instance, since that's where the plugin's
+    // class is specified), so we provide it the discovery object.
     $this->factory = new ReflectionFactory($this->discovery);
   }
 
diff --git a/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php b/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php
index 330ef4e..c3c9e45 100644
--- a/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php
+++ b/core/modules/system/tests/modules/plugin_test/src/Plugin/TestPluginManager.php
@@ -36,8 +36,8 @@ public function __construct() {
     // factory classes included with the plugin system, or create their own.
     // DefaultFactory is a simple, general purpose factory suitable for
     // many kinds of plugin types. Factories need access to the plugin
-    // definitions (e.g., since that's where the plugin's class is specified),
-    // so we provide it the discovery object.
+    // definitions (for instance, since that's where the plugin's class is
+    // specified), so we provide it the discovery object.
     $this->factory = new DefaultFactory($this->discovery);
   }
 }
diff --git a/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php b/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
index 3c2b851..c12b71c 100644
--- a/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
+++ b/core/modules/system/tests/modules/twig_extension_test/src/TwigExtension/TestExtension.php
@@ -19,7 +19,7 @@ class TestExtension extends TwigExtension {
    *
    * @return array
    *   A key/value array that defines custom Twig functions. The key denotes the
-   *   function name used in the tag, e.g.:
+   *   function name used in the tag; for example:
    *   @code
    *   {{ testfunc() }}
    *   @endcode
@@ -37,7 +37,7 @@ public function getFunctions() {
    *
    * @return array
    *   A key/value array that defines custom Twig filters. The key denotes the
-   *   filter name used in the tag, e.g.:
+   *   filter name used in the tag; for example:
    *   @code
    *   {{ foo|testfilter }}
    *   @endcode
diff --git a/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php b/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php
index d51f6e3..05f880f 100644
--- a/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php
+++ b/core/modules/system/tests/src/Unit/Menu/MenuLinkTreeTest.php
@@ -90,12 +90,13 @@ protected function setUp() {
    * of values for the two types of cacheability.
    *
    * There is another level of cacheability involved when actually rendering
-   * built menu trees (i.e. when invoking RendererInterface::render() on the
+   * built menu trees (that is, when invoking RendererInterface::render() on the
    * return value of MenuLinkTreeInterface::build()): the cacheability of the
    * generated URLs.
    * Fortunately, that doesn't need additional test coverage here because that
-   * cacheability is handled at the level of the Renderer (i.e. menu.html.twig
-   * template's link() function invocation). It also has its own test coverage.
+   * cacheability is handled at the level of the Renderer (that is,
+   * menu.html.twig template's link() function invocation). It also has its own
+   * test coverage.
    *
    * @see \Drupal\menu_link_content\Tests\MenuLinkContentCacheabilityBubblingTest
    *
diff --git a/core/modules/taxonomy/src/TermBreadcrumbBuilder.php b/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
index 4fdfe84..471c6bc 100644
--- a/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
+++ b/core/modules/taxonomy/src/TermBreadcrumbBuilder.php
@@ -61,8 +61,8 @@ public function build(RouteMatchInterface $route_match) {
     $breadcrumb->addLink(Link::createFromRoute($this->t('Home'), '<front>'));
     $term = $route_match->getParameter('taxonomy_term');
     // Breadcrumb needs to have terms cacheable metadata as a cacheable
-    // dependency even though it is not shown in the breadcrumb because e.g. its
-    // parent might have changed.
+    // dependency even though it is not shown in the breadcrumb because, for
+    // instance, its parent might have changed.
     $breadcrumb->addCacheableDependency($term);
     // @todo This overrides any other possible breadcrumb and is a pure
     //   hard-coded presumption. Make this behavior configurable per
diff --git a/core/modules/taxonomy/src/Tests/TermTest.php b/core/modules/taxonomy/src/Tests/TermTest.php
index da78d41..5b7ef70 100644
--- a/core/modules/taxonomy/src/Tests/TermTest.php
+++ b/core/modules/taxonomy/src/Tests/TermTest.php
@@ -387,7 +387,7 @@ function testTermReorder() {
 
     $taxonomy_storage = $this->container->get('entity.manager')->getStorage('taxonomy_term');
 
-    // Fetch the created terms in the default alphabetical order, i.e. term1
+    // Fetch the created terms in the default alphabetical order; that is, term1
     // precedes term2 alphabetically, and term2 precedes term3.
     $taxonomy_storage->resetCache();
     list($term1, $term2, $term3) = $taxonomy_storage->loadTree($this->vocabulary->id(), 0, NULL, TRUE);
diff --git a/core/modules/taxonomy/taxonomy.module b/core/modules/taxonomy/taxonomy.module
index a73f6fc..936dae1 100644
--- a/core/modules/taxonomy/taxonomy.module
+++ b/core/modules/taxonomy/taxonomy.module
@@ -179,7 +179,7 @@ function taxonomy_check_vocabulary_hierarchy(VocabularyInterface $vocabulary, $c
  * @param \Drupal\taxonomy\Entity\Term $term
  *   A taxonomy term object.
  * @param string $view_mode
- *   View mode; e.g., 'full', 'teaser', etc.
+ *   View mode; for example, 'full', 'teaser', etc.
  * @param string $langcode
  *   (optional) A language code to use for rendering. Defaults to the global
  *   content language of the current request.
@@ -197,7 +197,7 @@ function taxonomy_term_view(Term $term, $view_mode = 'full', $langcode = NULL) {
  * @param array $terms
  *   An array of taxonomy terms as returned by Term::loadMultiple().
  * @param string $view_mode
- *   View mode; e.g., 'full', 'teaser', etc.
+ *   View mode; for example, 'full', 'teaser', etc.
  * @param string $langcode
  *   (optional) A language code to use for rendering. Defaults to the global
  *   content language of the current request.
@@ -234,7 +234,7 @@ function taxonomy_theme_suggestions_taxonomy_term(array $variables) {
  *   - elements: An associative array containing the taxonomy term and any
  *     fields attached to the term. Properties used:
  *     - #taxonomy_term: A \Drupal\taxonomy\TermInterface object.
- *     - #view_mode: The current view mode for this taxonomy term, e.g.
+ *     - #view_mode: The current view mode for this taxonomy term; for example,
  *       'full' or 'teaser'.
  *   - attributes: HTML attributes for the containing element.
  */
diff --git a/core/modules/taxonomy/templates/taxonomy-term.html.twig b/core/modules/taxonomy/templates/taxonomy-term.html.twig
index 6636b79..2a61377 100644
--- a/core/modules/taxonomy/templates/taxonomy-term.html.twig
+++ b/core/modules/taxonomy/templates/taxonomy-term.html.twig
@@ -18,7 +18,7 @@
  * - term: The taxonomy term entity, including:
  *   - id: The ID of the taxonomy term.
  *   - bundle: Machine name of the current vocabulary.
- * - view_mode: View mode, e.g. 'full', 'teaser', etc.
+ * - view_mode: View mode; for example, 'full', 'teaser', etc.
  *
  * @see template_preprocess_taxonomy_term()
  *
diff --git a/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php b/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
index 0ac3151..48c78f3 100644
--- a/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
+++ b/core/modules/text/src/Plugin/Field/FieldWidget/TextareaWidget.php
@@ -43,8 +43,9 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
    */
   public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
     if ($violation->arrayPropertyPath == array('format') && isset($element['format']['#access']) && !$element['format']['#access']) {
-      // Ignore validation errors for formats if formats may not be changed,
-      // i.e. when existing formats become invalid. See filter_process_format().
+      // Ignore validation errors for formats if formats may not be changed;
+      // for example, when existing formats become invalid. See
+      // filter_process_format().
       return FALSE;
     }
     return $element;
diff --git a/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php b/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
index ab2f19a..5e78c8d 100644
--- a/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
+++ b/core/modules/text/src/Plugin/Field/FieldWidget/TextfieldWidget.php
@@ -43,8 +43,9 @@ public function formElement(FieldItemListInterface $items, $delta, array $elemen
    */
   public function errorElement(array $element, ConstraintViolationInterface $violation, array $form, FormStateInterface $form_state) {
     if ($violation->arrayPropertyPath == array('format') && isset($element['format']['#access']) && !$element['format']['#access']) {
-      // Ignore validation errors for formats if formats may not be changed,
-      // i.e. when existing formats become invalid. See filter_process_format().
+      // Ignore validation errors for formats if formats may not be changed;
+      // for example, when existing formats become invalid. See
+      // filter_process_format().
       return FALSE;
     }
     return $element;
diff --git a/core/modules/toolbar/js/models/ToolbarModel.js b/core/modules/toolbar/js/models/ToolbarModel.js
index 537601d..6959689 100644
--- a/core/modules/toolbar/js/models/ToolbarModel.js
+++ b/core/modules/toolbar/js/models/ToolbarModel.js
@@ -36,15 +36,16 @@
       /**
        * The active toolbar tab. All other tabs should be inactive under
        * normal circumstances. It will remain active across page loads. The
-       * active item is stored as an ID selector e.g. '#toolbar-item--1'.
+       * active item is stored as an ID selector; for example,
+       * '#toolbar-item--1'.
        *
        * @type {string}
        */
       activeTab: null,
 
       /**
-       * Represents whether a tray is open or not. Stored as an ID selector e.g.
-       * '#toolbar-item--1-tray'.
+       * Represents whether a tray is open or not. Stored as an ID selector; for
+       * example, '#toolbar-item--1-tray'.
        *
        * @type {string}
        */
diff --git a/core/modules/toolbar/src/Controller/ToolbarController.php b/core/modules/toolbar/src/Controller/ToolbarController.php
index cef06c6..593fbc9 100644
--- a/core/modules/toolbar/src/Controller/ToolbarController.php
+++ b/core/modules/toolbar/src/Controller/ToolbarController.php
@@ -30,8 +30,8 @@ public function subtreesAjax() {
 
     // The Expires HTTP header is the heart of the client-side HTTP caching. The
     // additional server-side page cache only takes effect when the client
-    // accesses the callback URL again (e.g., after clearing the browser cache
-    // or when force-reloading a Drupal page).
+    // accesses the callback URL again (for example, after clearing the browser
+    // cache or when force-reloading a Drupal page).
     $max_age = 365 * 24 * 60 * 60;
     $response->setPrivate();
     $response->setMaxAge($max_age);
diff --git a/core/modules/update/src/Form/UpdateManagerInstall.php b/core/modules/update/src/Form/UpdateManagerInstall.php
index f47e3ee..ef27e39 100644
--- a/core/modules/update/src/Form/UpdateManagerInstall.php
+++ b/core/modules/update/src/Form/UpdateManagerInstall.php
@@ -171,8 +171,9 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     }
 
     // Unfortunately, we can only use the directory name to determine the
-    // project name. Some archivers list the first file as the directory (i.e.,
-    // MODULE/) and others list an actual file (i.e., MODULE/README.TXT).
+    // project name. Some archivers list the first file as the directory (for
+    // example, MODULE/) and others list an actual file (that is,
+    // MODULE/README.TXT).
     $project = strtok($files[0], '/\\');
 
     $archive_errors = $this->moduleHandler->invokeAll('verify_update_archive', array($project, $local_cache, $directory));
@@ -225,10 +226,10 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     );
 
     // If the owner of the directory we extracted is the same as the owner of
-    // our configuration directory (e.g. sites/default) where we're trying to
-    // install the code, there's no need to prompt for FTP/SSH credentials.
-    // Instead, we instantiate a Drupal\Core\FileTransfer\Local and invoke
-    // update_authorize_run_install() directly.
+    // our configuration directory (for example, sites/default) where we're
+    // trying to install the code, there's no need to prompt for FTP/SSH
+    // credentials. Instead, we instantiate a Drupal\Core\FileTransfer\Local and
+    // invoke update_authorize_run_install() directly.
     if (fileowner($project_real_location) == fileowner($this->sitePath)) {
       $this->moduleHandler->loadInclude('update', 'inc', 'update.authorize');
       $filetransfer = new Local($this->root);
diff --git a/core/modules/update/src/Form/UpdateReady.php b/core/modules/update/src/Form/UpdateReady.php
index d1298ca..ad339d0 100644
--- a/core/modules/update/src/Form/UpdateReady.php
+++ b/core/modules/update/src/Form/UpdateReady.php
@@ -150,8 +150,8 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       }
 
       // If the owner of the last directory we extracted is the same as the
-      // owner of our configuration directory (e.g. sites/default) where we're
-      // trying to install the code, there's no need to prompt for FTP/SSH
+      // owner of our configuration directory (for example, sites/default) where
+      // we're trying to install the code, there's no need to prompt for FTP/SSH
       // credentials. Instead, we instantiate a Drupal\Core\FileTransfer\Local
       // and invoke update_authorize_run_update() directly.
       if (fileowner($project_real_location) == fileowner($this->sitePath)) {
diff --git a/core/modules/update/src/Tests/UpdateTestBase.php b/core/modules/update/src/Tests/UpdateTestBase.php
index faec496..0a17176 100644
--- a/core/modules/update/src/Tests/UpdateTestBase.php
+++ b/core/modules/update/src/Tests/UpdateTestBase.php
@@ -5,9 +5,9 @@
  * Contains \Drupal\update\Tests\UpdateTestBase.
  *
  * The overarching methodology of these tests is we need to compare a given
- * state of installed modules and themes (e.g., version, project grouping,
- * timestamps, etc) against a current state of what the release history XML
- * files we fetch say is available. We have dummy XML files (in the
+ * state of installed modules and themes (for example, version, project
+ * grouping, timestamps, etc) against a current state of what the release
+ * history XML files we fetch say is available. We have dummy XML files (in the
  * core/modules/update/tests directory) that describe various scenarios of
  * what's available for different test projects, and we have dummy .info file
  * data (specified via hook_system_info_alter() in the update_test helper
diff --git a/core/modules/update/templates/update-project-status.html.twig b/core/modules/update/templates/update-project-status.html.twig
index 4cc9a19..1f4c8f9 100644
--- a/core/modules/update/templates/update-project-status.html.twig
+++ b/core/modules/update/templates/update-project-status.html.twig
@@ -13,7 +13,7 @@
  *   - icon: The project status version indicator icon.
  * - existing_version: The version of the installed project.
  * - versions: The available versions of the project.
- * - install_type: The type of project (e.g., dev).
+ * - install_type: The type of project; for example, dev.
  * - datestamp: The date/time of a project version's release.
  * - extras: HTML attributes and additional information about the project.
  *   - attributes: HTML attributes for the extra item.
diff --git a/core/modules/update/update.authorize.inc b/core/modules/update/update.authorize.inc
index b96c904..2fe7d52 100644
--- a/core/modules/update/update.authorize.inc
+++ b/core/modules/update/update.authorize.inc
@@ -76,8 +76,8 @@ function update_authorize_run_update($filetransfer, $projects) {
  *   The FileTransfer object created by authorize.php for use during this
  *   operation.
  * @param string $project
- *   The canonical project short name; i.e., the name of the module, theme, or
- *   profile.
+ *   The canonical project short name; that is, the name of the module, theme,
+ *   or profile.
  * @param string $updater_name
  *   The name of the Drupal\Core\Updater\Updater class to use for installing
  *   this project.
diff --git a/core/modules/update/update.compare.inc b/core/modules/update/update.compare.inc
index a077c38..37f679a 100644
--- a/core/modules/update/update.compare.inc
+++ b/core/modules/update/update.compare.inc
@@ -30,8 +30,8 @@ function update_process_project_info(&$projects) {
       }
 
       // Figure out what the currently installed major version is. We need
-      // to handle both contribution (e.g. "5.x-1.3", major = 1) and core
-      // (e.g. "5.1", major = 5) version strings.
+      // to handle both contribution (for example, "8.x-1.3", major = 1) and
+      // core (for example, "8.1", major = 8) version strings.
       $matches = array();
       if (preg_match('/^(\d+\.x-)?(\d+)\..*$/', $info['version'], $matches)) {
         $info['major'] = $matches[2];
@@ -162,7 +162,7 @@ function update_calculate_project_data($available) {
  * This function relies on the fact that the .xml release history data comes
  * sorted based on major version and patch level, then finally by release date
  * if there are multiple releases such as betas from the same major.patch
- * version (e.g., 5.x-1.5-beta1, 5.x-1.5-beta2, and 5.x-1.5). Development
+ * version (for example, 8.x-1.5-beta1, 8.x-1.5-beta2, and 8.x-1.5). Development
  * snapshots for a given major version are always listed last.
  *
  * @param $project_data
@@ -218,8 +218,8 @@ function update_calculate_project_update_status(&$project_data, $available) {
         break;
 
       default:
-        // Assume anything else (e.g. 'published') is valid and we should
-        // perform the rest of the logic in this function.
+        // Assume anything else (for instance, 'published') is valid and we
+        // should perform the rest of the logic in this function.
         break;
     }
   }
@@ -279,7 +279,7 @@ function update_calculate_project_update_status(&$project_data, $available) {
   // If the project is marked as UPDATE_FETCH_PENDING, it means that the
   // data we currently have (if any) is stale, and we've got a task queued
   // up to (re)fetch the data. In that case, we mark it as such, merge in
-  // whatever data we have (e.g. project title and link), and move on.
+  // whatever data we have (for example, project title and link), and move on.
   if (!empty($available['fetch_status']) && $available['fetch_status'] == UPDATE_FETCH_PENDING) {
     $project_data['status'] = UPDATE_FETCH_PENDING;
     $project_data['reason'] = t('No available update data');
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index f9c7c5f..61f8ab7 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -154,13 +154,13 @@ function update_manager_archive_extract($file, $directory) {
   }
 
   // Remove the directory if it exists, otherwise it might contain a mixture of
-  // old files mixed with the new files (e.g. in cases where files were removed
-  // from a later release).
+  // old files mixed with the new files (for example, in cases where files were
+  // removed from a later release).
   $files = $archiver->listContents();
 
   // Unfortunately, we can only use the directory name to determine the project
-  // name. Some archivers list the first file as the directory (i.e., MODULE/)
-  // and others list an actual file (i.e., MODULE/README.TXT).
+  // name. Some archives list the first file as the directory (for example,
+  // MODULE/) and others list an actual file (that is, MODULE/README.TXT).
   $project = strtok($files[0], '/\\');
 
   $extract_location = $directory . '/' . $project;
@@ -286,10 +286,10 @@ function update_manager_batch_project_get($project, $url, &$context) {
  * Determines if file transfers will be performed locally.
  *
  * If the server is configured such that webserver-created files have the same
- * owner as the configuration directory (e.g., sites/default) where new code
- * will eventually be installed, the update manager can transfer files entirely
- * locally, without changing their ownership (in other words, without prompting
- * the user for FTP, SSH or other credentials).
+ * owner as the configuration directory (for example, sites/default) where new
+ * code will eventually be installed, the update manager can transfer files
+ * entirely locally, without changing their ownership (in other words, without
+ * prompting the user for FTP, SSH or other credentials).
  *
  * This server configuration is an inherent security weakness because it allows
  * a malicious webserver process to append arbitrary PHP code and then execute
diff --git a/core/modules/user/src/Plugin/Block/UserLoginBlock.php b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
index 8a0fcce..56d6147 100644
--- a/core/modules/user/src/Plugin/Block/UserLoginBlock.php
+++ b/core/modules/user/src/Plugin/Block/UserLoginBlock.php
@@ -42,9 +42,9 @@ class UserLoginBlock extends BlockBase implements ContainerFactoryPluginInterfac
    * Constructs a new UserLoginBlock instance.
    *
    * @param array $configuration
-   *   The plugin configuration, i.e. an array with configuration values keyed
-   *   by configuration option name. The special key 'context' may be used to
-   *   initialize the defined contexts by setting it to an array of context
+   *   The plugin configuration; that is, an array with configuration values
+   *   keyed by configuration option name. The special key 'context' may be used
+   *   to initialize the defined contexts by setting it to an array of context
    *   values keyed by context names.
    * @param string $plugin_id
    *   The plugin_id for the plugin instance.
diff --git a/core/modules/user/src/PrivateTempStore.php b/core/modules/user/src/PrivateTempStore.php
index d85c21d..95f217d 100644
--- a/core/modules/user/src/PrivateTempStore.php
+++ b/core/modules/user/src/PrivateTempStore.php
@@ -23,8 +23,8 @@
  * The PrivateTempStore is different from a cache, because the data in it is not
  * yet saved permanently and so it cannot be rebuilt. Typically, the
  * PrivateTempStore might be used to store work in progress that is later saved
- * permanently elsewhere, e.g. autosave data, multistep forms, or in-progress
- * changes to complex configuration that are not ready to be saved.
+ * permanently elsewhere; for example, autosave data, multistep forms, or
+ * in-progress changes to complex configuration that are not ready to be saved.
  *
  * The PrivateTempStore differs from the SharedTempStore in that all keys are
  * ensured to be unique for a particular user and users can never share data. If
diff --git a/core/modules/user/src/PrivateTempStoreFactory.php b/core/modules/user/src/PrivateTempStoreFactory.php
index 604edd4..b1db32d 100644
--- a/core/modules/user/src/PrivateTempStoreFactory.php
+++ b/core/modules/user/src/PrivateTempStoreFactory.php
@@ -79,7 +79,7 @@ function __construct(KeyValueExpirableFactoryInterface $storage_factory, LockBac
    *
    * @param string $collection
    *   The collection name to use for this key/value store. This is typically
-   *   a shared namespace or module name, e.g. 'views', 'entity', etc.
+   *   a shared namespace or module name; for example, 'views', 'entity', etc.
    *
    * @return \Drupal\user\PrivateTempStore
    *   An instance of the key/value store.
diff --git a/core/modules/user/src/SharedTempStore.php b/core/modules/user/src/SharedTempStore.php
index 07e4756..52fc1a7 100644
--- a/core/modules/user/src/SharedTempStore.php
+++ b/core/modules/user/src/SharedTempStore.php
@@ -22,12 +22,12 @@
  * The SharedTempStore is different from a cache, because the data in it is not
  * yet saved permanently and so it cannot be rebuilt. Typically, the
  * SharedTempStore might be used to store work in progress that is later saved
- * permanently elsewhere, e.g. autosave data, multistep forms, or in-progress
- * changes to complex configuration that are not ready to be saved.
+ * permanently elsewhere; for example, autosave data, multistep forms, or
+ * in-progress changes to complex configuration that are not ready to be saved.
  *
- * Each SharedTempStore belongs to a particular owner (e.g. a user, session, or
- * process). Multiple owners may use the same key/value collection, and the
- * owner is stored along with the key/value pair.
+ * Each SharedTempStore belongs to a particular owner (for example, a user,
+ * session, or process). Multiple owners may use the same key/value collection,
+ * and the owner is stored along with the key/value pair.
  *
  * Every key is unique within the collection, so the SharedTempStore can check
  * whether a particular key is already set by a different owner. This is
@@ -64,7 +64,7 @@ class SharedTempStore {
   protected $requestStack;
 
   /**
-   * The owner key to store along with the data (e.g. a user or session ID).
+   * The owner key to store along with the data (such as a user or session ID).
    *
    * @var mixed
    */
@@ -89,7 +89,8 @@ class SharedTempStore {
    * @param \Drupal\Core\Lock\LockBackendInterface $lock_backend
    *   The lock object used for this data.
    * @param mixed $owner
-   *   The owner key to store along with the data (e.g. a user or session ID).
+   *   The owner key to store along with the data (such as a user or session
+   *   ID).
    * @param \Symfony\Component\HttpFoundation\RequestStack $request_stack
    *   The request stack.
    * @param int $expire
diff --git a/core/modules/user/src/SharedTempStoreFactory.php b/core/modules/user/src/SharedTempStoreFactory.php
index ed27c44..e5a3f58 100644
--- a/core/modules/user/src/SharedTempStoreFactory.php
+++ b/core/modules/user/src/SharedTempStoreFactory.php
@@ -68,7 +68,7 @@ function __construct(KeyValueExpirableFactoryInterface $storage_factory, LockBac
    *
    * @param string $collection
    *   The collection name to use for this key/value store. This is typically
-   *   a shared namespace or module name, e.g. 'views', 'entity', etc.
+   *   a shared namespace or module name; for exmaple, 'views', 'entity', etc.
    * @param mixed $owner
    *   (optional) The owner of this SharedTempStore. By default, the
    *   SharedTempStore is owned by the currently authenticated user, or by the
diff --git a/core/modules/user/templates/user.html.twig b/core/modules/user/templates/user.html.twig
index 9075ab1..ca594a9 100644
--- a/core/modules/user/templates/user.html.twig
+++ b/core/modules/user/templates/user.html.twig
@@ -3,8 +3,8 @@
  * @file
  * Default theme implementation to present all user data.
  *
- * This template is used when viewing a registered user's page,
- * e.g., example.com/user/123. 123 being the user's ID.
+ * This template is used when viewing a registered user's page; for example,
+ * example.com/user/123. 123 being the user's ID.
  *
  * Available variables:
  * - content: A list of content items. Use 'content' to print all content, or
diff --git a/core/modules/user/tests/themes/user_test_theme/user.html.twig b/core/modules/user/tests/themes/user_test_theme/user.html.twig
index 415b7a5..189f9fb 100644
--- a/core/modules/user/tests/themes/user_test_theme/user.html.twig
+++ b/core/modules/user/tests/themes/user_test_theme/user.html.twig
@@ -3,8 +3,8 @@
  * @file
  * Theme override for testing the presence of all user data.
  *
- * This template is used when viewing a registered user's page,
- * e.g., example.com/user/123. 123 being the user's ID.
+ * This template is used when viewing a registered user's page; for example,
+ * example.com/user/123. 123 being the user's ID.
  *
  * Available variables:
  * - content: A list of content items. Use 'content' to print all content, or
diff --git a/core/modules/user/user.module b/core/modules/user/user.module
index 0e9cedb..ebaf5f0 100644
--- a/core/modules/user/user.module
+++ b/core/modules/user/user.module
@@ -123,7 +123,7 @@ function user_js_settings_alter(&$settings, AttachedAssetsInterface $assets) {
  * Returns whether this site supports the default user picture feature.
  *
  * This approach preserves compatibility with node/comment templates. Alternate
- * user picture implementations (e.g., Gravatar) should provide their own
+ * user picture implementations (for example, Gravatar) should provide their own
  * add/edit/delete forms and populate the 'picture' variable during the
  * preprocess stage.
  */
@@ -873,7 +873,7 @@ function user_delete_multiple(array $uids) {
  * @param \Drupal\user\UserInterface $account
  *   A user object.
  * @param string $view_mode
- *   View mode, e.g. 'full'.
+ *   View mode; for example, 'full'.
  * @param string|null $langcode
  *   (optional) A language code to use for rendering. Defaults to the global
  *   content language of the current request.
@@ -891,7 +891,8 @@ function user_view($account, $view_mode = 'full', $langcode = NULL) {
  * @param \Drupal\user\UserInterface[] $accounts
  *   An array of user accounts as returned by User::loadMultiple().
  * @param string $view_mode
- *   (optional) View mode, e.g., 'full', 'teaser', etc. Defaults to 'teaser.'
+ *   (optional) View mode; for example, 'full', 'teaser', etc. Defaults to
+ *   'teaser.'
  * @param string|null $langcode
  *   (optional) A language code to use for rendering. Defaults to the global
  *   content language of the current request.
diff --git a/core/modules/views/js/ajax_view.js b/core/modules/views/js/ajax_view.js
index ad61000..9d50e96 100644
--- a/core/modules/views/js/ajax_view.js
+++ b/core/modules/views/js/ajax_view.js
@@ -131,7 +131,7 @@
    */
   Drupal.views.ajaxView.prototype.filterNestedViews = function () {
     // If there is at least one parent with a view class, this view
-    // is nested (e.g., an attachment). Bail.
+    // is nested (for example, an attachment). Bail.
     return !this.$view.parents('.view').size();
   };
 
@@ -185,7 +185,7 @@
    */
   Drupal.AjaxCommands.prototype.viewsScrollTop = function (ajax, response) {
     // Scroll to the top of the view. This will allow users
-    // to browse newly loaded content after e.g. clicking a pager
+    // to browse newly loaded content; for instance, after clicking a pager
     // link.
     var offset = $(response.selector).offset();
     // We can't guarantee that the scrollable object should be
diff --git a/core/modules/views/js/base.js b/core/modules/views/js/base.js
index 7c7622d..10e70f8 100644
--- a/core/modules/views/js/base.js
+++ b/core/modules/views/js/base.js
@@ -71,7 +71,7 @@
    *   The href without the protocol and domain.
    */
   Drupal.Views.pathPortion = function (href) {
-    // Remove e.g. http://example.com if present.
+    // Remove; for example, http://example.com, if present.
     var protocol = window.location.protocol;
     if (href.substring(0, protocol.length) === protocol) {
       // 2 is the length of the '//' that normally follows the protocol.
diff --git a/core/modules/views/src/Entity/View.php b/core/modules/views/src/Entity/View.php
index e2a3436..44ea365 100644
--- a/core/modules/views/src/Entity/View.php
+++ b/core/modules/views/src/Entity/View.php
@@ -168,7 +168,7 @@ public function addDisplay($plugin_id = 'page', $title = NULL, $id = NULL) {
       $id = $this->generateDisplayId($plugin_id);
 
       // Generate a unique human-readable name by inspecting the counter at the
-      // end of the previous display ID, e.g., 'page_1'.
+      // end of the previous display ID; for example, 'page_1'.
       if ($id !== 'default') {
         preg_match("/[0-9]+/", $id, $count);
         $count = $count[0];
diff --git a/core/modules/views/src/Plugin/views/area/AreaPluginBase.php b/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
index ea22a76..c7cbd4b 100644
--- a/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
+++ b/core/modules/views/src/Plugin/views/area/AreaPluginBase.php
@@ -31,7 +31,7 @@
 abstract class AreaPluginBase extends HandlerBase {
 
   /**
-   * The type of this area handler, i.e. 'header', 'footer', or 'empty'.
+   * The type of this area handler; that is, 'header', 'footer', or 'empty'.
    *
    * @var string
    */
diff --git a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
index 2a9fe84..d836c8b 100644
--- a/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
+++ b/core/modules/views/src/Plugin/views/argument/ArgumentPluginBase.php
@@ -1129,7 +1129,7 @@ public function getPlugin($type = 'argument_default', $name = NULL) {
    * Return a description of how the argument would normally be sorted.
    *
    * Subclasses should override this to specify what the default sort order of
-   * their argument is (e.g. alphabetical, numeric, date).
+   * their argument is (for example, alphabetical, numeric, date).
    */
   public function getSortName() {
     return $this->t('Default sort', array(), array('context' => 'Sort order'));
diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index 2348408..ecb1d52 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -744,8 +744,8 @@ public function getRoutedDisplay() {
       return $this;
     }
 
-    // If the display does not have a route (e.g. a block display), get the
-    // route for the linked display.
+    // If the display does not have a route (for instance, a block display), get
+    // the route for the linked display.
     $display_id = $this->getLinkDisplay();
     if ($display_id && $this->view->displayHandlers->has($display_id) && is_object($this->view->displayHandlers->get($display_id))) {
       return $this->view->displayHandlers->get($display_id)->getRoutedDisplay();
@@ -2337,9 +2337,9 @@ public function buildRenderable(array $args = [], $cache = TRUE) {
 
     // When something passes $cache = FALSE, they're asking us not to create our
     // own render cache for it. However, we still need to include certain pieces
-    // of cacheability metadata (e.g.: cache contexts), so they can bubble up.
-    // Thus, we add the cacheability metadata first, then modify / remove the
-    // cache keys depending on the $cache argument.
+    // of cacheability metadata (for example, cache contexts), so they can
+    // bubble up. Thus, we add the cacheability metadata first, then
+    // modify/remove the cache keys depening on the $cache argument.
     $this->applyDisplayCachablityMetadata($this->view->element);
     if ($cache) {
       $this->view->element['#cache'] += ['keys' => []];
diff --git a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 33267b2..43c525a 100644
--- a/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/core/modules/views/src/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -164,8 +164,8 @@ public function query() {
     $exposed_data = isset($view->exposed_data) ? $view->exposed_data : array();
     $sort_by = isset($exposed_data['sort_by']) ? $exposed_data['sort_by'] : NULL;
     if (!empty($sort_by)) {
-      // Make sure the original order of sorts is preserved
-      // (e.g. a sticky sort is often first)
+      // Make sure the original order of sorts is preserved; for example, a
+      // sticky sort is often first.
       if (isset($view->sort[$sort_by])) {
         $view->query->orderby = array();
         foreach ($view->sort as $key => $sort) {
diff --git a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
index e16b37b..3d0e22a 100644
--- a/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
+++ b/core/modules/views/src/Plugin/views/query/QueryPluginBase.php
@@ -254,7 +254,8 @@ public function getDateFormat($field, $format, $string_date = FALSE) {
    * Includes the base table and all relationships, if eligible.
    *
    * Available keys for each table:
-   * - base: The actual base table (i.e. "user" for an author relationship).
+   * - base: The actual base table (for example, "user" for an author
+   *   relationship).
    * - relationship_id: The id of the relationship, or "none".
    * - alias: The alias used for the relationship.
    * - entity_type: The entity type matching the base table.
diff --git a/core/modules/views/src/Plugin/views/query/Sql.php b/core/modules/views/src/Plugin/views/query/Sql.php
index 5a3a370..771b9ab 100644
--- a/core/modules/views/src/Plugin/views/query/Sql.php
+++ b/core/modules/views/src/Plugin/views/query/Sql.php
@@ -1398,7 +1398,7 @@ function execute(ViewExecutable $view) {
       // Count queries must be run through the preExecute() method.
       // If not, then hook_query_node_access_alter() may munge the count by
       // adding a distinct against an empty query string
-      // (e.g. COUNT DISTINCT(1) ...) and no pager will return.
+      // (for example, COUNT DISTINCT(1) ...) and no pager will return.
       // See pager.inc > PagerDefault::execute()
       // http://api.drupal.org/api/drupal/includes--pager.inc/function/PagerDefault::execute/7
       // See https://www.drupal.org/node/1046170.
diff --git a/core/modules/views/src/Plugin/views/style/StylePluginBase.php b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
index 148e053..4ce580a 100644
--- a/core/modules/views/src/Plugin/views/style/StylePluginBase.php
+++ b/core/modules/views/src/Plugin/views/style/StylePluginBase.php
@@ -613,8 +613,8 @@ public function renderGrouping($records, $groupings = array(), $group_rendered =
             }
             else {
               $grouping = $this->getFieldValue($index, $field);
-              // Not all field handlers return a scalar value,
-              // e.g. views_handler_field_field.
+              // Not all field handlers return a scalar value; for example,
+              // views_handler_field_field.
               if (!is_scalar($grouping)) {
                 $grouping = hash('sha256', serialize($grouping));
               }
@@ -645,7 +645,7 @@ public function renderGrouping($records, $groupings = array(), $group_rendered =
 
     // If this parameter isn't explicitly set, modify the output to be fully
     // backward compatible to code before Views 7.x-3.0-rc2.
-    // @TODO Remove this as soon as possible e.g. October 2020
+    // @TODO Remove this as soon as possible; for example, October 2020
     if ($group_rendered === NULL) {
       $old_style_sets = array();
       foreach ($sets as $group) {
diff --git a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
index 8cc568c..7759ff7 100644
--- a/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
+++ b/core/modules/views/src/Plugin/views/wizard/WizardPluginBase.php
@@ -536,7 +536,7 @@ public static function getSelected(FormStateInterface $form_state, $parents, $de
    * @param \Drupal\Core\Form\FormStateInterface $form_state
    *   The current state of the wizard form.
    * @param string $type
-   *   The display ID (e.g. 'page' or 'block').
+   *   The display ID; for example, 'page' or 'block'.
    */
   protected function buildFormStyle(array &$form, FormStateInterface $form_state, $type) {
     $style_form = &$form['displays'][$type]['options']['style'];
diff --git a/core/modules/views/src/Tests/PluginInstanceTest.php b/core/modules/views/src/Tests/PluginInstanceTest.php
index 8647030..4ae3f5b 100644
--- a/core/modules/views/src/Tests/PluginInstanceTest.php
+++ b/core/modules/views/src/Tests/PluginInstanceTest.php
@@ -85,7 +85,7 @@ public function testPluginInstances() {
       $manager = $this->container->get("plugin.manager.views.$type");
       foreach ($plugins as $id => $definition) {
         // Get a reflection class for this plugin.
-        // We only want to test true plugins, i.e. They extend PluginBase.
+        // We only want to test true plugins; that is, they extend PluginBase.
         $reflection = new \ReflectionClass($definition['class']);
         if ($reflection->isSubclassOf('Drupal\views\Plugin\views\PluginBase')) {
           // Create a plugin instance and check what it is. This is not just
diff --git a/core/modules/views/src/ViewEntityInterface.php b/core/modules/views/src/ViewEntityInterface.php
index 68dbc14..92e3df1 100644
--- a/core/modules/views/src/ViewEntityInterface.php
+++ b/core/modules/views/src/ViewEntityInterface.php
@@ -26,7 +26,7 @@ public function getExecutable();
    * Retrieves a specific display's configuration by reference.
    *
    * @param string $display_id
-   *   The display ID to retrieve, e.g., 'default', 'page_1', 'block_2'.
+   *   The display ID to retrieve; for example, 'default', 'page_1', 'block_2'.
    *
    * @return array
    *   A reference to the specified display configuration.
@@ -62,8 +62,8 @@ public function duplicateDisplayAsType($old_display_id, $new_display_type);
    * @param string $title
    *   (optional) The title of the display. Defaults to NULL.
    * @param string $id
-   *   (optional) The ID to use, e.g., 'default', 'page_1', 'block_2'. Defaults
-   *   to NULL.
+   *   (optional) The ID to use; for example, 'default', 'page_1', 'block_2'.
+   *   Defaults to NULL.
    *
    * @return string|bool
    *   The key to the display in $view->display, or FALSE if no plugin ID was
diff --git a/core/modules/views/src/ViewExecutable.php b/core/modules/views/src/ViewExecutable.php
index 4ad44fe..5a72d3d 100644
--- a/core/modules/views/src/ViewExecutable.php
+++ b/core/modules/views/src/ViewExecutable.php
@@ -821,8 +821,8 @@ public function setDisplay($display_id = NULL) {
    * @param string $title
    *   (optional) The title of the display. Defaults to NULL.
    * @param string $id
-   *   (optional) The ID to use, e.g., 'default', 'page_1', 'block_2'. Defaults
-   *   to NULL.
+   *   (optional) The ID to use; for example, 'default', 'page_1', 'block_2'.
+   *   Defaults to NULL.
    *
    * @return \Drupal\views\Plugin\views\display\DisplayPluginBase
    *   A new display plugin instance if executable is set, the new display ID
@@ -1838,8 +1838,9 @@ public function buildTitle() {
   /**
    * Determines whether you can link to the view or a particular display.
    *
-   * Some displays (e.g. block displays) do not have their own route, but may
-   * optionally provide a link to another display that does have a route.
+   * Some displays (for instance, block displays) do not have their own route,
+   * but may optionally provide a link to another display that does have a
+   * route.
    *
    * @param array $args
    *   (optional) The arguments.
@@ -2180,7 +2181,7 @@ public function addHandler($display_id, $type, $table, $field, $options = array(
    * @return string
    *   A unique ID. This will be equal to $requested_id if no handler instance
    *   with that ID already exists. Otherwise, it will be appended with an
-   *   integer to make it unique, e.g., "{$requested_id}_1",
+   *   integer to make it unique; for example, "{$requested_id}_1",
    *   "{$requested_id}_2", etc.
    */
   public static function generateHandlerId($requested_id, $existing_items) {
diff --git a/core/modules/views/src/Views.php b/core/modules/views/src/Views.php
index 06b835e..d80143b 100644
--- a/core/modules/views/src/Views.php
+++ b/core/modules/views/src/Views.php
@@ -291,8 +291,9 @@ public static function getDisabledViews() {
    *  view or current display to exclude
    *  either a
    *  - views object (containing $exclude_view->storage->name and $exclude_view->current_display)
-   *  - views name as string:  e.g. my_view
-   *  - views name and display id (separated by ':'): e.g. my_view:default
+   *  - views name as string; for example, my_view
+   *  - views name and display id (separated by ':'); for example,
+   *    my_view:default
    * @param bool $optgroup
    *  If TRUE, returns an array with optgroups for each view (will be ignored for
    *  $views_only = TRUE). Can be used by select
diff --git a/core/modules/views/views.api.php b/core/modules/views/views.api.php
index 29e5382..fd414f3 100644
--- a/core/modules/views/views.api.php
+++ b/core/modules/views/views.api.php
@@ -931,7 +931,7 @@ function hook_views_preview_info_alter(array &$rows, ViewExecutable $view) {
  * @param \Drupal\views\ViewExecutable $view
  *   The view object being edited.
  * @param string $display_id
- *   The ID of the display being edited, e.g. 'default' or 'page_1'.
+ *   The ID of the display being edited; for example, 'default' or 'page_1'.
  *
  * @see \Drupal\views_ui\ViewUI::renderDisplayTop()
  */
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index 19c2b96..1b29c69 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -297,8 +297,8 @@ function views_theme_suggestions_container_alter(array &$suggestions, array $var
  * Adds contextual links associated with a view display to a renderable array.
  *
  * This function should be called when a view is being rendered in a particular
- * location and you want to attach the appropriate contextual links (e.g.,
- * links for editing the view) to it.
+ * location and you want to attach the appropriate contextual links (for
+ * instance, links for editing the view) to it.
  *
  * The function operates by checking the view's display plugin to see if it has
  * defined any contextual links that are intended to be displayed in the
@@ -376,7 +376,7 @@ function views_add_contextual_links(&$render_element, $location, $display_id, ar
     $plugin = Views::pluginManager('display')->getDefinition($display_plugin_id);
     // If contextual_links_locations are not set, provide a sane default. (To
     // avoid displaying any contextual links at all, a display plugin can still
-    // set 'contextual_links_locations' to, e.g., {""}.)
+    // set 'contextual_links_locations' to; for example, {""}.)
 
     if (!isset($plugin['contextual_links_locations'])) {
       $plugin['contextual_links_locations'] = array('view');
@@ -762,7 +762,7 @@ function views_embed_view($name, $display_id = 'default') {
  *   will be at the top of that list. Hover your cursor over the name of the
  *   display you want to use. A URL will appear in the status bar of your
  *   browser. This is usually at the bottom of the window, in the chrome.
- *   Everything after #views-tab- is the display ID, e.g. page_1.
+ *   Everything after #views-tab- is the display ID; for example, page_1.
  * @param ...
  *   Any additional parameters will be passed as arguments.
  * @return array
diff --git a/core/modules/views_ui/admin.inc b/core/modules/views_ui/admin.inc
index fd031d2..8896df4 100644
--- a/core/modules/views_ui/admin.inc
+++ b/core/modules/views_ui/admin.inc
@@ -306,8 +306,8 @@ function views_ui_build_form_url(FormStateInterface $form_state) {
  * extend button click detection to support multiple #values per button. If the
  * data in POST matches any value in the button's #values array, then the
  * button is detected as having been clicked. This can be used when the value
- * (label) of the same logical button may be different based on context (e.g.,
- * "Apply" vs. "Apply and continue").
+ * (label) of the same logical button may be different based on context (for
+ * instance, "Apply" vs. "Apply and continue").
  *
  * @see _form_builder_handle_input_element()
  * @see _form_button_was_clicked()
diff --git a/core/modules/views_ui/js/views-admin.js b/core/modules/views_ui/js/views-admin.js
index 3cc0f4c..93924be 100644
--- a/core/modules/views_ui/js/views-admin.js
+++ b/core/modules/views_ui/js/views-admin.js
@@ -668,13 +668,14 @@
 
     // Add methods to the tableDrag instance to account for operator cells
     // (which span multiple rows), the operator labels next to each filter
-    // (e.g., "And" or "Or"), the filter groups, and other special aspects of
-    // this tableDrag instance.
+    // (that is, "And" or "Or"), the filter groups, and other special
+    // aspects of this tableDrag instance.
     this.modifyTableDrag();
 
-    // Initialize the operator labels (e.g., "And" or "Or") that are displayed
-    // next to the filters in each group, and bind a handler so that they change
-    // based on the values of the operator dropdown within that group.
+    // Initialize the operator labels (that is, "And" or "Or") that are
+    // displayed next to the filters in each group, and bind a handler so that
+    // they change based on the values of the operator dropdown within that
+    // group.
     this.redrawOperatorLabels();
     $table.find('.views-group-title select')
       .once('views-rearrange-filter-handler')
@@ -854,7 +855,7 @@
       tableDrag.row.prototype.onSwap = function () {
         if (filterHandler.hasGroupOperator) {
           // Make sure the row that just got moved (this.group) is inside one
-          // of the filter groups (i.e. below an empty marker row or a
+          // of the filter groups (that is, below an empty marker row or a
           // draggable). If it isn't, move it down one.
           var thisRow = $(this.group);
           var previousRow = thisRow.prev('tr');
@@ -876,9 +877,9 @@
        * Override the onDrop method from tabledrag.js.
        */
       tableDrag.onDrop = function () {
-        // If the tabledrag change marker (i.e., the "*") has been inserted
-        // inside a row after the operator label (i.e., "And" or "Or")
-        // rearrange the items so the operator label continues to appear last.
+        // If the tabledrag change marker (the "*") has been inserted
+        // inside a row after the operator label ("And" or "Or") rearrange the
+        // items so the operator label continues to appear last.
         var changeMarker = $(this.oldRowElement).find('.tabledrag-changed');
         if (changeMarker.length) {
           // Search for occurrences of the operator label before the change
@@ -939,9 +940,9 @@
           }
           // If the next row doesn't contain a filter, then this is the last row
           // in the group. We don't want to display the operator there (since
-          // operators should only display between two related filters, e.g.
-          // "filter1 AND filter2 AND filter3"). So we remove any existing label
-          // that this row has.
+          // operators should only display between two related filters; for
+          // example, "filter1 AND filter2 AND filter3"). So we remove any
+          // existing label that this row has.
           else {
             $existingOperatorLabel.remove();
           }
diff --git a/core/modules/views_ui/src/Controller/ViewsUIController.php b/core/modules/views_ui/src/Controller/ViewsUIController.php
index 68bed4a..72e1a38 100644
--- a/core/modules/views_ui/src/Controller/ViewsUIController.php
+++ b/core/modules/views_ui/src/Controller/ViewsUIController.php
@@ -151,7 +151,7 @@ public function reportPlugins() {
    * @param \Drupal\views\ViewEntityInterface $view
    *   The view being acted upon.
    * @param string $op
-   *   The operation to perform, e.g., 'enable' or 'disable'.
+   *   The operation to perform; for example, 'enable' or 'disable'.
    * @param \Symfony\Component\HttpFoundation\Request $request
    *   The current request.
    *
diff --git a/core/modules/views_ui/src/Form/Ajax/ViewsFormInterface.php b/core/modules/views_ui/src/Form/Ajax/ViewsFormInterface.php
index a9a251f..915ee8f 100644
--- a/core/modules/views_ui/src/Form/Ajax/ViewsFormInterface.php
+++ b/core/modules/views_ui/src/Form/Ajax/ViewsFormInterface.php
@@ -16,7 +16,7 @@
    * Returns the key that represents this form.
    *
    * @return string
-   *   The form key used in the URL, e.g., the string 'add-handler' in
+   *   The form key used in the URL; for example, the string 'add-handler' in
    *   'admin/structure/views/%/add-handler/%/%/%'.
    */
   public function getFormKey();
diff --git a/core/modules/views_ui/src/Tests/DefaultViewsTest.php b/core/modules/views_ui/src/Tests/DefaultViewsTest.php
index 21be366..de757a8 100644
--- a/core/modules/views_ui/src/Tests/DefaultViewsTest.php
+++ b/core/modules/views_ui/src/Tests/DefaultViewsTest.php
@@ -71,8 +71,8 @@ function testDefaultViews() {
     $this->drupalPostForm('admin/structure/views/nojs/display/archive/page_1/title', array(), t('Apply'));
     $this->drupalPostForm('admin/structure/views/view/archive/edit/page_1', array(), t('Save'));
 
-    // Check there is an enable link. i.e. The view has not been enabled after
-    // editing.
+    // Check there is an enable link. That is, the view has not been enabled
+    // after editing.
     $this->drupalGet('admin/structure/views');
     $this->assertLinkByHref('admin/structure/views/view/archive/enable');
     // Enable it again so it can be tested for access permissions.
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index 284473c..ac8c377 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -526,8 +526,9 @@ public function getDisplayDetails($view, $display) {
     // Collapse the details by default.
     $build['columns']['third']['#open'] = \Drupal::config('views.settings')->get('ui.show.advanced_column');
 
-    // Each option (e.g. title, access, display as grid/table/list) fits into one
-    // of several "buckets," or boxes (Format, Fields, Sort, and so on).
+    // Each option (for example, title, access, display as grid/table/list) fits
+    // into one of several "buckets," or boxes (Format, Fields, Sort, and so
+    // on).
     $buckets = array();
 
     // Fetch options from the display plugin, with a list of buckets they go into.
@@ -770,9 +771,9 @@ public function renderDisplayTop(ViewUI $view) {
    * The Edit View form is a multistep form workflow, but with state managed by
    * the SharedTempStore rather than $form_state->setRebuild(). Without this
    * submit handler, buttons that add or remove displays would redirect to the
-   * destination parameter (e.g., when the Edit View form is linked to from a
-   * contextual link). This handler can be added to buttons whose form submission
-   * should not yet redirect to the destination.
+   * destination parameter (for example, when the Edit View form is linked to
+   * from a contextual link). This handler can be added to buttons whose form
+   * submission should not yet redirect to the destination.
    */
   public function submitDelayDestination($form, FormStateInterface $form_state) {
     $request = $this->requestStack->getCurrentRequest();
diff --git a/core/modules/views_ui/templates/views-ui-display-tab-bucket.html.twig b/core/modules/views_ui/templates/views-ui-display-tab-bucket.html.twig
index 88ab1bd..1c2f3d1 100644
--- a/core/modules/views_ui/templates/views-ui-display-tab-bucket.html.twig
+++ b/core/modules/views_ui/templates/views-ui-display-tab-bucket.html.twig
@@ -6,9 +6,11 @@
  * Available variables:
  * - attributes: HTML attributes to apply to the container element.
  * - actions: Action links such as "Add", "And/Or, Rearrange" for the content.
- * - title: The title of the bucket, e.g. "Fields", "Filter Criteria", etc.
+ * - title: The title of the bucket; for example, "Fields", "Filter Criteria",
+ *   etc.
  * - content: Content items such as fields or settings in this container.
- * - name: The name of the bucket, e.g. "Fields", "Filter Criteria", etc.
+ * - name: The name of the bucket; for example, "Fields", "Filter Criteria",
+ *   etc.
  * - overridden: A boolean indicating the setting has been overridden from the
  *   default.
  *
diff --git a/core/modules/views_ui/views_ui.module b/core/modules/views_ui/views_ui.module
index 60fdc51..6b38340 100644
--- a/core/modules/views_ui/views_ui.module
+++ b/core/modules/views_ui/views_ui.module
@@ -215,8 +215,8 @@ function views_ui_view_preview_section_rows_links(ViewExecutable $view) {
  */
 function views_ui_views_plugins_display_alter(&$plugins) {
   // Attach contextual links to each display plugin. The links will point to
-  // paths underneath "admin/structure/views/view/{$view->id()}" (i.e., paths
-  // for editing and performing other contextual actions on the view).
+  // paths underneath "admin/structure/views/view/{$view->id()}" (paths for
+  // editing and performing other contextual actions on the view).
   foreach ($plugins as &$display) {
     $display['contextual links']['entity.view.edit_form'] = array(
       'route_name' => 'entity.view.edit_form',
diff --git a/core/modules/views_ui/views_ui.theme.inc b/core/modules/views_ui/views_ui.theme.inc
index f9b165a..b38e3df 100644
--- a/core/modules/views_ui/views_ui.theme.inc
+++ b/core/modules/views_ui/views_ui.theme.inc
@@ -459,7 +459,7 @@ function template_preprocess_views_ui_style_plugin_table(&$variables) {
  * @param array $variables
  *   An associative array containing:
  *   - view: The view object.
- *   - section: The section name of a View (e.g. title, rows or pager).
+ *   - section: The section name of a View; for example, title, rows or pager.
  */
 function template_preprocess_views_ui_view_preview_section(&$variables) {
   switch ($variables['section']) {