X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=UPGRADE;h=7987b22104a73e6fd1044cdd95324e46f3127c17;hb=c1104c2dbdc16bda730c79c9bdd1c8f48b2f733f;hp=3e3cb1383b61d67956b964099ef7d9f892be109a;hpb=9315e39133ef940d76cfcb3ccd6514400cbb473b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/UPGRADE b/UPGRADE
index 3e3cb1383b..7987b22104 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -39,8 +39,8 @@ Download the files for the new version of the software. These are available
 as a compressed "tar" archive from the Wikimedia Download Service
 (http://download.wikimedia.org/mediawiki).
 
-You can also obtain the new files directly from our Subversion source code
-repository, via a checkout or export operation.
+You can also obtain the new files directly from our Git source code
+repository.
 
 Replace the existing MediaWiki files with the new. You should preserve the
 LocalSettings.php file and the "extensions" and "images" directories.
@@ -81,7 +81,7 @@ The names of configuration variables, and their default values and purposes,
 can change between release branches, e.g. $wgDisableUploads in 1.4 is replaced
 with $wgEnableUploads in later versions. When upgrading, consult the release
 notes to check for configuration changes which would alter the expected
-behaviour of MediaWiki.
+behavior of MediaWiki.
 
 === Check installed extensions ===
 
@@ -150,6 +150,10 @@ UTF-8; an experimental command-line upgrade helper script,
 'upgrade1_5.php', can do this -- run it prior to 'update.php' or
 the web upgrader.
 
+NOTE that upgrade1_5.php does not work properly with recent version
+of MediaWiki. If upgrading a 1.4.x wiki, you should upgrade to 1.5
+first.  upgrade1_5.php has been removed from MediaWiki 1.21.
+
 If you absolutely cannot make the UTF-8 upgrade work, you can try
 doing it by hand: dump your old database, convert the dump file
 using iconv as described here: