Re: [PHP-DOC] cvs: phpdoc /en/functions array.xml From: Daniel Beckham (danbeck <email protected>)
Date: 07/03/00

Would someone be kind enough to update the translations of
array_merge? I'm sure the translation didn't carry over the grammatical
problems, but the example would need to be updated.

Daniel

At 09:44 PM 06/30/2000 +0000, you wrote:
>danbeck Fri Jun 30 14:44:08 2000 EDT
>
> Modified files:
> /phpdoc/en/functions array.xml
> Log:
> clarified the description and fixed some grammatical errors; clarified
> the code example concerning numeric indexes
>
>Index: phpdoc/en/functions/array.xml
>diff -u phpdoc/en/functions/array.xml:1.7 phpdoc/en/functions/array.xml:1.8
>--- phpdoc/en/functions/array.xml:1.7 Sat Jun 24 00:38:43 2000
>+++ phpdoc/en/functions/array.xml Fri Jun 30 14:44:08 2000
>@@ -190,22 +190,22 @@
> the end of the previous one. It returns the resulting array.
> </para>
> <para>
>- If the input arrays had the same string keys, then the later
>- value for that key will overwrite previous one. If, however, the
>- arrays have the same numeric key, this does not happen since the
>- values are appended.
>+ If the input arrays have the same string keys, then the later
>+ value for that key will overwrite the previous one. If, however,
>+ the arrays have the same numeric key, the later value will not
>+ overwrite the original value, but will be appended.
> </para>
> <para>
> <example>
> <title><function>array_merge</function> example</title>
> <programlisting role="php">
> $array1 = array ("color" => "red", 2, 4);
>-$array2 = array ("a", "b", "color" => "green", "shape" => "trapezoid");
>+$array2 = array ("a", "b", "color" => "green", "shape" => "trapezoid", 4);
> array_merge ($array1, $array2);
> </programlisting>
> <para>
> Resulting array will be array("color" => "green", 2, 4, "a",
>- "b", "shape" => "trapezoid").
>+ "b", "shape" => "trapezoid", 4).
> </para>
> </example>
> <note>