goba            Fri Jan 26 02:17:53 2001 EDT

  Modified files:              
    /phpdoc/en/chapters install.xml 
  Log:
  Correcting some anoying typos.
  
   - We dont explain installing Windows
   - OmniHTTPd is the correct name for that server
   - php4 is PHP 4
   - PHP4 is PHP 4
   - apache is Apache
   - etc.
  
  
  
Index: phpdoc/en/chapters/install.xml
diff -u phpdoc/en/chapters/install.xml:1.34 phpdoc/en/chapters/install.xml:1.35
--- phpdoc/en/chapters/install.xml:1.34 Thu Jan 25 13:28:54 2001
+++ phpdoc/en/chapters/install.xml      Fri Jan 26 02:17:53 2001
@@ -182,7 +182,7 @@
     <programlisting>
 From: [EMAIL PROTECTED]
 04-Jan-2001 09:49
-(These tips are for php v4.0.4 and apache v1.3.9) 
+(These tips are for PHP 4.0.4 and Apache v1.3.9) 
 
 So you want to install PHP and Apache on a HP-UX 10.20 box? 
 
@@ -198,7 +198,6 @@
 
http://hpux.connect.org.uk/ftp/hpux/Gnu/binutils-2.9.1/binutils-2.9.1-sd-10.20.depot.gz
 
 gunzip and install using swinstall. 
 
-
 4. You now need bison, you can download a binary distribution from 
 http://hpux.connect.org.uk/ftp/hpux/Gnu/bison-1.28/bison-1.28-sd-10.20.depot.gz 
 install as above. 
@@ -213,9 +212,9 @@
 
 Right, now into the hard stuff. 
 
-6.Download the PHP and apache sources. 
+6. Download the PHP and apache sources. 
 
-7.gunzip and tar -xvf them. 
+7. gunzip and tar -xvf them. 
 
 We need to hack a couple of files so that they can compile ok. 
 
@@ -225,7 +224,7 @@
     lt_target=hpux10.20 
 on line 47286 of the configure script. 
 
-9. Next, the apache GuessOS file needs to be hacked. Under
+9. Next, the Apache GuessOS file needs to be hacked. Under
 apache_1.3.9/src/helpers change line 89 from 
     "echo "hp${HPUXMACH}-hpux${HPUXVER}"; exit 0" 
 to: 
@@ -234,16 +233,16 @@
 10. You cannot install PHP as a shared object under HP-UX so you must compile
 it as a static, just follow the instructions at the Apache page. 
 
-11. PHP and apache should have compiled OK, but apache won't start. you need
-to create a new user for apache, eg www, or apache. You then change lines 252
-and 253 of the conf/httpd.conf in apache so that instead of 
+11. PHP and apache should have compiled OK, but Apache won't start. you need
+to create a new user for Apache, eg www, or apache. You then change lines 252
+and 253 of the conf/httpd.conf in Apache so that instead of 
     User nobody 
     Group nogroup 
 you have something like 
     User www 
     Group sys 
 
-This is because you can't run apache as nobody under hp-ux. 
+This is because you can't run Apache as nobody under hp-ux. 
 Apache and PHP should then work. 
 
 Hope this helps somebody,
@@ -380,7 +379,7 @@
     setenv OPTIM=-O2 
     If you want the compiler to do some optimization. 
     
-5. Next, go to the php4 source directory and configure it. 
+5. Next, go to the PHP 4 source directory and configure it. 
     ./configure --prefix=/usr \ 
     --sysconfdir=/etc \ 
     --localstatedir=/var \ 
@@ -422,7 +421,7 @@
 10. make install
 
 11. copy and rename the php.ini-dist file to your "bin" directory from your
