philip Thu Jul 22 20:18:22 2004 EDT
Modified files:
/phpdoc/en/language control-structures.xml functions.xml
variables.xml
/phpdoc/en/reference/http/functions header.xml setcookie.xml
/phpdoc/en/reference/math/functions round.xml
/phpdoc/en/reference/misc/functions eval.xml uniqid.xml
/phpdoc/en/reference/mysql/functions mysql-change-user.xml
/phpdoc/en/reference/var/functions serialize.xml unserialize.xml
/phpdoc/en/reference/vpopmail configure.xml
Log:
Added changes to make manual "more PHP 5 friendly", like changing "In PHP 4" to "As
of PHP 4"
http://cvs.php.net/diff.php/phpdoc/en/language/control-structures.xml?r1=1.95&r2=1.96&ty=u
Index: phpdoc/en/language/control-structures.xml
diff -u phpdoc/en/language/control-structures.xml:1.95
phpdoc/en/language/control-structures.xml:1.96
--- phpdoc/en/language/control-structures.xml:1.95 Wed Jul 21 05:05:12 2004
+++ phpdoc/en/language/control-structures.xml Thu Jul 22 20:18:21 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.95 $ -->
+<!-- $Revision: 1.96 $ -->
<chapter id="language.control-structures">
<title>Control Structures</title>
@@ -476,23 +476,12 @@
</programlisting>
</informalexample>
</para>
- <para>
- Other languages have a <literal>foreach</literal> statement to
- traverse an array or hash. PHP 3 has no such construct; PHP 4 does
- (see <link
- linkend="control-structures.foreach">foreach</link>). In PHP 3, you
- can combine <link linkend="control-structures.while">while</link>
- with the <function>list</function> and <function>each</function>
- functions to achieve the same effect. See the documentation for
- these functions for an example.
- </para>
-
</sect1>
<sect1 id="control-structures.foreach">
<title><literal>foreach</literal></title>
<para>
- PHP 4 (not PHP 3) includes a <literal>foreach</literal> construct, much
+ PHP 4 introduced a <literal>foreach</literal> construct, much
like Perl and some other languages. This simply gives an easy way to
iterate over arrays. <literal>foreach</literal> works only on arrays, and
will issue an error when you try to use it on a variable with a different
http://cvs.php.net/diff.php/phpdoc/en/language/functions.xml?r1=1.49&r2=1.50&ty=u
Index: phpdoc/en/language/functions.xml
diff -u phpdoc/en/language/functions.xml:1.49 phpdoc/en/language/functions.xml:1.50
--- phpdoc/en/language/functions.xml:1.49 Mon May 31 04:32:15 2004
+++ phpdoc/en/language/functions.xml Thu Jul 22 20:18:21 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.49 $ -->
+<!-- $Revision: 1.50 $ -->
<chapter id="language.functions">
<title>Functions</title>
@@ -41,7 +41,7 @@
</simpara>
<simpara>
In PHP 3, functions must be defined before they are referenced. No
- such requirement exists in PHP 4. <emphasis>Except</emphasis> when
+ such requirement exists since PHP 4. <emphasis>Except</emphasis> when
a function is conditionally defined such as shown in the two examples
below.
</simpara>
http://cvs.php.net/diff.php/phpdoc/en/language/variables.xml?r1=1.78&r2=1.79&ty=u
Index: phpdoc/en/language/variables.xml
diff -u phpdoc/en/language/variables.xml:1.78 phpdoc/en/language/variables.xml:1.79
--- phpdoc/en/language/variables.xml:1.78 Tue Jul 6 02:50:34 2004
+++ phpdoc/en/language/variables.xml Thu Jul 22 20:18:21 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.78 $ -->
+<!-- $Revision: 1.79 $ -->
<chapter id="language.variables">
<title>Variables</title>
@@ -55,7 +55,7 @@
linkend="language.expressions">Expressions</link>.
</para>
<para>
- PHP 4 offers another way to assign values to variables:
+ As of PHP 4, PHP offers another way to assign values to variables:
<link linkend="language.references">assign by reference</link>.
This means that the new variable simply references (in other words,
"becomes an alias for" or "points to") the original variable.
@@ -942,7 +942,7 @@
<para>
In PHP 3, the array form variable usage is limited to
- single-dimensional arrays. In PHP 4, no such restriction applies.
+ single-dimensional arrays. As of PHP 4, no such restriction applies.
</para>
<sect3 id="language.variables.external.form.submit">
http://cvs.php.net/diff.php/phpdoc/en/reference/http/functions/header.xml?r1=1.23&r2=1.24&ty=u
Index: phpdoc/en/reference/http/functions/header.xml
diff -u phpdoc/en/reference/http/functions/header.xml:1.23
phpdoc/en/reference/http/functions/header.xml:1.24
--- phpdoc/en/reference/http/functions/header.xml:1.23 Mon Jan 19 10:17:17 2004
+++ phpdoc/en/reference/http/functions/header.xml Thu Jul 22 20:18:21 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.23 $ -->
+<!-- $Revision: 1.24 $ -->
<!-- splitted from ./en/functions/http.xml, last change in rev 1.2 -->
<refentry id="function.header">
<refnamediv>
@@ -201,7 +201,7 @@
</para>
<note>
<para>
- In PHP 4, you can use output buffering to get around this problem,
+ As of PHP 4, you can use output buffering to get around this problem,
with the overhead of all of your output to the browser being buffered
in the server until you send it. You can do this by calling
<function>ob_start</function> and <function>ob_end_flush</function>
http://cvs.php.net/diff.php/phpdoc/en/reference/http/functions/setcookie.xml?r1=1.28&r2=1.29&ty=u
Index: phpdoc/en/reference/http/functions/setcookie.xml
diff -u phpdoc/en/reference/http/functions/setcookie.xml:1.28
phpdoc/en/reference/http/functions/setcookie.xml:1.29
--- phpdoc/en/reference/http/functions/setcookie.xml:1.28 Sat Feb 7 13:56:34
2004
+++ phpdoc/en/reference/http/functions/setcookie.xml Thu Jul 22 20:18:21 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.28 $ -->
+<!-- $Revision: 1.29 $ -->
<!-- splitted from ./en/functions/http.xml, last change in rev 1.2 -->
<refentry id="function.setcookie">
<refnamediv>
@@ -31,12 +31,13 @@
</para>
<note>
<para>
- In PHP 4, you can use output buffering to send output prior to the call
- of this function, with the overhead of all of your output to the browser
- being buffered in the server until you send it. You can do this by calling
- <function>ob_start</function> and <function>ob_end_flush</function>
- in your script, or setting the <literal>output_buffering</literal>
- configuration directive on in your &php.ini; or server configuration files.
+ As of PHP 4, you can use output buffering to send output prior to the
+ call of this function, with the overhead of all of your output to the
+ browser being buffered in the server until you send it. You can do this
+ by calling <function>ob_start</function> and
+ <function>ob_end_flush</function> in your script, or setting the
+ <literal>output_buffering</literal> configuration directive on in your
+ &php.ini; or server configuration files.
</para>
</note>
<para>
@@ -201,7 +202,7 @@
In PHP 3, multiple calls to <function>setcookie</function> in the same
script will be performed in reverse order. If you are trying to
delete one cookie before inserting another you should put the
- insert before the delete. In PHP 4, multiple calls to
+ insert before the delete. As of PHP 4, multiple calls to
<function>setcookie</function> are performed in the order called.
</simpara>
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/math/functions/round.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/math/functions/round.xml
diff -u phpdoc/en/reference/math/functions/round.xml:1.8
phpdoc/en/reference/math/functions/round.xml:1.9
--- phpdoc/en/reference/math/functions/round.xml:1.8 Wed Mar 10 09:39:13 2004
+++ phpdoc/en/reference/math/functions/round.xml Thu Jul 22 20:18:22 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- splitted from ./en/functions/math.xml, last change in rev 1.2 -->
<refentry id="function.round">
<refnamediv>
@@ -66,8 +66,8 @@
<para>
<note>
<simpara>
- The <parameter>precision</parameter> parameter is only
- available in PHP 4.
+ The <parameter>precision</parameter> parameter was introduced
+ in PHP 4.
</simpara>
</note>
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/misc/functions/eval.xml?r1=1.7&r2=1.8&ty=u
Index: phpdoc/en/reference/misc/functions/eval.xml
diff -u phpdoc/en/reference/misc/functions/eval.xml:1.7
phpdoc/en/reference/misc/functions/eval.xml:1.8
--- phpdoc/en/reference/misc/functions/eval.xml:1.7 Tue May 18 10:35:55 2004
+++ phpdoc/en/reference/misc/functions/eval.xml Thu Jul 22 20:18:22 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/misc.xml, last change in rev 1.58 -->
<refentry id="function.eval">
<refnamediv>
@@ -33,7 +33,7 @@
</simpara>
<simpara>
A <literal>return</literal> statement will terminate the evaluation of
- the string immediately. In PHP 4, <function>eval</function> returns
+ the string immediately. As of PHP 4, <function>eval</function> returns
&null; unless <literal>return</literal> is called in the evaluated
code, in which case the value passed to <literal>return</literal> is
returned. In PHP 3, <function>eval</function> does not return a value.
http://cvs.php.net/diff.php/phpdoc/en/reference/misc/functions/uniqid.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc/en/reference/misc/functions/uniqid.xml
diff -u phpdoc/en/reference/misc/functions/uniqid.xml:1.5
phpdoc/en/reference/misc/functions/uniqid.xml:1.6
--- phpdoc/en/reference/misc/functions/uniqid.xml:1.5 Sat Jun 21 06:28:05 2003
+++ phpdoc/en/reference/misc/functions/uniqid.xml Thu Jul 22 20:18:22 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/misc.xml, last change in rev 1.2 -->
<refentry id="function.uniqid">
<refnamediv>
@@ -34,8 +34,7 @@
</simpara>
<note>
<simpara>
- The <parameter>lcg</parameter> parameter is only available in
- PHP 4 and PHP 3.0.13 and later.
+ The <parameter>lcg</parameter> parameter was introduced in PHP 3.0.13.
</simpara>
</note>
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/mysql/functions/mysql-change-user.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc/en/reference/mysql/functions/mysql-change-user.xml
diff -u phpdoc/en/reference/mysql/functions/mysql-change-user.xml:1.2
phpdoc/en/reference/mysql/functions/mysql-change-user.xml:1.3
--- phpdoc/en/reference/mysql/functions/mysql-change-user.xml:1.2 Wed Apr 17
02:41:05 2002
+++ phpdoc/en/reference/mysql/functions/mysql-change-user.xml Thu Jul 22 20:18:22
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
<refentry id="function.mysql-change-user">
<refnamediv>
@@ -33,8 +33,8 @@
<note>
<para>
- This function was introduced in PHP 3.0.13 and requires MySQL
- 3.23.3 or higher. It is not available in PHP 4.
+ This deprecated function is only available in PHP 3 and requires MySQL
+ 3.23.3 or higher.
</para>
</note>
</refsect1>
http://cvs.php.net/diff.php/phpdoc/en/reference/var/functions/serialize.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/var/functions/serialize.xml
diff -u phpdoc/en/reference/var/functions/serialize.xml:1.8
phpdoc/en/reference/var/functions/serialize.xml:1.9
--- phpdoc/en/reference/var/functions/serialize.xml:1.8 Mon Dec 15 11:54:11 2003
+++ phpdoc/en/reference/var/functions/serialize.xml Thu Jul 22 20:18:22 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.28 -->
<refentry id="function.serialize">
<refnamediv>
@@ -53,8 +53,8 @@
<note>
<para>
In PHP 3, object properties will be serialized, but methods are
- lost. PHP 4 removes that limitation and restores both properties
- and methods. Please see the <link
+ lost. That limitation was removed in PHP 4 as both properties
+ and methods are now restored. Please see the <link
linkend="language.oop.serialization">Serializing Objects</link>
section of <link linkend="language.oop">Classes and
Objects</link> for more information.
http://cvs.php.net/diff.php/phpdoc/en/reference/var/functions/unserialize.xml?r1=1.15&r2=1.16&ty=u
Index: phpdoc/en/reference/var/functions/unserialize.xml
diff -u phpdoc/en/reference/var/functions/unserialize.xml:1.15
phpdoc/en/reference/var/functions/unserialize.xml:1.16
--- phpdoc/en/reference/var/functions/unserialize.xml:1.15 Thu Jan 15 07:43:39
2004
+++ phpdoc/en/reference/var/functions/unserialize.xml Thu Jul 22 20:18:22 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.15 $ -->
+<!-- $Revision: 1.16 $ -->
<!-- splitted from ./en/functions/var.xml, last change in rev 1.2 -->
<refentry id="function.unserialize">
<refnamediv>
@@ -63,8 +63,8 @@
<note>
<para>
In PHP 3, methods are not preserved when unserializing a
- serialized object. PHP 4 removes that limitation and restores
- both properties and methods. Please see the <link
+ serialized object. That limitation was removed in PHP 4 as both
+ properties and methods are now restored. Please see the <link
linkend="language.oop.serialization">Serializing Objects</link>
section of <link linkend="language.oop">Classes and
Objects</link> or more information.
http://cvs.php.net/diff.php/phpdoc/en/reference/vpopmail/configure.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc/en/reference/vpopmail/configure.xml
diff -u phpdoc/en/reference/vpopmail/configure.xml:1.1
phpdoc/en/reference/vpopmail/configure.xml:1.2
--- phpdoc/en/reference/vpopmail/configure.xml:1.1 Sun May 11 19:55:05 2003
+++ phpdoc/en/reference/vpopmail/configure.xml Thu Jul 22 20:18:22 2004
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<section id="vpopmail.installation">
&reftitle.install;
<para id="vpopmail.configure">
- In 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 <literal>PHP</literal>
+ was configured with <option role="configure">--with-vpopmail[=DIR]</option>.
</para>
</section>
