fixed edit conflict bug

[lhc/web/wiklou.git] / INSTALL

diff --git a/INSTALL b/INSTALL
index f4d5e2d..9efed0c 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -1,3 +1,7 @@
+----
+Installing Wikipedia Phase III Software
+----
+
 The Wikipedia software was developed collabortively by
 many people, so it's something of a hodgepodge. The
 main wiki software itself is written in PHP, and requires
@@ -18,13 +22,40 @@ static binaries. TeTeX and ImageMagick are required at
 runtime, and ImageMagick requires GhostScript. These are
 present in most Linux distributions.
 
+----
+Scripts install.php and update.php
+----
+
 Before installing the software, you must copy the file
 "LocalSettings.sample" to "LocalSettings.php", and
 "AdminSettings.sample" to "AdminSettings.php", and
 customize both of the php files to your local setup
 (things like installation parh, passwords, etc.) The
-script install.php in the maintenance directory can then
-be run to install the software.
+script install.php can then be run to install the
+software. It must be run from the command line with
+PHP: that is, type "php install.php" (you may need to
+specify the path the php executable). You will probably
+need to run as root.
+
+This script will copy all the necessary software over to
+the directories you have specified in the settings files.
+It will then warn you that it is about to create the
+database and give you the chance to exit. If you are
+installing the software to an existing database, you can
+answer "no" here and it will be left alone. The software
+installation will be otherwise complete. If you do choose
+to create a new database, you will need te root password
+to your MySQL installation.
+
+If you are merely updating an existing installation, run
+"php update.php" instead of install.  This will copy all
+the software, and also run any dtabase updates that may
+be necessary. These should give appropriate warnings if
+there are any dangerous ones.
+
+----
+Building from scratch
+----
 
 Here are some more notes on building a system from scratch
 the way it was done for the Wikipedia server:
@@ -32,10 +63,10 @@ the way it was done for the Wikipedia server:
 Downloads:
 
   gcc-2.95.3.tar.gz
-  mysql-3.23.51.tar.gz
+  mysql-3.23.51.tar.gz (or 4.0.12)
   libiconv-1.8.tar.gz
   apache_1.3.26.tar.gz
-  php-4.2.1.tar.gz
+  php-4.3.1.tar.gz
   apc-cvs.tar.gz
 
 And for math support:
@@ -51,7 +82,7 @@ And for math support:
   directory into which you installed gcc 2.95 appears before the
   directory of gcc 2.96 in your path.  Configure with:
 
-  FLAGS="-O3 -mpentiumpro" CXX=gcc CXXFLAGS="-O3 -mpentiumpro -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charset=complex
+  FLAGS="-O3 -mcpu=i686" CXX=gcc CXXFLAGS="-O3 -mcpu=i686 -felide-constructors -fno-exceptions -fno-rtti" ./configure --prefix=/usr/local/mysql --enable-assembler --with-mysqld-ldflags=-all-static --disable-shared --with-extra-charset=complex
 
   Edit the file myisam/ftdefs.h, changing the define for minimum word
   length for fulltext indexing: #define MIN_WORD_LEN 2.  Update
@@ -74,7 +105,7 @@ And for math support:
 5. Unpack Apache distribution and begin configuring, but don't finish
   build yet. Configure with something like:
 
-   OPTIM='-O2 -mpentiumpro' ./configure --with-layout=Apache
+   OPTIM='-O2 -mcpu=i686' ./configure --with-layout=Apache
 
 6. If you'll want to use Apache's mod_rewrite to make page-viewing URLs
   look like static links (as wikipedia.org does), install the included
@@ -85,14 +116,14 @@ And for math support:
 
 7. Unpack and configure PHP. Configure with something like:
 
-  ./configure --enable-apc --with-mysql=/usr/local/mysql --with-iconv=/usr/local/lib --with-apache=/home/lee/src/apache_1.3.26
+  ./configure --enable-apc --enable-shmop --with-mysql=/usr/local/mysql --with-iconv=/usr/local/lib --with-apache=/home/lee/src/apache_1.3.26
 
   (using your own local paths, of course). Build and install as
   instructed. Set "register_globals" on in the config file.
 
 8. Finish building Apache. Configure with something like:
 
-  OPTIM='-O2 -mpentiumpro' ./configure --with-layout=Apache --enable-module=rewrite --activate-module=src/modules/php4/libphp4.a
+  OPTIM='-O2 -mcpu=i686' ./configure --with-layout=Apache --enable-module=rewrite --enable-module=mmap-static --enable-module=headers --enable-module=expires --activate-module=src/modules/php4/libphp4.a
 
   Update httpd.conf as needed for your site.  For example:
 
@@ -128,9 +159,9 @@ And for math support:
   You'll need to compile the texvc helper script; enter the math
   subdirectory of the source tree and run "make".
 
-  If you don't want embedded TeX support, disable it by setting
+  If you want embedded TeX support, enable it by setting
 
-   $wgUseTex = false;
+   $wgUseTex = true;
 
   in LocalSettings.php