From 3c7d5d1fdab73a803595c86b2f67e00d48457505 Mon Sep 17 00:00:00 2001
From: Jan Lehnardt <jan@php.net>
Date: Tue, 4 May 2004 19:01:46 +0000
Subject: [PATCH]  - reflect the fact, that merging a single array is possible 
   and added a corresponding example. Thanks to vmx.

git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@157951 c90b9560-bf6c-de11-be94-00142212c4b1
---
 reference/array/functions/array-merge.xml | 50 +++++++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/reference/array/functions/array-merge.xml b/reference/array/functions/array-merge.xml
index 46fc9dcec3..e6f6be554c 100644
--- a/reference/array/functions/array-merge.xml
+++ b/reference/array/functions/array-merge.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-merge">
    <refnamediv>
     <refname>array_merge</refname>
-    <refpurpose>Merge two or more arrays</refpurpose>
+    <refpurpose>Merge one or more arrays</refpurpose>
    </refnamediv>
    <refsect1>
     <title>Description</title>
      <methodsynopsis>
       <type>array</type><methodname>array_merge</methodname>
       <methodparam><type>array</type><parameter>array1</parameter></methodparam>
-      <methodparam><type>array</type><parameter>array2</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter>array2</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam>
      </methodsynopsis>
     <para>
-     <function>array_merge</function> merges the elements of two or
+     <function>array_merge</function> merges the elements of one or
      more arrays together so that the values of one are appended to
      the end of the previous one.  It returns the resulting array.
     </para>
@@ -26,6 +26,11 @@
      role="strong">not</emphasis> overwrite the original value, but will be
      appended.
     </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.
+    </para>
     <para>
      <example>
       <title><function>array_merge</function> example</title>
@@ -103,6 +108,43 @@ Array
 (
     [1] => data
 )
+]]>
+      </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>
+      <para>
+       The output is: 
+      </para>
+      <screen role="php">
+<![CDATA[
+Array
+(
+    [0] => jay
+    [1] => bob
+    [2] => dante
+)
+Array
+(
+    [jay] => jason
+    [randal] => dante
+)
 ]]>
       </screen>
      </example>