philip Mon Jul 19 21:27:19 2004 EDT
Modified files:
/phpdoc/en/appendices filters.xml
/phpdoc/en/chapters install.apache.xml install.caudium.xml
install.fhttpd.xml install.iplanet.xml
install.otherhttpd.xml install.unix.xml
install.windows.xml tutorial.xml
/phpdoc/en/reference/session reference.xml
Log:
Fix missing/changed entities/ids.
http://cvs.php.net/diff.php/phpdoc/en/appendices/filters.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/appendices/filters.xml
diff -u phpdoc/en/appendices/filters.xml:1.8 phpdoc/en/appendices/filters.xml:1.9
--- phpdoc/en/appendices/filters.xml:1.8 Fri Jul 16 20:15:21 2004
+++ phpdoc/en/appendices/filters.xml Mon Jul 19 21:27:19 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<appendix id="filters">
<title>List of Available Filters</title>
<para>
@@ -279,7 +279,7 @@
<simpara>
zlib.* compression filters are available with PHP as of version
<literal>5.1.0</literal> if
- <xref linkend="zlib"/> support is enabled. They are also available as a backport
in version
+ <xref linkend="ref.zlib"/> support is enabled. They are also available as a
backport in version
<literal>5.0.x</literal> by installing the <ulink
url="&url.pecl.package;zlib_filter">zlib_filter</ulink>
package from <ulink url="&url.pecl;">PECL</ulink>. These filters are
<emphasis>not</emphasis>
available for <literal>PHP 4</literal>.
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.apache.xml?r1=1.23&r2=1.24&ty=u
Index: phpdoc/en/chapters/install.apache.xml
diff -u phpdoc/en/chapters/install.apache.xml:1.23
phpdoc/en/chapters/install.apache.xml:1.24
--- phpdoc/en/chapters/install.apache.xml:1.23 Mon Mar 1 19:10:47 2004
+++ phpdoc/en/chapters/install.apache.xml Mon Jul 19 21:27:19 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.23 $ -->
+<!-- $Revision: 1.24 $ -->
<sect1 id="install.apache">
<title>Servers-Apache</title>
<para>
@@ -14,10 +14,10 @@
<para>
You can select arguments to add to the
<command>configure</command> on line 10 below from the <link
- linkend="install.configure">Complete list of configure
- options</link>. The version numbers have been omitted here, to
- ensure the instructions are not incorrect. You will need to replace
- the 'xxx' here with the correct values from your files.
+ linkend="configure">configure options</link>. The version numbers have
+ been omitted here, to ensure the instructions are not incorrect. You
+ will need to replace the 'xxx' here with the correct values from your
+ files.
</para>
<example id="install.apache.unix.longer">
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.caudium.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/chapters/install.caudium.xml
diff -u phpdoc/en/chapters/install.caudium.xml:1.7
phpdoc/en/chapters/install.caudium.xml:1.8
--- phpdoc/en/chapters/install.caudium.xml:1.7 Tue May 11 21:01:05 2004
+++ phpdoc/en/chapters/install.caudium.xml Mon Jul 19 21:27:19 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<sect1 id="install.caudium">
<title>Servers-Caudium</title>
<para>
@@ -36,9 +36,8 @@
</example>
<para>
You can of course compile your Caudium module with support for the
- various extensions available in PHP 4. See the
- <link linkend="install.configure">complete list of configure
- options</link> for an exhaustive rundown.
+ various extensions available in PHP. See the chapter on
+ <link linkend="configure">configure options</link> for more details.
</para>
<note>
<para>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.fhttpd.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/chapters/install.fhttpd.xml
diff -u phpdoc/en/chapters/install.fhttpd.xml:1.2
phpdoc/en/chapters/install.fhttpd.xml:1.3
--- phpdoc/en/chapters/install.fhttpd.xml:1.2 Mon May 12 18:32:47 2003
+++ phpdoc/en/chapters/install.fhttpd.xml Mon Jul 19 21:27:19 2004
@@ -1,14 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<sect1 id="install.fhttpd">
<title>Servers-fhttpd</title>
<para>
To build PHP as an fhttpd module, answer "yes" to "Build as an
- fhttpd module?" (the <link
- linkend="install.configure.with-fhttpd">
- --with-fhttpd</link>=<replaceable>DIR</replaceable>
- option to configure) and specify the fhttpd source base
- directory. The default directory is <filename
+ fhttpd module?" to the <literal>--with-fhttpd=[DIR]</literal>
+ <link linkend="configure">configure option</link> and specify the fhttpd
+ source base directory. The default directory is <filename
class="directory">/usr/local/src/fhttpd</filename>. If you are
running fhttpd, building PHP as a module will give better
performance, more control and remote execution capability.
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.iplanet.xml?r1=1.16&r2=1.17&ty=u
Index: phpdoc/en/chapters/install.iplanet.xml
diff -u phpdoc/en/chapters/install.iplanet.xml:1.16
phpdoc/en/chapters/install.iplanet.xml:1.17
--- phpdoc/en/chapters/install.iplanet.xml:1.16 Fri May 21 10:08:08 2004
+++ phpdoc/en/chapters/install.iplanet.xml Mon Jul 19 21:27:19 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.16 $ -->
+<!-- $Revision: 1.17 $ -->
<sect1 id="install.netscape-enterprise">
<title>Servers-Netscape, iPlanet and SunONE</title>
<para>
@@ -23,9 +23,8 @@
<title>Installing PHP with NES/iPlanet/SunONE Webserver on Sun Solaris</title>
<para>
To build PHP with NES/iPlanet/SunONE webservers, enter the proper install
- directory for the
- <link linkend="install.configure.with-nsapi">--with-nsapi=[DIR]</link>
- option. The default directory is usually
+ directory for the <literal>--with-nsapi=[DIR]</literal> option. The
+ default directory is usually
<filename class="directory">/opt/netscape/suitespot/</filename>.
Please also read
<filename>/php-xxx-version/sapi/nsapi/nsapi-readme.txt</filename>.
</para>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.otherhttpd.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/chapters/install.otherhttpd.xml
diff -u phpdoc/en/chapters/install.otherhttpd.xml:1.2
phpdoc/en/chapters/install.otherhttpd.xml:1.3
--- phpdoc/en/chapters/install.otherhttpd.xml:1.2 Fri May 21 10:08:08 2004
+++ phpdoc/en/chapters/install.otherhttpd.xml Mon Jul 19 21:27:19 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<sect1 id="install.otherhttpd">
<title>Servers-Other web servers</title>
<para>
@@ -10,10 +10,9 @@
see <link linkend="install.configure.servers">Server-related
options</link> 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.
+ see the <link linkend="configure">configure options</link> chapter for
+ more details. The PHP CGI binaries are compatible with almost all
+ webservers supporting the CGI standard.
</para>
</sect1>
@@ -36,4 +35,4 @@
vim600: syn=xml fen fdm=syntax fdl=2 si
vim: et tw=78 syn=sgml
vi: ts=1 sw=1
--->
\ No newline at end of file
+-->
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.unix.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc/en/chapters/install.unix.xml
diff -u phpdoc/en/chapters/install.unix.xml:1.4 phpdoc/en/chapters/install.unix.xml:1.5
--- phpdoc/en/chapters/install.unix.xml:1.4 Sat Dec 20 23:21:40 2003
+++ phpdoc/en/chapters/install.unix.xml Mon Jul 19 21:27:19 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<sect1 id="install.unix">
<title>Installation on Unix systems</title>
<para>
@@ -56,10 +56,9 @@
The initial PHP setup and configuration process is controlled by the
use of the commandline options of the <filename>configure</filename>
script. This page outlines the usage of the most common options,
- but there are many others to play with. Check out the <link
- linkend="install.configure">Complete list of configure
- options</link> for an exhaustive rundown. There are several ways
- to install PHP:
+ but there are many others to play with. Check out the chapter on
+ <link linkend="configure">configure options</link> for more details.
+ There are several ways to install PHP:
<itemizedlist>
<listitem>
<simpara>
http://cvs.php.net/diff.php/phpdoc/en/chapters/install.windows.xml?r1=1.43&r2=1.44&ty=u
Index: phpdoc/en/chapters/install.windows.xml
diff -u phpdoc/en/chapters/install.windows.xml:1.43
phpdoc/en/chapters/install.windows.xml:1.44
--- phpdoc/en/chapters/install.windows.xml:1.43 Mon May 24 17:20:47 2004
+++ phpdoc/en/chapters/install.windows.xml Mon Jul 19 21:27:19 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.43 $ -->
+<!-- $Revision: 1.44 $ -->
<sect1 id="install.windows">
<title>Installation on Windows systems</title>
<para>
@@ -380,12 +380,6 @@
</simpara>
</listitem>
- <listitem>
- <simpara>
- .. the <link linkend="install.oreilly">Oreilly Website Pro</link> server.
- </simpara>
- </listitem>
-
<listitem>
<simpara>
.. the <link linkend="install.sambar">Sambar</link> server.
http://cvs.php.net/diff.php/phpdoc/en/chapters/tutorial.xml?r1=1.34&r2=1.35&ty=u
Index: phpdoc/en/chapters/tutorial.xml
diff -u phpdoc/en/chapters/tutorial.xml:1.34 phpdoc/en/chapters/tutorial.xml:1.35
--- phpdoc/en/chapters/tutorial.xml:1.34 Mon May 24 03:11:05 2004
+++ phpdoc/en/chapters/tutorial.xml Mon Jul 19 21:27:19 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.34 $ -->
+<!-- $Revision: 1.35 $ -->
<chapter id="tutorial">
<title>A simple tutorial</title>
@@ -44,10 +44,10 @@
</para>
<para>
You can either install these individually or choose a simpler way. Our
- manual has <link linkend="install">installation instructions for PHP</link>
- (assuming you already have some webserver set up). In case you have
- problems with installing PHP yourself, we would suggest you ask your
- questions on our <ulink url="&url.php.mailing-lists;">installation
+ manual has <link linkend="installation">installation instructions for
+ PHP</link> (assuming you already have some webserver set up). In case
+ you have problems with installing PHP yourself, we would suggest you ask
+ your questions on our <ulink url="&url.php.mailing-lists;">installation
mailing list</ulink>. If you choose to go on the simpler route, then
<ulink url="&url.installkits;">locate a pre-configured package</ulink>
for your operating system, which automatically installs all of these
http://cvs.php.net/diff.php/phpdoc/en/reference/session/reference.xml?r1=1.46&r2=1.47&ty=u
Index: phpdoc/en/reference/session/reference.xml
diff -u phpdoc/en/reference/session/reference.xml:1.46
phpdoc/en/reference/session/reference.xml:1.47
--- phpdoc/en/reference/session/reference.xml:1.46 Mon Jun 28 10:54:12 2004
+++ phpdoc/en/reference/session/reference.xml Mon Jul 19 21:27:19 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.46 $ -->
+<!-- $Revision: 1.47 $ -->
<reference id="ref.session">
<title>Session Handling Functions</title>
<titleabbrev>Sessions</titleabbrev>
@@ -320,7 +320,7 @@
<para>
PHP is capable of transforming links transparently. Unless you are using
PHP 4.2 or later, you need to enable it manually when building PHP.
- Under Unix, pass <link linkend="configure.enable-trans-sid">
+ Under Unix, pass <link linkend="ini.session.use-trans-sid">
--enable-trans-sid</link> to configure. If this build
option and the run-time option
<literal>session.use_trans_sid</literal> are enabled, relative
@@ -374,7 +374,7 @@
</para>
<para>
Printing the SID, like shown above, is not necessary if
- <link linkend="install.configure.enable-trans-sid">
+ <link linkend="ini.session.use-trans-sid">
--enable-trans-sid</link> was used to compile PHP.
</para>
<note>