dams Fri May 21 10:08:08 2004 EDT
Modified files:
/phpdoc/en/chapters install.commandline.xml install.iplanet.xml
install.otherhttpd.xml install.sambar.xml
install.solaris.xml install.windows.xml
install.xitami.xml streams.file.xml
Log:
cosmetic changes
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.commandline.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/chapters/install.commandline.xml
diff -u phpdoc/en/chapters/install.commandline.xml:1.7
phpdoc/en/chapters/install.commandline.xml:1.8
--- phpdoc/en/chapters/install.commandline.xml:1.7 Tue Sep 30 04:33:24 2003
+++ phpdoc/en/chapters/install.commandline.xml Fri May 21 10:08:08 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<sect1 id="install.commandline">
<title>Servers-CGI/Commandline</title>
<para>
@@ -59,11 +59,15 @@
Some server supplied environment variables are not defined in the
current <ulink url="&url.cgispec;">CGI/1.1 specification</ulink>.
Only the following variables are defined there; everything else
- should be treated as 'vendor extensions': AUTH_TYPE, CONTENT_LENGTH,
CONTENT_TYPE,
- GATEWAY_INTERFACE, PATH_INFO, PATH_TRANSLATED, QUERY_STRING,
- REMOTE_ADDR, REMOTE_HOST, REMOTE_IDENT, REMOTE_USER,
- REQUEST_METHOD, SCRIPT_NAME, SERVER_NAME, SERVER_PORT,
- SERVER_PROTOCOL and SERVER_SOFTWARE
+ should be treated as 'vendor extensions': <varname>$AUTH_TYPE</varname>,
+ <varname>$CONTENT_LENGTH</varname>, <varname>$CONTENT_TYPE</varname>,
+ <varname>$GATEWAY_INTERFACE</varname>, <varname>$PATH_INFO</varname>,
+ <varname>$PATH_TRANSLATED</varname>, <varname>$QUERY_STRING</varname>,
+ <varname>$REMOTE_ADDR</varname>, <varname>$REMOTE_HOST</varname>,
+ <varname>$REMOTE_IDENT</varname>, <varname>$REMOTE_USER</varname>,
+ <varname>$REQUEST_METHOD</varname>, <varname>$SCRIPT_NAME</varname>,
+ <varname>$SERVER_NAME</varname>, <varname>$SERVER_PORT</varname>,
+ <varname>$SERVER_PROTOCOL</varname>, and <varname>$SERVER_SOFTWARE</varname>
</simpara>
</sect2>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.iplanet.xml?r1=1.15&r2=1.16&ty=u
Index: phpdoc/en/chapters/install.iplanet.xml
diff -u phpdoc/en/chapters/install.iplanet.xml:1.15
phpdoc/en/chapters/install.iplanet.xml:1.16
--- phpdoc/en/chapters/install.iplanet.xml:1.15 Thu Mar 18 08:48:20 2004
+++ phpdoc/en/chapters/install.iplanet.xml Fri May 21 10:08:08 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<sect1 id="install.netscape-enterprise">
<title>Servers-Netscape, iPlanet and SunONE</title>
<para>
@@ -105,7 +105,7 @@
<formalpara>
<title>Configuration Instructions for NES/iPlanet/SunONE</title>
<para>
- Firstly you may need to add some paths to the LD_LIBRARY_PATH environment
+ Firstly you may need to add some paths to the
<varname>LD_LIBRARY_PATH</varname> environment
for SunONE to find all the shared libs. This can best done in the start
script for your SunONE webserver. Windows users can probably skip this
step. The start script is often located in: <filename
@@ -422,7 +422,7 @@
<sect2 id="install.netscape.specialpages">
<title>Special use for error pages or self-made directory listings (PHP >=
4.3.3)</title>
<para>
- You can use PHP to generate the error pages for "404 Not Found"
+ You can use PHP to generate the error pages for <literal>"404 Not
Found"</literal>
or similar. Add the following line to the object in
<filename>obj.conf</filename> for
every error page you want to overwrite:
<programlisting>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.otherhttpd.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/chapters/install.otherhttpd.xml
diff -u phpdoc/en/chapters/install.otherhttpd.xml:1.1
phpdoc/en/chapters/install.otherhttpd.xml:1.2
--- phpdoc/en/chapters/install.otherhttpd.xml:1.1 Wed Jan 9 18:52:08 2002
+++ phpdoc/en/chapters/install.otherhttpd.xml Fri May 21 10:08:08 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<sect1 id="install.otherhttpd">
<title>Servers-Other web servers</title>
<para>
@@ -10,8 +10,8 @@
see <link linkend="install.configure.servers">Server-related
options</link> for a full list of server-related configure
-->
- see Server-related
- options for a full list of server-related configure
+ see <link linkend="install.configure.options.servers">Server-related
+ options</link> for a full list of server-related configure
options. The PHP CGI binaries are compatible with almost all
webservers supporting the CGI standard.
</para>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.sambar.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/chapters/install.sambar.xml
diff -u phpdoc/en/chapters/install.sambar.xml:1.2
phpdoc/en/chapters/install.sambar.xml:1.3
--- phpdoc/en/chapters/install.sambar.xml:1.2 Thu Jun 26 05:56:21 2003
+++ phpdoc/en/chapters/install.sambar.xml Fri May 21 10:08:08 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<sect1 id="install.sambar">
<title>Servers-Sambar</title>
<para>
@@ -26,15 +26,16 @@
<para>
Open <filename>mappings.ini</filename> and add the following line
under <literal>[ISAPI]</literal>:
- <informalexample>
- <screen>
+ <example>
+ <title>ISAPI configuration of Sambar</title>
+ <programlisting>
<![CDATA[
*.php = c:\php\php4isapi.dll
]]>
- </screen>
- </informalexample>
+ </programlisting>
+ </example>
(This line assumes that PHP was installed in
- <literal>c:\php</literal>.)
+ <filename>c:\php</filename>.)
</para>
</listitem>
<listitem>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.solaris.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/chapters/install.solaris.xml
diff -u phpdoc/en/chapters/install.solaris.xml:1.3
phpdoc/en/chapters/install.solaris.xml:1.4
--- phpdoc/en/chapters/install.solaris.xml:1.3 Fri Jul 18 15:28:28 2003
+++ phpdoc/en/chapters/install.solaris.xml Fri May 21 10:08:08 2004
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<sect1 id="install.solaris">
- <title>Unix/Solaris installs</title>
+ <title>Unix/<productname>Solaris</productname> installs</title>
<para>
This section contains notes and hints specific to installing
- PHP on Solaris systems.
+ PHP on <productname>Solaris</productname> systems.
</para>
<sect2 id="install.solaris.required">
<title>Required software</title>
<para>
- Solaris installs often lack C compilers and their related tools.
+ <productname>Solaris</productname> installs often lack C compilers and their
related tools.
Read <link linkend="faq.installation.needgnu">this FAQ</link>
for information on why using GNU versions for some of these
tools is necessary. The required software is as follows:
@@ -78,7 +78,7 @@
<sect2 id="install.solaris.packages">
<title>Using Packages</title>
<simpara>
- You can simplify the Solaris install process by using pkgadd to
+ You can simplify the <productname>Solaris</productname> install process by using
pkgadd to
install most of your needed components.
</simpara>
</sect2>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.windows.xml?r1=1.41&r2=1.42&ty=u
Index: phpdoc/en/chapters/install.windows.xml
diff -u phpdoc/en/chapters/install.windows.xml:1.41
phpdoc/en/chapters/install.windows.xml:1.42
--- phpdoc/en/chapters/install.windows.xml:1.41 Sat Apr 10 11:55:40 2004
+++ phpdoc/en/chapters/install.windows.xml Fri May 21 10:08:08 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.41 $ -->
+<!-- $Revision: 1.42 $ -->
<sect1 id="install.windows">
<title>Installation on Windows systems</title>
<para>
@@ -233,7 +233,7 @@
webserver loads the dll (e.g. <filename>php4apache.dll</filename>).
</member>
<member>
- Any directory in your Windows PATH environment variable.
+ Any directory in your Windows <varname>$PATH</varname> environment variable.
</member>
</simplelist>
<itemizedlist>
@@ -783,8 +783,8 @@
<filename class="directory">c:\php\dlls\</filename> folder but some, for
example Oracle
(<filename>php_oci8.dll</filename>) require DLLs which are not bundled
with the distribution package. Copy the bundled DLLs from
- <filename class="directory">c:\php\dlls</filename> folder to your Windows
PATH, safe
- places are:
+ <filename class="directory">c:\php\dlls</filename> folder to your Windows
+ <varname>$PATH</varname>, safe places are:
<simplelist>
<member>c:\windows\system for Windows 9x/Me</member>
<member>c:\winnt\system32 for Windows NT/2000</member>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.xitami.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/chapters/install.xitami.xml
diff -u phpdoc/en/chapters/install.xitami.xml:1.5
phpdoc/en/chapters/install.xitami.xml:1.6
--- phpdoc/en/chapters/install.xitami.xml:1.5 Sat Dec 20 20:22:46 2003
+++ phpdoc/en/chapters/install.xitami.xml Fri May 21 10:08:08 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<sect1 id="install.xitami">
<title>Servers-Xitami</title>
<para>
@@ -43,7 +43,7 @@
<listitem>
<para>
In Filter command or script put the path and name
- of your PHP executable i.e. <literal>c:\php\php.exe</literal>.
+ of your PHP executable i.e. <filename>c:\php\php.exe</filename>.
</para>
</listitem>
<listitem>
http://cvs.php.net/diff.php/phpdoc/en/chapters/streams.file.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/chapters/streams.file.xml
diff -u phpdoc/en/chapters/streams.file.xml:1.1 phpdoc/en/chapters/streams.file.xml:1.2
--- phpdoc/en/chapters/streams.file.xml:1.1 Sat Aug 10 19:38:41 2002
+++ phpdoc/en/chapters/streams.file.xml Fri May 21 10:08:08 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<!-- Author: Wez Furlong <[EMAIL PROTECTED]>
Please contact me before making any major amendments to the
content of this section. Splitting/Merging are fine if they are
@@ -44,7 +44,7 @@
<methodparam><type>void</type><parameter></parameter></methodparam>
</methodsynopsis>
<para>
- <function>php_stream_fopen_from_file</function> returns a stream based on a
+ <function>php_stream_fopen_tmpfile</function> returns a stream based on a
temporary file opened with a mode of "w+b". The temporary file will be deleted
automatically when the stream is closed or the process terminates.
</para>
