cvs: phpdoc /en/appendices migration4.xml phpdevel.xml reserved.xml resources.xml /en/faq html.xml installation.xml /en/features safe-mode.xml
/en/language functions.xml

vrana Tue Aug 3 16:59:43 2004 EDT Modified files: /phpdoc/en/appendices migration4.xml phpdevel.xml reserved.xml resources.xml /phpdoc/en/faq html.xml installation.xml /phpdoc/en/features safe-mode.xml /phpdoc/en/language functions.xml Log: Nuke tabs

http://cvs.php.net/diff.php/phpdoc/en/appendices/migration4.xml?r1=1.37&r2=1.38&ty=u Index: phpdoc/en/appendices/migration4.xml diff -u phpdoc/en/appendices/migration4.xml:1.37 phpdoc/en/appendices/migration4.xml:1.38 --- phpdoc/en/appendices/migration4.xml:1.37 Wed May 19 10:11:51 2004 +++ phpdoc/en/appendices/migration4.xml Tue Aug 3 16:59:42 2004 @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.37 $ --> +<!-- $Revision: 1.38 $ --> <appendix id="migration4"> <title>Migrating from PHP 3 to PHP 4</title> - + <section id='migration4.changes'> <title>What has changed in PHP 4</title> <para> @@ -47,8 +47,8 @@ --with-mysql \ --enable-track-vars ]]> - </programlisting> - </informalexample> + </programlisting> + </informalexample> </para> </section> @@ -135,12 +135,12 @@ To convert your Apache configuration files, run the apconf-conv.sh script (available in the scripts/apache/ directory). For example: <informalexample> - <programlisting role="shell"> + <programlisting role="shell"> <![CDATA[ ~/php4/scripts/apache:# ./apconf-conv.sh /usr/local/apache/conf/httpd.conf ]]> - </programlisting> - </informalexample> + </programlisting> + </informalexample> </para> <simpara> Your original configuration file will be saved in httpd.conf.orig. @@ -150,11 +150,11 @@ <filename>aphtaccess-conv.sh</filename> script (available in the <filename>scripts/apache/</filename> directory as well): <informalexample> - <programlisting role="shell"> + <programlisting role="shell"> <![CDATA[ ~/php4/scripts/apache:# find / -name .htaccess -exec ./aphtaccess-conv.sh {} \; ]]> - </programlisting> + </programlisting> </informalexample> </para> <simpara> @@ -206,7 +206,7 @@ <section id='migration4.error-reporting'> <title>Error reporting</title> - + <section id='migration4.error-reporting.config'> <title>Configuration changes</title> <para> http://cvs.php.net/diff.php/phpdoc/en/appendices/phpdevel.xml?r1=1.25&r2=1.26&ty=u Index: phpdoc/en/appendices/phpdevel.xml diff -u phpdoc/en/appendices/phpdevel.xml:1.25 phpdoc/en/appendices/phpdevel.xml:1.26 --- phpdoc/en/appendices/phpdevel.xml:1.25 Wed May 19 10:11:51 2004 +++ phpdoc/en/appendices/phpdevel.xml Tue Aug 3 16:59:42 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.25 $ --> +<!-- $Revision: 1.26 $ --> <appendix id="phpdevel"> <title>Extending PHP 3</title> @@ -434,7 +434,7 @@ add_method( return_value, function_name, function_ptr ); ]]> </programlisting> - </para></listitem> + </para></listitem> </orderedlist></para> <para> @@ -535,8 +535,8 @@ convert_to_long(resource_id); resource = php3_list_find(resource_id->value.lval, &type); if (type != LE_RESOURCE_TYPE) { - php3_error(E_WARNING,"resource index %d has the wrong type",resource_id->value.lval); - RETURN_FALSE; + php3_error(E_WARNING,"resource index %d has the wrong type",resource_id->value.lval); + RETURN_FALSE; } /* ...use resource... */ ]]> @@ -811,7 +811,7 @@ Warnings are printed by default, but do not interrupt script execution. These indicate a problem that should have been trapped by the script before the call was made. For example, calling - <function>ereg</function> with an invalid regular expression. + <function>ereg</function> with an invalid regular expression. </simpara> </sect2> http://cvs.php.net/diff.php/phpdoc/en/appendices/reserved.xml?r1=1.42&r2=1.43&ty=u Index: phpdoc/en/appendices/reserved.xml diff -u phpdoc/en/appendices/reserved.xml:1.42 phpdoc/en/appendices/reserved.xml:1.43 --- phpdoc/en/appendices/reserved.xml:1.42 Tue Jun 1 15:39:11 2004 +++ phpdoc/en/appendices/reserved.xml Tue Aug 3 16:59:42 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.42 $ --> +<!-- $Revision: 1.43 $ --> <appendix id="reserved"> <title>List of Reserved Words</title> @@ -325,7 +325,7 @@ </simpara> </listitem> </varlistentry> - + <varlistentry> <term>'<varname>GATEWAY_INTERFACE</varname>'</term> <listitem> @@ -376,7 +376,7 @@ </simpara> </listitem> </varlistentry> - + <varlistentry> <term>'<varname>QUERY_STRING</varname>'</term> <listitem> @@ -667,7 +667,7 @@ there regardless of whether PHP is running as a server module or CGI processor. </simpara> - + <simpara> This is a 'superglobal', or automatic global, variable. This simply means that it is available in all scopes throughout a http://cvs.php.net/diff.php/phpdoc/en/appendices/resources.xml?r1=1.30&r2=1.31&ty=u Index: phpdoc/en/appendices/resources.xml diff -u phpdoc/en/appendices/resources.xml:1.30 phpdoc/en/appendices/resources.xml:1.31 --- phpdoc/en/appendices/resources.xml:1.30 Mon Mar 17 14:00:49 2003 +++ phpdoc/en/appendices/resources.xml Tue Aug 3 16:59:42 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.30 $ --> +<!-- $Revision: 1.31 $ --> <appendix id="resource"> <title>List of Resource Types</title> <para> @@ -41,7 +41,7 @@ </entry> <entry>Aspell dictionary</entry> </row> - <row> + <row> <entry>bzip2</entry> <entry> <function>bzopen</function> http://cvs.php.net/diff.php/phpdoc/en/faq/html.xml?r1=1.26&r2=1.27&ty=u Index: phpdoc/en/faq/html.xml diff -u phpdoc/en/faq/html.xml:1.26 phpdoc/en/faq/html.xml:1.27 --- phpdoc/en/faq/html.xml:1.26 Wed Jan 28 19:35:23 2004 +++ phpdoc/en/faq/html.xml Tue Aug 3 16:59:42 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.26 $ --> +<!-- $Revision: 1.27 $ --> <chapter id="faq.html"> <title>PHP and HTML</title> <titleabbrev>PHP and HTML</titleabbrev> @@ -205,9 +205,9 @@ <para> <note> <para> - Specifying an arrays key is optional in HTML. If you do not specify - the keys, the array gets filled in the order the elements appear in - the form. Our first example will contain keys 0, 1, 2 and 3. + Specifying an arrays key is optional in HTML. If you do not specify + the keys, the array gets filled in the order the elements appear in + the form. Our first example will contain keys 0, 1, 2 and 3. </para> </note> </para> http://cvs.php.net/diff.php/phpdoc/en/faq/installation.xml?r1=1.31&r2=1.32&ty=u Index: phpdoc/en/faq/installation.xml diff -u phpdoc/en/faq/installation.xml:1.31 phpdoc/en/faq/installation.xml:1.32 --- phpdoc/en/faq/installation.xml:1.31 Mon Aug 2 17:33:03 2004 +++ phpdoc/en/faq/installation.xml Tue Aug 3 16:59:42 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.31 $ --> +<!-- $Revision: 1.32 $ --> <chapter id="faq.installation"> <title>Installation</title> <titleabbrev>Installation</titleabbrev> @@ -284,68 +284,68 @@ completely with RPMS for this example as well. <itemizedlist> <listitem> - <para> + <para> First remove mod_php3 : <programlisting role="shell"> rpm -e mod_php3 </programlisting> - </para> - </listitem> - <listitem> - <para> + </para> + </listitem> + <listitem> + <para> Then get the source rpm and INSTALL it, NOT --rebuild <programlisting role="shell"> rpm -Uvh mod_php3-3.0.5-2.src.rpm </programlisting> - </para> - </listitem> - <listitem> - <para> - Then edit the <filename>/usr/src/redhat/SPECS/mod_php3.spec</filename> file - </para> - <para> + </para> + </listitem> + <listitem> + <para> + Then edit the <filename>/usr/src/redhat/SPECS/mod_php3.spec</filename> file + </para> + <para> In the %build section add the database support you want, and the path. - </para> - <para> + </para> + <para> For MySQL you would add <programlisting role="shell"> --with-mysql=/usr \ </programlisting> The %build section will look something like this: <programlisting role="shell"> - ./configure --prefix=/usr \ - --with-apxs=/usr/sbin/apxs \ - --with-config-file-path=/usr/lib \ - --enable-debug=no \ - --enable-safe-mode \ - --with-exec-dir=/usr/bin \ - --with-mysql=/usr \ - --with-system-regex +./configure --prefix=/usr \ +--with-apxs=/usr/sbin/apxs \ +--with-config-file-path=/usr/lib \ +--enable-debug=no \ +--enable-safe-mode \ +--with-exec-dir=/usr/bin \ +--with-mysql=/usr \ +--with-system-regex </programlisting> - </para> - </listitem> - <listitem> - <para> - Once this modification is made then build the binary rpm as follows: + </para> + </listitem> + <listitem> + <para> + Once this modification is made then build the binary rpm as follows: <programlisting role="shell"> rpm -bb /usr/src/redhat/SPECS/mod_php3.spec </programlisting> - </para> - </listitem> - <listitem> - <para> - Then install the rpm + </para> + </listitem> + <listitem> + <para> + Then install the rpm <programlisting role="shell"> rpm -ivh /usr/src/redhat/RPMS/i386/mod_php3-3.0.5-2.i386.rpm </programlisting> - </para> - </listitem> + </para> + </listitem> </itemizedlist> Make sure you restart Apache, and you now have PHP 3 with MySQL support using RPM's. Note that it is probably much easier to just build from the distribution tarball of PHP 3 and follow the instructions in <filename>INSTALL.REDHAT</filename> found in that distribution. - </para> + </para> </answer> </qandaentry> http://cvs.php.net/diff.php/phpdoc/en/features/safe-mode.xml?r1=1.50&r2=1.51&ty=u Index: phpdoc/en/features/safe-mode.xml diff -u phpdoc/en/features/safe-mode.xml:1.50 phpdoc/en/features/safe-mode.xml:1.51 --- phpdoc/en/features/safe-mode.xml:1.50 Tue Jul 27 13:27:11 2004 +++ phpdoc/en/features/safe-mode.xml Tue Aug 3 16:59:42 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.50 $ --> +<!-- $Revision: 1.51 $ --> <chapter id="features.safe-mode"> <title>Safe Mode</title> @@ -604,17 +604,17 @@ </row> <row> <entry> - <function>mail</function> - </entry> - <entry> - In safe mode, the fifth parameter is disabled. (note: only affected since PHP 4.2.3) - </entry> + <function>mail</function> + </entry> + <entry> + In safe mode, the fifth parameter is disabled. (note: only affected since PHP 4.2.3) + </entry> </row> <row> <entry>Any function that uses - <filename>php4/main/fopen_wrappers.c</filename> - </entry> - <entry>??</entry> + <filename>php4/main/fopen_wrappers.c</filename> + </entry> + <entry>??</entry> </row> </tbody> </tgroup> http://cvs.php.net/diff.php/phpdoc/en/language/functions.xml?r1=1.50&r2=1.51&ty=u Index: phpdoc/en/language/functions.xml diff -u phpdoc/en/language/functions.xml:1.50 phpdoc/en/language/functions.xml:1.51 --- phpdoc/en/language/functions.xml:1.50 Thu Jul 22 20:18:21 2004 +++ phpdoc/en/language/functions.xml Tue Aug 3 16:59:42 2004 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.50 $ --> +<!-- $Revision: 1.51 $ --> <chapter id="language.functions"> <title>Functions</title> @@ -343,7 +343,7 @@ <sect2 id="functions.variable-arg-list"> <title>Variable-length argument lists</title> - + <simpara> PHP 4 has support for variable-length argument lists in user-defined functions. This is really quite easy, using the