cvs: phpdoc /en/appendices filters.xml migration5.xml tokens.xml transports.xml wrappers.xml /en/appendices/configure servers.xml /en/faq
installation.xml /en/features commandline.xml remote-files.xml /en/install/windows building.xml extensions.xml iis.xml omnihttpd.xml /en/language
variables.xml /en/reference/aspell configure.xml reference.xml /en/reference/bc configure.xml /en/reference/bzip2 configure.xml
/en/reference/calendar constants.xml /en/reference/calendar/functions easter-date.xml easter-days.xml /en/reference/ccvs reference.xml
/en/reference/datetime/functions microtime.xml /en/reference/dir/functions opendir.xml /en/reference/filepro configure.xml /en/reference/filesystem
ini.xml /en/reference/filesystem/functions mkdir.xml rename.xml rmdir.xml unlink.xml /en/reference/info/functions extension-loaded.xml
/en/reference/mail ini.xml /en/reference/mail/functions mail.xml /en/reference/mime_magic configure.xml /en/reference/misc/functions
php-check-syntax.xml /en/reference/muscat configure.xml /en/reference/network/functions fsockopen.xml /en/reference/outcontrol ini.xml
/en/reference/pcre constants.xml /en/reference/pcre/functions preg-match-all.xml preg-match.xml /en/reference/recode configure.xml
/en/reference/sesam reference.xml /en/reference/session ini.xml /en/reference/snmp configure.xml /en/reference/sockets/functions
socket-create-pair.xml socket-create.xml /en/reference/stream reference.xml /en/reference/stream/functions stream-register-wrapper.xml
stream-wrapper-register.xml /en/reference/strings/functions str-ireplace.xml str-replace.xml strrpos.xml /en/reference/url/functions
http-build-query.xml /en/reference/vpopmail configure.xml

betz Tue Aug 10 12:30:24 2004 EDT Modified files: /phpdoc/en/appendices filters.xml migration5.xml tokens.xml transports.xml wrappers.xml /phpdoc/en/appendices/configure servers.xml /phpdoc/en/faq installation.xml /phpdoc/en/features commandline.xml remote-files.xml /phpdoc/en/install/windows building.xml extensions.xml iis.xml omnihttpd.xml /phpdoc/en/language variables.xml /phpdoc/en/reference/aspell configure.xml reference.xml /phpdoc/en/reference/bc configure.xml /phpdoc/en/reference/bzip2 configure.xml /phpdoc/en/reference/calendar constants.xml /phpdoc/en/reference/calendar/functions easter-date.xml easter-days.xml /phpdoc/en/reference/ccvs reference.xml /phpdoc/en/reference/datetime/functions microtime.xml /phpdoc/en/reference/dir/functions opendir.xml /phpdoc/en/reference/filepro configure.xml /phpdoc/en/reference/filesystem ini.xml /phpdoc/en/reference/filesystem/functions mkdir.xml rename.xml rmdir.xml unlink.xml /phpdoc/en/reference/info/functions extension-loaded.xml /phpdoc/en/reference/mail ini.xml /phpdoc/en/reference/mail/functions mail.xml /phpdoc/en/reference/mime_magic configure.xml /phpdoc/en/reference/misc/functions php-check-syntax.xml /phpdoc/en/reference/muscat configure.xml /phpdoc/en/reference/network/functions fsockopen.xml /phpdoc/en/reference/outcontrol ini.xml /phpdoc/en/reference/pcre constants.xml /phpdoc/en/reference/pcre/functions preg-match-all.xml preg-match.xml /phpdoc/en/reference/recode configure.xml /phpdoc/en/reference/sesam reference.xml /phpdoc/en/reference/session ini.xml /phpdoc/en/reference/snmp configure.xml /phpdoc/en/reference/sockets/functions socket-create-pair.xml socket-create.xml /phpdoc/en/reference/stream reference.xml /phpdoc/en/reference/stream/functions stream-register-wrapper.xml stream-wrapper-register.xml /phpdoc/en/reference/strings/functions str-ireplace.xml str-replace.xml strrpos.xml /phpdoc/en/reference/url/functions http-build-query.xml /phpdoc/en/reference/vpopmail configure.xml Log: markup: no more <literal> with PHP (versions) replace literal with meaningful tags where appropriate

