vrana Fri Aug 17 02:03:58 2007 UTC
Modified files:
/phpdoc/en/reference/array/functions array-merge.xml
Log:
Plus doesn't overwrite keys (bug #42323)
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-merge.xml?r1=1.20&r2=1.21&diff_format=u
Index: phpdoc/en/reference/array/functions/array-merge.xml
diff -u phpdoc/en/reference/array/functions/array-merge.xml:1.20
phpdoc/en/reference/array/functions/array-merge.xml:1.21
--- phpdoc/en/reference/array/functions/array-merge.xml:1.20 Wed Jun 20
22:24:15 2007
+++ phpdoc/en/reference/array/functions/array-merge.xml Fri Aug 17 02:03:58 2007
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.20 $ -->
+<!-- $Revision: 1.21 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry xml:id="function.array-merge" xmlns="http://docbook.org/ns/docbook";>
<refnamediv>
@@ -85,7 +85,8 @@
</screen>
<para>
If you want to completely preserve the arrays and just want to append
- them to each other, use the <literal>+</literal> operator:
+ them to each other (not overwriting the previous keys), use the
+ <literal>+</literal> operator:
</para>
<programlisting role="php">
<