Merge "Prepare for REL1_33 cut, labelling master as 1.34-alpha"

diff --combined RELEASE-NOTES-1.33
index 39d502a,0babbfb..09fd35e
--- 1/RELEASE-NOTES-1.33
--- 2/RELEASE-NOTES-1.33
+++ b/RELEASE-NOTES-1.33
@@@ -4,8 -4,8 +4,8 @@@
  
  THIS IS NOT A RELEASE YET
  
- MediaWiki 1.33 is an alpha-quality branch and is not recommended for use in
- production.
+ MediaWiki 1.33 is a pre-release testing branch, and is not recommended for use
+ in production.
  
  == Upgrading notes for 1.33 ==
  1.33 has several database changes since 1.32, and will not work without schema
@@@ -37,7 -37,6 +37,7 @@@ Some specific notes for MediaWiki 1.33 
  For notes on 1.32.x and older releases, see HISTORY.
  
  === Configuration changes for system administrators in 1.33 ===
 +
  ==== New configuration ====
  * $wgEnablePartialBlocks – This enables the Partial Blocks feature, which gives
    accounts with block permissions the ability to block users, IPs, and IP ranges
@@@ -58,10 -57,6 +58,10 @@@
    argon2 to be used, by default, it will automatically choose the best available
    algorithm depending on which version of PHP you have available. To use this,
    you can set `$wgPasswordDefault = 'argon2';`.
 +* $wgActorTableSchemaMigrationStage now defaults to reading the new schema.
 +  update.php will back-populate the new database fields due to the changed
 +  setting, which may take some time on large wikis. You can avoid downtime by
 +  following a process like that described in T188327.
  
  ==== Removed configuration ====
  * $wgTagStatisticsNewTable (T199334) — This temporary setting, added in
@@@ -119,7 -114,6 +119,7 @@@
    associated with this entry in the patrol log.
  
  === External library changes in 1.33 ===
 +
  ==== New external libraries ====
  * Added wikimedia/password-blacklist 0.1.4.
  * Added guzzlehttp/guzzle 6.3.3.
@@@ -359,15 -353,6 +359,15 @@@ because of Phabricator reports
  * MessageBlobStore::getBlob(), deprecated in 1.27, has been removed.
    Use ::getBlobs() instead.
  * The .background-size() LESS mixin, deprecated in 1.27, has been removed.
 +* MWNamespace::clearCaches() has been removed.  So has the $rebuild parameter
 +  to MWNamespace::getCanonicalNamespaces(), which was deprecated since 1.31.
 +  Instead, create a new NamespaceInfo, such as by calling
 +  resetServiceForTesting( 'NamespaceInfo' ) on a MediaWikiServices.
 +  For classes that inherit from MediaWikiTestCase and used setMwGlobals() to
 +  modify a variable that affects namespaces, caches will automatically be
 +  reset and any calls to MWNamespace::clearCaches() can be removed entirely.
 +* ReadOnlyMode::clearCache() and ConfiguredReadOnlyMode::clearCache() have been
 +  removed. Use MediaWikiTestCase::overrideMwServices() instead.
  
  === Deprecations in 1.33 ===
  * The configuration option $wgUseESI has been deprecated, and is expected
@@@ -436,7 -421,6 +436,7 @@@
  * Block::isValid is deprecated, since it is no longer needed in core.
  * Calling Maintenance::hasArg() as well as Maintenance::getArg() with no
    parameter has been deprecated. Please pass the argument number 0.
 +* The MWNamespace class is deprecated.  Use MediaWikiServices::getNamespaceInfo.
  
  === Other changes in 1.33 ===
  * (T201747) Html::openElement() warns if given an element name with a space

diff --combined includes/DefaultSettings.php
index 44e0310,15b7707..4dece5b
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -72,7 -72,7 +72,7 @@@ $wgConfigRegistry = 
   * MediaWiki version number
   * @since 1.2
   */
- $wgVersion = '1.33.0-alpha';
+ $wgVersion = '1.34.0-alpha';
  
  /**
   * Name of the site. It must be changed in LocalSettings.php
@@@ -3992,12 -3992,13 +3992,12 @@@ $wgRedirectSources = false
  $wgCapitalLinks = true;
  
  /**
 - * @since 1.16 - This can now be set per-namespace. Some special namespaces (such
 - * as Special, see MWNamespace::$alwaysCapitalizedNamespaces for the full list) must be
 - * true by default (and setting them has no effect), due to various things that
 - * require them to be so. Also, since Talk namespaces need to directly mirror their
 - * associated content namespaces, the values for those are ignored in favor of the
 - * subject namespace's setting. Setting for NS_MEDIA is taken automatically from
 - * NS_FILE.
 + * @since 1.16 - This can now be set per-namespace. Some special namespaces (such as Special, see
 + * NamespaceInfo::$alwaysCapitalizedNamespaces for the full list) must be true by default (and
 + * setting them has no effect), due to various things that require them to be so. Also, since Talk
 + * namespaces need to directly mirror their associated content namespaces, the values for those are
 + * ignored in favor of the subject namespace's setting. Setting for NS_MEDIA is taken automatically
 + * from NS_FILE.
   *
   * @par Example:
   * @code
@@@ -8971,7 -8972,7 +8971,7 @@@ $wgXmlDumpSchemaVersion = XML_DUMP_SCHE
   * @since 1.32 changed allowed flags
   * @var int An appropriate combination of SCHEMA_COMPAT_XXX flags.
   */
 -$wgActorTableSchemaMigrationStage = SCHEMA_COMPAT_OLD;
 +$wgActorTableSchemaMigrationStage = SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW;
  
  /**
   * Flag to enable Partial Blocks. This allows an admin to prevent a user from editing specific pages