http://cvs.php.net/diff.php/phpdoc/en/appendices/filters.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc/en/appendices/filters.xml diff -u phpdoc/en/appendices/filters.xml:1.10 phpdoc/en/appendices/filters.xml:1.11 --- phpdoc/en/appendices/filters.xml:1.10 Wed Jul 21 00:06:43 2004 +++ phpdoc/en/appendices/filters.xml Tue Aug 10 12:30:13 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <appendix id="filters"> <title>List of Available Filters</title> <para> @@ -32,7 +32,7 @@ <para> For a list of filters installed in your version of - <literal>PHP</literal> use <function>stream_get_filters</function>. + PHP use <function>stream_get_filters</function>. </para> <section id="filters.string"> @@ -47,7 +47,7 @@ <simpara> <literal>string.rot13</literal> - (since <literal>PHP 4.3.0</literal>) + (since PHP 4.3.0) Use of this filter is equivalent to processing all stream data through the <function>str_rot13</function> function. </simpara> @@ -67,7 +67,7 @@ <simpara> <literal>string.toupper</literal> - (since <literal>PHP 5.0.0</literal>) + (since PHP 5.0.0) Use of this filter is equivalent to processing all stream data through the <function>strtoupper</function> function. </simpara> @@ -87,7 +87,7 @@ <simpara> <literal>string.tolower</literal> - (since <literal>PHP 5.0.0</literal>) + (since PHP 5.0.0) Use of this filter is equivalent to processing all stream data through the <function>strtolower</function> function. </simpara> @@ -107,7 +107,7 @@ <simpara> <literal>string.strip_tags</literal> - (since <literal>PHP 5.0.0</literal>) + (since PHP 5.0.0) Use of this filter is equivalent to processing all stream data through the <function>strip_tags</function> function. It accepts parameters in one of two forms: @@ -144,7 +144,7 @@ <simpara> Like the string.* filters, the convert.* filters perform actions similar to their names. The convert filters were added with - <literal>PHP 5.0.0</literal>. + PHP 5.0.0. For more information on a given filter, refer to the manual page for the corresponding function. </simpara> @@ -282,7 +282,7 @@ <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>. + available for PHP 4. </simpara> <example> @@ -384,7 +384,7 @@ <xref linkend="ref.bzip2"/> 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;bz2_filter">bz2_filter</ulink> package from <ulink url="&url.pecl;">PECL</ulink>. These filters are <emphasis>not</emphasis> - available for <literal>PHP 4</literal>. + available for PHP 4. </simpara> <example> http://cvs.php.net/diff.php/phpdoc/en/appendices/migration5.xml?r1=1.31&r2=1.32&ty=u Index: phpdoc/en/appendices/migration5.xml diff -u phpdoc/en/appendices/migration5.xml:1.31 phpdoc/en/appendices/migration5.xml:1.32 --- phpdoc/en/appendices/migration5.xml:1.31 Sun Aug 1 14:47:02 2004 +++ phpdoc/en/appendices/migration5.xml Tue Aug 10 12:30:13 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.31 $ --> +<!-- $Revision: 1.32 $ --> <appendix id="migration5"> <title>Migrating from PHP 4 to PHP 5</title> @@ -198,7 +198,7 @@ </para> <para> In PHP 5 it was also introduced a new mode: - <literal>php-win.exe</literal>. This is equal to the CLI version, except + <filename>php-win.exe</filename>. This is equal to the CLI version, except that php-win doesn't output anything and thus provides no console (no "dos box" appears on the screen). This behavior is similar to php-gtk. </para> http://cvs.php.net/diff.php/phpdoc/en/appendices/tokens.xml?r1=1.14&r2=1.15&ty=u Index: phpdoc/en/appendices/tokens.xml diff -u phpdoc/en/appendices/tokens.xml:1.14 phpdoc/en/appendices/tokens.xml:1.15 --- phpdoc/en/appendices/tokens.xml:1.14 Sat Jul 31 06:59:30 2004 +++ phpdoc/en/appendices/tokens.xml Tue Aug 10 12:30:13 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.14 $ --> +<!-- $Revision: 1.15 $ --> <appendix id="tokens"> <title>List of Parser Tokens</title> @@ -580,13 +580,13 @@ <entry>T_FUNC_C</entry> <entry>__FUNCTION__</entry> <entry><link linkend="language.constants">constants</link>, since - <literal>PHP</literal> 4.3.0</entry> + PHP 4.3.0</entry> </row> <row> <entry>T_CLASS_C</entry> <entry>__CLASS__</entry> <entry><link linkend="language.constants">constants</link>, since - <literal>PHP</literal> 4.3.0</entry> + PHP 4.3.0</entry> </row> </tbody> </tgroup> http://cvs.php.net/diff.php/phpdoc/en/appendices/transports.xml?r1=1.9&r2=1.10&ty=u Index: phpdoc/en/appendices/transports.xml diff -u phpdoc/en/appendices/transports.xml:1.9 phpdoc/en/appendices/transports.xml:1.10 --- phpdoc/en/appendices/transports.xml:1.9 Mon May 24 13:55:02 2004 +++ phpdoc/en/appendices/transports.xml Tue Aug 10 12:30:13 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <appendix id="transports"> <title>List of Supported Socket Transports</title> <para> @@ -13,7 +13,7 @@ <para> For a list of transports installed in your version of - <literal>PHP</literal> use <function>stream_get_transports</function>. + PHP use <function>stream_get_transports</function>. </para> <section id="transports.inet"> @@ -70,8 +70,8 @@ The <literal>ssl://</literal> and <literal>tls://</literal> transports (available only when openssl support is compiled into PHP) are extensions of the <literal>tcp://</literal> transport which includes SSL encryption. - Since <literal>PHP 4.3.0</literal> OpenSSL support must be statically - compiled into <literal>PHP</literal>, since <literal>PHP 5.0.0</literal> + Since PHP 4.3.0 OpenSSL support must be statically + compiled into PHP, since PHP 5.0.0 it may be compiled as a module or statically. </simpara> @@ -79,7 +79,7 @@ <table> <title> Context options for <literal>ssl://</literal> and <literal>tls://</literal> - transports (since <literal>PHP 4.3.2</literal>) + transports (since PHP 4.3.2) </title> <tgroup cols="3"> <thead> @@ -170,8 +170,8 @@ <section id="transports.unix"> <title>Unix Domain: Unix and UDG</title> <simpara> - <literal>unix://</literal> since <literal>PHP 3</literal>, - <literal>udg://</literal> since <literal>PHP 5</literal> + <literal>unix://</literal> since PHP 3, + <literal>udg://</literal> since PHP 5 </simpara> <itemizedlist> http://cvs.php.net/diff.php/phpdoc/en/appendices/wrappers.xml?r1=1.40&r2=1.41&ty=u Index: phpdoc/en/appendices/wrappers.xml diff -u phpdoc/en/appendices/wrappers.xml:1.40 phpdoc/en/appendices/wrappers.xml:1.41 --- phpdoc/en/appendices/wrappers.xml:1.40 Sat Jul 24 00:07:06 2004 +++ phpdoc/en/appendices/wrappers.xml Tue Aug 10 12:30:13 2004 @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.40 $ --> +<!-- $Revision: 1.41 $ --> <appendix id="wrappers"> <title>List of Supported Protocols/Wrappers</title> <para> The following is a list of the various URL style protocols that PHP has built-in for use with the filesystem functions such as <function>fopen</function> and <function>copy</function>. - In addition to these wrappers, as of <literal>PHP 4.3.0</literal>, you can write + In addition to these wrappers, as of PHP 4.3.0, you can write your own wrappers using PHP script and <function>stream_wrapper_register</function>. </para> <section id="wrappers.file"> <title>Filesystem</title> - <simpara>All versions of PHP. Explicitly using <filename>file://</filename> since <literal>PHP 4.3.0</literal></simpara> + <simpara>All versions of PHP. Explicitly using <filename>file://</filename> since PHP 4.3.0</simpara> <itemizedlist> <listitem><simpara><filename>/path/to/file.ext</filename></simpara></listitem> @@ -50,7 +50,7 @@ </thead> <tbody> <row> - <entry>Restricted by <literal>allow_url_fopen</literal>.</entry> + <entry>Restricted by <link linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry> <entry>No</entry> </row> <row> @@ -97,7 +97,7 @@ <section id="wrappers.http"> <title>HTTP and HTTPS</title> - <simpara>PHP 3, PHP 4, PHP 5. <filename>https://</filename> since <literal>PHP 4.3.0</literal></simpara> + <simpara>PHP 3, PHP 4, PHP 5. <filename>https://</filename> since PHP 4.3.0</simpara> <itemizedlist> <listitem><simpara><filename>http://example.com</filename></simpara></listitem> @@ -152,7 +152,7 @@ The stream allows access to the <emphasis>body</emphasis> of the resource; the headers are stored in the <varname>$http_response_header</varname> variable. - Since <literal>PHP 4.3.0</literal>, the headers are available using + Since PHP 4.3.0, the headers are available using <function>stream_get_meta_data</function>. </simpara> <simpara> @@ -160,7 +160,7 @@ files to an HTTP resource. </simpara> <note> - <simpara>HTTPS is supported starting from <literal>PHP 4.3.0</literal>, if you + <simpara>HTTPS is supported starting from PHP 4.3.0, if you have compiled in support for OpenSSL. </simpara> </note> @@ -176,7 +176,7 @@ </thead> <tbody> <row> - <entry>Restricted by <literal>allow_url_fopen</literal>.</entry> + <entry>Restricted by <link linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry> <entry>Yes</entry> </row> <row> @@ -221,7 +221,7 @@ </para> <para> <table> - <title>Context options (as of <literal>PHP 5.0.0</literal>)</title> + <title>Context options (as of PHP 5.0.0)</title> <tgroup cols="3"> <thead> <row> @@ -305,7 +305,7 @@ <section id="wrappers.ftp"> <title>FTP and FTPS</title> - <simpara>PHP 3, PHP 4, PHP 5. <filename>ftps://</filename> since <literal>PHP 4.3.0</literal></simpara> + <simpara>PHP 3, PHP 4, PHP 5. <filename>ftps://</filename> since PHP 4.3.0</simpara> <itemizedlist> <listitem><simpara><filename>ftp://example.com/pub/file.txt</filename></simpara></listitem> @@ -332,20 +332,20 @@ <note> <title>Appending</title> <simpara> - As of <literal>PHP 5.0.0</literal> files may be appended via the + As of PHP 5.0.0 files may be appended via the <literal>ftp://</literal> URL wrapper. In prior versions, attempting to append to a file via <literal>ftp://</literal> will result in failure. </simpara> </note> <simpara> - <filename>ftps://</filename> was introduced in <literal>PHP 4.3.0</literal>. + <filename>ftps://</filename> was introduced in PHP 4.3.0. It is the same as <filename>ftp://</filename>, but attempts to negotiate a secure connection with the ftp server. If the server does not support SSL, then the connection falls back to regular unencrypted ftp. </simpara> <note> - <simpara>FTPS is supported starting from <literal>PHP 4.3.0</literal>, if you + <simpara>FTPS is supported starting from PHP 4.3.0, if you have compiled in support for OpenSSL. </simpara> </note> @@ -356,13 +356,13 @@ <thead> <row> <entry>Attribute</entry> - <entry><literal>PHP 4</literal></entry> - <entry><literal>PHP 5</literal></entry> + <entry>PHP 4</entry> + <entry>PHP 5</entry> </row> </thead> <tbody> <row> - <entry>Restricted by <literal>allow_url_fopen</literal>.</entry> + <entry>Restricted by <link linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry> <entry>Yes</entry> <entry>Yes</entry> </row> @@ -390,10 +390,10 @@ <entry>Supports <function>stat</function></entry> <entry>No</entry> <entry> - As of <literal>5.0.0</literal>: <function>filesize</function>, + As of PHP 5.0.0: <function>filesize</function>, <function>filetype</function>, <function>file_exists</function>, <function>is_file</function>, and <function>is_dir</function> elements only. - As of <literal>5.1.0</literal>: <function>filemtime</function>. + As of PHP 5.1.0: <function>filemtime</function>. </entry> </row> <row> @@ -422,7 +422,7 @@ </para> <para> <table> - <title>Context options (as of <literal>PHP 5.0.0</literal>)</title> + <title>Context options (as of PHP 5.0.0)</title> <tgroup cols="3"> <thead> <row> @@ -477,9 +477,9 @@ <section id="wrappers.php"> <title>PHP input/output streams</title> <simpara> - <literal>PHP 3.0.13</literal> and up, <filename>php://output</filename> - and <filename>php://input</filename> since <literal>PHP 4.3.0</literal>, - <filename>php://filter</filename> since <literal>PHP 5.0.0</literal> + PHP 3.0.13 and up, <filename>php://output</filename> + and <filename>php://input</filename> since PHP 4.3.0, + <filename>php://filter</filename> since PHP 5.0.0. </simpara> <itemizedlist> @@ -616,7 +616,7 @@ </thead> <tbody> <row> - <entry>Restricted by <literal>allow_url_fopen</literal>.</entry> + <entry>Restricted by <link linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry> <entry>No</entry> </row> <row> @@ -686,7 +686,7 @@ <simpara> <filename>zlib:</filename> works like <function>gzopen</function>, except that the stream can be used with <function>fread</function> and the other - filesystem functions. This is deprecated as of <literal>PHP 4.3.0</literal> due + filesystem functions. This is deprecated as of PHP 4.3.0 due to ambiguities with filenames containing ':' characters; use <filename>compress.zlib://</filename> instead. </simpara> @@ -710,7 +710,7 @@ </thead> <tbody> <row> - <entry>Restricted by <literal>allow_url_fopen</literal>.</entry> + <entry>Restricted by <link linkend="ini.allow-url-fopen">allow_url_fopen</link>.</entry> <entry>No</entry> </row> <row> http://cvs.php.net/diff.php/phpdoc/en/appendices/configure/servers.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/appendices/configure/servers.xml diff -u phpdoc/en/appendices/configure/servers.xml:1.2 phpdoc/en/appendices/configure/servers.xml:1.3 --- phpdoc/en/appendices/configure/servers.xml:1.2 Thu Jun 3 06:04:37 2004 +++ phpdoc/en/appendices/configure/servers.xml Tue Aug 10 12:30:14 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <sect3 id="configure.options.servers"> <title>SAPI options</title> <para> @@ -286,7 +286,7 @@ <listitem> <para> If this is disabled, paths such as <filename>/info.php/test?a=b</filename> - will fail to work. Available since <literal>PHP 4.3.0</literal>. + will fail to work. Available since PHP 4.3.0. For more information see the <ulink url="&url.apache.core;acceptpathinfo">Apache Manual</ulink>. </para> http://cvs.php.net/diff.php/phpdoc/en/faq/installation.xml?r1=1.35&r2=1.36&ty=u Index: phpdoc/en/faq/installation.xml diff -u phpdoc/en/faq/installation.xml:1.35 phpdoc/en/faq/installation.xml:1.36 --- phpdoc/en/faq/installation.xml:1.35 Thu Aug 5 08:53:24 2004 +++ phpdoc/en/faq/installation.xml Tue Aug 10 12:30:14 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.35 $ --> +<!-- $Revision: 1.36 $ --> <chapter id="faq.installation"> <title>Installation</title> <titleabbrev>Installation</titleabbrev> @@ -400,7 +400,7 @@ get to see a sensible error message, from the command line, change to the directory containing the PHP executable (<filename>php.exe</filename> on Windows) and run - <literal>php -i</literal>. If PHP has any problems running, + <command>php -i</command>. If PHP has any problems running, then a suitable error message will be displayed which will give you a clue as to what needs to be done next. If you get a screen full of HTML codes (the output of the @@ -452,7 +452,7 @@ at all. To get to see a sensible error message, from the command line, change to the directory containing the PHP executable (<filename>php.exe</filename> on Windows) and run - <literal>php -i</literal>. If PHP has any problems running, + <command>php -i</command>. If PHP has any problems running, then a suitable error message will be displayed which will give you a clue as to what needs to be done next. If you get a screen full of HTML codes (the output of the http://cvs.php.net/diff.php/phpdoc/en/features/commandline.xml?r1=1.35&r2=1.36&ty=u Index: phpdoc/en/features/commandline.xml diff -u phpdoc/en/features/commandline.xml:1.35 phpdoc/en/features/commandline.xml:1.36 --- phpdoc/en/features/commandline.xml:1.35 Tue Jul 27 12:46:28 2004 +++ phpdoc/en/features/commandline.xml Tue Aug 10 12:30:14 2004 @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.35 $ --> +<!-- $Revision: 1.36 $ --> <chapter id="features.commandline"> <title>Using PHP from the command line</title> <!-- NEW DOCUMENTATION STARTS --> <para> - As of version 4.3.0, <literal>PHP</literal> supports a new + As of version 4.3.0, PHP supports a new <literal>SAPI</literal> type (Server Application Programming Interface) named <literal>CLI</literal> which means <emphasis>Command Line Interface</emphasis>. As the name implies, this <literal>SAPI</literal> type main focus is on developing shell (or desktop as well) applications with - <literal>PHP</literal>. There are quite a few differences between the + PHP. There are quite a few differences between the <literal>CLI SAPI</literal> and other <literal>SAPI</literal>s which are explained in this chapter. It's worth mentioning that <literal>CLI</literal> and <literal>CGI</literal> are different @@ -17,40 +17,39 @@ </para> <para> The <literal>CLI SAPI</literal> was released for the first time with - <literal>PHP 4.2.0</literal>, but was still experimental and had - to be explicitly enabled with <literal>--enable-cli</literal> when running - <literal>./configure</literal>. Since <literal>PHP 4.3.0</literal> the + PHP 4.2.0, but was still experimental and had + to be explicitly enabled with <option role="configure">--enable-cli</option> when running + <command>./configure</command>. Since PHP 4.3.0 the <literal>CLI SAPI</literal> is no longer experimental and the option - <literal>--enable-cli</literal> is on by default. You may use - <literal>--disable-cli</literal> to disable it. + <option role="configure">--enable-cli</option> is on by default. You may use + <option role="configure">--disable-cli</option> to disable it. </para> <para> As of PHP 4.3.0, the name, location and existence of the CLI/CGI binaries will differ depending on how PHP is installed on your system. By default - when executing <literal>make</literal>, both the CGI and CLI are built and - placed as <literal>sapi/cgi/php</literal> and <literal>sapi/cli/php</literal> + when executing <command>make</command>, both the CGI and CLI are built and + placed as <filename>sapi/cgi/php</filename> and <filename>sapi/cli/php</filename> respectively, in your PHP source directory. You will note that both are - named <literal>php</literal>. What happens during <literal>make - install</literal> depends on your configure - line. If a module SAPI is chosen during configure, such as apxs, or the - <literal> --disable-cgi</literal> option is used, the CLI is copied to - <literal>{PREFIX}/bin/php</literal> during <literal>make install</literal> - otherwise the CGI is placed there. So, for example, if <literal>--with--apxs - </literal> is in your configure line then the CLI is copied to - <literal>{PREFIX}/bin/php</literal> during <literal>make - install</literal>. If you want to override the installation of the CGI - binary, use <literal>make install-cli</literal> after <literal>make - install</literal>. Alternatively you can specify <literal>--disable-cgi - </literal> in your configure line. + named php. What happens during <command>make install</command> depends on + your configure line. If a module SAPI is chosen during configure, such as apxs, or the + <option role="configure">--disable-cgi</option> option is used, the CLI is copied to + <filename>{PREFIX}/bin/php</filename> during <command>make install</command> + otherwise the CGI is placed there. So, for example, if <option role="configure">--with--apxs + </option> is in your configure line then the CLI is copied to + <filename>{PREFIX}/bin/php</filename> during <command>make + install</command>. If you want to override the installation of the CGI + binary, use <command>make install-cli</command> after <command>make + install</command>. Alternatively you can specify <option role="configure"> + --disable-cgi</option> in your configure line. </para> <para> <note> <para> - Because both <literal>--enable-cli</literal> and <literal> - --enable-cgi</literal> are enabled by default, simply having - <literal>--enable-cli</literal> in your configure line does - not necessarily mean the CLI will be copied as <literal> - {PREFIX}/bin/php</literal> during <literal>make install</literal>. + Because both <option role="configure">--enable-cli</option> and + <option role="configure">--enable-cgi</option> are enabled by default, + simply having <option role="configure">--enable-cli</option> in your + configure line does not necessarily mean the CLI will be copied as + <filename>{PREFIX}/bin/php</filename> during <command>make install</command>. </para> </note> </para> @@ -59,24 +58,24 @@ <filename>php-cli.exe</filename>, living in the same folder as the CGI <filename>php.exe</filename>. Starting with PHP 4.3.0 the windows package distributes the CLI as <filename>php.exe</filename> in a separate folder - named <literal>cli</literal>, so <literal>cli/php.exe</literal>. - Starting with PHP 5, the CLI is distributed in the main folder, named - <filename>php.exe</filename>. The CGI version is distributed as + named <filename class="directory">cli</filename>, so <filename>cli/php.exe + </filename>. Starting with PHP 5, the CLI is distributed in the main folder, + named <filename>php.exe</filename>. The CGI version is distributed as <filename>php-cgi.exe</filename>. </para> <para> As of PHP 5, a new <filename>php-win.exe</filename> file is distributed. This is equal to the CLI version, except that php-win doesn't output - anything and thus provides no console (no "dos box" appears on the screen). This - behavior is similar to php-gtk. You should configure with - <literal>--enable-cli-win32</literal>. + anything and thus provides no console (no "dos box" appears on the screen). + This behavior is similar to php-gtk. You should configure with + <option role="configure">--enable-cli-win32</option>. </para> <para> <note> <title>What SAPI do I have?</title> <para> - From a shell, typing <literal>php -v</literal> will tell you - whether <literal>php</literal> is CGI or CLI. See also the function + From a shell, typing <command>php -v</command> will tell you + whether <filename>php</filename> is CGI or CLI. See also the function <function>php_sapi_name</function> and the constant <constant> PHP_SAPI</constant>. </para> @@ -86,7 +85,7 @@ <note> <para> A Unix <literal>man</literal>ual page was added in PHP 4.3.2. You may - view this by typing <literal>man php</literal> in your shell environment. + view this by typing <command>man php</command> in your shell environment. </para> </note> </para> @@ -105,12 +104,14 @@ SAPI</literal>. </para> <para> - CLI is started up in quiet mode by default, though the <literal>-q</literal> - and <literal>--no-header</literal> switches are kept for compatibility so that you can use older CGI scripts. + CLI is started up in quiet mode by default, though the <option>-q</option> + and <option>--no-header</option> switches are kept for compatibility so + that you can use older CGI scripts. </para> <para> It does not change the working directory to that of the script. - (<literal>-C</literal> and <literal>--no-chdir</literal> switches kept for compatibility) + (<option>-C</option> and <option>--no-chdir</option> switches kept for + compatibility) </para> <para> Plain text error messages (no HTML formatting). @@ -157,7 +158,7 @@ <entry><link linkend="ini.max-execution-time">max_execution_time</link></entry> <entry>0 (unlimited)</entry> <entry> - Due to endless possibilities of using <literal>PHP</literal> in + Due to endless possibilities of using PHP in shell environments, the maximum execution time has been set to unlimited. Whereas applications written for the web are often executed very quickly, shell application tend to have a much @@ -175,7 +176,7 @@ arguments) in the <literal>CLI SAPI</literal>. </para> <para> - As of PHP 4.3.0, the <literal>PHP</literal> variables <varname>$argc</varname> + As of PHP 4.3.0, the PHP variables <varname>$argc</varname> and <varname>$argv</varname> are registered and filled in with the appropriate values when using the <literal>CLI SAPI</literal>. Prior to this version, the creation of these variables behaved as they do in @@ -291,7 +292,7 @@ ]]> </programlisting> You do not need to explicitly close these streams, as they are closed - automatically by <literal>PHP</literal> when your script ends. + automatically by PHP when your script ends. </para> </listitem> <listitem> @@ -322,7 +323,7 @@ /tmp/another_directory ]]> </screen> - This clearly shows that <literal>PHP</literal> changes its current + This clearly shows that PHP changes its current directory to the one of the executed script. </para> <para> @@ -337,12 +338,12 @@ ]]> </screen> This allows greater flexibility when writing shell tools in - <literal>PHP</literal>. + PHP. </para> <note> <para> The <literal>CGI SAPI</literal> supports the <literal>CLI SAPI</literal> - behaviour by means of the <literal>-C</literal> switch when run from the + behaviour by means of the <option>-C</option> switch when run from the command line. </para> </note> @@ -350,9 +351,9 @@ </itemizedlist> </para> <para> - The list of command line options provided by the <literal>PHP</literal> - binary can be queried anytime by running <literal>PHP</literal> with the - <literal>-h</literal> switch: + The list of command line options provided by the PHP + binary can be queried anytime by running PHP with the + <option>-h</option> switch: <screen> <![CDATA[ Usage: php [options] [-f] <file> [args...] @@ -380,11 +381,11 @@ </para> <para> The <literal>CLI SAPI</literal> has three different ways of getting the - <literal>PHP</literal> code you want to execute: + PHP code you want to execute: <orderedlist> <listitem> <para> - Telling <literal>PHP</literal> to execute a certain file. + Telling PHP to execute a certain file. </para> <para> <screen> @@ -394,16 +395,16 @@ php -f my_script.php ]]> </screen> - Both ways (whether using the <literal>-f</literal> switch or not) execute + Both ways (whether using the <option>-f</option> switch or not) execute the file <filename>my_script.php</filename>. You can choose any file to - execute - your <literal>PHP</literal> scripts do not have to end with the - <filename>.php</filename> extension but can have any name or extension + execute - your PHP scripts do not have to end with the + <literal>.php</literal> extension but can have any name or extension you wish. </para> </listitem> <listitem> <para> - Pass the <literal>PHP</literal> code to execute directly on the command + Pass the PHP code to execute directly on the command line. </para> <para> @@ -418,19 +419,19 @@ <note> <para> Read the example carefully, there are no beginning or ending tags! The - <literal>-r</literal> switch simply does not need them. Using them will + <option>-r</option> switch simply does not need them. Using them will lead to a parser error. </para> </note> </listitem> <listitem> <para> - Provide the <literal>PHP</literal> code to execute via standard input + Provide the PHP code to execute via standard input (<literal>stdin</literal>). </para> <para> This gives the powerful ability to dynamically create - <literal>PHP</literal> code and feed it to the binary, as shown in this + PHP code and feed it to the binary, as shown in this (fictional) example: <screen> <![CDATA[ @@ -443,28 +444,28 @@ You cannot combine any of the three ways to execute code. </para> <para> - Like every shell application, the <literal>PHP</literal> binary - accepts a number of arguments but your <literal>PHP</literal> script can + Like every shell application, the PHP binary + accepts a number of arguments but your PHP script can also receive arguments. The number of arguments which can be passed to your script - is not limited by <literal>PHP</literal> (the shell has a certain size limit + is not limited by PHP (the shell has a certain size limit in the number of characters which can be passed; usually you won't hit this limit). The arguments passed to your script are available in the global - array <literal>$argv</literal>. The zero index always contains the script - name (which is <literal>-</literal> in case the <literal>PHP</literal> code + array <varname>$argv</varname>. The zero index always contains the script + name (which is <literal>-</literal> in case the PHP code is coming from either standard input or from the command line switch - <literal>-r</literal>). The second registered global variable is - <literal>$argc</literal> which contains the number of elements in the - <literal>$argv</literal> array (<emphasis role="strong">not</emphasis> the + <option>-r</option>). The second registered global variable is + <varname>$argc</varname> which contains the number of elements in the + <varname>$argv</varname> array (<emphasis role="strong">not</emphasis> the number of arguments passed to the script). </para> <para> As long as the arguments you want to pass to your script do not start with the <literal>-</literal> character, there's nothing special to watch out for. Passing an argument to your script which starts with a - <literal>-</literal> will cause trouble because <literal>PHP</literal> + <literal>-</literal> will cause trouble because PHP itself thinks it has to handle it. To prevent this, use the argument list separator <literal>--</literal>. After this separator has been parsed by - <literal>PHP</literal>, every argument following it is passed + PHP, every argument following it is passed untouched to your script. </para> <para> @@ -487,12 +488,12 @@ </screen> </para> <para> - However, there's another way of using <literal>PHP</literal> for shell + However, there's another way of using PHP for shell scripting. You can write a script where the first line starts with <literal>#!/usr/bin/php</literal>. Following this you can place - normal <literal>PHP</literal> code included within the <literal>PHP</literal> + normal PHP code included within the PHP starting and end tags. Once you have set the execution attributes of the file - appropriately (e.g. <literal>chmod +x test</literal>) your script can be + appropriately (e.g. <command>chmod +x test</command>) your script can be executed like a normal shell or perl script: <programlisting role="php"> <![CDATA[ @@ -506,7 +507,7 @@ directory, we can now do the following: <screen> <![CDATA[ -$ chmod 755 test +$ chmod +x test $ ./test -h -- foo array(4) { [0]=> @@ -552,7 +553,7 @@ </para> <note> <para> - This option does not work together with the <literal>-r</literal> + This option does not work together with the <option>-r</option> option. </para> </note> @@ -563,7 +564,7 @@ <entry>--syntax-highlighting</entry> <entry> <para> - Alias of <literal>--syntax-highlight</literal>. + Alias of <option>--syntax-highlight</option>. </para> </entry> </row> @@ -576,7 +577,7 @@ </para> <note> <para> - This option does not work together with the <literal>-r</literal> + This option does not work together with the <option>-r</option> option. </para> </note> @@ -587,7 +588,7 @@ <entry>--file</entry> <entry> <para> - Parses and executed the given filename to the <literal>-f</literal> + Parses and executed the given filename to the <option>-f</option> option. This switch is optional and can be left out. Only providing the filename to execute is sufficient. </para> @@ -634,7 +635,7 @@ <entry>--no-php-ini</entry> <entry> <para> - Ignore php.ini at all. This switch is available since PHP 4.3.0. + Ignore &php.ini; at all. This switch is available since PHP 4.3.0. </para> </entry> </row> @@ -714,7 +715,7 @@ (usually specified <filename>/etc/ld.so.conf</filename> on Linux systems). Passing a filename with an absolute path information will not use the systems library search path. A relative filename with a - directory information will tell <literal>PHP</literal> only to try to + directory information will tell PHP only to try to load the extension relative to the current directory. </para> </entry> @@ -725,7 +726,7 @@ <entry> <para> This option provides a convenient way to only perform a syntax check - on the given <literal>PHP</literal> code. On success, the text + on the given PHP code. On success, the text <literal>No syntax errors detected in &lt;filename&gt;</literal> is written to standard output and the shell return code is <literal>0</literal>. On failure, the text <literal>Errors parsing @@ -735,11 +736,11 @@ </para> <para> This option won't find fatal errors (like undefined functions). Use - <literal>-f</literal> if you would like to test for fatal errors too. + <option>-f</option> if you would like to test for fatal errors too. </para> <note> <para> - This option does not work together with the <literal>-r</literal> + This option does not work together with the <option>-r</option> option. </para> </note> @@ -778,8 +779,8 @@ <entry>--info</entry> <entry> This command line option calls <function>phpinfo</function>, and prints - out the results. If <literal>PHP</literal> is not working correctly, it is - advisable to use <literal>php -i</literal> and see whether any error + out the results. If PHP is not working correctly, it is + advisable to use <command>php -i</command> and see whether any error messages are printed out before or in place of the information tables. Beware that when using the CGI mode the output is in <literal>HTML</literal> and therefore quite huge. @@ -790,15 +791,15 @@ <entry>--run</entry> <entry> <para> - This option allows execution of <literal>PHP</literal> right from - within the command line. The <literal>PHP</literal> start and end tags + This option allows execution of PHP right from + within the command line. The PHP start and end tags (<literal>&lt;?php</literal> and <literal>?&gt;</literal>) are <emphasis role="strong">not needed</emphasis> and will cause a parser error if present. </para> <note> <para> - Care has to be taken when using this form of <literal>PHP</literal> + Care has to be taken when using this form of PHP to not collide with command line variable substitution done by the shell. </para> @@ -812,9 +813,9 @@ </screen> The problem here is that the sh/bash performs variable substitution even when using double quotes <literal>"</literal>. Since the - variable <literal>$foo</literal> is unlikely to be defined, it + variable <varname>$foo</varname> is unlikely to be defined, it expands to nothing which results in the code passed to - <literal>PHP</literal> for execution actually reading: + PHP for execution actually reading: <screen> <![CDATA[ $ php -r " = get_defined_constants();" @@ -840,8 +841,9 @@ ]]> </screen> If you are using a shell different from sh/bash, you might experience - further issues. Feel free to open a bug report or send a mail to - phpdoc@lists.php.net. + further issues. Feel free to open a bug report at + <ulink url="&url.php.bugs;">&url.php.bugs;</ulink>or send a mail to + &email.php.doc;. One can still easily run into troubles when trying to get shell variables into the code or using backslashes for escaping. You've @@ -850,7 +852,7 @@ </note> <note> <para> - <literal>-r</literal> is available in the <emphasis>CLI</emphasis> + <option>-r</option> is available in the <emphasis>CLI</emphasis> SAPI and not in the <emphasis>CGI</emphasis> SAPI. </para> </note> @@ -868,7 +870,7 @@ <entry>-?</entry> <entry>--usage</entry> <entry> - Alias of <literal>--help</literal>. + Alias of <option>--help</option>. </entry> </row> <!-- @@ -919,11 +921,12 @@ from the web server. If you are on a Unix system, you should add a special first line to your PHP script, and make it executable, so the system will know, what program should run the script. On a Windows platform you can - associate <literal>php.exe</literal> with the double click option of the - <literal>.php</literal> files, or you can make a batch file to run the - script through PHP. The first line added to the script to work on Unix won't - hurt on Windows, so you can write cross platform programs this way. A simple - example of writing a command line PHP program can be found below. + associate <filename>php.exe</filename> with the double click option of the + <literal>.php</literal> files, or you can make a batch + file to run the script through PHP. The first line added to the script to + work on Unix won't hurt on Windows, so you can write cross platform programs + this way. A simple example of writing a command line PHP program can be + found below. </para> <para> <example> @@ -966,16 +969,16 @@ </para> <para> In the program above we checked if there are less or more than one - arguments. Also if the argument was <literal>--help</literal>, - <literal>-help</literal>, <literal>-h</literal> or <literal>-?</literal>, + arguments. Also if the argument was <option>--help</option>, + <option>-help</option>, <option>-h</option> or <option>-?</option>, we printed out the help message, printing the script name dynamically. If we received some other argument we echoed that out. </para> <para> If you would like to run the above script on Unix, you need to make it executable, and simply call it as - <literal>script.php echothis</literal> or - <literal>script.php -h</literal>. On Windows, you can make a + <command>script.php echothis</command> or + <command>script.php -h</command>. On Windows, you can make a batch file for this task: </para> <para> @@ -994,8 +997,8 @@ CLI <filename>php.exe</filename> in <filename>c:\php\cli\php.exe</filename> this batch file will run it for you with your added options: - <literal>script.bat echothis</literal> or - <literal>script.bat -h</literal>. + <command>script.bat echothis</command> or + <command>script.bat -h</command>. </para> <para> See also the <link linkend="ref.readline">Readline</link> http://cvs.php.net/diff.php/phpdoc/en/features/remote-files.xml?r1=1.25&r2=1.26&ty=u Index: phpdoc/en/features/remote-files.xml diff -u phpdoc/en/features/remote-files.xml:1.25 phpdoc/en/features/remote-files.xml:1.26 --- phpdoc/en/features/remote-files.xml:1.25 Fri Jun 18 13:10:47 2004 +++ phpdoc/en/features/remote-files.xml Tue Aug 10 12:30:14 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.25 $ --> +<!-- $Revision: 1.26 $ --> <chapter id="features.remote-files"> <title>Using remote files</title> @@ -24,7 +24,7 @@ <para> <note> <para> - The Windows versions of <literal>PHP</literal> earlier than PHP 4.3 + The Windows versions of PHP earlier than PHP 4.3 did not support remote file accessing for the following functions: <function>include</function>, <function>include_once</function>, <function>require</function>, <function>require_once</function>, http://cvs.php.net/diff.php/phpdoc/en/install/windows/building.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/install/windows/building.xml diff -u phpdoc/en/install/windows/building.xml:1.2 phpdoc/en/install/windows/building.xml:1.3 --- phpdoc/en/install/windows/building.xml:1.2 Thu Aug 5 08:15:17 2004 +++ phpdoc/en/install/windows/building.xml Tue Aug 10 12:30:15 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <sect1 id="install.windows.build"> <title>Building from source</title> <para> @@ -30,7 +30,7 @@ <sect2 id="install.windows.build.requirement"> &reftitle.required; <para> - To compile and build <literal>PHP</literal> you need a Microsoft + To compile and build PHP you need a Microsoft Development Environment. Microsoft Visual C++ 6.0 is recommended. To extract the downloaded files you need a extraction utility (e.g.: Winzip). If you don't already have an unzip utility, you @@ -42,14 +42,14 @@ <itemizedlist> <listitem> <simpara> - ..the win32 buildtools from the <literal>PHP</literal> site + ..the win32 buildtools from the PHP site at <ulink url="&url.win32.buildtools;">&url.win32.buildtools;</ulink>. </simpara> </listitem> <listitem> <simpara> - ..the source code for the DNS name resolver used by <literal>PHP - </literal> from <ulink url="&url.win32.dnsresolver;"> + ..the source code for the DNS name resolver used by PHP from + <ulink url="&url.win32.dnsresolver;"> &url.win32.dnsresolver;</ulink>. This is a replacement for the <filename>resolv.lib</filename> library included in <filename> win32build.zip</filename>. @@ -57,7 +57,7 @@ </listitem> <listitem> <simpara> - If you plan to compile <literal>PHP</literal> as a Apache + If you plan to compile PHP as a Apache module you will also need the <ulink url="&url.apache.source;">Apache sources</ulink>. </simpara> @@ -290,8 +290,8 @@ to select the <literal>php4ts_cli - Win32 Debug_TS</literal> or <literal>php4ts_cli - Win32 Release_TS</literal> project file. After a successful compiling run you will find the <filename>php.exe</filename> - in either the directory <filename>Release_TS\cli\</filename> or - <filename>Debug_TS\cli\</filename>. + in either the directory <filename class="directory">Release_TS\cli\</filename> or + <filename class="directory">Debug_TS\cli\</filename>. </simpara> <note> <simpara> http://cvs.php.net/diff.php/phpdoc/en/install/windows/extensions.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/install/windows/extensions.xml diff -u phpdoc/en/install/windows/extensions.xml:1.4 phpdoc/en/install/windows/extensions.xml:1.5 --- phpdoc/en/install/windows/extensions.xml:1.4 Sun Aug 8 12:33:29 2004 +++ phpdoc/en/install/windows/extensions.xml Tue Aug 10 12:30:15 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <sect1 id="install.windows.extensions"> <title>Installation of extensions on Windows</title> <para> @@ -25,7 +25,7 @@ </note> <para> - The default location <literal>PHP</literal> searches for extensions is + The default location PHP searches for extensions is <filename class="directory">c:\php4\extensions</filename> in PHP 4 and <filename class="directory">c:\php5</filename> in PHP 5. To change this setting to reflect your setup of PHP edit your &php.ini; file: @@ -84,7 +84,7 @@ </itemizedlist> <note> <simpara> - If you are running a server module version of <literal>PHP</literal> + If you are running a server module version of PHP remember to restart your webserver to reflect your changes to &php.ini;. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/install/windows/iis.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/install/windows/iis.xml diff -u phpdoc/en/install/windows/iis.xml:1.6 phpdoc/en/install/windows/iis.xml:1.7 --- phpdoc/en/install/windows/iis.xml:1.6 Sat Aug 7 15:18:24 2004 +++ phpdoc/en/install/windows/iis.xml Tue Aug 10 12:30:15 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <sect1 id="install.windows.iis"> <title>Microsoft IIS / PWS</title> <para> @@ -71,9 +71,9 @@ <listitem> <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-cgi.exe</literal> for PHP 5. + <filename>php.exe</filename> in the value data field. ex: + <filename>C:\php\php.exe</filename> for PHP 4, or + <filename>C:\php\php-cgi.exe</filename> for PHP 5. </simpara> </listitem> <listitem> @@ -160,7 +160,7 @@ <simpara> Highlight the new key <literal>command</literal> and in the right side pane, double click the "default value" and enter - the path to <literal>php.exe</literal>. ex: + the path to <filename>php.exe</filename>. ex: <literal>c:\php\php.exe -q %1</literal>. (don't forget the <literal>%1</literal>). </simpara> http://cvs.php.net/diff.php/phpdoc/en/install/windows/omnihttpd.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/install/windows/omnihttpd.xml diff -u phpdoc/en/install/windows/omnihttpd.xml:1.4 phpdoc/en/install/windows/omnihttpd.xml:1.5 --- phpdoc/en/install/windows/omnihttpd.xml:1.4 Sat Aug 7 15:18:24 2004 +++ phpdoc/en/install/windows/omnihttpd.xml Tue Aug 10 12:30:15 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <sect1 id="install.windows.omnihttpd"> <title>OmniHTTPd Server</title> <para> @@ -51,7 +51,7 @@ <para> On the 'External' tab, enter: <literal>virtual = .php | actual = c:\php\php.exe</literal> (use - <literal>php-cgi.exe</literal> if installing PHP 5), and use the Add + <filename>php-cgi.exe</filename> if installing PHP 5), and use the Add button. </para> </listitem> http://cvs.php.net/diff.php/phpdoc/en/language/variables.xml?r1=1.80&r2=1.81&ty=u Index: phpdoc/en/language/variables.xml diff -u phpdoc/en/language/variables.xml:1.80 phpdoc/en/language/variables.xml:1.81 --- phpdoc/en/language/variables.xml:1.80 Thu Aug 5 22:45:16 2004 +++ phpdoc/en/language/variables.xml Tue Aug 10 12:30:15 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.80 $ --> +<!-- $Revision: 1.81 $ --> <chapter id="language.variables"> <title>Variables</title> @@ -592,7 +592,7 @@ <sect2 id="language.variables.scope.references"> <title>References with global and static variables</title> <simpara> - The Zend Engine 1, driving <literal>PHP 4</literal>, implements the + The Zend Engine 1, driving PHP 4, implements the <link linkend="language.variables.scope.static">static</link> and <link linkend="language.variables.scope.global">global</link> modifier for variables in terms of <link linkend="language.references"> http://cvs.php.net/diff.php/phpdoc/en/reference/aspell/configure.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/aspell/configure.xml diff -u phpdoc/en/reference/aspell/configure.xml:1.3 phpdoc/en/reference/aspell/configure.xml:1.4 --- phpdoc/en/reference/aspell/configure.xml:1.3 Wed Jun 18 11:18:54 2003 +++ phpdoc/en/reference/aspell/configure.xml Tue Aug 10 12:30:15 2004 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <section id="aspell.installation"> &reftitle.install; <para id="aspell.configure"> - In PHP 4, these functions are only available if <literal>PHP</literal> was + In PHP 4, these functions are only available if PHP was configured with <option role="configure">--with-aspell=[DIR]</option>. </para> </section> http://cvs.php.net/diff.php/phpdoc/en/reference/aspell/reference.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/aspell/reference.xml diff -u phpdoc/en/reference/aspell/reference.xml:1.7 phpdoc/en/reference/aspell/reference.xml:1.8 --- phpdoc/en/reference/aspell/reference.xml:1.7 Mon May 12 06:47:48 2003 +++ phpdoc/en/reference/aspell/reference.xml Tue Aug 10 12:30:15 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <reference id="ref.aspell"> <title>Aspell functions [deprecated]</title> <titleabbrev>Aspell</titleabbrev> @@ -13,7 +13,7 @@ </para> <note> <para> - This extension has been removed from <literal>PHP</literal> and is no + This extension has been removed from PHP and is no longer available as of PHP 4.3.0. If you want to use spell-checking capabilities in PHP, use <link linkend="ref.pspell">pspell</link> instead. It uses pspell library and works with newer versions of aspell. http://cvs.php.net/diff.php/phpdoc/en/reference/bc/configure.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/bc/configure.xml diff -u phpdoc/en/reference/bc/configure.xml:1.1 phpdoc/en/reference/bc/configure.xml:1.2 --- phpdoc/en/reference/bc/configure.xml:1.1 Mon Nov 25 18:49:16 2002 +++ phpdoc/en/reference/bc/configure.xml Tue Aug 10 12:30:15 2004 @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <section id="bc.installation"> &reftitle.install; <para> - In PHP 4, these functions are only available if <literal>PHP</literal> was + In PHP 4, these functions are only available if PHP was configured with <option role="configure">--enable-bcmath</option>. - In PHP 3, these functions are only available if <literal>PHP</literal> was - NOT configured with <option role="configure">--disable-bcmath</option>. + In PHP 3, these functions are only available if PHP was <emphasis>not</emphasis> + configured with <option role="configure">--disable-bcmath</option>. </para> &windows.builtin; </section> http://cvs.php.net/diff.php/phpdoc/en/reference/bzip2/configure.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/bzip2/configure.xml diff -u phpdoc/en/reference/bzip2/configure.xml:1.4 phpdoc/en/reference/bzip2/configure.xml:1.5 --- phpdoc/en/reference/bzip2/configure.xml:1.4 Fri Jan 10 20:15:33 2003 +++ phpdoc/en/reference/bzip2/configure.xml Tue Aug 10 12:30:16 2004 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <section id="bzip2.installation"> &reftitle.install; <para> - Bzip2 support in <literal>PHP</literal> is not enabled by default. You will + Bzip2 support in PHP is not enabled by default. You will need to use the <option role="configure">--with-bz2[=DIR]</option> configuration option when compiling PHP to enable bzip2 support. </para> http://cvs.php.net/diff.php/phpdoc/en/reference/calendar/constants.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/calendar/constants.xml diff -u phpdoc/en/reference/calendar/constants.xml:1.6 phpdoc/en/reference/calendar/constants.xml:1.7 --- phpdoc/en/reference/calendar/constants.xml:1.6 Mon Oct 6 23:48:59 2003 +++ phpdoc/en/reference/calendar/constants.xml Tue Aug 10 12:30:16 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <section id="calendar.constants"> &reftitle.constants; &extension.constants; @@ -160,7 +160,7 @@ </varlistentry> </variablelist> <para> - The following constants are available since <literal>PHP</literal> 4.3.0 : + The following constants are available since PHP 4.3.0 : </para> <variablelist> <varlistentry> @@ -209,7 +209,7 @@ </varlistentry> </variablelist> <para> - The following constants are available since <literal>PHP</literal> 5.0.0 : + The following constants are available since PHP 5.0.0 : </para> <variablelist> <varlistentry> http://cvs.php.net/diff.php/phpdoc/en/reference/calendar/functions/easter-date.xml?r1=1.11&r2=1.12&ty=u Index: phpdoc/en/reference/calendar/functions/easter-date.xml diff -u phpdoc/en/reference/calendar/functions/easter-date.xml:1.11 phpdoc/en/reference/calendar/functions/easter-date.xml:1.12 --- phpdoc/en/reference/calendar/functions/easter-date.xml:1.11 Sat Dec 20 23:21:42 2003 +++ phpdoc/en/reference/calendar/functions/easter-date.xml Tue Aug 10 12:30:16 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <!-- splitted from ./en/functions/calendar.xml, last change in rev 1.2 --> <refentry id="function.easter-date"> <refnamediv> @@ -19,7 +19,7 @@ the given year. </para> <para> - Since <literal>PHP</literal> 4.3.0, the <parameter>year</parameter> + Since PHP 4.3.0, the <parameter>year</parameter> parameter is optional and defaults to the current year according to the localtime if omitted. </para> http://cvs.php.net/diff.php/phpdoc/en/reference/calendar/functions/easter-days.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc/en/reference/calendar/functions/easter-days.xml diff -u phpdoc/en/reference/calendar/functions/easter-days.xml:1.10 phpdoc/en/reference/calendar/functions/easter-days.xml:1.11 --- phpdoc/en/reference/calendar/functions/easter-days.xml:1.10 Sat Dec 20 23:21:42 2003 +++ phpdoc/en/reference/calendar/functions/easter-days.xml Tue Aug 10 12:30:16 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/calendar.xml, last change in rev 1.2 --> <refentry id="function.easter-days"> <refnamediv> @@ -22,13 +22,13 @@ assumed. </para> <para> - Since <literal>PHP</literal> 4.3.0, the <parameter>year</parameter> + Since PHP 4.3.0, the <parameter>year</parameter> parameter is optional and defaults to the current year according to the localtime if omitted. </para> <para> The <parameter>method</parameter> parameter was also introduced in - <literal>PHP</literal> 4.3.0 and allows to calculate easter dates based + PHP 4.3.0 and allows to calculate easter dates based on the Gregorian calendar during the years 1582 - 1752 when set to <constant>CAL_EASTER_ROMAN</constant>. See the <link linkend="calendar.constants">calendar constants</link> for more valid http://cvs.php.net/diff.php/phpdoc/en/reference/ccvs/reference.xml?r1=1.14&r2=1.15&ty=u Index: phpdoc/en/reference/ccvs/reference.xml diff -u phpdoc/en/reference/ccvs/reference.xml:1.14 phpdoc/en/reference/ccvs/reference.xml:1.15 --- phpdoc/en/reference/ccvs/reference.xml:1.14 Sun Feb 8 01:14:59 2004 +++ phpdoc/en/reference/ccvs/reference.xml Tue Aug 10 12:30:16 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.14 $ --> +<!-- $Revision: 1.15 $ --> <!-- CCVS Documentation by Brendan W. McAdams <brendan@plexmedia.com> Copyright (c) 2000 by the PHP Group @@ -37,7 +37,7 @@ PHP support! </para> <para> - This extension has been removed from <literal>PHP</literal> and is no + This extension has been removed from PHP and is no longer available as of PHP 4.3.0. If you want to use credit card processing features you can use <link linkend="ref.mcve">MCVE</link> instead. http://cvs.php.net/diff.php/phpdoc/en/reference/datetime/functions/microtime.xml?r1=1.10&r2=1.11&ty=u Index: phpdoc/en/reference/datetime/functions/microtime.xml diff -u phpdoc/en/reference/datetime/functions/microtime.xml:1.10 phpdoc/en/reference/datetime/functions/microtime.xml:1.11 --- phpdoc/en/reference/datetime/functions/microtime.xml:1.10 Fri Jul 30 10:50:51 2004 +++ phpdoc/en/reference/datetime/functions/microtime.xml Tue Aug 10 12:30:17 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/datetime.xml, last change in rev 1.2 --> <refentry id="function.microtime"> <refnamediv> @@ -33,7 +33,7 @@ <note> <simpara> The <parameter>get_as_float</parameter> parameter was added as of - <literal>PHP 5.0.0</literal>. + PHP 5.0.0. </simpara> </note> <para> @@ -108,4 +108,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/reference/dir/functions/opendir.xml?r1=1.8&r2=1.9&ty=u Index: phpdoc/en/reference/dir/functions/opendir.xml diff -u phpdoc/en/reference/dir/functions/opendir.xml:1.8 phpdoc/en/reference/dir/functions/opendir.xml:1.9 --- phpdoc/en/reference/dir/functions/opendir.xml:1.8 Wed Jan 28 19:35:25 2004 +++ phpdoc/en/reference/dir/functions/opendir.xml Tue Aug 10 12:30:17 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/dir.xml, last change in rev 1.2 --> <refentry id="function.opendir"> <refnamediv> @@ -50,10 +50,10 @@ </example> </para> <para> - As of <literal>PHP 4.3.0</literal> <parameter>path</parameter> can also + As of PHP 4.3.0 <parameter>path</parameter> can also be any URL which supports directory listing, however only the <literal>file://</literal> - URL wrapper supports this in <literal>PHP 4.3</literal>. As of - <literal>PHP 5.0.0</literal>, support for the <literal>ftp://</literal> + URL wrapper supports this in PHP 4.3. As of + PHP 5.0.0, support for the <literal>ftp://</literal> URL wrapper is included as well. </para> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/filepro/configure.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/filepro/configure.xml diff -u phpdoc/en/reference/filepro/configure.xml:1.1 phpdoc/en/reference/filepro/configure.xml:1.2 --- phpdoc/en/reference/filepro/configure.xml:1.1 Wed Nov 27 19:42:45 2002 +++ phpdoc/en/reference/filepro/configure.xml Tue Aug 10 12:30:17 2004 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <section id="filepro.installation"> &reftitle.install; <para> - filePro support in <literal>PHP</literal> is not enabled by default. To + filePro support in PHP is not enabled by default. To enable the bundled <emphasis>read-only</emphasis> filePro support you need to use the<option role="configure">--enable-filepro</option> configuration option when compiling PHP. http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/ini.xml?r1=1.8&r2=1.9&ty=u Index: phpdoc/en/reference/filesystem/ini.xml diff -u phpdoc/en/reference/filesystem/ini.xml:1.8 phpdoc/en/reference/filesystem/ini.xml:1.9 --- phpdoc/en/reference/filesystem/ini.xml:1.8 Tue Jun 1 15:50:44 2004 +++ phpdoc/en/reference/filesystem/ini.xml Tue Aug 10 12:30:17 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <section id="filesystem.configuration"> &reftitle.runtime; &extension.runtime; @@ -96,7 +96,7 @@ </term> <listitem> <para> - Define the user agent for <literal>PHP</literal> to send. + Define the user agent for PHP to send. </para> </listitem> </varlistentry> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/mkdir.xml?r1=1.15&r2=1.16&ty=u Index: phpdoc/en/reference/filesystem/functions/mkdir.xml diff -u phpdoc/en/reference/filesystem/functions/mkdir.xml:1.15 phpdoc/en/reference/filesystem/functions/mkdir.xml:1.16 --- phpdoc/en/reference/filesystem/functions/mkdir.xml:1.15 Tue May 18 10:23:19 2004 +++ phpdoc/en/reference/filesystem/functions/mkdir.xml Tue Aug 10 12:30:17 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.15 $ --> +<!-- $Revision: 1.16 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.39 --> <refentry id="function.mkdir"> <refnamediv> @@ -51,7 +51,7 @@ </para> <note> <simpara> - As of <literal>PHP 5.0.0</literal> <function>mkdir</function> can also be + As of PHP 5.0.0 <function>mkdir</function> can also be used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>mkdir</function>. </simpara> @@ -59,7 +59,7 @@ <note> <simpara> The <parameter>recursive</parameter> and <parameter>context</parameter> parameters - were added as of <literal>PHP 5.0.0</literal>. + were added as of PHP 5.0.0. </simpara> </note> &note.sm.uidcheck.dir; http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/rename.xml?r1=1.9&r2=1.10&ty=u Index: phpdoc/en/reference/filesystem/functions/rename.xml diff -u phpdoc/en/reference/filesystem/functions/rename.xml:1.9 phpdoc/en/reference/filesystem/functions/rename.xml:1.10 --- phpdoc/en/reference/filesystem/functions/rename.xml:1.9 Fri Feb 20 08:36:47 2004 +++ phpdoc/en/reference/filesystem/functions/rename.xml Tue Aug 10 12:30:18 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.rename"> <refnamediv> @@ -41,7 +41,7 @@ </note> <note> <simpara> - As of <literal>PHP 5.0.0</literal> <function>rename</function> can also be + As of PHP 5.0.0 <function>rename</function> can also be used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>rename</function>. </simpara> @@ -54,7 +54,7 @@ </note> <note> <simpara> - The <parameter>context</parameter> parameter was added as of <literal>PHP 5.0.0</literal>. + The <parameter>context</parameter> parameter was added as of PHP 5.0.0. </simpara> </note> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/rmdir.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/filesystem/functions/rmdir.xml diff -u phpdoc/en/reference/filesystem/functions/rmdir.xml:1.7 phpdoc/en/reference/filesystem/functions/rmdir.xml:1.8 --- phpdoc/en/reference/filesystem/functions/rmdir.xml:1.7 Wed Jan 28 19:35:26 2004 +++ phpdoc/en/reference/filesystem/functions/rmdir.xml Tue Aug 10 12:30:18 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.rmdir"> <refnamediv> @@ -20,14 +20,14 @@ </para> <note> <simpara> - As of <literal>PHP 5.0.0</literal> <function>rmdir</function> can also be + As of PHP 5.0.0 <function>rmdir</function> can also be used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>rmdir</function>. </simpara> </note> <note> <simpara> - The <parameter>context</parameter> parameter was added as of <literal>PHP 5.0.0</literal>. + The <parameter>context</parameter> parameter was added as of PHP 5.0.0. </simpara> </note> &note.sm.uidcheck.dir; http://cvs.php.net/diff.php/phpdoc/en/reference/filesystem/functions/unlink.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/filesystem/functions/unlink.xml diff -u phpdoc/en/reference/filesystem/functions/unlink.xml:1.7 phpdoc/en/reference/filesystem/functions/unlink.xml:1.8 --- phpdoc/en/reference/filesystem/functions/unlink.xml:1.7 Wed Jan 28 19:35:26 2004 +++ phpdoc/en/reference/filesystem/functions/unlink.xml Tue Aug 10 12:30:18 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/filesystem.xml, last change in rev 1.2 --> <refentry id="function.unlink"> <refnamediv> @@ -19,14 +19,14 @@ </para> <note> <simpara> - As of <literal>PHP 5.0.0</literal> <function>unlink</function> can also be + As of PHP 5.0.0 <function>unlink</function> can also be used with <emphasis>some</emphasis> URL wrappers. Refer to <xref linkend="wrappers"/> for a listing of which wrappers support <function>unlink</function>. </simpara> </note> <note> <simpara> - The <parameter>context</parameter> parameter was added as of <literal>PHP 5.0.0</literal>. + The <parameter>context</parameter> parameter was added as of PHP 5.0.0. </simpara> </note> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/info/functions/extension-loaded.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/info/functions/extension-loaded.xml diff -u phpdoc/en/reference/info/functions/extension-loaded.xml:1.7 phpdoc/en/reference/info/functions/extension-loaded.xml:1.8 --- phpdoc/en/reference/info/functions/extension-loaded.xml:1.7 Fri Feb 21 23:24:23 2003 +++ phpdoc/en/reference/info/functions/extension-loaded.xml Tue Aug 10 12:30:18 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/info.xml, last change in rev 1.2 --> <refentry id="function.extension-loaded"> <refnamediv> @@ -36,7 +36,7 @@ You can see the names of various extensions by using <function>phpinfo</function> or if you're using the <literal>CGI</literal> or <literal>CLI</literal> version of - <literal>PHP</literal> you can use the <literal>-m</literal> switch to + PHP you can use the <option>-m</option> switch to list all available extensions: <screen> <![CDATA[ http://cvs.php.net/diff.php/phpdoc/en/reference/mail/ini.xml?r1=1.5&r2=1.6&ty=u Index: phpdoc/en/reference/mail/ini.xml diff -u phpdoc/en/reference/mail/ini.xml:1.5 phpdoc/en/reference/mail/ini.xml:1.6 --- phpdoc/en/reference/mail/ini.xml:1.5 Tue Jul 27 08:32:26 2004 +++ phpdoc/en/reference/mail/ini.xml Tue Aug 10 12:30:18 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <section id="mail.configuration"> &reftitle.runtime; &extension.runtime; @@ -69,7 +69,7 @@ Used under Windows only: Number of the port to connect to the server specified with the <literal>SMTP</literal> setting when sending mail with <function>mail</function>; defaults to 25. Only available since - <literal>PHP</literal> 4.3.0. + PHP 4.3.0. </para> </listitem> </varlistentry> @@ -145,4 +145,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - http://cvs.php.net/diff.php/phpdoc/en/reference/mail/functions/mail.xml?r1=1.26&r2=1.27&ty=u Index: phpdoc/en/reference/mail/functions/mail.xml diff -u phpdoc/en/reference/mail/functions/mail.xml:1.26 phpdoc/en/reference/mail/functions/mail.xml:1.27 --- phpdoc/en/reference/mail/functions/mail.xml:1.26 Thu Dec 18 12:45:17 2003 +++ phpdoc/en/reference/mail/functions/mail.xml Tue Aug 10 12:30:18 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.26 $ --> +<!-- $Revision: 1.27 $ --> <!-- splitted from ./en/functions/mail.xml, last change in rev 1.2 --> <refentry id="function.mail"> <refnamediv> @@ -51,9 +51,9 @@ headers like <literal>From:</literal>, <literal>Cc:</literal>, <literal>Bcc:</literal> and <literal>Date:</literal> are <emphasis role="strong">not</emphasis> interpreted by the <literal>MTA</literal> - in the first place, but are parsed by <literal>PHP</literal>. - <literal>PHP</literal> &lt; 4.3 only supported the <literal>Cc:</literal> - header element (and was case-sensitive). <literal>PHP</literal> &gt;= 4.3 + in the first place, but are parsed by PHP. + PHP &lt; 4.3 only supported the <literal>Cc:</literal> + header element (and was case-sensitive). PHP &gt;= 4.3 supports all the mentioned header elements and is no longer case-sensitive. </para> http://cvs.php.net/diff.php/phpdoc/en/reference/mime_magic/configure.xml?r1=1.8&r2=1.9&ty=u Index: phpdoc/en/reference/mime_magic/configure.xml diff -u phpdoc/en/reference/mime_magic/configure.xml:1.8 phpdoc/en/reference/mime_magic/configure.xml:1.9 --- phpdoc/en/reference/mime_magic/configure.xml:1.8 Tue Dec 16 13:32:50 2003 +++ phpdoc/en/reference/mime_magic/configure.xml Tue Aug 10 12:30:18 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <section id="mime-magic.installation"> &reftitle.install; <para> @@ -41,8 +41,8 @@ </para> <para> Remember to substitute the <filename>$PHP_INSTALL_DIR</filename> for your actual - path to <literal>PHP</literal> in the above example. e.g. - <filename>c:\php</filename> + path to PHP in the above example. e.g. + <filename class="directory">c:\php</filename> </para> </note> </section> @@ -67,4 +67,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - http://cvs.php.net/diff.php/phpdoc/en/reference/misc/functions/php-check-syntax.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/misc/functions/php-check-syntax.xml diff -u phpdoc/en/reference/misc/functions/php-check-syntax.xml:1.4 phpdoc/en/reference/misc/functions/php-check-syntax.xml:1.5 --- phpdoc/en/reference/misc/functions/php-check-syntax.xml:1.4 Thu Jul 22 15:46:10 2004 +++ phpdoc/en/reference/misc/functions/php-check-syntax.xml Tue Aug 10 12:30:18 2004 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <refentry id="function.php-check-syntax"> <refnamediv> <refname>php_check_syntax</refname> @@ -17,7 +17,7 @@ <simpara> The <function>php_check_syntax</function> function performs a syntax (lint) check on the specified <parameter>filename</parameter> testing - for scripting errors. This is similar to using <literal>php -l</literal> + for scripting errors. This is similar to using <command>php -l</command> from the <link linkend="features.commandline">commandline</link>. </simpara> <simpara> http://cvs.php.net/diff.php/phpdoc/en/reference/muscat/configure.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/muscat/configure.xml diff -u phpdoc/en/reference/muscat/configure.xml:1.1 phpdoc/en/reference/muscat/configure.xml:1.2 --- phpdoc/en/reference/muscat/configure.xml:1.1 Sun May 11 19:55:05 2003 +++ phpdoc/en/reference/muscat/configure.xml Tue Aug 10 12:30:19 2004 @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <section id="muscat.installation"> &reftitle.install; <para id="muscat.configure"> - These functions are only available if <literal>PHP</literal> was + These functions are only available if PHP was configured with <option role="configure">--with-muscat[=DIR]</option>. </para> </section> http://cvs.php.net/diff.php/phpdoc/en/reference/network/functions/fsockopen.xml?r1=1.16&r2=1.17&ty=u Index: phpdoc/en/reference/network/functions/fsockopen.xml diff -u phpdoc/en/reference/network/functions/fsockopen.xml:1.16 phpdoc/en/reference/network/functions/fsockopen.xml:1.17 --- phpdoc/en/reference/network/functions/fsockopen.xml:1.16 Tue Aug 3 11:51:10 2004 +++ phpdoc/en/reference/network/functions/fsockopen.xml Tue Aug 10 12:30:19 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.16 $ --> +<!-- $Revision: 1.17 $ --> <!-- splitted from ./en/functions/network.xml, last change in rev 1.2 --> <refentry id="function.fsockopen"> <refnamediv> @@ -20,7 +20,7 @@ </methodsynopsis> <para> Initiates a socket connection to the resource specified by - <parameter>target</parameter>. <literal>PHP</literal> supports + <parameter>target</parameter>. PHP supports targets in the Internet and Unix domains as described in <xref linkend="transports"/>. A list of supported transports can also be retrieved using <function>stream_get_transports</function>. http://cvs.php.net/diff.php/phpdoc/en/reference/outcontrol/ini.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/outcontrol/ini.xml diff -u phpdoc/en/reference/outcontrol/ini.xml:1.3 phpdoc/en/reference/outcontrol/ini.xml:1.4 --- phpdoc/en/reference/outcontrol/ini.xml:1.3 Thu May 1 17:52:58 2003 +++ phpdoc/en/reference/outcontrol/ini.xml Tue Aug 10 12:30:19 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <section id="outcontrol.configuration"> &reftitle.runtime; &extension.runtime; @@ -89,13 +89,13 @@ <para> &false; by default. Changing this to &true; tells PHP to tell the output layer to flush itself automatically after every output block. - This is equivalent to calling the <literal>PHP</literal> function + This is equivalent to calling the PHP function <function>flush</function> after each and every call to <function>print</function> or <function>echo</function> and each and every <literal>HTML</literal> block. </para> <para> - When using <literal>PHP</literal> within an web environment, turning + When using PHP within an web environment, turning this option on has serious performance implications and is generally recommended for debugging purposes only. This value defaults to &true; when operating under the <literal>CLI SAPI</literal>. @@ -129,4 +129,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - http://cvs.php.net/diff.php/phpdoc/en/reference/pcre/constants.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/pcre/constants.xml diff -u phpdoc/en/reference/pcre/constants.xml:1.7 phpdoc/en/reference/pcre/constants.xml:1.8 --- phpdoc/en/reference/pcre/constants.xml:1.7 Wed Mar 17 04:10:20 2004 +++ phpdoc/en/reference/pcre/constants.xml Tue Aug 10 12:30:19 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <section id="pcre.constants"> &reftitle.constants; &extension.constants; @@ -35,7 +35,7 @@ <entry> See the description of <constant>PREG_SPLIT_OFFSET_CAPTURE</constant>. This flag is - available since <literal>PHP</literal> 4.3.0. + available since PHP 4.3.0. </entry> </row> <row> @@ -50,7 +50,7 @@ <entry> This flag tells <function>preg_split</function> to capture parenthesized expression in the delimiter pattern as well. This flag - is available since <literal>PHP</literal> 4.0.5. + is available since PHP 4.0.5. </entry> </row> <row> @@ -60,7 +60,7 @@ offset will also be returned. Note that this changes the return values in an array where every element is an array consisting of the matched string at offset 0 and its string offset within subject at - offset 1. This flag is available since <literal>PHP</literal> 4.3.0 + offset 1. This flag is available since PHP 4.3.0 and is only used for <function>preg_split</function>. </entry> </row> http://cvs.php.net/diff.php/phpdoc/en/reference/pcre/functions/preg-match-all.xml?r1=1.13&r2=1.14&ty=u Index: phpdoc/en/reference/pcre/functions/preg-match-all.xml diff -u phpdoc/en/reference/pcre/functions/preg-match-all.xml:1.13 phpdoc/en/reference/pcre/functions/preg-match-all.xml:1.14 --- phpdoc/en/reference/pcre/functions/preg-match-all.xml:1.13 Tue Aug 3 11:51:10 2004 +++ phpdoc/en/reference/pcre/functions/preg-match-all.xml Tue Aug 10 12:30:20 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.13 $ --> +<!-- $Revision: 1.14 $ --> <!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 --> <refentry id="function.preg-match-all"> <refnamediv> @@ -117,7 +117,7 @@ value in an array where every element is an array consisting of the matched string at offset <literal>0</literal> and its string offset into <parameter>subject</parameter> at offset <literal>1</literal>. - This flag is available since <literal>PHP</literal> 4.3.0 . + This flag is available since PHP 4.3.0 . </para> </listitem> </varlistentry> @@ -135,7 +135,7 @@ passing <function>substr</function>($subject, $offset) to <function>preg_match</function> in place of the subject string. The <parameter>offset</parameter> parameter is available since - <literal>PHP</literal> 4.3.3. + PHP 4.3.3. </para> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/pcre/functions/preg-match.xml?r1=1.14&r2=1.15&ty=u Index: phpdoc/en/reference/pcre/functions/preg-match.xml diff -u phpdoc/en/reference/pcre/functions/preg-match.xml:1.14 phpdoc/en/reference/pcre/functions/preg-match.xml:1.15 --- phpdoc/en/reference/pcre/functions/preg-match.xml:1.14 Tue Aug 3 11:51:10 2004 +++ phpdoc/en/reference/pcre/functions/preg-match.xml Tue Aug 10 12:30:20 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.14 $ --> +<!-- $Revision: 1.15 $ --> <!-- splitted from ./en/functions/pcre.xml, last change in rev 1.2 --> <refentry id="function.preg-match"> <refnamediv> @@ -39,13 +39,13 @@ in an array where every element is an array consisting of the matched string at offset <literal>0</literal> and its string offset into <parameter>subject</parameter> at offset <literal>1</literal>. This - flag is available since <literal>PHP</literal> 4.3.0 . + flag is available since PHP 4.3.0 . </simpara> </listitem> </varlistentry> </variablelist> The <parameter>flags</parameter> parameter is available since - <literal>PHP</literal> 4.3.0. + PHP 4.3.0. </para> <para> @@ -55,7 +55,7 @@ passing <function>substr</function>($subject, $offset) to <function>preg_match</function> in place of the subject string. The <parameter>offset</parameter> parameter is available since - <literal>PHP</literal> 4.3.3. + PHP 4.3.3. </para> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/recode/configure.xml?r1=1.3&r2=1.4&ty=u Index: phpdoc/en/reference/recode/configure.xml diff -u phpdoc/en/reference/recode/configure.xml:1.3 phpdoc/en/reference/recode/configure.xml:1.4 --- phpdoc/en/reference/recode/configure.xml:1.3 Fri Dec 19 10:49:49 2003 +++ phpdoc/en/reference/recode/configure.xml Tue Aug 10 12:30:20 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <section id="recode.installation"> &reftitle.install; <para> @@ -10,7 +10,7 @@ </para> <warning> <para> - Crashes and startup problems of <literal>PHP</literal> may be encountered + Crashes and startup problems of PHP may be encountered when loading the recode as extension <emphasis role="strong">after</emphasis> loading any extension of <link linkend="ref.mysql">mysql</link> or <link @@ -46,4 +46,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - http://cvs.php.net/diff.php/phpdoc/en/reference/sesam/reference.xml?r1=1.8&r2=1.9&ty=u Index: phpdoc/en/reference/sesam/reference.xml diff -u phpdoc/en/reference/sesam/reference.xml:1.8 phpdoc/en/reference/sesam/reference.xml:1.9 --- phpdoc/en/reference/sesam/reference.xml:1.8 Tue Feb 24 03:46:20 2004 +++ phpdoc/en/reference/sesam/reference.xml Tue Aug 10 12:30:20 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <reference id="ref.sesam"> <title>SESAM Database Functions</title> <titleabbrev>SESAM</titleabbrev> @@ -36,14 +36,13 @@ </itemizedlist> </para> <para> - There is a <literal>PHP3</literal> SESAM interface available which allows + There is a PHP 3 SESAM interface available which allows database operations via PHP-scripts. </para> <note> <simpara> Access to SESAM is only available with the latest CVS-Version of - <literal>PHP3</literal>. <literal>PHP 4</literal> does not support the - SESAM database. + PHP 3. PHP 4 does not support the SESAM database. </simpara> </note> </section> @@ -548,4 +547,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - http://cvs.php.net/diff.php/phpdoc/en/reference/session/ini.xml?r1=1.25&r2=1.26&ty=u Index: phpdoc/en/reference/session/ini.xml diff -u phpdoc/en/reference/session/ini.xml:1.25 phpdoc/en/reference/session/ini.xml:1.26 --- phpdoc/en/reference/session/ini.xml:1.25 Fri Jul 23 10:00:45 2004 +++ phpdoc/en/reference/session/ini.xml Tue Aug 10 12:30:20 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.25 $ --> +<!-- $Revision: 1.26 $ --> <section id="session.configuration"> &reftitle.runtime; &extension.runtime; @@ -403,8 +403,7 @@ cookies to store the session id on the client side. Defaults to <literal>0</literal> (disabled, for backward compatibility). Enabling this setting prevents attacks involved passing session - ids in URLs. This setting was added in <literal>PHP</literal> - 4.3.0. + ids in URLs. This setting was added in PHP 4.3.0. </simpara> </listitem> </varlistentry> @@ -467,8 +466,7 @@ <literal>session.cookie_secure</literal> specifies whether cookies should only be sent over secure connections. Defaults to <literal>off</literal>. - This setting was added in <literal>PHP</literal> - 4.0.4. See also + This setting was added in PHP 4.0.4. See also <function>session_get_cookie_params</function> and <function>session_set_cookie_params</function>. </simpara> @@ -674,4 +672,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - http://cvs.php.net/diff.php/phpdoc/en/reference/snmp/configure.xml?r1=1.1&r2=1.2&ty=u Index: phpdoc/en/reference/snmp/configure.xml diff -u phpdoc/en/reference/snmp/configure.xml:1.1 phpdoc/en/reference/snmp/configure.xml:1.2 --- phpdoc/en/reference/snmp/configure.xml:1.1 Mon Dec 2 07:55:41 2002 +++ phpdoc/en/reference/snmp/configure.xml Tue Aug 10 12:30:20 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.1 $ --> +<!-- $Revision: 1.2 $ --> <section id="snmp.installation"> &reftitle.install; <para> @@ -24,10 +24,10 @@ </para> <para> The Windows distribution contains support files for SNMP in the - <filename>mibs</filename> directory. This directory should be moved - to <filename>DRIVE:\usr\mibs</filename>, where DRIVE must be replaced - with the driveletter where <literal>PHP</literal> is installed on, e.g.: - <filename>c:\usr\mibs</filename>. + <filename class="directory">mibs</filename> directory. This directory + should be moved to <filename class="directory">DRIVE:\usr\mibs</filename>, + where DRIVE must be replaced with the driveletter where PHP is installed on, + e.g.<filename class="directory">c:\usr\mibs</filename>. </para> </section> @@ -51,4 +51,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - http://cvs.php.net/diff.php/phpdoc/en/reference/sockets/functions/socket-create-pair.xml?r1=1.7&r2=1.8&ty=u Index: phpdoc/en/reference/sockets/functions/socket-create-pair.xml diff -u phpdoc/en/reference/sockets/functions/socket-create-pair.xml:1.7 phpdoc/en/reference/sockets/functions/socket-create-pair.xml:1.8 --- phpdoc/en/reference/sockets/functions/socket-create-pair.xml:1.7 Tue Aug 3 13:25:34 2004 +++ phpdoc/en/reference/sockets/functions/socket-create-pair.xml Tue Aug 10 12:30:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.27 --> <refentry id="function.socket-create-pair"> <refnamediv> @@ -45,7 +45,7 @@ <entry>AF_INET6</entry> <entry> IPv6 Internet based protocols. TCP and UDP are common protocols of - this protocol family. Support added in <literal>PHP 5.0.0</literal>. + this protocol family. Support added in PHP 5.0.0. Supported only in windows. </entry> </row> http://cvs.php.net/diff.php/phpdoc/en/reference/sockets/functions/socket-create.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/sockets/functions/socket-create.xml diff -u phpdoc/en/reference/sockets/functions/socket-create.xml:1.6 phpdoc/en/reference/sockets/functions/socket-create.xml:1.7 --- phpdoc/en/reference/sockets/functions/socket-create.xml:1.6 Sun Jun 22 15:43:21 2003 +++ phpdoc/en/reference/sockets/functions/socket-create.xml Tue Aug 10 12:30:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/sockets.xml, last change in rev 1.4 --> <refentry id="function.socket-create"> <refnamediv> @@ -44,7 +44,7 @@ <entry>AF_INET6</entry> <entry> IPv6 Internet based protocols. TCP and UDP are common protocols of - this protocol family. Support added in <literal>PHP 5.0.0</literal>. + this protocol family. Support added in PHP 5.0.0. </entry> </row> <row> http://cvs.php.net/diff.php/phpdoc/en/reference/stream/reference.xml?r1=1.22&r2=1.23&ty=u Index: phpdoc/en/reference/stream/reference.xml diff -u phpdoc/en/reference/stream/reference.xml:1.22 phpdoc/en/reference/stream/reference.xml:1.23 --- phpdoc/en/reference/stream/reference.xml:1.22 Thu Apr 1 01:31:14 2004 +++ phpdoc/en/reference/stream/reference.xml Tue Aug 10 12:30:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.22 $ --> +<!-- $Revision: 1.23 $ --> <reference id="ref.stream"> <title>Stream Functions</title> <titleabbrev>Streams</titleabbrev> @@ -9,7 +9,7 @@ <section id="stream.intro"> &reftitle.intro; <simpara> - Streams were introduced with <literal>PHP</literal> 4.3.0 as + Streams were introduced with PHP 4.3.0 as a way of generalizing file, network, data compression, and other operations which share a common set of functions and uses. In its simplest definition, a <literal>stream</literal> is a @@ -23,11 +23,11 @@ specific protocols/encodings. For example, the <literal>http</literal> wrapper knows how to translate a URL into an <literal>HTTP/1.0</literal> request for a file on a remote server. There are many wrappers - built into <literal>PHP</literal> by default (See <xref linkend="wrappers"/>), + built into PHP by default (See <xref linkend="wrappers"/>), and additional, custom wrappers may be added either within a PHP script using <function>stream_wrapper_register</function>, or directly from an extension using the API Reference in <xref linkend="streams"/>. - Because any variety of wrapper may be added to <literal>PHP</literal>, + Because any variety of wrapper may be added to PHP, there is no set limit on what can be done with them. To access the list of currently registered wrappers, use <function>stream_get_wrappers</function>. </simpara> @@ -63,7 +63,7 @@ A <literal>filter</literal> is a final piece of code which may perform operations on data as it is being read from or written to a stream. Any number of filters may be stacked onto a stream. Custom - filters can be defined in a <literal>PHP</literal> script using + filters can be defined in a PHP script using <function>stream_filter_register</function> or in an extension using the API Reference in <xref linkend="streams"/>. To access the list of currently registered filters, use <function>stream_get_filters</function>. @@ -91,7 +91,7 @@ <simpara> In addition, <literal>parameters</literal> may be set on a <literal>context</literal> using <function>stream_context_set_params</function>. Currently the only - <literal>context parameter</literal> supported by <literal>PHP</literal> is + <literal>context parameter</literal> supported by PHP is <literal>notification</literal>. The value of this parameter must be the name of a function to be called when an event occurs on a stream. The notification function called during an event should accept the following @@ -123,8 +123,8 @@ <section id="stream.installation"> &reftitle.install; <para> - Streams are an integral part of <literal>PHP</literal> - as of version 4.3.0. No steps are required to enable them. + Streams are an integral part of PHP as of version 4.3.0. No steps are + required to enable them. </para> </section> @@ -152,7 +152,7 @@ host, file not found, etc...). A stream related call may also fail because the desired stream is not registered on the running system. See the array returned by <function>stream_get_wrappers</function> for a list of streams supported by your - installation of <literal>PHP</literal>. As with most PHP internal functions + installation of PHP. As with most PHP internal functions if a failure occurs an <constant>E_WARNING</constant> message will be generated describing the nature of the error. </para> @@ -276,4 +276,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-register-wrapper.xml?r1=1.4&r2=1.5&ty=u Index: phpdoc/en/reference/stream/functions/stream-register-wrapper.xml diff -u phpdoc/en/reference/stream/functions/stream-register-wrapper.xml:1.4 phpdoc/en/reference/stream/functions/stream-register-wrapper.xml:1.5 --- phpdoc/en/reference/stream/functions/stream-register-wrapper.xml:1.4 Sat Mar 20 18:25:11 2004 +++ phpdoc/en/reference/stream/functions/stream-register-wrapper.xml Tue Aug 10 12:30:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <refentry id="function.stream-register-wrapper"> <refnamediv> <refname>stream_register_wrapper</refname> @@ -9,9 +9,8 @@ <title>Description</title> <para> This function is an alias of <function>stream_wrapper_register</function>. - This function is included for compatability with <literal>PHP 4.3.0</literal> - and <literal>PHP 4.3.1</literal> only. <function>stream_wrapper_register</function> - should be used instead. + This function is included for compatability with PHP 4.3.0 and PHP 4.3.1 + only. <function>stream_wrapper_register</function> should be used instead. </para> </refsect1> </refentry> http://cvs.php.net/diff.php/phpdoc/en/reference/stream/functions/stream-wrapper-register.xml?r1=1.12&r2=1.13&ty=u Index: phpdoc/en/reference/stream/functions/stream-wrapper-register.xml diff -u phpdoc/en/reference/stream/functions/stream-wrapper-register.xml:1.12 phpdoc/en/reference/stream/functions/stream-wrapper-register.xml:1.13 --- phpdoc/en/reference/stream/functions/stream-wrapper-register.xml:1.12 Mon Mar 29 18:21:04 2004 +++ phpdoc/en/reference/stream/functions/stream-wrapper-register.xml Tue Aug 10 12:30:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.13 $ --> <refentry id="function.stream-wrapper-register"> <refnamediv> <refname>stream_wrapper_register</refname> @@ -28,7 +28,7 @@ </para> <note> <simpara> - As of <literal>PHP 5.0.0</literal> the instance of + As of PHP 5.0.0 the instance of <parameter>classname</parameter> will be populated with a <parameter>context</parameter> property referencing a <literal>Context Resource</literal> which may be accessed @@ -220,7 +220,7 @@ <note> <simpara> Userspace wrapper unlink method is not supported prior to - <literal>PHP 5.0.0</literal>. + PHP 5.0.0. </simpara> </note> @@ -241,7 +241,7 @@ <note> <simpara> Userspace wrapper rename method is not supported prior to - <literal>PHP 5.0.0</literal>. + PHP 5.0.0. </simpara> </note> @@ -265,7 +265,7 @@ <note> <simpara> Userspace wrapper mkdir method is not supported prior to - <literal>PHP 5.0.0</literal>. + PHP 5.0.0. </simpara> </note> @@ -287,7 +287,7 @@ <note> <simpara> Userspace wrapper rmdir method is not supported prior to - <literal>PHP 5.0.0</literal>. + PHP 5.0.0. </simpara> </note> http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/str-ireplace.xml?r1=1.6&r2=1.7&ty=u Index: phpdoc/en/reference/strings/functions/str-ireplace.xml diff -u phpdoc/en/reference/strings/functions/str-ireplace.xml:1.6 phpdoc/en/reference/strings/functions/str-ireplace.xml:1.7 --- phpdoc/en/reference/strings/functions/str-ireplace.xml:1.6 Tue Sep 30 04:33:43 2003 +++ phpdoc/en/reference/strings/functions/str-ireplace.xml Tue Aug 10 12:30:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 --> <refentry id="function.str-ireplace"> <refnamediv> @@ -61,10 +61,10 @@ </para> <note> <simpara> - As of <literal>PHP 5.0.0</literal> the number of matched and replaced + As of PHP 5.0.0 the number of matched and replaced <parameter>needles</parameter> will be returned in <parameter>count</parameter> which is passed by reference. - Prior to <literal>PHP 5.0.0</literal> this parameter is not available. + Prior to PHP 5.0.0 this parameter is not available. </simpara> </note> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/str-replace.xml?r1=1.15&r2=1.16&ty=u Index: phpdoc/en/reference/strings/functions/str-replace.xml diff -u phpdoc/en/reference/strings/functions/str-replace.xml:1.15 phpdoc/en/reference/strings/functions/str-replace.xml:1.16 --- phpdoc/en/reference/strings/functions/str-replace.xml:1.15 Mon Jun 14 05:45:09 2004 +++ phpdoc/en/reference/strings/functions/str-replace.xml Tue Aug 10 12:30:21 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.15 $ --> +<!-- $Revision: 1.16 $ --> <!-- splitted from ./en/functions/strings.xml, last change in rev 1.2 --> <refentry id="function.str-replace"> <refnamediv> @@ -36,7 +36,7 @@ parameters which caused empty <parameter>search</parameter> indexes to be skipped without advancing the internal pointer on the <parameter>replace</parameter> array. This has been corrected in - <literal>PHP 4.3.3</literal>, any scripts which relied on this bug + PHP 4.3.3, any scripts which relied on this bug should remove empty search values prior to calling this function in order to mimick the original behavior. </simpara> @@ -93,10 +93,10 @@ <note> <simpara> - As of <literal>PHP 5.0.0</literal> the number of matched and replaced + As of PHP 5.0.0 the number of matched and replaced needles (<parameter>search</parameter>) will be returned in <parameter>count</parameter> which is passed by reference. - Prior to <literal>PHP 5.0.0</literal> this parameter is not available. + Prior to PHP 5.0.0 this parameter is not available. </simpara> </note> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/strings/functions/strrpos.xml?r1=1.9&r2=1.10&ty=u Index: phpdoc/en/reference/strings/functions/strrpos.xml diff -u phpdoc/en/reference/strings/functions/strrpos.xml:1.9 phpdoc/en/reference/strings/functions/strrpos.xml:1.10 --- phpdoc/en/reference/strings/functions/strrpos.xml:1.9 Fri Jan 2 12:10:33 2004 +++ phpdoc/en/reference/strings/functions/strrpos.xml Tue Aug 10 12:30:22 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <!-- splitted from ./en/functions/strings.xml, last change in rev 1.8 --> <refentry id="function.strrpos"> <refnamediv> @@ -58,7 +58,7 @@ </para> <note> <simpara> - As of <literal>PHP 5.0.0</literal> <parameter>offset</parameter> may + As of PHP 5.0.0 <parameter>offset</parameter> may be specified to begin searching an arbitrary number of characters into the string. Negative values will stop searching at an arbitrary point prior to the end of the string. @@ -67,7 +67,7 @@ <note> <simpara> The <parameter>needle</parameter> may be a string of more than one - character as of <literal>PHP 5.0.0</literal>. + character as of PHP 5.0.0. </simpara> </note> <para> http://cvs.php.net/diff.php/phpdoc/en/reference/url/functions/http-build-query.xml?r1=1.8&r2=1.9&ty=u Index: phpdoc/en/reference/url/functions/http-build-query.xml diff -u phpdoc/en/reference/url/functions/http-build-query.xml:1.8 phpdoc/en/reference/url/functions/http-build-query.xml:1.9 --- phpdoc/en/reference/url/functions/http-build-query.xml:1.8 Tue Feb 17 08:19:18 2004 +++ phpdoc/en/reference/url/functions/http-build-query.xml Tue Aug 10 12:30:22 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <refentry id="function.http-build-query"> <refnamediv> <refname>http_build_query</refname> @@ -20,7 +20,7 @@ or an array of arrays (who in turn may contain other arrays). If numeric indices are used in the base array and a <parameter>numeric_prefix</parameter> is provided, it will be prepended to the numeric index for elements in the base array only. - This is to allow for legal variable names when the data is decoded by <literal>PHP</literal> + This is to allow for legal variable names when the data is decoded by PHP or another CGI application later on. </simpara> @@ -158,4 +158,3 @@ vim: et tw=78 syn=sgml vi: ts=1 sw=1 --> - http://cvs.php.net/diff.php/phpdoc/en/reference/vpopmail/configure.xml?r1=1.2&r2=1.3&ty=u Index: phpdoc/en/reference/vpopmail/configure.xml diff -u phpdoc/en/reference/vpopmail/configure.xml:1.2 phpdoc/en/reference/vpopmail/configure.xml:1.3 --- phpdoc/en/reference/vpopmail/configure.xml:1.2 Thu Jul 22 20:18:22 2004 +++ phpdoc/en/reference/vpopmail/configure.xml Tue Aug 10 12:30:22 2004 @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <section id="vpopmail.installation"> &reftitle.install; <para id="vpopmail.configure"> - As of PHP 4, these functions are only available if <literal>PHP</literal> - was configured with <option role="configure">--with-vpopmail[=DIR]</option>. + As of PHP 4, these functions are only available if PHP was configured with + <option role="configure">--with-vpopmail[=DIR]</option>. </para> </section>