nlopess Thu Aug 5 08:53:24 2004 EDT
Modified files:
/phpdoc/en/faq installation.xml
/phpdoc/en/install/windows apache1.xml iis.xml manual.xml
xitami.xml
Log:
Dave's bugs
http://cvs.php.net/diff.php/phpdoc/en/faq/installation.xml?r1=1.34&r2=1.35&ty=u
Index: phpdoc/en/faq/installation.xml
diff -u phpdoc/en/faq/installation.xml:1.34 phpdoc/en/faq/installation.xml:1.35
--- phpdoc/en/faq/installation.xml:1.34 Thu Aug 5 08:33:11 2004
+++ phpdoc/en/faq/installation.xml Thu Aug 5 08:53:24 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.34 $ -->
+<!-- $Revision: 1.35 $ -->
<chapter id="faq.installation">
<title>Installation</title>
<titleabbrev>Installation</titleabbrev>
@@ -574,7 +574,7 @@
On Windows NT, 2000, XP and 2003:
<itemizedlist>
<listitem><para>
- Got to Control Panel and open the System icon (Start -> Settings
+ Go to Control Panel and open the System icon (Start -> Settings
-> Control Panel -> System, or just Start -> Control Panel
-> System for Windows XP/2003)
</para></listitem>
@@ -607,7 +607,7 @@
file:
<itemizedlist>
<listitem><para>
- Open the Notepad (Start->Run and enter notepad)
+ Open the Notepad (Start -> Run and enter notepad)
</para></listitem>
<listitem><para>
Open the <filename>C:\autoexec.bat</filename> file
@@ -642,7 +642,7 @@
On Windows NT, 2000, XP and 2003:
<itemizedlist>
<listitem><para>
- Got to Control Panel and open the System icon (Start -> Settings
+ Go to Control Panel and open the System icon (Start -> Settings
-> Control Panel -> System, or just Start -> Control Panel
-> System for Windows XP/2003)
</para></listitem>
@@ -670,7 +670,7 @@
file:
<itemizedlist>
<listitem><para>
- Open the Notepad (Start->Run and enter notepad)
+ Open the Notepad (Start -> Run and enter notepad)
</para></listitem>
<listitem><para>
Open the <filename>C:\autoexec.bat</filename> file
http://cvs.php.net/diff.php/phpdoc/en/install/windows/apache1.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc/en/install/windows/apache1.xml
diff -u phpdoc/en/install/windows/apache1.xml:1.6
phpdoc/en/install/windows/apache1.xml:1.7
--- phpdoc/en/install/windows/apache1.xml:1.6 Mon Aug 2 17:33:03 2004
+++ phpdoc/en/install/windows/apache1.xml Thu Aug 5 08:53:24 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<sect1 id="install.windows.apache1">
<title>Apache 1.3.x on Microsft Windows</title>
<para>
@@ -50,7 +50,7 @@
<title>Installing as a CGI binary</title>
<para>
- If you unziped the PHP package to <filename>c:\php\</filename> as described
+ If you unziped the PHP package to <filename>C:\php\</filename> as described
in the <link linkend="install.windows.manual">Manual
Installation Steps</link> section, you need to insert
these lines to your Apache configuration file to set
http://cvs.php.net/diff.php/phpdoc/en/install/windows/iis.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/install/windows/iis.xml
diff -u phpdoc/en/install/windows/iis.xml:1.3 phpdoc/en/install/windows/iis.xml:1.4
--- phpdoc/en/install/windows/iis.xml:1.3 Thu Aug 5 08:15:17 2004
+++ phpdoc/en/install/windows/iis.xml Thu Aug 5 08:53:24 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<sect1 id="install.windows.iis">
<title>Microsoft IIS / PWS</title>
<para>
@@ -71,7 +71,7 @@
<simpara>
Double click on the new string value and enter the path to
<literal>php.exe</literal> in the value data field. ex:
- <literal>c:\php\php.exe</literal> for PHP 4, or
+ <literal>C:\php\php.exe</literal> for PHP 4, or
<literal>C:\php\php-cgi.exe</literal> for PHP 5.
</simpara>
</listitem>
@@ -87,7 +87,7 @@
The following steps do not affect the web server installation
and only apply if you want your PHP scripts to be executed when
they are run from the command line (ex. run
- <filename>c:\myscripts\test.php</filename>) or by double clicking
+ <filename>C:\myscripts\test.php</filename>) or by double clicking
on them in a directory viewer window. You may wish to skip these
steps as you might prefer the PHP files to load into a text
editor when you double click on them.
@@ -204,7 +204,7 @@
your <filename>php.exe</filename> / <filename>php-cgi.exe</filename>.
Backslashes should be escaped, for example:
<literal>[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\w3svc\parameters\Script
- Map] ".php"="c:\\php\\php.exe"</literal> (change to
+ Map] ".php"="C:\\php\\php.exe"</literal> (change to
<literal>C:\\php\\php-cgi.exe</literal> if you are using PHP 5)
Now merge this registery file into your system; you may do
this by double-clicking it.
@@ -231,7 +231,7 @@
your <filename>php4isapi.dll</filename> /
<filename>php5isapi.dll</filename>. Backslashes should be escaped, for
example:
<literal>[HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\w3svc\parameters\Script
- Map] ".php"="c:\\php\\sapi\\php4isapi.dll"</literal> (or
+ Map] ".php"="C:\\php\\sapi\\php4isapi.dll"</literal> (or
<literal>C:\\php\\php5isapi.dll</literal> for PHP 5)
Now merge this registery file into your system; you may do
this by double-clicking it.
@@ -281,7 +281,7 @@
<listitem>
<simpara>
Click Add, and in the Executable box, type:
- <literal>c:\php\php.exe</literal> for PHP 4 or
+ <literal>C:\php\php.exe</literal> for PHP 4 or
<literal>C:\php\php-cgi.exe</literal> for PHP 5 (assuming
that you have unziped PHP in <filename>c:\php\</filename>).
</simpara>
http://cvs.php.net/diff.php/phpdoc/en/install/windows/manual.xml?r1=1.10&r2=1.11&ty=u
Index: phpdoc/en/install/windows/manual.xml
diff -u phpdoc/en/install/windows/manual.xml:1.10
phpdoc/en/install/windows/manual.xml:1.11
--- phpdoc/en/install/windows/manual.xml:1.10 Thu Aug 5 08:15:17 2004
+++ phpdoc/en/install/windows/manual.xml Thu Aug 5 08:53:24 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<sect1 id="install.windows.manual">
<title>Manual Installation Steps</title>
@@ -252,8 +252,8 @@
by your PHP installation. The search order for this DLL is as follows:
<itemizedlist>
<listitem><para>
- The same directory from where <filename>php.exe</filename> is called,
- or in case you use a SAPI module, the webserver's directory (e.g.
+ The same directory from where <filename>php.exe</filename> is called,
+ or in case you use a SAPI module, the webserver's directory (e.g.
<filename>C:\Program Files\Apache Group\Apache2\bin</filename>).
</para></listitem>
<listitem><para>
http://cvs.php.net/diff.php/phpdoc/en/install/windows/xitami.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/install/windows/xitami.xml
diff -u phpdoc/en/install/windows/xitami.xml:1.2
phpdoc/en/install/windows/xitami.xml:1.3
--- phpdoc/en/install/windows/xitami.xml:1.2 Thu Aug 5 08:44:24 2004
+++ phpdoc/en/install/windows/xitami.xml Thu Aug 5 08:53:24 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<sect1 id="install.windows.xitami">
<title>Xitami on Microsoft Windows</title>
<para>
@@ -46,7 +46,7 @@
<listitem>
<para>
In Filter command or script put the path and name
- of your PHP CGI executable i.e. <filename>c:\php\php.exe</filename>
+ of your PHP CGI executable i.e. <filename>C:\php\php.exe</filename>
for PHP 4, or <filename>C:\php\php-cgi.exe</filename> for PHP 5.
</para>
</listitem>
