didou Fri Aug 13 00:34:35 2004 EDT
Modified files:
/phpdoc/en/appendices migration4.xml
/phpdoc/en/faq build.xml databases.xml installation.xml
migration5.xml
/phpdoc/en/reference/dba configure.xml
/phpdoc/en/reference/fdf configure.xml
/phpdoc/en/reference/imap configure.xml
/phpdoc/en/reference/info/functions php-ini-scanned-files.xml
/phpdoc/en/reference/uodbc configure.xml
Log:
used <option role="configure"> where needed
http://cvs.php.net/diff.php/phpdoc/en/appendices/migration4.xml?r1=1.38&r2=1.39&ty=u
Index: phpdoc/en/appendices/migration4.xml
diff -u phpdoc/en/appendices/migration4.xml:1.38
phpdoc/en/appendices/migration4.xml:1.39
--- phpdoc/en/appendices/migration4.xml:1.38 Tue Aug 3 16:59:42 2004
+++ phpdoc/en/appendices/migration4.xml Fri Aug 13 00:34:34 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.38 $ -->
+<!-- $Revision: 1.39 $ -->
<appendix id="migration4">
<title>Migrating from PHP 3 to PHP 4</title>
@@ -35,11 +35,11 @@
</itemizedlist>
<para>
To enable it, configure PHP 3 and PHP 4 to use APXS
- (--with-apxs) and the necessary link extensions
- (--enable-versioning). Otherwise, all standard installations
- instructions apply. For example:
+ (<option role="configure">--with-apxs</option>) and the necessary
+ link extensions (<option role="configure">--enable-versioning</option>).
+ Otherwise, all standard installations instructions apply. For example:
<informalexample>
- <programlisting role="configure">
+ <programlisting role="shell">
<![CDATA[
$ ./configure \
--with-apxs=/apache/bin/apxs \
http://cvs.php.net/diff.php/phpdoc/en/faq/build.xml?r1=1.30&r2=1.31&ty=u
Index: phpdoc/en/faq/build.xml
diff -u phpdoc/en/faq/build.xml:1.30 phpdoc/en/faq/build.xml:1.31
--- phpdoc/en/faq/build.xml:1.30 Tue Jan 6 09:35:35 2004
+++ phpdoc/en/faq/build.xml Fri Aug 13 00:34:34 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.30 $ -->
+<!-- $Revision: 1.31 $ -->
<chapter id="faq.build">
<title>Build Problems</title>
<titleabbrev>Build Problems</titleabbrev>
@@ -44,8 +44,10 @@
<para>
You need to tell the configure/setup script the location of the
top-level of your Apache source tree. This means that
- you want to specify <literal>--with-apache=/path/to/apache</literal>
- and <emphasis>not</emphasis>
<literal>--with-apache=/path/to/apache/src</literal>.
+ you want to specify <option
+ role="configure">--with-apache=/path/to/apache</option>
+ and <emphasis>not</emphasis> <option
+ role="configure">--with-apache=/path/to/apache/src</option>.
</para>
</answer>
</qandaentry>
@@ -348,8 +350,8 @@
<qandaentry id="faq.build.apxs">
<question>
<para>
- When I try to build PHP using <literal>--with-apxs</literal>
- I get strange error messages.
+ When I try to build PHP using <option
+ role="configure">--with-apxs</option> I get strange error messages.
</para>
</question>
<answer>
http://cvs.php.net/diff.php/phpdoc/en/faq/databases.xml?r1=1.25&r2=1.26&ty=u
Index: phpdoc/en/faq/databases.xml
diff -u phpdoc/en/faq/databases.xml:1.25 phpdoc/en/faq/databases.xml:1.26
--- phpdoc/en/faq/databases.xml:1.25 Sun Mar 21 11:53:09 2004
+++ phpdoc/en/faq/databases.xml Fri Aug 13 00:34:34 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.25 $ -->
+<!-- $Revision: 1.26 $ -->
<chapter id="faq.databases">
<title>Database issues</title>
<titleabbrev>Database issues</titleabbrev>
@@ -166,10 +166,11 @@
</question>
<answer>
<para>
- Most likely what has happened is, PHP 4 was compiled with the '--with-mysql'
- option, without specifying the path to MySQL. This means PHP is using its
- built-in MySQL client library. If your system is running applications,
- such as PHP 3 as a concurrent Apache module, or auth-mysql, that use other
+ Most likely what has happened is, PHP 4 was compiled with the <option
+ role="configure">--with-mysql</option> option, without specifying the
+ path to MySQL. This means PHP is using its built-in MySQL client
+ library. If your system is running applications, such as PHP 3 as a
+ concurrent Apache module, or auth-mysql, that use other
versions of MySQL clients, then there is a conflict between the two
differing versions of those clients.
</para>
@@ -230,7 +231,8 @@
<para>
This won't actually affect that many people. Unix users, at least the
ones who know what they are doing, tend to always build PHP against
- their system's libmyqlclient library simply by doing --with-mysql=/usr
+ their system's libmyqlclient library simply by adding the <option
+ role="configure">--with-mysql=/usr</option> option
when building PHP. Windows users may enable the extension
<filename>php_mysql.dll</filename> inside &php.ini;. Also, copy
<filename>libmySQL.dll</filename> into the appropriate
http://cvs.php.net/diff.php/phpdoc/en/faq/installation.xml?r1=1.37&r2=1.38&ty=u
Index: phpdoc/en/faq/installation.xml
diff -u phpdoc/en/faq/installation.xml:1.37 phpdoc/en/faq/installation.xml:1.38
--- phpdoc/en/faq/installation.xml:1.37 Thu Aug 12 21:00:42 2004
+++ phpdoc/en/faq/installation.xml Fri Aug 13 00:34:34 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.37 $ -->
+<!-- $Revision: 1.38 $ -->
<chapter id="faq.installation">
<title>Installation</title>
<titleabbrev>Installation</titleabbrev>
@@ -308,9 +308,7 @@
</para>
<para>
For MySQL you would add
- <programlisting role="shell">
---with-mysql=/usr \
- </programlisting>
+ <option role="configure">--with-mysql=/usr</option>
The %build section will look something like this:
<programlisting role="shell">
./configure --prefix=/usr \
@@ -427,7 +425,8 @@
<answer>
<para>
This has actually nothing to do with PHP, but with the MySQL
- client libraries. Some need --with-zlib, others do not. This
+ client libraries. Some need <option
+ role="configure">--with-zlib</option>, others do not. This
is also covered in the MySQL FAQ.
</para>
</answer>
http://cvs.php.net/diff.php/phpdoc/en/faq/migration5.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/faq/migration5.xml
diff -u phpdoc/en/faq/migration5.xml:1.2 phpdoc/en/faq/migration5.xml:1.3
--- phpdoc/en/faq/migration5.xml:1.2 Mon Jul 26 07:39:15 2004
+++ phpdoc/en/faq/migration5.xml Fri Aug 13 00:34:34 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<chapter id="faq.migration5">
<title>Migrating from PHP 4 to PHP 5</title>
<titleabbrev>Migrating from PHP 4 to PHP 5</titleabbrev>
@@ -40,9 +40,9 @@
<link linkend="ref.mysql">MySQL</link> is supported with the only
change being that MySQL support is no longer enabled by
<emphasis>default</emphasis> in PHP 5. This essentially means that
- PHP doesn't include <literal>--with-mysql</literal> in the
- <link linkend="configuration">configure</link> line so that you must
- now manually do this when compiling PHP. Windows users will
+ PHP doesn't include the <option role="configure">--with-mysql</option>
+ option in the <link linkend="configuration">configure</link> line so
+ that you must now manually do this when compiling PHP. Windows users will
edit &php.ini; and enable the <filename>php_mysql.dll</filename> DLL as
in PHP 4 no such DLL existed, it was simply built into your Windows
PHP binaries.
@@ -53,8 +53,8 @@
<link linkend="faq.databases.mysql.php5">the following FAQ</link> and
be sure to read the <link linkend="ref.mysql">MySQL section</link>
for details on installing MySQL. An example configure line would be
- <literal>--with-mysql=/usr</literal> while Windows users will need
- the <filename>libmySQL.dll</filename> available to the system.
+ <option role="configure">--with-mysql=/usr</option> while Windows users
+ will need the <filename>libmySQL.dll</filename> available to the system.
</para>
</answer>
</qandaentry>
http://cvs.php.net/diff.php/phpdoc/en/reference/dba/configure.xml?r1=1.13&r2=1.14&ty=u
Index: phpdoc/en/reference/dba/configure.xml
diff -u phpdoc/en/reference/dba/configure.xml:1.13
phpdoc/en/reference/dba/configure.xml:1.14
--- phpdoc/en/reference/dba/configure.xml:1.13 Thu Aug 12 21:00:44 2004
+++ phpdoc/en/reference/dba/configure.xml Fri Aug 13 00:34:34 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
<section id="dba.installation">
&reftitle.install;
<para>
@@ -7,8 +7,8 @@
configuration option you can build a dynamic loadable module to enable PHP
for basic support of dbm-style databases. You also have to add support
for at least one of the following handlers by specifying the
- <literal>--with-XXXX</literal> configure switch to your PHP configure
- line.
+ <option role="configure">--with-XXXX</option> configure switch to your PHP
+ configure line.
</para>
<warning>
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/fdf/configure.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/reference/fdf/configure.xml
diff -u phpdoc/en/reference/fdf/configure.xml:1.3
phpdoc/en/reference/fdf/configure.xml:1.4
--- phpdoc/en/reference/fdf/configure.xml:1.3 Wed Dec 31 10:25:18 2003
+++ phpdoc/en/reference/fdf/configure.xml Fri Aug 13 00:34:34 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<section id="fdf.installation">
&reftitle.install;
<simpara>
@@ -18,7 +18,7 @@
file and the appropriate library for your platform into e.g.
<filename>/usr/local/include</filename> and
<filename>/usr/local/lib</filename> and configure with
- <literal>--with-fdftk=/usr/local</literal>.
+ <option role="configure">--with-fdftk=/usr/local</option>.
</simpara>
</note>
<note>
http://cvs.php.net/diff.php/phpdoc/en/reference/imap/configure.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/imap/configure.xml
diff -u phpdoc/en/reference/imap/configure.xml:1.5
phpdoc/en/reference/imap/configure.xml:1.6
--- phpdoc/en/reference/imap/configure.xml:1.5 Sun Jun 22 21:21:45 2003
+++ phpdoc/en/reference/imap/configure.xml Fri Aug 13 00:34:35 2004
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<section id="imap.installation">
&reftitle.install;
<para>
To get these functions to work, you have to compile PHP with
<option role="configure">--with-imap[=DIR]</option>, where DIR is the
c-client install prefix. From our example above, you would use
- <literal>--with-imap=/usr/local/imap-2000b</literal>. This location
- depends on where you created this directory according to the
+ <option role="configure">--with-imap=/usr/local/imap-2000b</option>.
+ This location depends on where you created this directory according to the
description above. Windows users may include the
<filename>php_imap.dll</filename> DLL in &php.ini;
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/info/functions/php-ini-scanned-files.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc/en/reference/info/functions/php-ini-scanned-files.xml
diff -u phpdoc/en/reference/info/functions/php-ini-scanned-files.xml:1.3
phpdoc/en/reference/info/functions/php-ini-scanned-files.xml:1.4
--- phpdoc/en/reference/info/functions/php-ini-scanned-files.xml:1.3 Wed Dec 17
09:32:32 2003
+++ phpdoc/en/reference/info/functions/php-ini-scanned-files.xml Fri Aug 13
00:34:35 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<refentry id="function.php-ini-scanned-files">
<refnamediv>
<refname>php_ini_scanned_files</refname>
@@ -15,12 +15,13 @@
<function>php_ini_scanned_files</function> returns a comma-separated
list of configuration files parsed after &php.ini;. These files are
found in a directory defined by the
- <literal>--with-config-file-scan-dir</literal>. option which is set
- during compilation.
+ <option role="configure">--with-config-file-scan-dir</option> option
+ which is set during compilation.
</simpara>
<simpara>
Returns a comma-separated string of .ini files on success. If the
- directive <literal>--with-config-files-scan-dir</literal> wasn't set,
+ directive <option
+ role="configure">--with-config-files-scan-dir</option> wasn't set,
&false; is returned. If it was set and the directory was empty, an
empty string is returned. If a file is unrecognizable, the file will
still make it into the returned string but a PHP error will also result.
@@ -29,8 +30,8 @@
</simpara>
<simpara>
The returned configuration files also include the path as declared in
- the <literal>--with-config-file-scan-dir</literal> directive. Also, each
- comma is followed by a newline.
+ the <option role="configure">--with-config-file-scan-dir</option>
+ option. Also, each comma is followed by a newline.
</simpara>
<para>
<example>
http://cvs.php.net/diff.php/phpdoc/en/reference/uodbc/configure.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/uodbc/configure.xml
diff -u phpdoc/en/reference/uodbc/configure.xml:1.5
phpdoc/en/reference/uodbc/configure.xml:1.6
--- phpdoc/en/reference/uodbc/configure.xml:1.5 Sun Dec 21 09:42:22 2003
+++ phpdoc/en/reference/uodbc/configure.xml Fri Aug 13 00:34:35 2004
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<section id="odbc.installation">
&reftitle.install;
<para>
<variablelist>
<varlistentry id="install.configure.with-adabas">
<term>
- <parameter>--with-adabas[=DIR]</parameter>
+ <option role="configure">--with-adabas[=DIR]</option>
</term>
<listitem>
<para>
@@ -17,7 +17,7 @@
</varlistentry>
<varlistentry id="install.configure.with-sapdb">
<term>
- <parameter>--with-sapdb[=DIR]</parameter>
+ <option role="configure">--with-sapdb[=DIR]</option>
</term>
<listitem>
<para>
@@ -28,7 +28,7 @@
</varlistentry>
<varlistentry id="install.configure.with-solid">
<term>
- <parameter>--with-solid[=DIR]</parameter>
+ <option role="configure">--with-solid[=DIR]</option>
</term>
<listitem>
<para>
@@ -39,7 +39,7 @@
</varlistentry>
<varlistentry id="install.configure.with-ibm-db2">
<term>
- <parameter>--with-ibm-db2[=DIR]</parameter>
+ <option role="configure">--with-ibm-db2[=DIR]</option>
</term>
<listitem>
<para>
@@ -50,7 +50,7 @@
</varlistentry>
<varlistentry id="install.configure.with-empress">
<term>
- <parameter>--with-empress[=DIR]</parameter>
+ <option role="configure">--with-empress[=DIR]</option>
</term>
<listitem>
<para>
@@ -62,7 +62,7 @@
</varlistentry>
<varlistentry id="install.configure.with-empress-bcs">
<term>
- <parameter>--with-empress-bcs[=DIR]</parameter>
+ <option role="configure">--with-empress-bcs[=DIR]</option>
</term>
<listitem>
<para>
@@ -74,7 +74,7 @@
</varlistentry>
<varlistentry id="install.configure.with-birdstep">
<term>
- <parameter>--with-birdstep[=DIR]</parameter>
+ <option role="configure">--with-birdstep[=DIR]</option>
</term>
<listitem>
<para>
@@ -85,7 +85,7 @@
</varlistentry>
<varlistentry id="install.configure.with-custom-odbc">
<term>
- <parameter>--with-custom-odbc[=DIR]</parameter>
+ <option role="configure">--with-custom-odbc[=DIR]</option>
</term>
<listitem>
<para>
@@ -104,7 +104,7 @@
</varlistentry>
<varlistentry id="install.configure.with-iodbc">
<term>
- <parameter>--with-iodbc[=DIR]</parameter>
+ <option role="configure">--with-iodbc[=DIR]</option>
</term>
<listitem>
<para>
@@ -115,7 +115,7 @@
</varlistentry>
<varlistentry id="install.configure.with-esoob">
<term>
- <parameter>--with-esoob[=DIR]</parameter>
+ <option role="configure">--with-esoob[=DIR]</option>
</term>
<listitem>
<para>
@@ -126,7 +126,7 @@
</varlistentry>
<varlistentry id="install.configure.with-unixODBC">
<term>
- <parameter>--with-unixODBC[=DIR]</parameter>
+ <option role="configure">--with-unixODBC[=DIR]</option>
</term>
<listitem>
<para>
@@ -137,7 +137,7 @@
</varlistentry>
<varlistentry id="install.configure.with-openlink">
<term>
- <parameter>--with-openlink[=DIR]</parameter>
+ <option role="configure">--with-openlink[=DIR]</option>
</term>
<listitem>
<para>
@@ -148,7 +148,7 @@
</varlistentry>
<varlistentry id="install.configure.with-dbmaker">
<term>
- <parameter>--with-dbmaker[=DIR]</parameter>
+ <option role="configure">--with-dbmaker[=DIR]</option>
</term>
<listitem>
<para>
