cvs: phpdoc /en/reference/array/functions array-merge.xml

vrana Wed Feb 16 10:27:04 2005 EDT Modified files: /phpdoc/en/reference/array/functions array-merge.xml Log: 'duplicate entries will be merged into the last one' - this has nothing to do with array_merge without it, example 3 is a copy of example 2 http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-merge.xml?r1=1.15&r2=1.16&ty=u Index: phpdoc/en/reference/array/functions/array-merge.xml diff -u phpdoc/en/reference/array/functions/array-merge.xml:1.15 phpdoc/en/reference/array/functions/array-merge.xml:1.16 --- phpdoc/en/reference/array/functions/array-merge.xml:1.15 Thu Dec 23 03:34:20 2004 +++ phpdoc/en/reference/array/functions/array-merge.xml Wed Feb 16 10:27:02 2005 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.15 $ --> +<!-- $Revision: 1.16 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-merge"> <refnamediv> @@ -28,8 +28,7 @@ </para> <para> If only one array is given and the array is numerically indexed, the - keys get reindexed in a continuous way. For associative arrays, duplicate - entries will be merged into the last one. See example three for details. + keys get reindexed in a continuous way. </para> <para> <example> @@ -111,47 +110,7 @@ ]]> </screen> </example> - <example> - <title><function>array_merge</function> example</title> - <programlisting role="php"> -<![CDATA[ -<?php -$array_one = array(0 => "jay", 1 => "bob", 2 => "randal", 3 => "dante"); -$array_two = array("jay" => "bob", "randal" => "dante", "jay" => "jason"); - -unset($array_one[2]); - -$result_one = array_merge($array_one); -$result_two = array_merge($array_two); - -print_r($result_one); -print_r($result_two); -?> -]]> - </programlisting> - &example.outputs; - <screen role="php"> -<![CDATA[ -Array -( - [0] => jay - [1] => bob - [2] => dante -) -Array -( - [jay] => jason - [randal] => dante -) -]]> - </screen> - </example> </para> - <note> - <para> - Shared keys will be overwritten on a first-come first-served basis. - </para> - </note> <warning> <para> The behavior of <function>array_merge</function> was modified in PHP 5. Unlike PHP 4, <function>array_merge</function>