cvs: phpdoc-it /reference/array/functions array-merge.xml
| From: | Marco Cucinato | Date: | Mon, 01 Jul 2002 22:25:03 +0000 |
| Subject: | cvs: phpdoc-it /reference/array/functions array-merge.xml | ||
| Groups: | php.doc.it | ||
| Request: | Send a blank email to doc-it+get-26@lists.php.net to get a copy of this message | ||
cucinato Mon Jul 1 18:25:03 2002 EDT
Modified files:
/phpdoc-it/reference/array/functions array-merge.xml
Log:
Sync to EN version
Index: phpdoc-it/reference/array/functions/array-merge.xml
diff -u phpdoc-it/reference/array/functions/array-merge.xml:1.4
phpdoc-it/reference/array/functions/array-merge.xml:1.5
--- phpdoc-it/reference/array/functions/array-merge.xml:1.4 Mon May 20 15:29:41 2002
+++ phpdoc-it/reference/array/functions/array-merge.xml Mon Jul 1 18:25:03 2002
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="iso-8859-1"?>
<!-- splitted from ./it/functions/array.xml, last change in rev 1.6 -->
<!-- last change to 'array-merge' in en/ tree in rev 1.2 -->
-<!-- EN-Revision: 1.5 Maintainer: cucinato Status: ready -->
+<!-- EN-Revision: 1.6 Maintainer: cucinato Status: ready -->
<!-- OLD-Revision: 1.173/EN.1.2 -->
<refentry id="function.array-merge">
<refnamediv>
@@ -100,6 +100,11 @@
</para>
</example>
</para>
+ <note>
+ <para>
+ Le chiavi condivise verranno sovrascritte dala prima chiave processata.
+ </para>
+ </note>
<para>
Vedere anche <function>array_merge_recursive</function>.
</para>