cvs: phpdoc /en/reference/array/functions array-change-key-case.xml array-chunk.xml array-count-values.xml array-fill.xml array-filter.xml
array-flip.xml array-intersect.xml array-keys.xml array-map.xml array-merge-recursive.xml array-merge.xml array-pop.xml array-push.xml
array-reverse.xml array-shift.xml array-sum.xml array-unique.xml array-unshift.xml array-values.xml array-walk.xml array.xml arsort.xml asort.xml
compact.xml each.xml extract.xml in-array.xml krsort.xml ksort.xml list.xml natsort.xml reset.xml rsort.xml sort.xml uksort.xml usort.xml
| From: | Derick Rethans | Date: | Mon, 16 Jun 2003 12:03:39 +0000 |
| Subject: | cvs: phpdoc /en/reference/array/functions array-change-key-case.xml array-chunk.xml array-count-values.xml array-fill.xml array-filter.xml array-flip.xml array-intersect.xml array-keys.xml array-map.xml array-merge-recursive.xml array-merge.xml array-pop.xml array-push.xml array-reverse.xml array-shift.xml array-sum.xml array-unique.xml array-unshift.xml array-values.xml array-walk.xml array.xml arsort.xml asort.xml compact.xml each.xml extract.xml in-array.xml krsort.xml ksort.xml list.xml natsort.xml reset.xml rsort.xml sort.xml uksort.xml usort.xml |
||
| Groups: | php.doc | ||
| Request: | Send a blank email to phpdoc+get-969354499@lists.php.net to get a copy of this message | ||
derick Mon Jun 16 08:03:39 2003 EDT
Modified files:
/phpdoc/en/reference/array/functions array-change-key-case.xml
array-chunk.xml
array-count-values.xml
array-fill.xml
array-filter.xml
array-flip.xml
array-intersect.xml
array-keys.xml array-map.xml
array-merge-recursive.xml
array-merge.xml array-pop.xml
array-push.xml
array-reverse.xml
array-shift.xml array-sum.xml
array-unique.xml
array-unshift.xml
array-values.xml
array-walk.xml array.xml
arsort.xml asort.xml
compact.xml each.xml
extract.xml in-array.xml
krsort.xml ksort.xml list.xml
natsort.xml reset.xml
rsort.xml sort.xml uksort.xml
usort.xml
Log:
- Fixed structures. The structure for adding examples is:
<para>
<example>
<title />
<programlisting>
<![CDATA[
<?php
echo "foo\n";
?>
]]>
</programlisting>
<para>
The output is:
</para>
<screen>
<![CDATA[
foo
]]>
</screen>
</example>
</para>
Index: phpdoc/en/reference/array/functions/array-change-key-case.xml diff -u phpdoc/en/reference/array/functions/array-change-key-case.xml:1.8 phpdoc/en/reference/array/functions/array-change-key-case.xml:1.9 --- phpdoc/en/reference/array/functions/array-change-key-case.xml:1.8 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-change-key-case.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.113 --> <refentry id="function.array-change-key-case"> <refnamediv> @@ -36,7 +36,8 @@ </programlisting> <para> The printout of the above program will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -44,8 +45,7 @@ [SECOND] => 2 ) ]]> - </screen> - </para> + </screen> </example> <para> If an array has indices that will be the same once run through this Index: phpdoc/en/reference/array/functions/array-chunk.xml diff -u phpdoc/en/reference/array/functions/array-chunk.xml:1.7 phpdoc/en/reference/array/functions/array-chunk.xml:1.8 --- phpdoc/en/reference/array/functions/array-chunk.xml:1.7 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-chunk.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-chunk"> <refnamediv> @@ -42,7 +42,8 @@ </programlisting> <para> The printout of the above program will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -85,8 +86,7 @@ ) ]]> - </screen> - </para> + </screen> </example> </refsect1> </refentry> Index: phpdoc/en/reference/array/functions/array-count-values.xml diff -u phpdoc/en/reference/array/functions/array-count-values.xml:1.7 phpdoc/en/reference/array/functions/array-count-values.xml:1.8 --- phpdoc/en/reference/array/functions/array-count-values.xml:1.7 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-count-values.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-count-values"> <refnamediv> @@ -30,7 +30,8 @@ </programlisting> <para> The printout of the above program will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -39,8 +40,7 @@ [world] => 1 ) ]]> - </screen> - </para> + </screen> </example> </para> </refsect1> Index: phpdoc/en/reference/array/functions/array-fill.xml diff -u phpdoc/en/reference/array/functions/array-fill.xml:1.7 phpdoc/en/reference/array/functions/array-fill.xml:1.8 --- phpdoc/en/reference/array/functions/array-fill.xml:1.7 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-fill.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-fill"> <refnamediv> @@ -34,8 +34,9 @@ ]]> </programlisting> <para> - <varname>$a</varname> now is : - <screen> + <varname>$a</varname> now is: + </para> + <screen> <![CDATA[ Array ( @@ -47,8 +48,7 @@ [10] => banana ) ]]> - </screen> - </para> + </screen> </example> </para> </refsect1> Index: phpdoc/en/reference/array/functions/array-filter.xml diff -u phpdoc/en/reference/array/functions/array-filter.xml:1.10 phpdoc/en/reference/array/functions/array-filter.xml:1.11 --- phpdoc/en/reference/array/functions/array-filter.xml:1.10 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-filter.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.62 --> <refentry id="function.array-filter"> <refnamediv> @@ -49,7 +49,8 @@ </programlisting> <para> The printout of the program above will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Odd : Array @@ -67,8 +68,7 @@ [6] => 12 ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-flip.xml diff -u phpdoc/en/reference/array/functions/array-flip.xml:1.8 phpdoc/en/reference/array/functions/array-flip.xml:1.9 --- phpdoc/en/reference/array/functions/array-flip.xml:1.8 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-flip.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.107 --> <refentry id="function.array-flip"> <refnamediv> @@ -58,8 +58,9 @@ ]]> </programlisting> <para> - now <varname>$trans</varname> is : - <screen> + now <varname>$trans</varname> is: + </para> + <screen> <![CDATA[ Array ( @@ -67,8 +68,7 @@ [2] => c ) ]]> - </screen> - </para> + </screen> </example> </para> </refsect1> Index: phpdoc/en/reference/array/functions/array-intersect.xml diff -u phpdoc/en/reference/array/functions/array-intersect.xml:1.7 phpdoc/en/reference/array/functions/array-intersect.xml:1.8 --- phpdoc/en/reference/array/functions/array-intersect.xml:1.7 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-intersect.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.14 --> <refentry id="function.array-intersect"> <refnamediv> @@ -34,7 +34,8 @@ </programlisting> <para> This makes <varname>$result</varname> have - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -42,8 +43,7 @@ [0] => red ) ]]> - </screen> - </para> + </screen> </example> </para> <note> Index: phpdoc/en/reference/array/functions/array-keys.xml diff -u phpdoc/en/reference/array/functions/array-keys.xml:1.6 phpdoc/en/reference/array/functions/array-keys.xml:1.7 --- phpdoc/en/reference/array/functions/array-keys.xml:1.6 Fri May 30 13:10:53 2003 +++ phpdoc/en/reference/array/functions/array-keys.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-keys"> <refnamediv> @@ -44,7 +44,8 @@ </programlisting> <para> The printout of the program above will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -63,8 +64,7 @@ [1] => size ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-map.xml diff -u phpdoc/en/reference/array/functions/array-map.xml:1.8 phpdoc/en/reference/array/functions/array-map.xml:1.9 --- phpdoc/en/reference/array/functions/array-map.xml:1.8 Tue Feb 4 14:17:43 2003 +++ phpdoc/en/reference/array/functions/array-map.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.62 --> <refentry id="function.array-map"> <refnamediv> @@ -43,7 +43,8 @@ </programlisting> <para> This makes <varname>$b</varname> have: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -54,8 +55,7 @@ [4] => 125 ) ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -85,7 +85,8 @@ </programlisting> <para> This results: - <screen> + </para> + <screen> <![CDATA[ // printout of $c Array @@ -127,8 +128,7 @@ ) ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -162,7 +162,8 @@ </para> <para> The printout of the program above will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -203,8 +204,7 @@ ) ]]> - </screen> - </para> + </screen> <para> See also <function>array_filter</function>, <function>array_reduce</function>, and Index: phpdoc/en/reference/array/functions/array-merge-recursive.xml diff -u phpdoc/en/reference/array/functions/array-merge-recursive.xml:1.5 phpdoc/en/reference/array/functions/array-merge-recursive.xml:1.6 --- phpdoc/en/reference/array/functions/array-merge-recursive.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-merge-recursive.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.12 --> <refentry id="function.array-merge-recursive"> <refnamediv> @@ -41,7 +41,8 @@ </programlisting> <para> The <literal>$result</literal> will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -60,8 +61,7 @@ [1] => 10 ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-merge.xml diff -u phpdoc/en/reference/array/functions/array-merge.xml:1.8 phpdoc/en/reference/array/functions/array-merge.xml:1.9 --- phpdoc/en/reference/array/functions/array-merge.xml:1.8 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-merge.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-merge"> <refnamediv> @@ -41,7 +41,8 @@ </programlisting> <para> The <varname>$result</varname> is: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -54,8 +55,7 @@ [4] => 4 ) ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -72,19 +72,20 @@ </programlisting> <para> Don't forget that numeric keys will be renumbered! - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( [0] => data ) ]]> - </screen> - </para> + </screen> <para> If you want to completely preserve the arrays and just want to append them to each other, use the <literal>+</literal> operator: - <programlisting role="php"> + </para> + <programlisting role="php"> <![CDATA[ <?php $array1 = array(); @@ -92,17 +93,18 @@ $result = $array1 + $array2; ?> ]]> - </programlisting> + </programlisting> + <para> The numeric key will be preserved and thus the association remains. - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( [1] => data ) ]]> - </screen> - </para> + </screen> </example> </para> <note> Index: phpdoc/en/reference/array/functions/array-pop.xml diff -u phpdoc/en/reference/array/functions/array-pop.xml:1.6 phpdoc/en/reference/array/functions/array-pop.xml:1.7 --- phpdoc/en/reference/array/functions/array-pop.xml:1.6 Sat May 17 22:32:19 2003 +++ phpdoc/en/reference/array/functions/array-pop.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-pop"> <refnamediv> @@ -36,7 +36,8 @@ </programlisting> <para> After this, <varname>$stack</varname> will have only 3 elements: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -45,7 +46,8 @@ [2] => apple ) ]]> - </screen> + </screen> + <para> and <literal>raspberry</literal> will be assigned to <varname>$fruit</varname>. </para> Index: phpdoc/en/reference/array/functions/array-push.xml diff -u phpdoc/en/reference/array/functions/array-push.xml:1.6 phpdoc/en/reference/array/functions/array-push.xml:1.7 --- phpdoc/en/reference/array/functions/array-push.xml:1.6 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-push.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-push"> <refnamediv> @@ -49,7 +49,8 @@ <para> This example would result in <varname>$stack</varname> having the following elements: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -59,8 +60,7 @@ [3] => raspberry ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-reverse.xml diff -u phpdoc/en/reference/array/functions/array-reverse.xml:1.4 phpdoc/en/reference/array/functions/array-reverse.xml:1.5 --- phpdoc/en/reference/array/functions/array-reverse.xml:1.4 Sun May 12 04:19:28 2002 +++ phpdoc/en/reference/array/functions/array-reverse.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.62 --> <refentry id="function.array-reverse"> <refnamediv> @@ -37,7 +37,8 @@ note the difference between the keys. The printout of <varname>$result</varname> and <varname>$result_keyed</varname> will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -62,9 +63,7 @@ [0] => php ) ]]> - </screen> - </para> - + </screen> </example> </para> <note> Index: phpdoc/en/reference/array/functions/array-shift.xml diff -u phpdoc/en/reference/array/functions/array-shift.xml:1.7 phpdoc/en/reference/array/functions/array-shift.xml:1.8 --- phpdoc/en/reference/array/functions/array-shift.xml:1.7 Wed Feb 5 02:20:39 2003 +++ phpdoc/en/reference/array/functions/array-shift.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-shift"> <refnamediv> @@ -25,10 +25,9 @@ &array.resetspointer; - <para> - <example> - <title><function>array_shift</function> example</title> - <programlisting role="php"> + <example> + <title><function>array_shift</function> example</title> + <programlisting role="php"> <![CDATA[ <?php $stack = array ("orange", "banana", "apple", "raspberry"); @@ -36,10 +35,11 @@ print_r($stack); ?> ]]> - </programlisting> - <para> - This would result in <varname>$stack</varname> having 3 elements left: - <screen role="php"> + </programlisting> + <para> + This would result in <varname>$stack</varname> having 3 elements left: + </para> + <screen role="php"> <![CDATA[ Array ( @@ -48,12 +48,12 @@ [2] => raspberry ) ]]> - </screen> - and <literal>orange</literal> will be assigned to - <varname>$fruit</varname>. - </para> - </example> - </para> + </screen> + <para> + and <literal>orange</literal> will be assigned to + <varname>$fruit</varname>. + </para> + </example> <para> See also <function>array_unshift</function>, <function>array_push</function>, and Index: phpdoc/en/reference/array/functions/array-sum.xml diff -u phpdoc/en/reference/array/functions/array-sum.xml:1.6 phpdoc/en/reference/array/functions/array-sum.xml:1.7 --- phpdoc/en/reference/array/functions/array-sum.xml:1.6 Sat May 31 11:13:09 2003 +++ phpdoc/en/reference/array/functions/array-sum.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.59 --> <refentry id="function.array-sum"> <refnamediv> @@ -34,13 +34,13 @@ </programlisting> <para> The printout of the program above will be: - <screen role="php"> + </para> + <screen> <![CDATA[ sum(a) = 20 sum(b) = 6.9 ]]> - </screen> - </para> + </screen> </example> </para> <note> Index: phpdoc/en/reference/array/functions/array-unique.xml diff -u phpdoc/en/reference/array/functions/array-unique.xml:1.10 phpdoc/en/reference/array/functions/array-unique.xml:1.11 --- phpdoc/en/reference/array/functions/array-unique.xml:1.10 Fri Feb 7 17:57:56 2003 +++ phpdoc/en/reference/array/functions/array-unique.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-unique"> <refnamediv> @@ -48,7 +48,8 @@ </programlisting> <para> This will output: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -57,8 +58,7 @@ [1] => blue ) ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -75,15 +75,15 @@ </programlisting> <para> This script will output: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ array(2) { [0] => int(4) [2] => string(1) "3" } ]]> - </screen> - </para> + </screen> </example> </para> </refsect1> Index: phpdoc/en/reference/array/functions/array-unshift.xml diff -u phpdoc/en/reference/array/functions/array-unshift.xml:1.6 phpdoc/en/reference/array/functions/array-unshift.xml:1.7 --- phpdoc/en/reference/array/functions/array-unshift.xml:1.6 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-unshift.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-unshift"> <refnamediv> @@ -43,7 +43,8 @@ <para> This would result in <varname>$queue</varname> having the following elements: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -53,8 +54,7 @@ [3] => banana ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-values.xml diff -u phpdoc/en/reference/array/functions/array-values.xml:1.6 phpdoc/en/reference/array/functions/array-values.xml:1.7 --- phpdoc/en/reference/array/functions/array-values.xml:1.6 Fri May 30 13:53:11 2003 +++ phpdoc/en/reference/array/functions/array-values.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-values"> <refnamediv> @@ -30,7 +30,8 @@ </programlisting> <para> This will output: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -38,8 +39,7 @@ [1] => gold ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-walk.xml diff -u phpdoc/en/reference/array/functions/array-walk.xml:1.10 phpdoc/en/reference/array/functions/array-walk.xml:1.11 --- phpdoc/en/reference/array/functions/array-walk.xml:1.10 Sat May 3 21:13:00 2003 +++ phpdoc/en/reference/array/functions/array-walk.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-walk"> <refnamediv> @@ -97,7 +97,8 @@ </programlisting> <para> The printout of the program above will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Before ...: d. lemon @@ -110,8 +111,7 @@ b. fruit: banana c. fruit: apple ]]> - </screen> - </para> + </screen> </example> </para> <simpara> Index: phpdoc/en/reference/array/functions/array.xml diff -u phpdoc/en/reference/array/functions/array.xml:1.9 phpdoc/en/reference/array/functions/array.xml:1.10 --- phpdoc/en/reference/array/functions/array.xml:1.9 Mon Jun 16 01:23:40 2003 +++ phpdoc/en/reference/array/functions/array.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.110 --> <refentry id="function.array"> <refnamediv> @@ -68,8 +68,9 @@ ]]> </programlisting> <para> - will display : - <screen role="php"> + will display: + </para> + <screen role="php"> <![CDATA[ Array ( @@ -82,9 +83,10 @@ [9] => 19 ) ]]> - </screen> - </para> + </screen> </example> + </para> + <para> Note that index '3' is defined twice, and keep its final value of 13. Index 4 is defined after index 8, and next generated index (value 19) is 9, since biggest index was 8. @@ -102,8 +104,9 @@ ]]> </programlisting> <para> - will display : - <screen> + will display: + </para> + <screen> <![CDATA[ Array ( @@ -112,8 +115,7 @@ [3] => March ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/arsort.xml diff -u phpdoc/en/reference/array/functions/arsort.xml:1.5 phpdoc/en/reference/array/functions/arsort.xml:1.6 --- phpdoc/en/reference/array/functions/arsort.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/arsort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.arsort"> <refnamediv> @@ -37,15 +37,15 @@ </programlisting> <para> This example would display: - <screen> + </para> + <screen> <![CDATA[ a = orange d = lemon b = banana c = apple ]]> - </screen> - </para> + </screen> </example> <para> The fruits have been sorted in reverse alphabetical order, and Index: phpdoc/en/reference/array/functions/asort.xml diff -u phpdoc/en/reference/array/functions/asort.xml:1.5 phpdoc/en/reference/array/functions/asort.xml:1.6 --- phpdoc/en/reference/array/functions/asort.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/asort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.asort"> <refnamediv> @@ -35,15 +35,15 @@ </programlisting> <para> This example would display: - <screen> + </para> + <screen> <![CDATA[ c = apple b = banana d = lemon a = orange ]]> - </screen> - </para> + </screen> </example> <para> The fruits have been sorted in alphabetical order, and the index Index: phpdoc/en/reference/array/functions/compact.xml diff -u phpdoc/en/reference/array/functions/compact.xml:1.5 phpdoc/en/reference/array/functions/compact.xml:1.6 --- phpdoc/en/reference/array/functions/compact.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/compact.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.compact"> <refnamediv> @@ -51,7 +51,8 @@ </programlisting> <para> After this, <varname>$result</varname> will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -60,8 +61,7 @@ [state] => CA ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/each.xml diff -u phpdoc/en/reference/array/functions/each.xml:1.9 phpdoc/en/reference/array/functions/each.xml:1.10 --- phpdoc/en/reference/array/functions/each.xml:1.9 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/each.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.each"> <refnamediv> @@ -46,6 +46,7 @@ <para> <varname>$bar</varname> now contains the following key/value pairs: + </para> <screen> <![CDATA[ Array @@ -57,7 +58,11 @@ ) ]]> </screen> - <programlisting role="php"> + </example> + </para> + <para> + <informalexample> + <programlisting role="php"> <![CDATA[ <?php $foo = array ("Robert" => "Bob", "Seppo" => "Sepi"); @@ -65,11 +70,11 @@ print_r($bar); ?> ]]> - </programlisting> - </para> + </programlisting> <para> <varname>$bar</varname> now contains the following key/value pairs: + </para> <screen> <![CDATA[ Array @@ -81,8 +86,7 @@ ) ]]> </screen> - </para> - </example> + </informalexample> </para> <para> <function>each</function> is typically used in conjunction with Index: phpdoc/en/reference/array/functions/extract.xml diff -u phpdoc/en/reference/array/functions/extract.xml:1.8 phpdoc/en/reference/array/functions/extract.xml:1.9 --- phpdoc/en/reference/array/functions/extract.xml:1.8 Tue Feb 4 12:19:32 2003 +++ phpdoc/en/reference/array/functions/extract.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.extract"> <refnamediv> @@ -173,15 +173,15 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - The above example will produce: - <programlisting> + <para> + The above example will produce: + </para> + <programlisting> <![CDATA[ blue, large, sphere, medium ]]> - </programlisting> + </programlisting> + </example> </para> <para> The <varname>$size</varname> wasn't overwritten, because we Index: phpdoc/en/reference/array/functions/in-array.xml diff -u phpdoc/en/reference/array/functions/in-array.xml:1.7 phpdoc/en/reference/array/functions/in-array.xml:1.8 --- phpdoc/en/reference/array/functions/in-array.xml:1.7 Wed Jun 11 02:21:32 2003 +++ phpdoc/en/reference/array/functions/in-array.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.56 --> <refentry id="function.in-array"> <refnamediv> @@ -56,12 +56,12 @@ <para> The second condition fails because <function>in_array</function> is case-sensitive, so the program above will display: - <screen role="php"> + </para> + <screen> <![CDATA[ Got Irix ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -84,12 +84,12 @@ </programlisting> <para> This will display: - <screen role="php"> + </para> + <screen> <![CDATA[ 1.13 found with strict check ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/krsort.xml diff -u phpdoc/en/reference/array/functions/krsort.xml:1.5 phpdoc/en/reference/array/functions/krsort.xml:1.6 --- phpdoc/en/reference/array/functions/krsort.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/krsort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.krsort"> <refnamediv> @@ -16,6 +16,8 @@ <para> Sorts an array by key in reverse order, maintaining key to data correlations. This is useful mainly for associative arrays. + </para> + <para> <example> <title><function>krsort</function> example</title> <programlisting role="php"> @@ -30,20 +32,18 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ d = lemon c = apple b = banana a = orange ]]> - </screen> + </screen> + </example> </para> <para> You may modify the behavior of the sort using the optional Index: phpdoc/en/reference/array/functions/ksort.xml diff -u phpdoc/en/reference/array/functions/ksort.xml:1.4 phpdoc/en/reference/array/functions/ksort.xml:1.5 --- phpdoc/en/reference/array/functions/ksort.xml:1.4 Sun May 12 04:19:28 2002 +++ phpdoc/en/reference/array/functions/ksort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.ksort"> <refnamediv> @@ -16,6 +16,8 @@ <para> Sorts an array by key, maintaining key to data correlations. This is useful mainly for associative arrays. + </para> + <para> <example> <title><function>ksort</function> example</title> <programlisting role="php"> @@ -28,20 +30,18 @@ } ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ a = orange b = banana c = apple d = lemon ]]> - </screen> + </screen> + </example> </para> <para> You may modify the behavior of the sort using the optional Index: phpdoc/en/reference/array/functions/list.xml diff -u phpdoc/en/reference/array/functions/list.xml:1.7 phpdoc/en/reference/array/functions/list.xml:1.8 --- phpdoc/en/reference/array/functions/list.xml:1.7 Sun Oct 6 16:39:38 2002 +++ phpdoc/en/reference/array/functions/list.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.list"> <refnamediv> @@ -80,14 +80,14 @@ </example> </para> <warning> - <para> - <function>list</function> assigns the values starting with the right-most - parameter. If you are using plain variables, you don't have to worry - about this. But if you are using arrays with indices you usually expect - the order of the indices in the array the same you wrote in the - <function>list</function> from left to right; which it isn't. It's - assigned in the reverse order. - </para> + <para> + <function>list</function> assigns the values starting with the right-most + parameter. If you are using plain variables, you don't have to worry + about this. But if you are using arrays with indices you usually expect + the order of the indices in the array the same you wrote in the + <function>list</function> from left to right; which it isn't. It's + assigned in the reverse order. + </para> </warning> <para> <example> @@ -105,10 +105,12 @@ ?> ]]> </programlisting> - </example> - Gives the following output (note the order of the elements compared in - which order they were written in the <function>list</function> syntax): - <screen> + <para> + Gives the following output (note the order of the elements compared in + which order they were written in the <function>list</function> syntax): + </para> + <screen> +<![CDATA[ array(3) { [2]=> string(8) "caffeine" @@ -117,7 +119,9 @@ [0]=> string(6) "coffee" } - </screen> +]]> + </screen> + </example> </para> <para> See also <function>each</function>, <function>array</function> Index: phpdoc/en/reference/array/functions/natsort.xml diff -u phpdoc/en/reference/array/functions/natsort.xml:1.6 phpdoc/en/reference/array/functions/natsort.xml:1.7 --- phpdoc/en/reference/array/functions/natsort.xml:1.6 Fri May 16 07:29:47 2003 +++ phpdoc/en/reference/array/functions/natsort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.25 --> <refentry id="function.natsort"> <refnamediv> @@ -39,13 +39,10 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - The code above will generate the following output: - </para> - <para> - <screen> + <para> + The code above will generate the following output: + </para> + <screen> <![CDATA[ Standard sorting Array @@ -65,10 +62,13 @@ [0] => img12.png ) ]]> - </screen> - For more information see: Martin Pool's <ulink - url="&url.strnatcmp;">Natural Order String Comparison</ulink> - page. + </screen> + <para> + For more information see: Martin Pool's <ulink + url="&url.strnatcmp;">Natural Order String Comparison</ulink> + page. + </para> + </example> </para> <note> <para> Index: phpdoc/en/reference/array/functions/reset.xml diff -u phpdoc/en/reference/array/functions/reset.xml:1.4 phpdoc/en/reference/array/functions/reset.xml:1.5 --- phpdoc/en/reference/array/functions/reset.xml:1.4 Sun May 12 04:19:28 2002 +++ phpdoc/en/reference/array/functions/reset.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.reset"> <refnamediv> @@ -16,11 +16,8 @@ </methodsynopsis> <para> <function>reset</function> rewinds <parameter>array</parameter>'s - internal pointer to the first element. - </para> - <para> - <function>reset</function> returns the value of the first array - element. + internal pointer to the first element and returns the value of the first + array element. </para> <para> See also <function>current</function>, Index: phpdoc/en/reference/array/functions/rsort.xml diff -u phpdoc/en/reference/array/functions/rsort.xml:1.5 phpdoc/en/reference/array/functions/rsort.xml:1.6 --- phpdoc/en/reference/array/functions/rsort.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/rsort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.rsort"> <refnamediv> @@ -15,6 +15,8 @@ </methodsynopsis> <para> This function sorts an array in reverse order (highest to lowest). + </para> + <para> <example> <title><function>rsort</function> example</title> <programlisting role="php"> @@ -29,20 +31,18 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ 0 = orange 1 = lemon 2 = banana 3 = apple ]]> - </screen> + </screen> + </example> </para> <para> The fruits have been sorted in reverse alphabetical order. Index: phpdoc/en/reference/array/functions/sort.xml diff -u phpdoc/en/reference/array/functions/sort.xml:1.5 phpdoc/en/reference/array/functions/sort.xml:1.6 --- phpdoc/en/reference/array/functions/sort.xml:1.5 Tue Feb 18 13:04:41 2003 +++ phpdoc/en/reference/array/functions/sort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.sort"> <refnamediv> @@ -16,6 +16,8 @@ <para> This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. + </para> + <para> <example> <title><function>sort</function> example</title> <programlisting role="php"> @@ -32,20 +34,18 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ fruits[0] = apple fruits[1] = banana fruits[2] = lemon fruits[3] = orange ]]> - </screen> + </screen> + </example> </para> <para> The fruits have been sorted in alphabetical order. Index: phpdoc/en/reference/array/functions/uksort.xml diff -u phpdoc/en/reference/array/functions/uksort.xml:1.6 phpdoc/en/reference/array/functions/uksort.xml:1.7 --- phpdoc/en/reference/array/functions/uksort.xml:1.6 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/uksort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.uksort"> <refnamediv> @@ -21,9 +21,10 @@ needs to be sorted by some non-trivial criteria, you should use this function. </para> - <example> - <title><function>uksort</function> example</title> - <programlisting role="php"> + <para> + <example> + <title><function>uksort</function> example</title> + <programlisting role="php"> <![CDATA[ <?php function cmp ($a, $b) { @@ -40,20 +41,19 @@ } ?> ]]> - </programlisting> - </example> - <para> - This example would display: - </para> - <para> - <screen> + </programlisting> + <para> + This example would display: + </para> + <screen> <![CDATA[ 20: twenty 10: ten 4: four 3: three ]]> - </screen> + </screen> + </example> </para> <para> See also <function>usort</function>, <function>uasort</function>, Index: phpdoc/en/reference/array/functions/usort.xml diff -u phpdoc/en/reference/array/functions/usort.xml:1.10 phpdoc/en/reference/array/functions/usort.xml:1.11 --- phpdoc/en/reference/array/functions/usort.xml:1.10 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/usort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.usort"> <refnamediv> @@ -26,6 +26,8 @@ to, or greater than zero if the first argument is considered to be respectively less than, equal to, or greater than the second. + </para> + <para> <note> <para> If two members compare as equal, their order in the sorted array is undefined. @@ -56,13 +58,10 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ 0: 1 1: 2 @@ -70,7 +69,8 @@ 3: 5 4: 6 ]]> - </screen> + </screen> + </example> </para> <note> <para> @@ -102,23 +102,21 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - When sorting a multi-dimensional array, $a and $b contain - references to the first index of the array. - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + When sorting a multi-dimensional array, $a and $b contain + references to the first index of the array. + </para> + <para> + This example would display: + </para> + <screen> <![CDATA[ $fruits[0]: apples $fruits[1]: grapes $fruits[2]: lemons ]]> - </screen> + </screen> + </example> </para> <para> @@ -159,19 +157,17 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ b c d ]]> - </screen> + </screen> + </example> </para> <para>
Index: phpdoc/en/reference/array/functions/array-change-key-case.xml diff -u phpdoc/en/reference/array/functions/array-change-key-case.xml:1.8 phpdoc/en/reference/array/functions/array-change-key-case.xml:1.9 --- phpdoc/en/reference/array/functions/array-change-key-case.xml:1.8 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-change-key-case.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.113 --> <refentry id="function.array-change-key-case"> <refnamediv> @@ -36,7 +36,8 @@ </programlisting> <para> The printout of the above program will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -44,8 +45,7 @@ [SECOND] => 2 ) ]]> - </screen> - </para> + </screen> </example> <para> If an array has indices that will be the same once run through this Index: phpdoc/en/reference/array/functions/array-chunk.xml diff -u phpdoc/en/reference/array/functions/array-chunk.xml:1.7 phpdoc/en/reference/array/functions/array-chunk.xml:1.8 --- phpdoc/en/reference/array/functions/array-chunk.xml:1.7 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-chunk.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-chunk"> <refnamediv> @@ -42,7 +42,8 @@ </programlisting> <para> The printout of the above program will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -85,8 +86,7 @@ ) ]]> - </screen> - </para> + </screen> </example> </refsect1> </refentry> Index: phpdoc/en/reference/array/functions/array-count-values.xml diff -u phpdoc/en/reference/array/functions/array-count-values.xml:1.7 phpdoc/en/reference/array/functions/array-count-values.xml:1.8 --- phpdoc/en/reference/array/functions/array-count-values.xml:1.7 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-count-values.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-count-values"> <refnamediv> @@ -30,7 +30,8 @@ </programlisting> <para> The printout of the above program will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -39,8 +40,7 @@ [world] => 1 ) ]]> - </screen> - </para> + </screen> </example> </para> </refsect1> Index: phpdoc/en/reference/array/functions/array-fill.xml diff -u phpdoc/en/reference/array/functions/array-fill.xml:1.7 phpdoc/en/reference/array/functions/array-fill.xml:1.8 --- phpdoc/en/reference/array/functions/array-fill.xml:1.7 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-fill.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-fill"> <refnamediv> @@ -34,8 +34,9 @@ ]]> </programlisting> <para> - <varname>$a</varname> now is : - <screen> + <varname>$a</varname> now is: + </para> + <screen> <![CDATA[ Array ( @@ -47,8 +48,7 @@ [10] => banana ) ]]> - </screen> - </para> + </screen> </example> </para> </refsect1> Index: phpdoc/en/reference/array/functions/array-filter.xml diff -u phpdoc/en/reference/array/functions/array-filter.xml:1.10 phpdoc/en/reference/array/functions/array-filter.xml:1.11 --- phpdoc/en/reference/array/functions/array-filter.xml:1.10 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-filter.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.62 --> <refentry id="function.array-filter"> <refnamediv> @@ -49,7 +49,8 @@ </programlisting> <para> The printout of the program above will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Odd : Array @@ -67,8 +68,7 @@ [6] => 12 ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-flip.xml diff -u phpdoc/en/reference/array/functions/array-flip.xml:1.8 phpdoc/en/reference/array/functions/array-flip.xml:1.9 --- phpdoc/en/reference/array/functions/array-flip.xml:1.8 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-flip.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.107 --> <refentry id="function.array-flip"> <refnamediv> @@ -58,8 +58,9 @@ ]]> </programlisting> <para> - now <varname>$trans</varname> is : - <screen> + now <varname>$trans</varname> is: + </para> + <screen> <![CDATA[ Array ( @@ -67,8 +68,7 @@ [2] => c ) ]]> - </screen> - </para> + </screen> </example> </para> </refsect1> Index: phpdoc/en/reference/array/functions/array-intersect.xml diff -u phpdoc/en/reference/array/functions/array-intersect.xml:1.7 phpdoc/en/reference/array/functions/array-intersect.xml:1.8 --- phpdoc/en/reference/array/functions/array-intersect.xml:1.7 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-intersect.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.14 --> <refentry id="function.array-intersect"> <refnamediv> @@ -34,7 +34,8 @@ </programlisting> <para> This makes <varname>$result</varname> have - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -42,8 +43,7 @@ [0] => red ) ]]> - </screen> - </para> + </screen> </example> </para> <note> Index: phpdoc/en/reference/array/functions/array-keys.xml diff -u phpdoc/en/reference/array/functions/array-keys.xml:1.6 phpdoc/en/reference/array/functions/array-keys.xml:1.7 --- phpdoc/en/reference/array/functions/array-keys.xml:1.6 Fri May 30 13:10:53 2003 +++ phpdoc/en/reference/array/functions/array-keys.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-keys"> <refnamediv> @@ -44,7 +44,8 @@ </programlisting> <para> The printout of the program above will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -63,8 +64,7 @@ [1] => size ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-map.xml diff -u phpdoc/en/reference/array/functions/array-map.xml:1.8 phpdoc/en/reference/array/functions/array-map.xml:1.9 --- phpdoc/en/reference/array/functions/array-map.xml:1.8 Tue Feb 4 14:17:43 2003 +++ phpdoc/en/reference/array/functions/array-map.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.62 --> <refentry id="function.array-map"> <refnamediv> @@ -43,7 +43,8 @@ </programlisting> <para> This makes <varname>$b</varname> have: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -54,8 +55,7 @@ [4] => 125 ) ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -85,7 +85,8 @@ </programlisting> <para> This results: - <screen> + </para> + <screen> <![CDATA[ // printout of $c Array @@ -127,8 +128,7 @@ ) ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -162,7 +162,8 @@ </para> <para> The printout of the program above will be: - <screen> + </para> + <screen> <![CDATA[ Array ( @@ -203,8 +204,7 @@ ) ]]> - </screen> - </para> + </screen> <para> See also <function>array_filter</function>, <function>array_reduce</function>, and Index: phpdoc/en/reference/array/functions/array-merge-recursive.xml diff -u phpdoc/en/reference/array/functions/array-merge-recursive.xml:1.5 phpdoc/en/reference/array/functions/array-merge-recursive.xml:1.6 --- phpdoc/en/reference/array/functions/array-merge-recursive.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-merge-recursive.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.12 --> <refentry id="function.array-merge-recursive"> <refnamediv> @@ -41,7 +41,8 @@ </programlisting> <para> The <literal>$result</literal> will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -60,8 +61,7 @@ [1] => 10 ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-merge.xml diff -u phpdoc/en/reference/array/functions/array-merge.xml:1.8 phpdoc/en/reference/array/functions/array-merge.xml:1.9 --- phpdoc/en/reference/array/functions/array-merge.xml:1.8 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-merge.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-merge"> <refnamediv> @@ -41,7 +41,8 @@ </programlisting> <para> The <varname>$result</varname> is: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -54,8 +55,7 @@ [4] => 4 ) ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -72,19 +72,20 @@ </programlisting> <para> Don't forget that numeric keys will be renumbered! - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( [0] => data ) ]]> - </screen> - </para> + </screen> <para> If you want to completely preserve the arrays and just want to append them to each other, use the <literal>+</literal> operator: - <programlisting role="php"> + </para> + <programlisting role="php"> <![CDATA[ <?php $array1 = array(); @@ -92,17 +93,18 @@ $result = $array1 + $array2; ?> ]]> - </programlisting> + </programlisting> + <para> The numeric key will be preserved and thus the association remains. - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( [1] => data ) ]]> - </screen> - </para> + </screen> </example> </para> <note> Index: phpdoc/en/reference/array/functions/array-pop.xml diff -u phpdoc/en/reference/array/functions/array-pop.xml:1.6 phpdoc/en/reference/array/functions/array-pop.xml:1.7 --- phpdoc/en/reference/array/functions/array-pop.xml:1.6 Sat May 17 22:32:19 2003 +++ phpdoc/en/reference/array/functions/array-pop.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-pop"> <refnamediv> @@ -36,7 +36,8 @@ </programlisting> <para> After this, <varname>$stack</varname> will have only 3 elements: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -45,7 +46,8 @@ [2] => apple ) ]]> - </screen> + </screen> + <para> and <literal>raspberry</literal> will be assigned to <varname>$fruit</varname>. </para> Index: phpdoc/en/reference/array/functions/array-push.xml diff -u phpdoc/en/reference/array/functions/array-push.xml:1.6 phpdoc/en/reference/array/functions/array-push.xml:1.7 --- phpdoc/en/reference/array/functions/array-push.xml:1.6 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-push.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-push"> <refnamediv> @@ -49,7 +49,8 @@ <para> This example would result in <varname>$stack</varname> having the following elements: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -59,8 +60,7 @@ [3] => raspberry ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-reverse.xml diff -u phpdoc/en/reference/array/functions/array-reverse.xml:1.4 phpdoc/en/reference/array/functions/array-reverse.xml:1.5 --- phpdoc/en/reference/array/functions/array-reverse.xml:1.4 Sun May 12 04:19:28 2002 +++ phpdoc/en/reference/array/functions/array-reverse.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.62 --> <refentry id="function.array-reverse"> <refnamediv> @@ -37,7 +37,8 @@ note the difference between the keys. The printout of <varname>$result</varname> and <varname>$result_keyed</varname> will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -62,9 +63,7 @@ [0] => php ) ]]> - </screen> - </para> - + </screen> </example> </para> <note> Index: phpdoc/en/reference/array/functions/array-shift.xml diff -u phpdoc/en/reference/array/functions/array-shift.xml:1.7 phpdoc/en/reference/array/functions/array-shift.xml:1.8 --- phpdoc/en/reference/array/functions/array-shift.xml:1.7 Wed Feb 5 02:20:39 2003 +++ phpdoc/en/reference/array/functions/array-shift.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-shift"> <refnamediv> @@ -25,10 +25,9 @@ &array.resetspointer; - <para> - <example> - <title><function>array_shift</function> example</title> - <programlisting role="php"> + <example> + <title><function>array_shift</function> example</title> + <programlisting role="php"> <![CDATA[ <?php $stack = array ("orange", "banana", "apple", "raspberry"); @@ -36,10 +35,11 @@ print_r($stack); ?> ]]> - </programlisting> - <para> - This would result in <varname>$stack</varname> having 3 elements left: - <screen role="php"> + </programlisting> + <para> + This would result in <varname>$stack</varname> having 3 elements left: + </para> + <screen role="php"> <![CDATA[ Array ( @@ -48,12 +48,12 @@ [2] => raspberry ) ]]> - </screen> - and <literal>orange</literal> will be assigned to - <varname>$fruit</varname>. - </para> - </example> - </para> + </screen> + <para> + and <literal>orange</literal> will be assigned to + <varname>$fruit</varname>. + </para> + </example> <para> See also <function>array_unshift</function>, <function>array_push</function>, and Index: phpdoc/en/reference/array/functions/array-sum.xml diff -u phpdoc/en/reference/array/functions/array-sum.xml:1.6 phpdoc/en/reference/array/functions/array-sum.xml:1.7 --- phpdoc/en/reference/array/functions/array-sum.xml:1.6 Sat May 31 11:13:09 2003 +++ phpdoc/en/reference/array/functions/array-sum.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.59 --> <refentry id="function.array-sum"> <refnamediv> @@ -34,13 +34,13 @@ </programlisting> <para> The printout of the program above will be: - <screen role="php"> + </para> + <screen> <![CDATA[ sum(a) = 20 sum(b) = 6.9 ]]> - </screen> - </para> + </screen> </example> </para> <note> Index: phpdoc/en/reference/array/functions/array-unique.xml diff -u phpdoc/en/reference/array/functions/array-unique.xml:1.10 phpdoc/en/reference/array/functions/array-unique.xml:1.11 --- phpdoc/en/reference/array/functions/array-unique.xml:1.10 Fri Feb 7 17:57:56 2003 +++ phpdoc/en/reference/array/functions/array-unique.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-unique"> <refnamediv> @@ -48,7 +48,8 @@ </programlisting> <para> This will output: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -57,8 +58,7 @@ [1] => blue ) ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -75,15 +75,15 @@ </programlisting> <para> This script will output: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ array(2) { [0] => int(4) [2] => string(1) "3" } ]]> - </screen> - </para> + </screen> </example> </para> </refsect1> Index: phpdoc/en/reference/array/functions/array-unshift.xml diff -u phpdoc/en/reference/array/functions/array-unshift.xml:1.6 phpdoc/en/reference/array/functions/array-unshift.xml:1.7 --- phpdoc/en/reference/array/functions/array-unshift.xml:1.6 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/array-unshift.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-unshift"> <refnamediv> @@ -43,7 +43,8 @@ <para> This would result in <varname>$queue</varname> having the following elements: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -53,8 +54,7 @@ [3] => banana ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-values.xml diff -u phpdoc/en/reference/array/functions/array-values.xml:1.6 phpdoc/en/reference/array/functions/array-values.xml:1.7 --- phpdoc/en/reference/array/functions/array-values.xml:1.6 Fri May 30 13:53:11 2003 +++ phpdoc/en/reference/array/functions/array-values.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-values"> <refnamediv> @@ -30,7 +30,8 @@ </programlisting> <para> This will output: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -38,8 +39,7 @@ [1] => gold ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/array-walk.xml diff -u phpdoc/en/reference/array/functions/array-walk.xml:1.10 phpdoc/en/reference/array/functions/array-walk.xml:1.11 --- phpdoc/en/reference/array/functions/array-walk.xml:1.10 Sat May 3 21:13:00 2003 +++ phpdoc/en/reference/array/functions/array-walk.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-walk"> <refnamediv> @@ -97,7 +97,8 @@ </programlisting> <para> The printout of the program above will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Before ...: d. lemon @@ -110,8 +111,7 @@ b. fruit: banana c. fruit: apple ]]> - </screen> - </para> + </screen> </example> </para> <simpara> Index: phpdoc/en/reference/array/functions/array.xml diff -u phpdoc/en/reference/array/functions/array.xml:1.9 phpdoc/en/reference/array/functions/array.xml:1.10 --- phpdoc/en/reference/array/functions/array.xml:1.9 Mon Jun 16 01:23:40 2003 +++ phpdoc/en/reference/array/functions/array.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.110 --> <refentry id="function.array"> <refnamediv> @@ -68,8 +68,9 @@ ]]> </programlisting> <para> - will display : - <screen role="php"> + will display: + </para> + <screen role="php"> <![CDATA[ Array ( @@ -82,9 +83,10 @@ [9] => 19 ) ]]> - </screen> - </para> + </screen> </example> + </para> + <para> Note that index '3' is defined twice, and keep its final value of 13. Index 4 is defined after index 8, and next generated index (value 19) is 9, since biggest index was 8. @@ -102,8 +104,9 @@ ]]> </programlisting> <para> - will display : - <screen> + will display: + </para> + <screen> <![CDATA[ Array ( @@ -112,8 +115,7 @@ [3] => March ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/arsort.xml diff -u phpdoc/en/reference/array/functions/arsort.xml:1.5 phpdoc/en/reference/array/functions/arsort.xml:1.6 --- phpdoc/en/reference/array/functions/arsort.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/arsort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.arsort"> <refnamediv> @@ -37,15 +37,15 @@ </programlisting> <para> This example would display: - <screen> + </para> + <screen> <![CDATA[ a = orange d = lemon b = banana c = apple ]]> - </screen> - </para> + </screen> </example> <para> The fruits have been sorted in reverse alphabetical order, and Index: phpdoc/en/reference/array/functions/asort.xml diff -u phpdoc/en/reference/array/functions/asort.xml:1.5 phpdoc/en/reference/array/functions/asort.xml:1.6 --- phpdoc/en/reference/array/functions/asort.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/asort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.asort"> <refnamediv> @@ -35,15 +35,15 @@ </programlisting> <para> This example would display: - <screen> + </para> + <screen> <![CDATA[ c = apple b = banana d = lemon a = orange ]]> - </screen> - </para> + </screen> </example> <para> The fruits have been sorted in alphabetical order, and the index Index: phpdoc/en/reference/array/functions/compact.xml diff -u phpdoc/en/reference/array/functions/compact.xml:1.5 phpdoc/en/reference/array/functions/compact.xml:1.6 --- phpdoc/en/reference/array/functions/compact.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/compact.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.compact"> <refnamediv> @@ -51,7 +51,8 @@ </programlisting> <para> After this, <varname>$result</varname> will be: - <screen role="php"> + </para> + <screen role="php"> <![CDATA[ Array ( @@ -60,8 +61,7 @@ [state] => CA ) ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/each.xml diff -u phpdoc/en/reference/array/functions/each.xml:1.9 phpdoc/en/reference/array/functions/each.xml:1.10 --- phpdoc/en/reference/array/functions/each.xml:1.9 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/each.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.9 $ --> +<!-- $Revision: 1.10 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.each"> <refnamediv> @@ -46,6 +46,7 @@ <para> <varname>$bar</varname> now contains the following key/value pairs: + </para> <screen> <![CDATA[ Array @@ -57,7 +58,11 @@ ) ]]> </screen> - <programlisting role="php"> + </example> + </para> + <para> + <informalexample> + <programlisting role="php"> <![CDATA[ <?php $foo = array ("Robert" => "Bob", "Seppo" => "Sepi"); @@ -65,11 +70,11 @@ print_r($bar); ?> ]]> - </programlisting> - </para> + </programlisting> <para> <varname>$bar</varname> now contains the following key/value pairs: + </para> <screen> <![CDATA[ Array @@ -81,8 +86,7 @@ ) ]]> </screen> - </para> - </example> + </informalexample> </para> <para> <function>each</function> is typically used in conjunction with Index: phpdoc/en/reference/array/functions/extract.xml diff -u phpdoc/en/reference/array/functions/extract.xml:1.8 phpdoc/en/reference/array/functions/extract.xml:1.9 --- phpdoc/en/reference/array/functions/extract.xml:1.8 Tue Feb 4 12:19:32 2003 +++ phpdoc/en/reference/array/functions/extract.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.8 $ --> +<!-- $Revision: 1.9 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.extract"> <refnamediv> @@ -173,15 +173,15 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - The above example will produce: - <programlisting> + <para> + The above example will produce: + </para> + <programlisting> <![CDATA[ blue, large, sphere, medium ]]> - </programlisting> + </programlisting> + </example> </para> <para> The <varname>$size</varname> wasn't overwritten, because we Index: phpdoc/en/reference/array/functions/in-array.xml diff -u phpdoc/en/reference/array/functions/in-array.xml:1.7 phpdoc/en/reference/array/functions/in-array.xml:1.8 --- phpdoc/en/reference/array/functions/in-array.xml:1.7 Wed Jun 11 02:21:32 2003 +++ phpdoc/en/reference/array/functions/in-array.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.56 --> <refentry id="function.in-array"> <refnamediv> @@ -56,12 +56,12 @@ <para> The second condition fails because <function>in_array</function> is case-sensitive, so the program above will display: - <screen role="php"> + </para> + <screen> <![CDATA[ Got Irix ]]> - </screen> - </para> + </screen> </example> </para> <para> @@ -84,12 +84,12 @@ </programlisting> <para> This will display: - <screen role="php"> + </para> + <screen> <![CDATA[ 1.13 found with strict check ]]> - </screen> - </para> + </screen> </example> </para> <para> Index: phpdoc/en/reference/array/functions/krsort.xml diff -u phpdoc/en/reference/array/functions/krsort.xml:1.5 phpdoc/en/reference/array/functions/krsort.xml:1.6 --- phpdoc/en/reference/array/functions/krsort.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/krsort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.krsort"> <refnamediv> @@ -16,6 +16,8 @@ <para> Sorts an array by key in reverse order, maintaining key to data correlations. This is useful mainly for associative arrays. + </para> + <para> <example> <title><function>krsort</function> example</title> <programlisting role="php"> @@ -30,20 +32,18 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ d = lemon c = apple b = banana a = orange ]]> - </screen> + </screen> + </example> </para> <para> You may modify the behavior of the sort using the optional Index: phpdoc/en/reference/array/functions/ksort.xml diff -u phpdoc/en/reference/array/functions/ksort.xml:1.4 phpdoc/en/reference/array/functions/ksort.xml:1.5 --- phpdoc/en/reference/array/functions/ksort.xml:1.4 Sun May 12 04:19:28 2002 +++ phpdoc/en/reference/array/functions/ksort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.ksort"> <refnamediv> @@ -16,6 +16,8 @@ <para> Sorts an array by key, maintaining key to data correlations. This is useful mainly for associative arrays. + </para> + <para> <example> <title><function>ksort</function> example</title> <programlisting role="php"> @@ -28,20 +30,18 @@ } ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ a = orange b = banana c = apple d = lemon ]]> - </screen> + </screen> + </example> </para> <para> You may modify the behavior of the sort using the optional Index: phpdoc/en/reference/array/functions/list.xml diff -u phpdoc/en/reference/array/functions/list.xml:1.7 phpdoc/en/reference/array/functions/list.xml:1.8 --- phpdoc/en/reference/array/functions/list.xml:1.7 Sun Oct 6 16:39:38 2002 +++ phpdoc/en/reference/array/functions/list.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.7 $ --> +<!-- $Revision: 1.8 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.list"> <refnamediv> @@ -80,14 +80,14 @@ </example> </para> <warning> - <para> - <function>list</function> assigns the values starting with the right-most - parameter. If you are using plain variables, you don't have to worry - about this. But if you are using arrays with indices you usually expect - the order of the indices in the array the same you wrote in the - <function>list</function> from left to right; which it isn't. It's - assigned in the reverse order. - </para> + <para> + <function>list</function> assigns the values starting with the right-most + parameter. If you are using plain variables, you don't have to worry + about this. But if you are using arrays with indices you usually expect + the order of the indices in the array the same you wrote in the + <function>list</function> from left to right; which it isn't. It's + assigned in the reverse order. + </para> </warning> <para> <example> @@ -105,10 +105,12 @@ ?> ]]> </programlisting> - </example> - Gives the following output (note the order of the elements compared in - which order they were written in the <function>list</function> syntax): - <screen> + <para> + Gives the following output (note the order of the elements compared in + which order they were written in the <function>list</function> syntax): + </para> + <screen> +<![CDATA[ array(3) { [2]=> string(8) "caffeine" @@ -117,7 +119,9 @@ [0]=> string(6) "coffee" } - </screen> +]]> + </screen> + </example> </para> <para> See also <function>each</function>, <function>array</function> Index: phpdoc/en/reference/array/functions/natsort.xml diff -u phpdoc/en/reference/array/functions/natsort.xml:1.6 phpdoc/en/reference/array/functions/natsort.xml:1.7 --- phpdoc/en/reference/array/functions/natsort.xml:1.6 Fri May 16 07:29:47 2003 +++ phpdoc/en/reference/array/functions/natsort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.25 --> <refentry id="function.natsort"> <refnamediv> @@ -39,13 +39,10 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - The code above will generate the following output: - </para> - <para> - <screen> + <para> + The code above will generate the following output: + </para> + <screen> <![CDATA[ Standard sorting Array @@ -65,10 +62,13 @@ [0] => img12.png ) ]]> - </screen> - For more information see: Martin Pool's <ulink - url="&url.strnatcmp;">Natural Order String Comparison</ulink> - page. + </screen> + <para> + For more information see: Martin Pool's <ulink + url="&url.strnatcmp;">Natural Order String Comparison</ulink> + page. + </para> + </example> </para> <note> <para> Index: phpdoc/en/reference/array/functions/reset.xml diff -u phpdoc/en/reference/array/functions/reset.xml:1.4 phpdoc/en/reference/array/functions/reset.xml:1.5 --- phpdoc/en/reference/array/functions/reset.xml:1.4 Sun May 12 04:19:28 2002 +++ phpdoc/en/reference/array/functions/reset.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.4 $ --> +<!-- $Revision: 1.5 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.reset"> <refnamediv> @@ -16,11 +16,8 @@ </methodsynopsis> <para> <function>reset</function> rewinds <parameter>array</parameter>'s - internal pointer to the first element. - </para> - <para> - <function>reset</function> returns the value of the first array - element. + internal pointer to the first element and returns the value of the first + array element. </para> <para> See also <function>current</function>, Index: phpdoc/en/reference/array/functions/rsort.xml diff -u phpdoc/en/reference/array/functions/rsort.xml:1.5 phpdoc/en/reference/array/functions/rsort.xml:1.6 --- phpdoc/en/reference/array/functions/rsort.xml:1.5 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/rsort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.rsort"> <refnamediv> @@ -15,6 +15,8 @@ </methodsynopsis> <para> This function sorts an array in reverse order (highest to lowest). + </para> + <para> <example> <title><function>rsort</function> example</title> <programlisting role="php"> @@ -29,20 +31,18 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ 0 = orange 1 = lemon 2 = banana 3 = apple ]]> - </screen> + </screen> + </example> </para> <para> The fruits have been sorted in reverse alphabetical order. Index: phpdoc/en/reference/array/functions/sort.xml diff -u phpdoc/en/reference/array/functions/sort.xml:1.5 phpdoc/en/reference/array/functions/sort.xml:1.6 --- phpdoc/en/reference/array/functions/sort.xml:1.5 Tue Feb 18 13:04:41 2003 +++ phpdoc/en/reference/array/functions/sort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.5 $ --> +<!-- $Revision: 1.6 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.sort"> <refnamediv> @@ -16,6 +16,8 @@ <para> This function sorts an array. Elements will be arranged from lowest to highest when this function has completed. + </para> + <para> <example> <title><function>sort</function> example</title> <programlisting role="php"> @@ -32,20 +34,18 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ fruits[0] = apple fruits[1] = banana fruits[2] = lemon fruits[3] = orange ]]> - </screen> + </screen> + </example> </para> <para> The fruits have been sorted in alphabetical order. Index: phpdoc/en/reference/array/functions/uksort.xml diff -u phpdoc/en/reference/array/functions/uksort.xml:1.6 phpdoc/en/reference/array/functions/uksort.xml:1.7 --- phpdoc/en/reference/array/functions/uksort.xml:1.6 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/uksort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.6 $ --> +<!-- $Revision: 1.7 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.uksort"> <refnamediv> @@ -21,9 +21,10 @@ needs to be sorted by some non-trivial criteria, you should use this function. </para> - <example> - <title><function>uksort</function> example</title> - <programlisting role="php"> + <para> + <example> + <title><function>uksort</function> example</title> + <programlisting role="php"> <![CDATA[ <?php function cmp ($a, $b) { @@ -40,20 +41,19 @@ } ?> ]]> - </programlisting> - </example> - <para> - This example would display: - </para> - <para> - <screen> + </programlisting> + <para> + This example would display: + </para> + <screen> <![CDATA[ 20: twenty 10: ten 4: four 3: three ]]> - </screen> + </screen> + </example> </para> <para> See also <function>usort</function>, <function>uasort</function>, Index: phpdoc/en/reference/array/functions/usort.xml diff -u phpdoc/en/reference/array/functions/usort.xml:1.10 phpdoc/en/reference/array/functions/usort.xml:1.11 --- phpdoc/en/reference/array/functions/usort.xml:1.10 Fri May 30 14:12:53 2003 +++ phpdoc/en/reference/array/functions/usort.xml Mon Jun 16 08:03:39 2003 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.10 $ --> +<!-- $Revision: 1.11 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.usort"> <refnamediv> @@ -26,6 +26,8 @@ to, or greater than zero if the first argument is considered to be respectively less than, equal to, or greater than the second. + </para> + <para> <note> <para> If two members compare as equal, their order in the sorted array is undefined. @@ -56,13 +58,10 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ 0: 1 1: 2 @@ -70,7 +69,8 @@ 3: 5 4: 6 ]]> - </screen> + </screen> + </example> </para> <note> <para> @@ -102,23 +102,21 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - When sorting a multi-dimensional array, $a and $b contain - references to the first index of the array. - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + When sorting a multi-dimensional array, $a and $b contain + references to the first index of the array. + </para> + <para> + This example would display: + </para> + <screen> <![CDATA[ $fruits[0]: apples $fruits[1]: grapes $fruits[2]: lemons ]]> - </screen> + </screen> + </example> </para> <para> @@ -159,19 +157,17 @@ ?> ]]> </programlisting> - </example> - </para> - <para> - This example would display: - </para> - <para> - <screen> + <para> + This example would display: + </para> + <screen> <![CDATA[ b c d ]]> - </screen> + </screen> + </example> </para> <para>