cvs: phpdoc /en language-snippets.ent /en/appendices reserved.xml tokens.xml /en/language operators.xml /en/language/oop5 iterations.xml
/en/language/predefined iterator.xml traversable.xml /en/language/predefined/iterator next.xml rewind.xml /en/language/types array.xml
/en/reference/array/functions array-walk.xml array.xml each.xml range.xml /en/reference/com examples.xml /en/reference/com/functions com-isenum.xml
/en/reference/dom/domnodelist item.xml /en/reference/pdo_sqlite/functions PDO-sqliteCreateFunction.xml /en/reference/sdo examples.xml
/en/reference/spl arrayiterator.xml /en/reference/sqlite/functions sqlite-create-function.xml
| From: | Damien Seguy | Date: | Mon, 16 Feb 2009 15:30:18 +0000 |
| Subject: | cvs: phpdoc /en language-snippets.ent /en/appendices reserved.xml tokens.xml /en/language operators.xml /en/language/oop5 iterations.xml /en/language/predefined iterator.xml traversable.xml /en/language/predefined/iterator next.xml rewind.xml /en/language/types array.xml /en/reference/array/functions array-walk.xml array.xml each.xml range.xml /en/reference/com examples.xml /en/reference/com/functions com-isenum.xml /en/reference/dom/domnodelist item.xml /en/reference/pdo_sqlite/functions PDO-sqliteCreateFunction.xml /en/reference/sdo examples.xml /en/reference/spl arrayiterator.xml /en/reference/sqlite/functions sqlite-create-function.xml |
||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-3280@lists.php.net to get a copy of this message | ||
dams Mon Feb 16 15:30:18 2009 UTC
Modified files:
/phpdoc/en language-snippets.ent
/phpdoc/en/language/predefined iterator.xml traversable.xml
/phpdoc/en/language/predefined/iterator next.xml rewind.xml
/phpdoc/en/appendices reserved.xml tokens.xml
/phpdoc/en/language/oop5 iterations.xml
/phpdoc/en/language/types array.xml
/phpdoc/en/reference/array/functions array-walk.xml array.xml
each.xml range.xml
/phpdoc/en/reference/com examples.xml
/phpdoc/en/reference/com/functions com-isenum.xml
/phpdoc/en/language operators.xml
/phpdoc/en/reference/pdo_sqlite/functions
PDO-sqliteCreateFunction.xml
/phpdoc/en/reference/sdo examples.xml
/phpdoc/en/reference/spl arrayiterator.xml
/phpdoc/en/reference/sqlite/functions sqlite-create-function.xml
/phpdoc/en/reference/dom/domnodelist item.xml
Log:
introduction of the foreach entity
http://cvs.php.net/viewvc.cgi/phpdoc/en/language-snippets.ent?r1=1.242&r2=1.243&diff_format=u Index: phpdoc/en/language-snippets.ent diff -u phpdoc/en/language-snippets.ent:1.242 phpdoc/en/language-snippets.ent:1.243 --- phpdoc/en/language-snippets.ent:1.242 Mon Feb 16 11:49:35 2009 +++ phpdoc/en/language-snippets.ent Mon Feb 16 15:30:17 2009 @@ -1,4 +1,4 @@ -<!-- $Revision: 1.242 $ --> +<!-- $Revision: 1.243 $ --> <!-- Keep 'em sorted --> @@ -236,6 +236,8 @@ <!ENTITY resource '<link linkend="language.types.resource">resource</link>'> +<!ENTITY foreach '<link linkend="control-structures.foreach">foreach</link>'> + <!-- Returns --> <!ENTITY return.success 'Returns &true; on success or &false; on failure.'> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/predefined/iterator.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/language/predefined/iterator.xml diff -u phpdoc/en/language/predefined/iterator.xml:1.4 phpdoc/en/language/predefined/iterator.xml:1.5 --- phpdoc/en/language/predefined/iterator.xml:1.4 Mon Feb 16 14:48:32 2009 +++ phpdoc/en/language/predefined/iterator.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <phpdoc:classref xml:id="class.iterator" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> @@ -49,7 +49,7 @@ <title>Basic usage</title> <para> This example demonstrates in which order methods are called when - <link linkend="control-structures.foreach">foreach</link>ing over an iterator. + using &foreach; with an iterator. </para> <programlisting role="php"> <![CDATA[ http://cvs.php.net/viewvc.cgi/phpdoc/en/language/predefined/traversable.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/language/predefined/traversable.xml diff -u phpdoc/en/language/predefined/traversable.xml:1.3 phpdoc/en/language/predefined/traversable.xml:1.4 --- phpdoc/en/language/predefined/traversable.xml:1.3 Mon Feb 16 14:48:32 2009 +++ phpdoc/en/language/predefined/traversable.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <phpdoc:classref xml:id="class.traversable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> @@ -12,8 +12,7 @@ <section xml:id="traversable.intro"> &reftitle.intro; <para> - Interface to detect if a class is traversable using - <link linkend="control-structures.foreach">foreach</link>. + Interface to detect if a class is traversable using &foreach;. </para> <para> Abstract base interface that cannot be implemented alone. Instead it must @@ -23,7 +22,7 @@ <note> <para> Internal (built-in) classes that implement this interface can be used in - a <link linkend="control-structures.foreach">foreach</link> construct and do not need to implement + a &foreach; construct and do not need to implement <classname>IteratorAggregate</classname> or <classname>Iterator</classname>. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/predefined/iterator/next.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/language/predefined/iterator/next.xml diff -u phpdoc/en/language/predefined/iterator/next.xml:1.3 phpdoc/en/language/predefined/iterator/next.xml:1.4 --- phpdoc/en/language/predefined/iterator/next.xml:1.3 Mon Feb 16 14:48:32 2009 +++ phpdoc/en/language/predefined/iterator/next.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <refentry xml:id="iterator.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -19,7 +19,7 @@ <note> <para> This method is called <emphasis>after</emphasis> each - <link linkend="control-structures.foreach">foreach</link> loop. + &foreach; loop. </para> </note> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/predefined/iterator/rewind.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/language/predefined/iterator/rewind.xml diff -u phpdoc/en/language/predefined/iterator/rewind.xml:1.3 phpdoc/en/language/predefined/iterator/rewind.xml:1.4 --- phpdoc/en/language/predefined/iterator/rewind.xml:1.3 Mon Feb 16 14:48:32 2009 +++ phpdoc/en/language/predefined/iterator/rewind.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <refentry xml:id="iterator.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -19,8 +19,8 @@ <note> <para> This is the <emphasis>first</emphasis> method called when starting a - <link linkend="control-structures.foreach">foreach</link> loop. It will <emphasis>not</emphasis> be - executed <emphasis>after</emphasis> <link linkend="control-structures.foreach">foreach</link> loops. + &foreach; loop. It will <emphasis>not</emphasis> be + executed <emphasis>after</emphasis> &foreach; loops. </para> </note> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/reserved.xml?r1=1.80&r2=1.81&diff_format=u Index: phpdoc/en/appendices/reserved.xml diff -u phpdoc/en/appendices/reserved.xml:1.80 phpdoc/en/appendices/reserved.xml:1.81 --- phpdoc/en/appendices/reserved.xml:1.80 Wed Jan 7 13:34:18 2009 +++ phpdoc/en/appendices/reserved.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.80 $ --> +<!-- $Revision: 1.81 $ --> <appendix xml:id="reserved" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>List of Reserved Words</title> @@ -115,7 +115,7 @@ <link linkend="control-structures.for">for</link> </entry> <entry> - <link linkend="control-structures.foreach">foreach</link> + &foreach; </entry> <entry> <link linkend="functions.user-defined">function</link> http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/tokens.xml?r1=1.32&r2=1.33&diff_format=u Index: phpdoc/en/appendices/tokens.xml diff -u phpdoc/en/appendices/tokens.xml:1.32 phpdoc/en/appendices/tokens.xml:1.33 --- phpdoc/en/appendices/tokens.xml:1.32 Sun Jan 25 13:33:42 2009 +++ phpdoc/en/appendices/tokens.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.32 $ --> +<!-- $Revision: 1.33 $ --> <appendix xml:id="tokens" xmlns="http://docbook.org/ns/docbook"> <title>List of Parser Tokens</title> @@ -49,7 +49,7 @@ <row> <entry>T_AS</entry> <entry>as</entry> - <entry><link linkend="control-structures.foreach">foreach</link></entry> + <entry>&foreach;</entry> </row> <row> <entry>T_BAD_CHARACTER</entry> @@ -256,7 +256,7 @@ <row> <entry>T_ENDFOREACH</entry> <entry>endforeach</entry> - <entry><link linkend="control-structures.foreach">foreach</link>, <link + <entry>&foreach;, <link linkend="control-structures.alternative-syntax">alternative syntax</link></entry> </row> <row> @@ -317,7 +317,7 @@ <row> <entry>T_FOREACH</entry> <entry>foreach</entry> - <entry><link linkend="control-structures.foreach">foreach</link></entry> + <entry>&foreach;</entry> </row> <row> <entry>T_FUNCTION</entry> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/oop5/iterations.xml?r1=1.13&r2=1.14&diff_format=u Index: phpdoc/en/language/oop5/iterations.xml diff -u phpdoc/en/language/oop5/iterations.xml:1.13 phpdoc/en/language/oop5/iterations.xml:1.14 --- phpdoc/en/language/oop5/iterations.xml:1.13 Wed Jun 20 22:24:13 2007 +++ phpdoc/en/language/oop5/iterations.xml Mon Feb 16 15:30:17 2009 @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.13 $ --> +<!-- $Revision: 1.14 $ --> <sect1 xml:id="language.oop5.iterations" xmlns="http://docbook.org/ns/docbook"> <title>Object Iteration</title> <para> PHP 5 provides a way for objects to be defined so it is possible to iterate - through a list of items, with, for example a <link - linkend="control-structures.foreach">foreach</link> statement. By default, + through a list of items, with, for example a &foreach; statement. By default, all <link linkend="language.oop5.visibility">visible</link> properties will be used for the iteration. @@ -66,8 +65,7 @@ </example> <para> - As the output shows, the <link - linkend="control-structures.foreach">foreach</link> iterated through all + As the output shows, the &foreach; iterated through all <link linkend="language.oop5.visibility">visible</link> variables that can be accessed. To take it a step further you can <varname>implement</varname> one of PHP 5's internal <link http://cvs.php.net/viewvc.cgi/phpdoc/en/language/types/array.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc/en/language/types/array.xml diff -u phpdoc/en/language/types/array.xml:1.7 phpdoc/en/language/types/array.xml:1.8 --- phpdoc/en/language/types/array.xml:1.7 Wed Nov 5 10:56:08 2008 +++ phpdoc/en/language/types/array.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <sect1 xml:id="language.types.array"> <title>Arrays</title> @@ -286,7 +286,7 @@ </note> <para> - The <link linkend="control-structures.foreach">foreach</link> control + The &foreach; control structure exists specifically for <type>array</type>s. It provides an easy way to traverse an <type>array</type>. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-walk.xml?r1=1.29&r2=1.30&diff_format=u Index: phpdoc/en/reference/array/functions/array-walk.xml diff -u phpdoc/en/reference/array/functions/array-walk.xml:1.29 phpdoc/en/reference/array/functions/array-walk.xml:1.30 --- phpdoc/en/reference/array/functions/array-walk.xml:1.29 Sun Nov 30 00:38:25 2008 +++ phpdoc/en/reference/array/functions/array-walk.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.29 $ --> +<!-- $Revision: 1.30 $ --> <refentry xml:id="function.array-walk" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array_walk</refname> @@ -177,7 +177,7 @@ <member><function>call_user_func_array</function></member> <member><function>array_map</function></member> <member>&seealso.callback;</member> - <member><link linkend="control-structures.foreach">foreach</link></member> + <member>&foreach;</member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array.xml?r1=1.17&r2=1.18&diff_format=u Index: phpdoc/en/reference/array/functions/array.xml diff -u phpdoc/en/reference/array/functions/array.xml:1.17 phpdoc/en/reference/array/functions/array.xml:1.18 --- phpdoc/en/reference/array/functions/array.xml:1.17 Sun Dec 30 23:05:06 2007 +++ phpdoc/en/reference/array/functions/array.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> +<!-- $Revision: 1.18 $ --> <refentry xml:id="function.array" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array</refname> @@ -167,7 +167,7 @@ <member><function>list</function></member> <member><function>count</function></member> <member><function>range</function></member> - <member><link linkend="control-structures.foreach">foreach</link></member> + <member>&foreach;</member> <member>The <link linkend="language.types.array">array</link> type</member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/each.xml?r1=1.22&r2=1.23&diff_format=u Index: phpdoc/en/reference/array/functions/each.xml diff -u phpdoc/en/reference/array/functions/each.xml:1.22 phpdoc/en/reference/array/functions/each.xml:1.23 --- phpdoc/en/reference/array/functions/each.xml:1.22 Wed Aug 20 07:49:46 2008 +++ phpdoc/en/reference/array/functions/each.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.22 $ --> +<!-- $Revision: 1.23 $ --> <refentry xml:id="function.each" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>each</refname> @@ -168,7 +168,7 @@ <member><function>reset</function></member> <member><function>next</function></member> <member><function>prev</function></member> - <member><link linkend="control-structures.foreach">foreach</link></member> + <member>&foreach;</member> <member><link linkend="language.oop5.iterations">Object Iteration</link></member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/range.xml?r1=1.19&r2=1.20&diff_format=u Index: phpdoc/en/reference/array/functions/range.xml diff -u phpdoc/en/reference/array/functions/range.xml:1.19 phpdoc/en/reference/array/functions/range.xml:1.20 --- phpdoc/en/reference/array/functions/range.xml:1.19 Sun Dec 30 19:17:05 2007 +++ phpdoc/en/reference/array/functions/range.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.19 $ --> +<!-- $Revision: 1.20 $ --> <refentry xml:id="function.range" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>range</refname> @@ -141,7 +141,7 @@ <simplelist> <member><function>shuffle</function></member> <member><function>array_fill</function></member> - <member><link linkend="control-structures.foreach">foreach</link></member> + <member>&foreach;</member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/com/examples.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/com/examples.xml diff -u phpdoc/en/reference/com/examples.xml:1.2 phpdoc/en/reference/com/examples.xml:1.3 --- phpdoc/en/reference/com/examples.xml:1.2 Thu Dec 13 17:47:35 2007 +++ phpdoc/en/reference/com/examples.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="com.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.examples; @@ -7,8 +7,8 @@ <section xml:id="com.examples.foreach"> <title>For Each</title> <para> - Starting with PHP 5, you may use PHP's own <link - linkend="control-structures.foreach">foreach</link> statement to iterate + Starting with PHP 5, you may use PHP's own + &foreach; statement to iterate over the contents of a standard COM/OLE IEnumVariant. In laymans terms, this means that you can use foreach in places where you would have used <literal>For Each</literal> in VB/ASP code. @@ -82,9 +82,8 @@ </listitem> <listitem> <para> - Iterate SafeArrays ("true" arrays) using the <xref - linkend="control-structures.foreach"/> control structure. This works - because SafeArrays include information about their size. If an + Iterate SafeArrays ("true" arrays) using the &foreach; control structure. + This works because SafeArrays include information about their size. If an array-style property implements IEnumVariant then you can also use foreach for that property too; take a look at <xref linkend="com.examples.foreach"/> for more information on this topic. http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/com/functions/com-isenum.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc/en/reference/com/functions/com-isenum.xml diff -u phpdoc/en/reference/com/functions/com-isenum.xml:1.11 phpdoc/en/reference/com/functions/com-isenum.xml:1.12 --- phpdoc/en/reference/com/functions/com-isenum.xml:1.11 Mon Sep 8 12:49:20 2008 +++ phpdoc/en/reference/com/functions/com-isenum.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <refentry xml:id='function.com-isenum' xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>com_isenum</refname> @@ -44,9 +44,8 @@ <note> <para> This function does not exist in PHP 5; use the more natural - <link linkend="control-structures.foreach">foreach</link> statement to iterate - over the contents of COM objects. See <xref linkend="com.examples.foreach"/> for - more details. + &foreach; statement to iterate over the contents of COM objects. + See <xref linkend="com.examples.foreach"/> for more details. </para> </note> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/operators.xml?r1=1.130&r2=1.131&diff_format=u Index: phpdoc/en/language/operators.xml diff -u phpdoc/en/language/operators.xml:1.130 phpdoc/en/language/operators.xml:1.131 --- phpdoc/en/language/operators.xml:1.130 Wed Feb 11 15:42:03 2009 +++ phpdoc/en/language/operators.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.130 $ --> +<!-- $Revision: 1.131 $ --> <chapter xml:id="language.operators" xmlns="http://docbook.org/ns/docbook"> <title>Operators</title> <simpara> @@ -784,7 +784,7 @@ function and <function>include</function> calls, constants, and so forth. You cannot prepend it to function or class definitions, or conditional structures such as <literal>if</literal> and - <literal>foreach</literal>, and so forth. + &foreach;, and so forth. </simpara> </note> <simpara> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml?r1=1.12&r2=1.13&diff_format=u Index: phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml diff -u phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml:1.12 phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml:1.13 --- phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml:1.12 Thu Feb 12 11:55:33 2009 +++ phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.13 $ --> <refentry xml:id="function.pdo-sqlitecreatefunction" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>PDO::sqliteCreateFunction</refname> @@ -107,7 +107,7 @@ </para> <para> The beauty of this technique is that you do not need to process the - result using a foreach() loop after you have queried for the data. + result using a &foreach; loop after you have queried for the data. </para> <!-- not for PDO it doesn't, at least not yet <para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sdo/examples.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/sdo/examples.xml diff -u phpdoc/en/reference/sdo/examples.xml:1.3 phpdoc/en/reference/sdo/examples.xml:1.4 --- phpdoc/en/reference/sdo/examples.xml:1.3 Thu Jun 5 05:03:02 2008 +++ phpdoc/en/reference/sdo/examples.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <chapter xml:id="sdo.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.examples; @@ -129,7 +129,7 @@ <example> <title>Data Object iteration</title> <para> - We can iterate over the properties of a data object using foreach. + We can iterate over the properties of a data object using &foreach;. The following iterates over the properties of the employee of the month. </para> <programlisting role="php" xml:id="sdo.examples.doiter"> @@ -195,7 +195,7 @@ <title>Many-valued property iteration</title> <para> Many-valued properties can also be iterated over using - foreach. The following iterates over the company's departments. + &foreach;. The following iterates over the company's departments. </para> <programlisting role="php" xml:id="sdo.examples.mvpiter"> <![CDATA[ @@ -583,7 +583,7 @@ <example> <title>Sequence iteration</title> <para> - We can iterate through the individual sequence values using foreach. + We can iterate through the individual sequence values using &foreach;. The following runs through the individual values in sequence order. </para> <programlisting role="php" xml:id="sdo.examples.seqiter"> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/spl/arrayiterator.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/spl/arrayiterator.xml diff -u phpdoc/en/reference/spl/arrayiterator.xml:1.5 phpdoc/en/reference/spl/arrayiterator.xml:1.6 --- phpdoc/en/reference/spl/arrayiterator.xml:1.5 Tue Dec 16 04:22:47 2008 +++ phpdoc/en/reference/spl/arrayiterator.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.arrayiterator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>The ArrayIterator class</title> <titleabbrev>ArrayIterator</titleabbrev> @@ -16,7 +16,7 @@ <para> When you want to iterate over the same array multiple times you need to instantiate ArrayObject and let it create ArrayIterator instances that - refer to it either by using foreach or by calling its getIterator() + refer to it either by using &foreach; or by calling its getIterator() method manually. </para> </section> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml?r1=1.19&r2=1.20&diff_format=u Index: phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml diff -u phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml:1.19 phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml:1.20 --- phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml:1.19 Fri Jan 16 12:08:50 2009 +++ phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.19 $ --> +<!-- $Revision: 1.20 $ --> <refentry xml:id="function.sqlite-create-function" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>sqlite_create_function</refname> @@ -132,7 +132,7 @@ </para> <para> The beauty of this technique is that you do not need to process the - result using a foreach() loop after you have queried for the data. + result using a &foreach; loop after you have queried for the data. </para> <para> PHP registers a special function named <literal>php</literal> when the http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/dom/domnodelist/item.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/dom/domnodelist/item.xml diff -u phpdoc/en/reference/dom/domnodelist/item.xml:1.3 phpdoc/en/reference/dom/domnodelist/item.xml:1.4 --- phpdoc/en/reference/dom/domnodelist/item.xml:1.3 Sun Dec 16 13:18:08 2007 +++ phpdoc/en/reference/dom/domnodelist/item.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <refentry xml:id='domnodelist.item' xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>DOMNodelist::item</refname> @@ -70,7 +70,7 @@ ]]> </programlisting> <para> - Alternatively, you can use foreach, which is a much more convenient way: + Alternatively, you can use &foreach;, which is a much more convenient way: </para> <programlisting role="php"> <![CDATA[
http://cvs.php.net/viewvc.cgi/phpdoc/en/language-snippets.ent?r1=1.242&r2=1.243&diff_format=u Index: phpdoc/en/language-snippets.ent diff -u phpdoc/en/language-snippets.ent:1.242 phpdoc/en/language-snippets.ent:1.243 --- phpdoc/en/language-snippets.ent:1.242 Mon Feb 16 11:49:35 2009 +++ phpdoc/en/language-snippets.ent Mon Feb 16 15:30:17 2009 @@ -1,4 +1,4 @@ -<!-- $Revision: 1.242 $ --> +<!-- $Revision: 1.243 $ --> <!-- Keep 'em sorted --> @@ -236,6 +236,8 @@ <!ENTITY resource '<link linkend="language.types.resource">resource</link>'> +<!ENTITY foreach '<link linkend="control-structures.foreach">foreach</link>'> + <!-- Returns --> <!ENTITY return.success 'Returns &true; on success or &false; on failure.'> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/predefined/iterator.xml?r1=1.4&r2=1.5&diff_format=u Index: phpdoc/en/language/predefined/iterator.xml diff -u phpdoc/en/language/predefined/iterator.xml:1.4 phpdoc/en/language/predefined/iterator.xml:1.5 --- phpdoc/en/language/predefined/iterator.xml:1.4 Mon Feb 16 14:48:32 2009 +++ phpdoc/en/language/predefined/iterator.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <phpdoc:classref xml:id="class.iterator" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> @@ -49,7 +49,7 @@ <title>Basic usage</title> <para> This example demonstrates in which order methods are called when - <link linkend="control-structures.foreach">foreach</link>ing over an iterator. + using &foreach; with an iterator. </para> <programlisting role="php"> <![CDATA[ http://cvs.php.net/viewvc.cgi/phpdoc/en/language/predefined/traversable.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/language/predefined/traversable.xml diff -u phpdoc/en/language/predefined/traversable.xml:1.3 phpdoc/en/language/predefined/traversable.xml:1.4 --- phpdoc/en/language/predefined/traversable.xml:1.3 Mon Feb 16 14:48:32 2009 +++ phpdoc/en/language/predefined/traversable.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <phpdoc:classref xml:id="class.traversable" xmlns:phpdoc="http://php.net/ns/phpdoc" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> @@ -12,8 +12,7 @@ <section xml:id="traversable.intro"> &reftitle.intro; <para> - Interface to detect if a class is traversable using - <link linkend="control-structures.foreach">foreach</link>. + Interface to detect if a class is traversable using &foreach;. </para> <para> Abstract base interface that cannot be implemented alone. Instead it must @@ -23,7 +22,7 @@ <note> <para> Internal (built-in) classes that implement this interface can be used in - a <link linkend="control-structures.foreach">foreach</link> construct and do not need to implement + a &foreach; construct and do not need to implement <classname>IteratorAggregate</classname> or <classname>Iterator</classname>. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/predefined/iterator/next.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/language/predefined/iterator/next.xml diff -u phpdoc/en/language/predefined/iterator/next.xml:1.3 phpdoc/en/language/predefined/iterator/next.xml:1.4 --- phpdoc/en/language/predefined/iterator/next.xml:1.3 Mon Feb 16 14:48:32 2009 +++ phpdoc/en/language/predefined/iterator/next.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <refentry xml:id="iterator.next" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -19,7 +19,7 @@ <note> <para> This method is called <emphasis>after</emphasis> each - <link linkend="control-structures.foreach">foreach</link> loop. + &foreach; loop. </para> </note> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/predefined/iterator/rewind.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/language/predefined/iterator/rewind.xml diff -u phpdoc/en/language/predefined/iterator/rewind.xml:1.3 phpdoc/en/language/predefined/iterator/rewind.xml:1.4 --- phpdoc/en/language/predefined/iterator/rewind.xml:1.3 Mon Feb 16 14:48:32 2009 +++ phpdoc/en/language/predefined/iterator/rewind.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <refentry xml:id="iterator.rewind" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <refnamediv> @@ -19,8 +19,8 @@ <note> <para> This is the <emphasis>first</emphasis> method called when starting a - <link linkend="control-structures.foreach">foreach</link> loop. It will <emphasis>not</emphasis> be - executed <emphasis>after</emphasis> <link linkend="control-structures.foreach">foreach</link> loops. + &foreach; loop. It will <emphasis>not</emphasis> be + executed <emphasis>after</emphasis> &foreach; loops. </para> </note> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/reserved.xml?r1=1.80&r2=1.81&diff_format=u Index: phpdoc/en/appendices/reserved.xml diff -u phpdoc/en/appendices/reserved.xml:1.80 phpdoc/en/appendices/reserved.xml:1.81 --- phpdoc/en/appendices/reserved.xml:1.80 Wed Jan 7 13:34:18 2009 +++ phpdoc/en/appendices/reserved.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.80 $ --> +<!-- $Revision: 1.81 $ --> <appendix xml:id="reserved" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> <title>List of Reserved Words</title> @@ -115,7 +115,7 @@ <link linkend="control-structures.for">for</link> </entry> <entry> - <link linkend="control-structures.foreach">foreach</link> + &foreach; </entry> <entry> <link linkend="functions.user-defined">function</link> http://cvs.php.net/viewvc.cgi/phpdoc/en/appendices/tokens.xml?r1=1.32&r2=1.33&diff_format=u Index: phpdoc/en/appendices/tokens.xml diff -u phpdoc/en/appendices/tokens.xml:1.32 phpdoc/en/appendices/tokens.xml:1.33 --- phpdoc/en/appendices/tokens.xml:1.32 Sun Jan 25 13:33:42 2009 +++ phpdoc/en/appendices/tokens.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.32 $ --> +<!-- $Revision: 1.33 $ --> <appendix xml:id="tokens" xmlns="http://docbook.org/ns/docbook"> <title>List of Parser Tokens</title> @@ -49,7 +49,7 @@ <row> <entry>T_AS</entry> <entry>as</entry> - <entry><link linkend="control-structures.foreach">foreach</link></entry> + <entry>&foreach;</entry> </row> <row> <entry>T_BAD_CHARACTER</entry> @@ -256,7 +256,7 @@ <row> <entry>T_ENDFOREACH</entry> <entry>endforeach</entry> - <entry><link linkend="control-structures.foreach">foreach</link>, <link + <entry>&foreach;, <link linkend="control-structures.alternative-syntax">alternative syntax</link></entry> </row> <row> @@ -317,7 +317,7 @@ <row> <entry>T_FOREACH</entry> <entry>foreach</entry> - <entry><link linkend="control-structures.foreach">foreach</link></entry> + <entry>&foreach;</entry> </row> <row> <entry>T_FUNCTION</entry> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/oop5/iterations.xml?r1=1.13&r2=1.14&diff_format=u Index: phpdoc/en/language/oop5/iterations.xml diff -u phpdoc/en/language/oop5/iterations.xml:1.13 phpdoc/en/language/oop5/iterations.xml:1.14 --- phpdoc/en/language/oop5/iterations.xml:1.13 Wed Jun 20 22:24:13 2007 +++ phpdoc/en/language/oop5/iterations.xml Mon Feb 16 15:30:17 2009 @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.13 $ --> +<!-- $Revision: 1.14 $ --> <sect1 xml:id="language.oop5.iterations" xmlns="http://docbook.org/ns/docbook"> <title>Object Iteration</title> <para> PHP 5 provides a way for objects to be defined so it is possible to iterate - through a list of items, with, for example a <link - linkend="control-structures.foreach">foreach</link> statement. By default, + through a list of items, with, for example a &foreach; statement. By default, all <link linkend="language.oop5.visibility">visible</link> properties will be used for the iteration. @@ -66,8 +65,7 @@ </example> <para> - As the output shows, the <link - linkend="control-structures.foreach">foreach</link> iterated through all + As the output shows, the &foreach; iterated through all <link linkend="language.oop5.visibility">visible</link> variables that can be accessed. To take it a step further you can <varname>implement</varname> one of PHP 5's internal <link http://cvs.php.net/viewvc.cgi/phpdoc/en/language/types/array.xml?r1=1.7&r2=1.8&diff_format=u Index: phpdoc/en/language/types/array.xml diff -u phpdoc/en/language/types/array.xml:1.7 phpdoc/en/language/types/array.xml:1.8 --- phpdoc/en/language/types/array.xml:1.7 Wed Nov 5 10:56:08 2008 +++ phpdoc/en/language/types/array.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <sect1 xml:id="language.types.array"> <title>Arrays</title> @@ -286,7 +286,7 @@ </note> <para> - The <link linkend="control-structures.foreach">foreach</link> control + The &foreach; control structure exists specifically for <type>array</type>s. It provides an easy way to traverse an <type>array</type>. </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-walk.xml?r1=1.29&r2=1.30&diff_format=u Index: phpdoc/en/reference/array/functions/array-walk.xml diff -u phpdoc/en/reference/array/functions/array-walk.xml:1.29 phpdoc/en/reference/array/functions/array-walk.xml:1.30 --- phpdoc/en/reference/array/functions/array-walk.xml:1.29 Sun Nov 30 00:38:25 2008 +++ phpdoc/en/reference/array/functions/array-walk.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.29 $ --> +<!-- $Revision: 1.30 $ --> <refentry xml:id="function.array-walk" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array_walk</refname> @@ -177,7 +177,7 @@ <member><function>call_user_func_array</function></member> <member><function>array_map</function></member> <member>&seealso.callback;</member> - <member><link linkend="control-structures.foreach">foreach</link></member> + <member>&foreach;</member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array.xml?r1=1.17&r2=1.18&diff_format=u Index: phpdoc/en/reference/array/functions/array.xml diff -u phpdoc/en/reference/array/functions/array.xml:1.17 phpdoc/en/reference/array/functions/array.xml:1.18 --- phpdoc/en/reference/array/functions/array.xml:1.17 Sun Dec 30 23:05:06 2007 +++ phpdoc/en/reference/array/functions/array.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.17 $ --> +<!-- $Revision: 1.18 $ --> <refentry xml:id="function.array" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>array</refname> @@ -167,7 +167,7 @@ <member><function>list</function></member> <member><function>count</function></member> <member><function>range</function></member> - <member><link linkend="control-structures.foreach">foreach</link></member> + <member>&foreach;</member> <member>The <link linkend="language.types.array">array</link> type</member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/each.xml?r1=1.22&r2=1.23&diff_format=u Index: phpdoc/en/reference/array/functions/each.xml diff -u phpdoc/en/reference/array/functions/each.xml:1.22 phpdoc/en/reference/array/functions/each.xml:1.23 --- phpdoc/en/reference/array/functions/each.xml:1.22 Wed Aug 20 07:49:46 2008 +++ phpdoc/en/reference/array/functions/each.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.22 $ --> +<!-- $Revision: 1.23 $ --> <refentry xml:id="function.each" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>each</refname> @@ -168,7 +168,7 @@ <member><function>reset</function></member> <member><function>next</function></member> <member><function>prev</function></member> - <member><link linkend="control-structures.foreach">foreach</link></member> + <member>&foreach;</member> <member><link linkend="language.oop5.iterations">Object Iteration</link></member> </simplelist> </para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/range.xml?r1=1.19&r2=1.20&diff_format=u Index: phpdoc/en/reference/array/functions/range.xml diff -u phpdoc/en/reference/array/functions/range.xml:1.19 phpdoc/en/reference/array/functions/range.xml:1.20 --- phpdoc/en/reference/array/functions/range.xml:1.19 Sun Dec 30 19:17:05 2007 +++ phpdoc/en/reference/array/functions/range.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.19 $ --> +<!-- $Revision: 1.20 $ --> <refentry xml:id="function.range" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>range</refname> @@ -141,7 +141,7 @@ <simplelist> <member><function>shuffle</function></member> <member><function>array_fill</function></member> - <member><link linkend="control-structures.foreach">foreach</link></member> + <member>&foreach;</member> </simplelist> </para> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/com/examples.xml?r1=1.2&r2=1.3&diff_format=u Index: phpdoc/en/reference/com/examples.xml diff -u phpdoc/en/reference/com/examples.xml:1.2 phpdoc/en/reference/com/examples.xml:1.3 --- phpdoc/en/reference/com/examples.xml:1.2 Thu Dec 13 17:47:35 2007 +++ phpdoc/en/reference/com/examples.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.2 $ --> +<!-- $Revision: 1.3 $ --> <chapter xml:id="com.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.examples; @@ -7,8 +7,8 @@ <section xml:id="com.examples.foreach"> <title>For Each</title> <para> - Starting with PHP 5, you may use PHP's own <link - linkend="control-structures.foreach">foreach</link> statement to iterate + Starting with PHP 5, you may use PHP's own + &foreach; statement to iterate over the contents of a standard COM/OLE IEnumVariant. In laymans terms, this means that you can use foreach in places where you would have used <literal>For Each</literal> in VB/ASP code. @@ -82,9 +82,8 @@ </listitem> <listitem> <para> - Iterate SafeArrays ("true" arrays) using the <xref - linkend="control-structures.foreach"/> control structure. This works - because SafeArrays include information about their size. If an + Iterate SafeArrays ("true" arrays) using the &foreach; control structure. + This works because SafeArrays include information about their size. If an array-style property implements IEnumVariant then you can also use foreach for that property too; take a look at <xref linkend="com.examples.foreach"/> for more information on this topic. http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/com/functions/com-isenum.xml?r1=1.11&r2=1.12&diff_format=u Index: phpdoc/en/reference/com/functions/com-isenum.xml diff -u phpdoc/en/reference/com/functions/com-isenum.xml:1.11 phpdoc/en/reference/com/functions/com-isenum.xml:1.12 --- phpdoc/en/reference/com/functions/com-isenum.xml:1.11 Mon Sep 8 12:49:20 2008 +++ phpdoc/en/reference/com/functions/com-isenum.xml Mon Feb 16 15:30:17 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.11 $ --> +<!-- $Revision: 1.12 $ --> <refentry xml:id='function.com-isenum' xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>com_isenum</refname> @@ -44,9 +44,8 @@ <note> <para> This function does not exist in PHP 5; use the more natural - <link linkend="control-structures.foreach">foreach</link> statement to iterate - over the contents of COM objects. See <xref linkend="com.examples.foreach"/> for - more details. + &foreach; statement to iterate over the contents of COM objects. + See <xref linkend="com.examples.foreach"/> for more details. </para> </note> </refsect1> http://cvs.php.net/viewvc.cgi/phpdoc/en/language/operators.xml?r1=1.130&r2=1.131&diff_format=u Index: phpdoc/en/language/operators.xml diff -u phpdoc/en/language/operators.xml:1.130 phpdoc/en/language/operators.xml:1.131 --- phpdoc/en/language/operators.xml:1.130 Wed Feb 11 15:42:03 2009 +++ phpdoc/en/language/operators.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.130 $ --> +<!-- $Revision: 1.131 $ --> <chapter xml:id="language.operators" xmlns="http://docbook.org/ns/docbook"> <title>Operators</title> <simpara> @@ -784,7 +784,7 @@ function and <function>include</function> calls, constants, and so forth. You cannot prepend it to function or class definitions, or conditional structures such as <literal>if</literal> and - <literal>foreach</literal>, and so forth. + &foreach;, and so forth. </simpara> </note> <simpara> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml?r1=1.12&r2=1.13&diff_format=u Index: phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml diff -u phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml:1.12 phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml:1.13 --- phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml:1.12 Thu Feb 12 11:55:33 2009 +++ phpdoc/en/reference/pdo_sqlite/functions/PDO-sqliteCreateFunction.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='iso-8859-1'?> -<!-- $Revision: 1.12 $ --> +<!-- $Revision: 1.13 $ --> <refentry xml:id="function.pdo-sqlitecreatefunction" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>PDO::sqliteCreateFunction</refname> @@ -107,7 +107,7 @@ </para> <para> The beauty of this technique is that you do not need to process the - result using a foreach() loop after you have queried for the data. + result using a &foreach; loop after you have queried for the data. </para> <!-- not for PDO it doesn't, at least not yet <para> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sdo/examples.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/sdo/examples.xml diff -u phpdoc/en/reference/sdo/examples.xml:1.3 phpdoc/en/reference/sdo/examples.xml:1.4 --- phpdoc/en/reference/sdo/examples.xml:1.3 Thu Jun 5 05:03:02 2008 +++ phpdoc/en/reference/sdo/examples.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <chapter xml:id="sdo.examples" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink"> &reftitle.examples; @@ -129,7 +129,7 @@ <example> <title>Data Object iteration</title> <para> - We can iterate over the properties of a data object using foreach. + We can iterate over the properties of a data object using &foreach;. The following iterates over the properties of the employee of the month. </para> <programlisting role="php" xml:id="sdo.examples.doiter"> @@ -195,7 +195,7 @@ <title>Many-valued property iteration</title> <para> Many-valued properties can also be iterated over using - foreach. The following iterates over the company's departments. + &foreach;. The following iterates over the company's departments. </para> <programlisting role="php" xml:id="sdo.examples.mvpiter"> <![CDATA[ @@ -583,7 +583,7 @@ <example> <title>Sequence iteration</title> <para> - We can iterate through the individual sequence values using foreach. + We can iterate through the individual sequence values using &foreach;. The following runs through the individual values in sequence order. </para> <programlisting role="php" xml:id="sdo.examples.seqiter"> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/spl/arrayiterator.xml?r1=1.5&r2=1.6&diff_format=u Index: phpdoc/en/reference/spl/arrayiterator.xml diff -u phpdoc/en/reference/spl/arrayiterator.xml:1.5 phpdoc/en/reference/spl/arrayiterator.xml:1.6 --- phpdoc/en/reference/spl/arrayiterator.xml:1.5 Tue Dec 16 04:22:47 2008 +++ phpdoc/en/reference/spl/arrayiterator.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <phpdoc:classref xmlns:phpdoc="http://php.net/ns/phpdoc" xml:id="class.arrayiterator" xmlns="http://docbook.org/ns/docbook" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xi="http://www.w3.org/2001/XInclude"> <title>The ArrayIterator class</title> <titleabbrev>ArrayIterator</titleabbrev> @@ -16,7 +16,7 @@ <para> When you want to iterate over the same array multiple times you need to instantiate ArrayObject and let it create ArrayIterator instances that - refer to it either by using foreach or by calling its getIterator() + refer to it either by using &foreach; or by calling its getIterator() method manually. </para> </section> http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml?r1=1.19&r2=1.20&diff_format=u Index: phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml diff -u phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml:1.19 phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml:1.20 --- phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml:1.19 Fri Jan 16 12:08:50 2009 +++ phpdoc/en/reference/sqlite/functions/sqlite-create-function.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.19 $ --> +<!-- $Revision: 1.20 $ --> <refentry xml:id="function.sqlite-create-function" xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>sqlite_create_function</refname> @@ -132,7 +132,7 @@ </para> <para> The beauty of this technique is that you do not need to process the - result using a foreach() loop after you have queried for the data. + result using a &foreach; loop after you have queried for the data. </para> <para> PHP registers a special function named <literal>php</literal> when the http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/dom/domnodelist/item.xml?r1=1.3&r2=1.4&diff_format=u Index: phpdoc/en/reference/dom/domnodelist/item.xml diff -u phpdoc/en/reference/dom/domnodelist/item.xml:1.3 phpdoc/en/reference/dom/domnodelist/item.xml:1.4 --- phpdoc/en/reference/dom/domnodelist/item.xml:1.3 Sun Dec 16 13:18:08 2007 +++ phpdoc/en/reference/dom/domnodelist/item.xml Mon Feb 16 15:30:18 2009 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.3 $ --> +<!-- $Revision: 1.4 $ --> <refentry xml:id='domnodelist.item' xmlns="http://docbook.org/ns/docbook"> <refnamediv> <refname>DOMNodelist::item</refname> @@ -70,7 +70,7 @@ ]]> </programlisting> <para> - Alternatively, you can use foreach, which is a much more convenient way: + Alternatively, you can use &foreach;, which is a much more convenient way: </para> <programlisting role="php"> <![CDATA[