Merge "Missing space between variable name and docstring"

diff --combined includes/parser/ParserOutput.php
index f80e6bf,605e7e2..9a1653d
--- 1/includes/parser/ParserOutput.php
--- 2/includes/parser/ParserOutput.php
+++ b/includes/parser/ParserOutput.php
@@@ -42,7 -42,7 +42,7 @@@ class ParserOutput extends CacheTime 
        public $mLanguageLinks;
  
        /**
-        * @var array $mCategoriesMap of category names to sort keys
+        * @var array $mCategories Map of category names to sort keys
         */
        public $mCategories;
  
@@@ -471,6 -471,14 +471,6 @@@
                return $this->mSections;
        }
  
 -      /**
 -       * @deprecated since 1.31 Use getText() options.
 -       */
 -      public function getEditSectionTokens() {
 -              wfDeprecated( __METHOD__, '1.31' );
 -              return true;
 -      }
 -
        public function &getLinks() {
                return $this->mLinks;
        }
@@@ -558,6 -566,14 +558,6 @@@
                return $this->mLimitReportJSData;
        }
  
 -      /**
 -       * @deprecated since 1.31 Use getText() options.
 -       */
 -      public function getTOCEnabled() {
 -              wfDeprecated( __METHOD__, '1.31' );
 -              return true;
 -      }
 -
        public function getEnableOOUI() {
                return $this->mEnableOOUI;
        }
@@@ -582,6 -598,14 +582,6 @@@
                return wfSetVar( $this->mSections, $toc );
        }
  
 -      /**
 -       * @deprecated since 1.31 Use getText() options.
 -       */
 -      public function setEditSectionTokens( $t ) {
 -              wfDeprecated( __METHOD__, '1.31' );
 -              return true;
 -      }
 -
        public function setIndexPolicy( $policy ) {
                return wfSetVar( $this->mIndexPolicy, $policy );
        }
@@@ -594,6 -618,14 +594,6 @@@
                return wfSetVar( $this->mTimestamp, $timestamp );
        }
  
 -      /**
 -       * @deprecated since 1.31 Use getText() options.
 -       */
 -      public function setTOCEnabled( $flag ) {
 -              wfDeprecated( __METHOD__, '1.31' );
 -              return true;
 -      }
 -
        public function addCategory( $c, $sort ) {
                $this->mCategories[$c] = $sort;
        }