Updated install instructions from the documentation project (Philip Olson)

1 files changed, 28 insertions, 18 deletions

diff --git a/INSTALL b/INSTALL
index dcf56e4c78..f305d0be8f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -3,6 +3,7 @@ Installing PHP
      _________________________________________________________________
 
    Table of Contents
+   Preface
    1. General Installation Considerations
    2. Installation on Unix systems
 
@@ -44,6 +45,13 @@ Installing PHP
         How to change configuration settings
      _________________________________________________________________
 
+Preface
+
+   These installation instructions were generated from the HTML version
+   of the PHP Manual so formatting and linking have been altered. See the
+   online and updated version at: http://php.net/install.unix
+     _________________________________________________________________
+
 Chapter 1. General Installation Considerations
 
    Before starting the installation, first you need to know what do you
@@ -360,9 +368,9 @@ Apache 2.0 on Unix systems
 
    Warning
 
-   Do not use Apache 2.0.x and PHP in a production environment neither on
-   Unix nor on Windows. For information on why, read the following FAQ
-   entry
+   We do not recommend using a threaded MPM in production with Apache2.
+   Use the prefork MPM instead, or use Apache1. For information on why,
+   read the related FAQ entry on using Apache2 with a threaded MPM
 
    You are highly encouraged to take a look at the Apache Documentation
    to get a basic understanding of the Apache 2.0 Server.
@@ -486,7 +494,8 @@ Apache 2.0 on Unix systems
    about the consequences and understand what you are doing. For more
    information read the Apache documentation about the MPM-Modules.
 
-     Note: If you want to use content negotiation, read related FAQ.
+     Note: If you want to use content negotiation, read the Apache
+     MultiViews FAQ.
 
      Note: To build a multithreaded version of Apache your system must
      support threads. This also implies to build PHP with experimental
@@ -870,7 +879,7 @@ Group sys
 OpenBSD installation notes
 
    This section contains notes and hints specific to installing PHP on
-   OpenBSD 3.4.
+   OpenBSD 3.6.
      _________________________________________________________________
 
 Using Binary Packages
@@ -881,27 +890,27 @@ Using Binary Packages
    others. The files you need can be found on your OpenBSD CD or on the
    FTP site.
 
-   The main package you need to install is php4-core-4.3.3.tgz, which
+   The main package you need to install is php4-core-4.3.8.tgz, which
    contains the basic engine (plus gettext and iconv). Next, take a look
-   at the module packages, such as php4-mysql-4.3.3.tgz or
-   php4-imap-4.3.3.tgz. You need to use the phpxs command to activate and
+   at the module packages, such as php4-mysql-4.3.8.tgz or
+   php4-imap-4.3.8.tgz. You need to use the phpxs command to activate and
    deactivate these modules in your php.ini.
 
    Example 2-6. OpenBSD Package Install Example
-# pkg_add php4-core-4.3.3.tgz
+# pkg_add php4-core-4.3.8.tgz
 # /usr/local/sbin/phpxs -s
 # cp /usr/local/share/doc/php4/php.ini-recommended /var/www/conf/php.ini
   (add in mysql)
-# pkg_add php4-mysql-4.3.3.tgz
+# pkg_add php4-mysql-4.3.8.tgz
 # /usr/local/sbin/phpxs -a mysql
   (add in imap)
-# pkg_add php4-imap-4.3.3.tgz
+# pkg_add php4-imap-4.3.8.tgz
 # /usr/local/sbin/phpxs -a imap
   (remove mysql as a test)
-# pkg_delete php4-mysql-4.3.3
+# pkg_delete php4-mysql-4.3.8
 # /usr/local/sbin/phpxs -r mysql
   (install the PEAR libraries)
-# pkg_add php4-pear-4.3.3.tgz
+# pkg_add php4-pear-4.3.8.tgz
 
    Read the packages(7) manual page for more information about binary
    packages on OpenBSD.
@@ -931,9 +940,9 @@ Common Problems
        automatically installs into the correct chroot directories, so no
        special modification is needed there. More information on the
        OpenBSD Apache is available in the OpenBSD FAQ.
-     * The OpenBSD 3.4 package for the gd extension requires XFree86 to
+     * The OpenBSD 3.6 package for the gd extension requires XFree86 to
        be installed. If you do not wish to use some of the font features
-       that require X11, install the php4-gd-4.3.3-no_x11.tgz package
+       that require X11, install the php4-gd-4.3.8-no_x11.tgz package
        instead.
      _________________________________________________________________
 
@@ -1002,7 +1011,7 @@ Using Portage (emerge)
 
    The first decision you need to make is whether you want to install
    Apache 1.3.x or Apache 2.x. While both can be used with PHP, the steps
-   given bellow will use Apache 1.3.x. Another thing to consider is
+   given below will use Apache 1.3.x. Another thing to consider is
    whether your local Portage tree is up to date. If you have not updated
    it recently, you need to run emerge sync before anything else. This
    way, you will be using the most recent stable version of Apache and
@@ -1444,7 +1453,7 @@ Running PHP as an Apache module
    you to change the PHP configuration from within the Apache
    configuration files. For a listing of which directives are
    PHP_INI_ALL, PHP_INI_PERDIR, or PHP_INI_SYSTEM, have a look at the
-   table found within the ini_set() documentation.
+   List of php.ini directives appendix.
 
      Note: With PHP 3, there are Apache directives that correspond to
      each configuration setting in the php3.ini name, except the name is
@@ -1509,7 +1518,8 @@ Changing PHP configuration via the Windows registry
    active for any script running from this directory or any subdirectory
    of it. The values under the key should have the name of the PHP
    configuration directive and the string value. PHP constants in the
-   values are not parsed.
+   values are not parsed. However, only configuration values changeable
+   in PHP_INI_USER can be set this way, PHP_INI_PERDIR values can not.
      _________________________________________________________________
 
 Other interfaces to PHP