Merge "Drop strings for wgExternalDiffEngine, deprecated in 1.27 and 1.32" into REL1_34

diff --combined RELEASE-NOTES-1.34
index 3d85b38,d793008..6dc0d66
--- 1/RELEASE-NOTES-1.34
--- 2/RELEASE-NOTES-1.34
+++ b/RELEASE-NOTES-1.34
@@@ -63,6 -63,9 +63,9 @@@ $wgPasswordPolicy['policies']['default'
  * Introduced $wgVerifyMimeTypeIE to allow disabling the MSIE 6/7 file type
    detection heuristic on upload, which is more conservative than the checks
    that were changed above.
+ * $wgExternalDiffEngine — Setting this to a string value of 'wikidiff',
+   'wikidiff2', or 'wikidiff3' will no longer work. This legacy behaviour was
+   deprecated in MediaWiki 1.27, 1.32, and 1.27, respectively.
  * $wgSkipSkin — Setting this instead of $wgSkipSkins, deprecated in 1.23, is now
    hard-deprecated.
  * $wgLocalInterwiki — Setting this instead of $wgLocalInterwikis, deprecated in
@@@ -598,7 -601,6 +601,7 @@@ because of Phabricator reports
    $wgGroupPermissions['sysop']['blockemail'] = true;
  * ApiQueryBase::showHiddenUsersAddBlockInfo() is deprecated. Use
    ApiQueryBlockInfoTrait instead.
 +* PasswordReset is now a service, its direct instantiation is deprecated.
  
  === Other changes in 1.34 ===
  * Added option to specify "Various authors" as author in extension credits using
@@@ -608,7 -610,9 +611,7 @@@
  * …
  
  == Compatibility ==
 -MediaWiki 1.34 requires PHP 7.2.0 or later. Although HHVM 3.18.5 or later is
 -supported, it is generally advised to use PHP 7.2.0 or later for long term
 -support. It also requires the following PHP extensions:
 +MediaWiki 1.34 requires PHP 7.2.0 or later, and the following PHP extensions:
  
  * ctype
  * dom