Merge "[JobQueue] Minor documentation improvements."

[lhc/web/wiklou.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index 33cc595..e393631 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -6,18 +6,19 @@ Starting with MediaWiki 1.2.0, it's possible to install and configure the wiki
 "in-place", as long as you have the necessary prerequisites available.
 
 Required software:
 "in-place", as long as you have the necessary prerequisites available.
 
 Required software:

-* Web server with PHP 5.1.x or higher.
+* Web server with PHP 5.3.2 or higher.

 * A SQL server, the following types are supported
 * A SQL server, the following types are supported

-** MySQL 4.0.14 or higher
-** PostgreSQL 8.1 or higher
-** SQLite
+** MySQL 5.0.2 or higher
+** PostgreSQL 8.3 or higher
+** SQLite 3.3.7 or higher
+** Oracle 9.0.1 or higher

 
 MediaWiki is developed and tested mainly on Unix/Linux platforms, but should
 work on Windows as well.
 
 If your PHP is configured as a CGI plug-in rather than an Apache module you may
 experience problems, as this configuration is not well tested. safe_mode is also
 
 MediaWiki is developed and tested mainly on Unix/Linux platforms, but should
 work on Windows as well.
 
 If your PHP is configured as a CGI plug-in rather than an Apache module you may
 experience problems, as this configuration is not well tested. safe_mode is also

-not tested and unlikely to work. 
+not tested and unlikely to work.

 
 If you want math support see the instructions in math/README
 
 
 If you want math support see the instructions in math/README
 


@@ -33,7 +34,7 @@ http://www.mediawiki.org/wiki/Manual:Installation_guide
 
 ******************* WARNING *******************
 
 
 ******************* WARNING *******************
 

-REMEMBER: ALWAYS BACK UP YOUR DATABASE BEFORE 
+REMEMBER: ALWAYS BACK UP YOUR DATABASE BEFORE

 ATTEMPTING TO INSTALL OR UPGRADE!!!
 
 ******************* WARNING *******************
 ATTEMPTING TO INSTALL OR UPGRADE!!!
 
 ******************* WARNING *******************


@@ -65,7 +66,7 @@ available to download from the installer. Download this now, there is not a
 way (yet) to get it after you exit the installer. Place it in the main wiki
 directory, and the wiki should now be working.
 
 way (yet) to get it after you exit the installer. Place it in the main wiki
 directory, and the wiki should now be working.
 

-Once the wiki is set up, you should remove the config directory (though it will
+Once the wiki is set up, you should remove the mw-config directory (though it will

 refuse to config again if the wiki is set up).
 
 ----
 refuse to config again if the wiki is set up).
 
 ----