* (bug 28485) Block::purgeExpired Database returned error "1205: Lock wait timeout...

[lhc/web/wiklou.git] / UPGRADE

diff --git a/UPGRADE b/UPGRADE
index 9977e1a..b7be613 100644 (file)
--- a/UPGRADE
+++ b/UPGRADE
@@ -1,3 +1,4 @@
+
 This file provides an overview of the MediaWiki upgrade process. For help with
 specific problems, check
 
@@ -55,9 +56,8 @@ LocalSettings.php, see there for more info.
 
 ==== From the web ====
 
-You will need to temporarily remove LocalSettings.php. This is to keep people
-from accessing the installer. Keep a backup copy of LocalSettings.php somewhere
-safe
+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
@@ -67,8 +67,6 @@ 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.
 
-Once you are done, you can move LocalSettings.php back to its proper place.
-
 ==== From the command line ====
 
 From the command line, browse to the "maintenance" directory and run the
@@ -121,10 +119,8 @@ Note that the large number of deletions may cause older edits to expire
 from the list on Special:Recentchanges, although the deletions themselves
 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 ==
 
 $wgDefaultUserOptions now contains all the defaults, not only overrides.
@@ -134,9 +130,6 @@ to set only specific items as recommended in DefaultSettings.php.
 == Upgrading from 1.6 wikis ==
 
 $wgLocalTZoffset was in hours, it is now using minutes.
-Link autonumbering got fixed (#5918) for protocols other than http.
- - 'irc://irc.server.tld/' render as a link with a chat icon
- - '[irc://irc.server.tld]' render as an autonumbered link: [1]
 
 == Upgrading from pre-1.5 wikis ==
 
@@ -219,13 +212,6 @@ http://www.postgresql.org/docs/current/static/app-pgdump.html
 
 == Caveats ==
 
-=== Postgres ===
-
-Postgres support is new, and much of the upgrade instructions may 
-not apply. The schema was changed significantly from 1.7 to 1.8, 
-so you will need to at least use the update.php or web installer, 
-as described above.
-
 === Upgrading from 1.4.2 or earlier ===
 
 1.4.3 has added new fields to the sitestats table. These fields are
@@ -269,19 +255,20 @@ to this:
 As well as new messages, the processing of some messages has changed.
 If you have customized them, please compare the new format using
 Special:Allmessages or the relevant LanguageXX.php files:
-  copyrightwarning
-  dberrortext
-  editingcomment  (was named commentedit)
-  editingsection  (was named sectionedit)
-  numauthors
-  numedits
-  numtalkauthors
-  numtalkedits
-  numwatchers
-  protectedarticle
-  searchresulttext
-  showhideminor
-  unprotectedarticle
+
+* copyrightwarning
+* dberrortext
+* editingcomment  (was named commentedit)
+* editingsection  (was named sectionedit)
+* numauthors
+* numedits
+* numtalkauthors
+* numtalkedits
+* numwatchers
+* protectedarticle
+* searchresulttext
+* showhideminor
+* unprotectedarticle
 
 Note that the 1.3 beta releases included a potential vulnerability if PHP
 is configured with register_globals on and the includes directory is