Merge "Follow up to 'Remove support for the deprecated Key header'"

diff --combined includes/OutputPage.php
index b8cbff1,4977a26..4ccb0d4
--- 1/includes/OutputPage.php
--- 2/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@@ -2278,7 -2278,7 +2278,7 @@@ class OutputPage extends ContextSource 
        }
  
        /**
-        * T23672: Add Accept-Language to Vary and Key headers if there's no 'variant' parameter in GET.
+        * T23672: Add Accept-Language to Vary header if there's no 'variant' parameter in GET.
         *
         * For example:
         *   /w/index.php?title=Main_page will vary based on Accept-Language; but
@@@ -3992,6 -3992,13 +3992,6 @@@
                        if ( is_array( $spec ) ) {
                                $args = $spec;
                                $name = array_shift( $args );
 -                              if ( isset( $args['options'] ) ) {
 -                                      unset( $args['options'] );
 -                                      wfDeprecated(
 -                                              'Adding "options" to ' . __METHOD__ . ' is no longer supported',
 -                                              '1.20'
 -                                      );
 -                              }
                        } else {
                                $args = [];
                                $name = $spec;
@@@ -4010,6 -4017,16 +4010,6 @@@
                return $this->mEnableTOC;
        }
  
 -      /**
 -       * Enables/disables section edit links, doesn't override __NOEDITSECTION__
 -       * @param bool $flag
 -       * @since 1.23
 -       * @deprecated since 1.31, use $poOptions to addParserOutput() instead.
 -       */
 -      public function enableSectionEditLinks( $flag = true ) {
 -              wfDeprecated( __METHOD__, '1.31' );
 -      }
 -
        /**
         * Helper function to setup the PHP implementation of OOUI to use in this request.
         *