Merge "Add prefered magic words first"

diff --combined RELEASE-NOTES-1.27
index 12fb06e,1856c75..bbf03f2
--- 1/RELEASE-NOTES-1.27
--- 2/RELEASE-NOTES-1.27
+++ b/RELEASE-NOTES-1.27
@@@ -109,6 -109,11 +109,6 @@@ HHVM 3.1
    module should express a dependency on it.
  * Removed configuration option $wgCopyrightIcon (deprecated since 1.18). Use
    $wgFooterIcons['copyright']['copyright'] instead.
 -* ApiMain::getShowVersions() was removed (deprecated in 1.21).
 -* ApiMain::addModule() was removed (deprecated in 1.21).
 -* ApiMain::addFormat() was removed (deprecated in 1.21).
 -* ApiMain::getFormats() was removed (deprecated in 1.21).
 -* ApiPageSet::finishPageSetGeneration() was removed (deprecated in 1.21).
  
  === New features in 1.27 ===
  * $wgDataCenterUpdateStickTTL was also added. This decides how long a user
@@@ -251,11 -256,18 +251,11 @@@
  * ApiQuery::setGeneratorContinue() was removed (deprecated since 1.24).
  * ApiMain::getModules() was removed (deprecated since 1.21).
  * ApiBase::getVersion() was removed (deprecated since 1.21).
 -* Language::getLangObj() was removed (deprecated since 1.24).
 -* Language::getLanguageName() was removed (deprecated since 1.20).
 -* Language::getLanguageNames() was removed (deprecated since 1.20).
 -* Language::getTranslatedLanguageNames() was removed (deprecated since 1.20).
 -* Language::specialPage() was removed (deprecated since 1.24).
 -* MediaWikiTestCase::assertException() was removed (deprecated since 1.22).
 -* OutputPage::getHeadItems() was removed (deprecated since 1.24).
 -* OutputPage::getScript() was removed (deprecated since 1.24).
 -* OutputPage::out() was removed (deprecated since 1.22).
 -* OutputPage::setAllowedModules() was removed (deprecated since 1.24).
 -* UserrightsPage::makeGroupNameListForLog() was removed (deprecated since 1.21).
 -* MediaWikiSite::newFromGlobalId() was removed (deprecated since 1.21).
 +* ApiMain::getShowVersions() was removed (deprecated in 1.21).
 +* ApiMain::addModule() was removed (deprecated in 1.21).
 +* ApiMain::addFormat() was removed (deprecated in 1.21).
 +* ApiMain::getFormats() was removed (deprecated in 1.21).
 +* ApiPageSet::finishPageSetGeneration() was removed (deprecated in 1.21).
  
  === Languages updated in 1.27 ===
  
@@@ -264,6 -276,7 +264,7 @@@ regularly. Below only new and removed l
  changes to languages because of Phabricator reports.
  
  * (T113688) Change default numerals from Gurmukhi to Arabic for Punjabi locale.
+ * (T116020) Aliases of magic words in MessagesXx.php are sorted by usage.
  
  === Other changes in 1.27 ===
  * ProfilerOutputUdp was removed. Note that there is a ProfilerOutputStats class.
@@@ -376,26 -389,6 +377,26 @@@
    way. Run `composer install` to install it and other dev dependencies to run unit tests.
  * wl_id field added to the watchlist table.
  * Revision::getRawText() was removed (deprecated since 1.21).
 +* WikiPage::replaceSection() was removed (deprecated since 1.21).
 +* Article::replaceSection() was removed (deprecated since 1.21).
 +* Language::getLangObj() was removed (deprecated since 1.24).
 +* Language::getLanguageName() was removed (deprecated since 1.20).
 +* Language::getLanguageNames() was removed (deprecated since 1.20).
 +* Language::getTranslatedLanguageNames() was removed (deprecated since 1.20).
 +* Language::specialPage() was removed (deprecated since 1.24).
 +* MediaWikiTestCase::assertException() was removed (deprecated since 1.22).
 +* OutputPage::getHeadItems() was removed (deprecated since 1.24).
 +* OutputPage::getScript() was removed (deprecated since 1.24).
 +* OutputPage::out() was removed (deprecated since 1.22).
 +* OutputPage::setAllowedModules() was removed (deprecated since 1.24).
 +* UserrightsPage::makeGroupNameListForLog() was removed (deprecated since 1.21).
 +* MediaWikiSite::newFromGlobalId() was removed (deprecated since 1.21).
 +* Title::newFromRedirect() was removed (deprecated since 1.21).
 +* Skin::commonPrintStylesheet() was removed (deprecated since 1.22).
 +* Skin::getCommonStylePath() was removed (deprecated since 1.24).
 +* Skin::newFromKey() was removed (deprecated since 1.24).
 +* Skin::getUsableSkins() was removed (deprecated since 1.23).
 +* LoadBalancer::pickRandom() was removed (deprecated in 1.21).
  
  == Compatibility ==