MFT r874911.17.0beta1

1 files changed, 28 insertions, 57 deletions

diff --git a/UPGRADE b/UPGRADE
index b7be61351f31..9e7d0353a202 100644
--- a/UPGRADE
+++ b/UPGRADE
@@ -29,7 +29,7 @@ the upgrade scripts are somewhat robust, there is no guarantee that things will
 not fail, leaving the database in an inconsistent state.
 
 http://www.mediawiki.org/wiki/Manual:Backing_up_a_wiki provides an overview of
-the upgrade process. You should also refer to the documentation for your
+the backup process. You should also refer to the documentation for your
 database management system for information on backing up a database, and to
 your operating system documentation for information on making copies of files.
 
@@ -51,21 +51,11 @@ deleted file archives, and any custom skins.
 
 === Perform the database upgrade ===
 
-You will need to have $wgDBadminuser and $wgDBadminpassword set in your
-LocalSettings.php, see there for more info.
-
 ==== From the web ====
 
-You will need to set $wgUpgradeKey in your LocalSettings.php in order to use
-the updater.
-
-If you browse to the web-based installation script (usually at /config/index.php)
-from your wiki installation you can follow the script and upgrade your database
-in place.
-
-You may change some settings during the install, but be very careful!
-Changing the encoding in particular will generally leave you with a
-lot of corrupt pages, particularly if your wiki is not in English.
+If you browse to the web-based installation script (usually at 
+/mw-config/index.php) from your wiki installation you can follow the script and 
+upgrade your database in place.
 
 ==== From the command line ====
 
@@ -74,14 +64,6 @@ update.php script to check and update the schema. This will insert missing
 tables, update existing tables, and move data around as needed. In most cases,
 this is successful and nothing further needs to be done.
 
-If you have a Chinese or Japanese wiki ($wgLanguageCode is set to one
-of "zh", "ja", or "yue") and you are using MySQL fulltext search, you
-will probably want to update the search index.
-
-In the "maintenance" directory, run the updateDoubleWidthSearch.php
-script.  This will update the searchindex table for those pages that
-contain double-byte latin characters.
-
 === Check configuration settings ===
 
 The names of configuration variables, and their default values and purposes,
@@ -92,6 +74,8 @@ behaviour of MediaWiki.
 
 === Check installed extensions ===
 
+Extensions usually need to be upgraded at the same time as the MediaWiki core.
+
 In MediaWiki 1.14 some extensions are migrated into the core. Please see the
 HISTORY section "Migrated extensions" and disable these extensions in your
 LocalSettings.php
@@ -105,7 +89,17 @@ and quirks which reveal themselves.
 
 You should also test any extensions, and upgrade these if necessary.
 
-== Upgrading from 1.8 wikis ==
+== Upgrading from 1.16 or earlier ==
+
+If you have a Chinese or Japanese wiki ($wgLanguageCode is set to one
+of "zh", "ja", or "yue") and you are using MySQL fulltext search, you
+will probably want to update the search index.
+
+In the "maintenance" directory, run the updateDoubleWidthSearch.php
+script.  This will update the searchindex table for those pages that
+contain double-byte latin characters.
+
+== Upgrading from 1.8 or earlier ==
 
 MediaWiki 1.9 and later no longer keep default localized message text
 in the database; 'MediaWiki:'-namespace pages that do not exist in the
@@ -121,17 +115,17 @@ will be hidden by default. (Click "show bot edits" to list them.)
 
 See RELEASE-NOTES for more details about new and changed options.
 
-== Upgrading from 1.7 wikis ==
+== Upgrading from 1.7 or earlier ==
 
 $wgDefaultUserOptions now contains all the defaults, not only overrides.
 If you're setting this as a complete array(), you may need to change it
 to set only specific items as recommended in DefaultSettings.php.
 
-== Upgrading from 1.6 wikis ==
+== Upgrading from 1.6 or earlier ==
 
 $wgLocalTZoffset was in hours, it is now using minutes.
 
-== Upgrading from pre-1.5 wikis ==
+== Upgrading from 1.5 or earlier ==
 
 Major changes have been made to the schema from 1.4.x. The updater
 has not been fully tested for all conditions, and might well break.
@@ -187,32 +181,7 @@ If using Memcached, you must enabled it differently now:
 should be replaced with:
   $wgMainCacheType = CACHE_MEMCACHED;
 
-== Backups! ==
-
-To upgrade an existing MediaWiki installation, first BACK UP YOUR WIKI!
-If something goes wrong, you want to be able to start again.
-
-Your image files, configuration, etc can simply be copied or archived as
-you would any other files. (Make sure that the contents of your
-LocalSettings.php are not accidentally made public, as this contains
-a database password.)
-
-To back up the database, use the tools provided by your service provider
-(if applicable) or the standard mysqldump or pg_dump programs.
-
-For general help on mysqldump:
-http://dev.mysql.com/doc/mysql/en/mysqldump.html
-
-WARNING: If using MySQL 4.1.x, mysqldump's charset conversion may in
-some cases damage data in your wiki. If necessary, set the charset
-option to 'latin1' to avoid the conversion.
-
-For general help on pg_dump:
-http://www.postgresql.org/docs/current/static/app-pgdump.html
-
-== Caveats ==
-
-=== Upgrading from 1.4.2 or earlier ===
+== Upgrading from 1.4.2 or earlier ==
 
 1.4.3 has added new fields to the sitestats table. These fields are
 optional and help to speed Special:Statistics on large sites. If you
@@ -224,7 +193,7 @@ manually run the SQL commands from this file:
   maintenance/archives/patch-ss_total_articles.sql
 
 
-=== Upgrading from 1.4rc1 or earlier betas ===
+== Upgrading from 1.4rc1 or earlier betas ==
 
 The logging table has been altered from 1.4beta4 to 1.4beta5
 and again in 1.4.0 final. Copy in the new files and use the web
@@ -237,7 +206,7 @@ files:
    maintenance/archives/patch-logging-title.sql
 
 
-=== Upgrading from 1.3.x ===
+== Upgrading from 1.3 or earlier ==
 
 This should generally go smoothly.
 
@@ -280,7 +249,7 @@ send them a kind note explaining that it can expose their servers and their
 customers to attacks.
 
 
-=== Upgrading from 1.2.x ===
+== Upgrading from 1.2 or earlier ==
 
 If you've been using the MediaWiki: namespace for custom page templates,
 note that things are a little different. The Template: namespace has been
@@ -300,7 +269,7 @@ to dump the database to SQL, run it through iconv or another conversion tool,
 and restore it. Sorry.
 
 
-=== Upgrading from 1.1.x or earlier ===
+== Upgrading from 1.1 or earlier ==
 
 This is less thoroughly tested, but should work.
 
@@ -314,7 +283,7 @@ scripts in maintenance/archives before the installer is able to pick up
 with remaining updates.
 
 
-=== Upgrading from UseModWiki or old "phase 2" Wikipedia code ===
+== Upgrading from UseModWiki or old "phase 2" Wikipedia code ==
 
 There is a semi-maintained UseModWiki to MediaWiki conversion script at
 maintenance/importUseModWiki.php; it may require tweaking and customization
@@ -325,3 +294,5 @@ output SQL statements; direct these to a file and then run that into your
 database.
 
 You will have to rebuild the links tables etc after importing.
+
+