diff --git a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
index a0ff4ac..b376e00 100644
--- a/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
+++ b/core/modules/views/src/Plugin/views/display/DisplayPluginBase.php
@@ -182,7 +182,7 @@ public function initDisplay(ViewExecutable $view, array &$display, array &$optio
     // Track changes that the user should know about.
     $changed = FALSE;
 
-    // Make some modifications:
+    // Make some modifications.
     if (!isset($options) && isset($display['display_options'])) {
       $options = $display['display_options'];
     }
@@ -251,13 +251,13 @@ public function destroy() {
   }
 
   /**
-   * Determine if this display is the 'default' display which contains
-   * fallback settings
+   * Determines if this display is the 'default' display which contains
+   * fallback settings.
    */
   public function isDefaultDisplay() { return FALSE; }
 
   /**
-   * Determine if this display uses exposed filters, so the view
+   * Determines if this display uses exposed filters, so the view
    * will know whether or not to build them.
    */
   public function usesExposed() {
@@ -265,7 +265,7 @@ public function usesExposed() {
       foreach ($this->handlers as $type => $value) {
         foreach ($this->view->$type as $handler) {
           if ($handler->canExpose() && $handler->isExposed()) {
-            // one is all we need; if we find it, return true.
+            // One is all we need; if we find it, return TRUE.
             $this->has_exposed = TRUE;
             return TRUE;
           }
@@ -283,7 +283,7 @@ public function usesExposed() {
   }
 
   /**
-   * Determine if this display should display the exposed
+   * Determines if this display should display the exposed
    * filters widgets, so the view will know whether or not
    * to render them.
    *
@@ -442,7 +442,7 @@ public function usesAreas() {
   }
 
   /**
-   * Allow displays to attach to other views.
+   * Allows displays to attach to other views.
    *
    * @param \Drupal\views\ViewExecutable $view
    *   The views executable.
@@ -481,7 +481,7 @@ public function defaultableSections($section = NULL) {
 
       'exposed_form' => array('exposed_form'),
 
-      // These guys are special
+      // These guys are special.
       'header' => array('header'),
       'footer' => array('footer'),
       'empty' => array('empty'),
@@ -724,7 +724,7 @@ protected function defineOptions() {
   }
 
   /**
-   * Check to see if the display has a 'path' field.
+   * Checks to see if the display has a 'path' field.
    *
    * This is a pure function and not just a setting on the definition
    * because some displays (such as a panel pane) may have a path based
@@ -735,16 +735,16 @@ protected function defineOptions() {
   public function hasPath() { return FALSE; }
 
   /**
-   * Check to see if the display has some need to link to another display.
+   * Checks to see if the display has some need to link to another display.
    *
-   * For the most part, displays without a path will use a link display. However,
-   * sometimes displays that have a path might also need to link to another display.
-   * This is true for feeds.
+   * For the most part, displays without a path will use a link display.
+   * However, sometimes displays that have a path might also need to link to
+   * another display. This is true for feeds.
    */
   public function usesLinkDisplay() { return !$this->hasPath(); }
 
   /**
-   * Check to see if the display can put the exposed formin a block.
+   * Checks to see if the display can put the exposed form in a block.
    *
    * By default, displays that do not have a path cannot disconnect
    * the exposed form and put it in a block, because the form has no
@@ -777,7 +777,7 @@ public function getAttachedDisplays() {
   }
 
   /**
-   * Check to see which display to use when creating links within
+   * Checks to see which display to use when creating links within
    * a view using this display.
    */
   public function getLinkDisplay() {
@@ -793,11 +793,11 @@ public function getLinkDisplay() {
     else {
       return $display_id;
     }
-    // fall-through returns NULL
+    // Fall-through returns NULL.
   }
 
   /**
-   * Return the base path to use for this display.
+   * Returns the base path to use for this display.
    *
    * This can be overridden for displays that do strange things
    * with the path.
@@ -818,11 +818,11 @@ public function getUrl() {
   }
 
   /**
-   * Determine if a given option is set to use the default display or the
-   * current display
+   * Determines if a given option is set to use the default display or the
+   * current display.
    *
    * @return
-   *   TRUE for the default display
+   *   TRUE for the default display.
    */
   public function isDefaulted($option) {
     return !$this->isDefaultDisplay() && !empty($this->default_display) && !empty($this->options['defaults'][$option]);
@@ -843,7 +843,7 @@ public function getOption($option) {
   }
 
   /**
-   * Determine if the display's style uses fields.
+   * Determines if the display's style uses fields.
    *
    * @return bool
    */
@@ -1079,7 +1079,7 @@ public function getArgumentsTokens() {
   }
 
   /**
-   * Provide the default summary for options in the views UI.
+   * Provides the default summary for options in the views UI.
    *
    * This output is returned as an array.
    */
@@ -1169,7 +1169,8 @@ public function optionsSummary(&$categories, &$options) {
       'desc' => $this->t('Change the way content is formatted.'),
     );
 
-    // This adds a 'Settings' link to the style_options setting if the style has options.
+    // This adds a 'Settings' link to the style_options setting if the style has
+    // options.
     if ($style_plugin_instance->usesOptions()) {
       $options['style']['links']['style_options'] = $this->t('Change settings for this format');
     }
@@ -1186,7 +1187,8 @@ public function optionsSummary(&$categories, &$options) {
         'setting' => $row_summary,
         'desc' => $this->t('Change the way each row in the view is styled.'),
       );
-      // This adds a 'Settings' link to the row_options setting if the row style has options.
+      // This adds a 'Settings' link to the row_options setting if the row style
+      // has options.
       if ($row_plugin_instance->usesOptions()) {
         $options['row']['links']['row_options'] = $this->t('Change settings for this style');
       }
@@ -1218,7 +1220,7 @@ public function optionsSummary(&$categories, &$options) {
 
     $pager_plugin = $this->getPlugin('pager');
     if (!$pager_plugin) {
-      // default to the no pager plugin.
+      // Default to the no pager plugin.
       $pager_plugin = Views::pluginManager('pager')->createInstance('none');
     }
 
@@ -1232,7 +1234,7 @@ public function optionsSummary(&$categories, &$options) {
       'desc' => $this->t("Change this display's pager setting."),
     );
 
-    // If pagers aren't allowed, change the text of the item:
+    // If pagers aren't allowed, change the text of the item.
     if (!$this->usesPager()) {
       $options['pager']['title'] = $this->t('Items to display');
     }
@@ -1278,7 +1280,7 @@ public function optionsSummary(&$categories, &$options) {
 
     $access_plugin = $this->getPlugin('access');
     if (!$access_plugin) {
-      // default to the no access control plugin.
+      // Default to the no access control plugin.
       $access_plugin = Views::pluginManager('access')->createInstance('none');
     }
 
@@ -1298,7 +1300,7 @@ public function optionsSummary(&$categories, &$options) {
 
     $cache_plugin = $this->getPlugin('cache');
     if (!$cache_plugin) {
-      // default to the no cache control plugin.
+      // Default to the no cache control plugin.
       $cache_plugin = Views::pluginManager('cache')->createInstance('none');
     }
 
@@ -1354,7 +1356,7 @@ public function optionsSummary(&$categories, &$options) {
 
     $exposed_form_plugin = $this->getPlugin('exposed_form');
     if (!$exposed_form_plugin) {
-      // default to the no cache control plugin.
+      // Default to the no cache control plugin.
       $exposed_form_plugin = Views::pluginManager('exposed_form')->createInstance('basic');
     }
 
@@ -1390,7 +1392,7 @@ public function optionsSummary(&$categories, &$options) {
   }
 
   /**
-   * Provide the default form for setting options.
+   * Provides the default form for setting options.
    */
   public function buildOptionsForm(&$form, FormStateInterface $form_state) {
     parent::buildOptionsForm($form, $form_state);
@@ -1692,7 +1694,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
           $row_plugin = $this->getOption('row');
           $name = $row_plugin['type'];
         }
-        // if row, $style will be empty.
+        // If row, $style will be empty.
         if (empty($style)) {
           $form['#title'] .= $this->t('Row style options');
         }
@@ -1878,7 +1880,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
-   * Validate the options form.
+   * Validates the options form.
    */
   public function validateOptionsForm(&$form, FormStateInterface $form_state) {
     $section = $form_state->get('section');
@@ -1930,7 +1932,7 @@ public function validateOptionsForm(&$form, FormStateInterface $form_state) {
   }
 
   /**
-   * Perform any necessary changes to the form values prior to storage.
+   * Performs any necessary changes to the form values prior to storage.
    * There is no need for this function to actually store the data.
    */
   public function submitOptionsForm(&$form, FormStateInterface $form_state) {
@@ -2052,9 +2054,8 @@ public function optionsOverride($form, FormStateInterface $form_state) {
    * @param string $section
    *   Which option should be marked as overridden, for example "filters".
    * @param bool $new_state
-   *   Select the new state of the option.
-   *     - TRUE: Revert to default.
-   *     - FALSE: Mark it as overridden.
+   *   (optional) TRUE to revert new state option to default, FALSE to mark it
+   *   as overridden. Defaults to NULL.
    */
   public function setOverride($section, $new_state = NULL) {
     $options = $this->defaultableSections($section);
@@ -2074,7 +2075,7 @@ public function setOverride($section, $new_state = NULL) {
         unset($this->display['display_options'][$option]);
       }
       else {
-        // copy existing values into our display.
+        // Copy existing values into our display.
         $this->options[$option] = $this->getOption($option);
         $this->display['display_options'][$option] = $this->options[$option];
       }
@@ -2084,7 +2085,7 @@ public function setOverride($section, $new_state = NULL) {
   }
 
   /**
-   * Inject anything into the query that the display handler needs.
+   * Injects anything into the query that the display handler needs.
    */
   public function query() {
     foreach ($this->extenders as $extender) {
@@ -2093,21 +2094,23 @@ public function query() {
   }
 
   /**
-   * Not all display plugins will support filtering
+   * Not all display plugins will support filtering.
    *
-   * @todo this doesn't seems to be used
+   * @todo This function no longer seems to be use.
    */
   public function renderFilters() { }
 
   /**
-   * Not all display plugins will suppert pager rendering.
+   * Returns a rendered pager for the display.
+   *
+   * @return bool
    */
   public function renderPager() {
     return TRUE;
   }
 
   /**
-   * Render the 'more' link
+   * Renders the 'more' link.
    */
   public function renderMoreLink() {
     if ($this->isMoreEnabled() && ($this->useMoreAlways() || (!empty($this->view->pager) && $this->view->pager->hasMoreRecords()))) {
@@ -2152,7 +2155,7 @@ public function getMenuLinks() {
   }
 
   /**
-   * Render this display.
+   * Renders this display.
    */
   public function render() {
     $rows = (!empty($this->view->result) || $this->view->style_plugin->evenEmpty()) ? $this->view->style_plugin->render($this->view->result) : array();
@@ -2240,7 +2243,7 @@ public function elementPreRender(array $element) {
   }
 
   /**
-   * Render one of the available areas.
+   * Renders one of the available areas.
    *
    * @param string $area
    *   Identifier of the specific area to render.
@@ -2261,7 +2264,7 @@ public function renderArea($area, $empty = FALSE) {
 
 
   /**
-   * Determine if the user has access to this display of the view.
+   * Determines if the user has access to this display of the view.
    */
   public function access(AccountInterface $account = NULL) {
     if (!isset($account)) {
@@ -2274,7 +2277,7 @@ public function access(AccountInterface $account = NULL) {
       return $plugin->access($account);
     }
 
-    // fallback to all access if no plugin.
+    // Fallback to all access if no plugin.
     return TRUE;
   }
 
@@ -2400,8 +2403,9 @@ protected function getType() {
   /**
    * Make sure the display and all associated handlers are valid.
    *
-   * @return
-   *   Empty array if the display is valid; an array of error strings if it is not.
+   * @return array
+   *   Empty array if the display is valid; an array of error strings if it is
+   *   not.
    */
   public function validate() {
     $errors = array();
@@ -2423,7 +2427,7 @@ public function validate() {
       $errors[] = $this->t('Display "@display" uses a path but the path is undefined.', array('@display' => $this->display['display_title']));
     }
 
-    // Validate style plugin
+    // Validate style plugin.
     $style = $this->getPlugin('style');
     if (empty($style)) {
       $errors[] = $this->t('Display "@display" has an invalid style plugin.', array('@display' => $this->display['display_title']));
@@ -2441,8 +2445,7 @@ public function validate() {
     if (!empty($result) && is_array($result)) {
       $errors = array_merge($errors, $result);
     }
-
-    // Validate handlers
+    // Validate handlers.
     foreach (ViewExecutable::getHandlerTypes() as $type => $info) {
       foreach ($this->getHandlers($type) as $handler) {
         $result = $handler->validate();
@@ -2476,7 +2479,7 @@ public function remove() {
   }
 
   /**
-   * Check if the provided identifier is unique.
+   * Checks if the provided identifier is unique.
    *
    * @param string $id
    *   The id of the handler which is checked.
@@ -2536,7 +2539,7 @@ public function outputIsEmpty() {
   }
 
   /**
-   * Provide the block system with any exposed widget blocks for this display.
+   * Provides the block system with any exposed widget blocks for this display.
    */
   public function getSpecialBlocks() {
     $blocks = array();
@@ -2554,7 +2557,7 @@ public function getSpecialBlocks() {
   }
 
   /**
-   * Render the exposed form as block.
+   * Renders the exposed form as block.
    *
    * @return string|null
    *  The rendered exposed form as string or NULL otherwise.
@@ -2574,15 +2577,18 @@ public function viewExposedFormBlocks() {
   }
 
   /**
-   * Provide some helpful text for the arguments.
-   * The result should contain of an array with
+   * Provides help text for the arguments.
+   *
+   * @return array
+   *   Returns an array which contains text for the argument fieldset:
    *   - filter value present: The title of the fieldset in the argument
    *     where you can configure what should be done with a given argument.
-   *   - filter value not present: The tiel of the fieldset in the argument
+   *   - filter value not present: The title of the fieldset in the argument
    *     where you can configure what should be done if the argument does not
    *     exist.
-   *   - description: A description about how arguments comes to the display.
-   *     For example blocks don't get it from url.
+   *   - description: A description about how arguments are passed
+   *     to the display.
+   *     For example blocks can't get arguments from url.
    */
   public function getArgumentText() {
     return array(
@@ -2593,10 +2599,15 @@ public function getArgumentText() {
   }
 
   /**
-   * Provide some helpful text for pagers.
+   * Provides help text for pagers.
    *
-   * The result should contain of an array within
-   *   - items per page title
+   * @return array
+   *   Returns an array which contains text for the items_per_page form
+   *   element:
+   *   - items per page title: The title text for the items_per_page form
+   *     element.
+   *   - items per page description: The description text for the
+   *     items_per_page form element.
    */
   public function getPagerText() {
     return array(