-    php4 source directory:
+    PHP 4 source directory:
     cp php.ini-dist /usr/local/bin/php.ini 
 
     or (if your don't have a local directory) 
@@ -2500,10 +2499,10 @@
        </para>
        <para>
         PHP 4: Build PHP as a Pike module for use with the Caudium
-       webserver.  DIR is the Caudium base directory. If no directory
-       is specified $prefix/caudium/server is used. The prefix is
-       controlled by the --prefix option and is /usr/local per
-       default.
+  webserver.  DIR is the Caudium base directory. If no directory
+  is specified $prefix/caudium/server is used. The prefix is
+  controlled by the --prefix option and is /usr/local per
+  default.
        </para>
       </listitem>
      </varlistentry>
@@ -2779,8 +2778,8 @@
 
   </sect1>
 
-  <sect1 id="install-windows95-nt">
-   <title>Installation on Windows 95/98/NT systems</title>
+  <sect1 id="install-windows">
+   <title>Installation on Windows 9x/NT/2000 systems</title>
    <para>
     There are two main ways to install PHP for Windows: either
     <link linkend="install.windows.manual">manually</link>
@@ -2841,7 +2840,7 @@
     <title>General Installation Steps</title>
    <simpara>
     This install guide will help you manually install and configure
-    PHP on your Windows 9x/NT webservers. This guide was compiled by
+    PHP on your Windows 9x/NT/2000 webservers. This guide was compiled by
      &link.bob;. The original version can be found at <ulink
      url="&url.win32install;">&url.win32install;</ulink>.
    </simpara>
@@ -2865,7 +2864,7 @@
      </listitem> 
      <listitem>
       <para>
-       Omni HTTPd 2.0b1 and up
+       OmniHTTPd 2.0b1 and up
       </para>
      </listitem>
     </itemizedlist>
@@ -2886,7 +2885,7 @@
         Copy the file, &apos;php.ini-dist&apos; to your 
         &apos;%WINDOWS%&apos; directory on Windows 95/98 or to your 
         &apos;%SYSTEMROOT%&apos; directory under Windows NT or Windows 
-        20000  and rename it to &apos;php.ini&apos;. Your 
+        2000 and rename it to &apos;php.ini&apos;. Your 
         &apos;%WINDOWS%&apos; or &apos;%SYSTEMROOT%&apos; directory is
         typically:
         <simplelist>
@@ -2908,7 +2907,7 @@
          </listitem>
          <listitem>
           <simpara>
-           If you are using Omni Httpd, do not follow the next step.
+           If you are using OmniHTTPd, do not follow the next step.
            Set the 'doc_root' to point to your webservers
            document_root. ex: c:\apache\htdocs or c:\webroot
           </simpara>
@@ -2929,7 +2928,7 @@
           <simpara>
            On PWS and IIS, you can set the browscap.ini to point to:
            'c:\windows\system\inetsrv\browscap.ini' on Windows 95/98
-           and 'c:\winnt\system32\inetsrv\browscap.ini' on NT
+           and 'c:\winnt\system32\inetsrv\browscap.ini' on NT/2000
            Server. Additional information on using the browscap
            functionality in PHP can be found at this <ulink
             url="&url.browscap;">mirror</ulink>, select the "source"
@@ -2967,7 +2966,7 @@
      </simpara></listitem>
      <listitem><simpara>
       Pretty much all of the instructions that follow are of the
-      "set and forget" variety.  So sit back and try follow the
+      "set and forget" variety. So sit back and try follow the
       instructions below as faithfully as you can.
      </simpara></listitem>
     </orderedlist>
@@ -3032,13 +3031,13 @@
       </simpara></listitem>
       <listitem>
        <simpara>
-       Execute <filename>cygwin.exe</filename> and follow the installation
-       instructions.  If you choose to install to a path other than
-       <filename>c:\cygnus</filename>, let the build process know by setting
-       the Cygwin environment variable. On Windows 95/98 setting
-       an environment variable can be done by placing a line in
-       your autoexec.bat. On Windows NT, go to My Computer =&gt;
-       Control Panel =&gt; System and select the environment tab.
+  Execute <filename>cygwin.exe</filename> and follow the installation
+  instructions.  If you choose to install to a path other than
+  <filename>c:\cygnus</filename>, let the build process know by setting
+  the Cygwin environment variable. On Windows 95/98 setting
+  an environment variable can be done by placing a line in
+  your autoexec.bat. On Windows NT, go to My Computer =&gt;
+  Control Panel =&gt; System and select the environment tab.
        </simpara>
        <warning>
         <simpara>
@@ -3054,16 +3053,16 @@
       </simpara></listitem>
       <listitem>
        <simpara>
-       Launch Microsoft Visual C++, and from the menu select
-       Tools =&gt; Options. In the dialog, select the
-       directories tab. Sequentially change the dropdown
-       to Executables, Includes, and Library files,
-       and ensure that <filename>cygwin\bin</filename>,
-       <filename>win32build\include</filename>, and
-       <filename>win32build\lib</filename> are in each list,
-       respectively. (To add an entry, select a blank line
-       at the end of the list and begin typing).  Typical entries
-       will look like this:
+  Launch Microsoft Visual C++, and from the menu select
+  Tools =&gt; Options. In the dialog, select the
+  directories tab. Sequentially change the dropdown
+  to Executables, Includes, and Library files,
+  and ensure that <filename>cygwin\bin</filename>,
+  <filename>win32build\include</filename>, and
+  <filename>win32build\lib</filename> are in each list,
+  respectively. (To add an entry, select a blank line
+  at the end of the list and begin typing).  Typical entries
+  will look like this:
        </simpara>
        <itemizedlist>
         <listitem><simpara>
@@ -3096,16 +3095,16 @@
         </simpara></listitem>
         <listitem>
          <simpara>
-         For command line users, make sure that you either have
-         the C++ environment variables registered, or have run
-         <command>vcvars.bat</command>, and then execute one of the
-         following:
+    For command line users, make sure that you either have
+    the C++ environment variables registered, or have run
+    <command>vcvars.bat</command>, and then execute one of the
+    following:
          </simpara>
-        <itemizedlist>
-         <listitem><simpara>
+   <itemizedlist>
+    <listitem><simpara>
            <userinput>msdev bindlib.dsp /MAKE "bindlib - Win32 Debug"</userinput>
           </simpara></listitem>
-         <listitem><simpara>
+    <listitem><simpara>
            <userinput>msdev bindlib.dsp /MAKE "bindlib - Win32 Release"</userinput>
           </simpara></listitem>
          </itemizedlist>
@@ -3175,8 +3174,8 @@
      The following table describes some of the extensions available. As
      described in the manual installation steps, you can choose which
      extensions you would like to load when PHP starts by uncommenting the:
-     'extension=php_*.dll' lines. Some extensions require you to have
-     additional libraries installed on your system for the module to
+     'extension=php_*.dll' lines in php.ini. Some extensions require you
+     to have additional libraries installed on your system for the module to
      work correctly. The PHP <ulink url="&url.php.faq;">FAQ</ulink>
      has more information on where to get supporting libraries. You
      can also load a module dynamically in your script using <function>dl</function>.
@@ -3186,74 +3185,74 @@
       <title>PHP Extensions</title>
       <tgroup cols="2">
        <tbody>
-       <row>
-        <entry>php_calendar.dll</entry>
-        <entry>Calendar conversion functions</entry>
-       </row>
-       <row>
-        <entry>php_crypt.dll</entry>
-        <entry>Crypt functions</entry>
-       </row>
-       <row>
-        <entry>php_dbase.dll</entry>
-        <entry>dBase functions</entry>
-       </row>
-       <row>
-        <entry>php_dbm.dll</entry>
-        <entry>Berkeley DB2 library</entry>
-       </row>
-       <row>
-        <entry>php_filepro.dll</entry>
-        <entry>Read-only access to Filepro databases</entry>
-       </row>
-       <row>
-        <entry>php_gd.dll</entry>
-        <entry>GD library functions for GIF manipulation</entry>
-       </row>
-       <row>
-        <entry>php_hyperwave.dll</entry>
-        <entry>HyperWave functions</entry>
-       </row>
-       <row>
-        <entry>php_imap4r2.dll</entry>
-        <entry>IMAP 4 functions</entry>
-       </row>
-       <row>
-        <entry>php_ldap.dll</entry>
-        <entry>LDAP functions</entry>
-       </row>
-       <row>
-        <entry>php_msql1.dll</entry>
-        <entry>mSQL 1 client</entry>
-       </row>
-       <row>
-        <entry>php_msql2.dll</entry>
-        <entry>mSQL 2 client</entry>
-       </row>
-       <row>
-        <entry>php_mssql.dll</entry>
-        <entry>MSSQL client (requires MSSQL DB-Libraries</entry>
-       </row>
-       <row>
-        <entry>php3_mysql.dll (built into PHP 4)</entry>
-        <entry>MySQL functions</entry>
-       </row>
-       <row>
-        <entry>php_nsmail.dll</entry>
-        <entry>Netscape mail functions</entry>
-       </row>
-       <row>
-        <entry>php_oci73.dll</entry>
-        <entry>Oracle functions</entry>
-       </row>
-       <row>
-        <entry>php_snmp.dll</entry>
-        <entry>SNMP get and walk functions (NT only!)</entry>
-       </row>
-       <row>
-        <entry>php_zlib.dll</entry>
-        <entry>ZLib compression functions</entry>
-       </row>
+  <row>
+   <entry>php_calendar.dll</entry>
+   <entry>Calendar conversion functions</entry>
+  </row>
+  <row>
+   <entry>php_crypt.dll</entry>
+   <entry>Crypt functions</entry>
+  </row>
+  <row>
+   <entry>php_dbase.dll</entry>
+   <entry>dBase functions</entry>
+  </row>
+  <row>
+   <entry>php_dbm.dll</entry>
+   <entry>Berkeley DB2 library</entry>
+  </row>
+  <row>
+   <entry>php_filepro.dll</entry>
+   <entry>Read-only access to Filepro databases</entry>
+  </row>
+  <row>
+   <entry>php_gd.dll</entry>
+   <entry>GD library functions for GIF manipulation</entry>
+  </row>
+  <row>
+   <entry>php_hyperwave.dll</entry>
+   <entry>HyperWave functions</entry>
+  </row>
+  <row>
+   <entry>php_imap4r2.dll</entry>
+   <entry>IMAP 4 functions</entry>
+  </row>
+  <row>
+   <entry>php_ldap.dll</entry>
+   <entry>LDAP functions</entry>
+  </row>
+  <row>
+   <entry>php_msql1.dll</entry>
+   <entry>mSQL 1 client</entry>
+  </row>
+  <row>
+   <entry>php_msql2.dll</entry>
+   <entry>mSQL 2 client</entry>
+  </row>
+  <row>
+   <entry>php_mssql.dll</entry>
+   <entry>MSSQL client (requires MSSQL DB-Libraries</entry>
+  </row>
+  <row>
+   <entry>php3_mysql.dll (built into PHP 4)</entry>
+   <entry>MySQL functions</entry>
+  </row>
+  <row>
+   <entry>php_nsmail.dll</entry>
+   <entry>Netscape mail functions</entry>
+  </row>
+  <row>
+   <entry>php_oci73.dll</entry>
+   <entry>Oracle functions</entry>
+  </row>
+  <row>
+   <entry>php_snmp.dll</entry>
+   <entry>SNMP get and walk functions (NT only!)</entry>
+  </row>
+  <row>
+   <entry>php_zlib.dll</entry>
+   <entry>ZLib compression functions</entry>
+  </row>
        </tbody>
       </tgroup>
      </table>
@@ -3318,7 +3317,6 @@
   You can choose any extension you wish here.  .php is simply the one
   we suggest. You can even include .html .
 
-
 18. Use your normal procedure for starting the Apache server. (You must
     stop and restart the server, not just cause the server to reload by
     use a HUP or USR1 signal.)
@@ -3402,7 +3400,7 @@
    
 
    <sect2 id="install.apache.windows">
-    <title>Details of installing Windows 9x/NT and Apache 1.3.x</title>
+    <title>Details of installing PHP on Windows 9x/NT/2000 with Apache 1.3.x</title>
     
     <simpara>
      You must edit your <literal>srm.conf</literal> or
@@ -3526,15 +3524,15 @@
   <sect1 id="install.caudium">
    <title>Caudium Server installs</title>
    <para>
-    PHP4 can be build as a Pike module for the Caudium webserver. Note
-    that this is not supported with PHP3. Follow the simple
-    instructions below to install PHP4 for Caudium.
+    PHP 4 can be build as a Pike module for the Caudium webserver. Note
+    that this is not supported with PHP 3. Follow the simple
+    instructions below to install PHP 4 for Caudium.
    </para>
    <example id="install.caudium.instructions">
     <title>Caudium Installation Instructions</title>
     <programlisting>
 1.  Make sure you have Caudium installed prior to attempting to
-    install PHP4. For PHP4 to work correctly, you will need Pike
+    install PHP 4. For PHP 4 to work correctly, you will need Pike
     7.0.268 or newer. For the sake of this example we assume that
     Caudium is installed in /opt/caudium/server/.
 2.  Change directory to php-x.y.z (where x.y.z is the version number).
@@ -3543,9 +3541,9 @@
 5.  make install
 6.  Restart Caudium if it's currently running.
 7.  Log into the graphical configuration interface and go to the
-    virtual server where you want to add PHP4 support.
+    virtual server where you want to add PHP 4 support.
 8.  Click Add Module and locate and add the PHP4 Script Support module.
-9.  If the documentation says that the 'PHP4 interpreter isn't
+9.  If the documentation says that the 'PHP 4 interpreter isn't
     available', make sure that you restarted the server. If you did
     check /opt/caudium/logs/debug/default.1 for any errors related to
     PHP4.so.  Also make sure that caudium/server/lib/[pike-version]/PHP4.so
@@ -3561,7 +3559,7 @@
    </para>
    <note>
     <para>
-     When compiling PHP4 with MySQL support you must make sure that
+     When compiling PHP 4 with MySQL support you must make sure that
      the normal MySQL client code is used. Otherwise there might be
      conflicts if your Pike already has MySQL support. You do this by
      specifying a MySQL install directory <link
@@ -3579,7 +3577,7 @@
     <link linkend="install.iis.iis4">IIS4</link> versions.
    </para>
    <sect2 id="install.iis.iis3">
-    <title>Windows 95/98/NT and PWS/IIS 3</title>
+    <title>Windows 9x/NT/2000 and PWS/IIS 3</title>
     
     <simpara>
      The recommended method for configuring these servers is to use
@@ -3914,12 +3912,12 @@
   </sect1>
 
   <sect1 id="install.omnihttpd">
-   <title>Omni HTTPd Server installs</title>
+   <title>OmniHTTPd Server installs</title>
    <para>
-    This section contains notes and hints specific Omni HTTPd.
+    This section contains notes and hints specific OmniHTTPd.
    </para>
    <sect2 id="install.omnihttpd.windows">
-    <title>Omni HTTPd 2.0b1 and up for Windows</title>
+    <title>OmniHTTPd 2.0b1 and up for Windows</title>
     
     <simpara>
      This has got to be the easiest config there is:

Reply via email to