[prev in list] [next in list] [prev in thread] [next in thread] 

List:       php-doc-cvs
Subject:    [DOC-CVS] =?utf-8?q?svn:_/phpdoc/en/trunk/reference/array/functions/_array-merge-recursive.xml_array
From:       Christoph_Michael_Becker <cmb () php ! net>
Date:       2018-07-21 11:52:11
Message-ID: svn-cmb-1532173931-345370-1304854498 () svn ! php ! net
[Download RAW message or body]

cmb                                      Sat, 21 Jul 2018 11:52:11 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=345370

Log:
array_replace[_recursive] only requires one argument, like array_merge[_recursive]. \
See https://github.com/php/php-src/pull/3194

PS: maybe further tweak the wording...

--
Provided by anonymous 92566 ()

Changed paths:
    U   phpdoc/en/trunk/reference/array/functions/array-merge-recursive.xml
    U   phpdoc/en/trunk/reference/array/functions/array-replace-recursive.xml
    U   phpdoc/en/trunk/reference/array/functions/array-replace.xml

Modified: phpdoc/en/trunk/reference/array/functions/array-merge-recursive.xml
===================================================================
--- phpdoc/en/trunk/reference/array/functions/array-merge-recursive.xml	2018-07-21 \
                07:06:40 UTC (rev 345369)
+++ phpdoc/en/trunk/reference/array/functions/array-merge-recursive.xml	2018-07-21 \
11:52:11 UTC (rev 345370) @@ -3,7 +3,7 @@
 <refentry xmlns="http://docbook.org/ns/docbook" \
xml:id="function.array-merge-recursive">  <refnamediv>
   <refname>array_merge_recursive</refname>
-  <refpurpose>Merge two or more arrays recursively</refpurpose>
+  <refpurpose>Merge one or more arrays recursively</refpurpose>
  </refnamediv>

  <refsect1 role="description">

Modified: phpdoc/en/trunk/reference/array/functions/array-replace-recursive.xml
===================================================================
--- phpdoc/en/trunk/reference/array/functions/array-replace-recursive.xml	2018-07-21 \
                07:06:40 UTC (rev 345369)
+++ phpdoc/en/trunk/reference/array/functions/array-replace-recursive.xml	2018-07-21 \
11:52:11 UTC (rev 345370) @@ -10,7 +10,6 @@
   <methodsynopsis>
    <type>array</type><methodname>array_replace_recursive</methodname>
    <methodparam><type>array</type><parameter>array1</parameter></methodparam>
-   <methodparam><type>array</type><parameter>array2</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam>
  </methodsynopsis>
   <para>
@@ -28,9 +27,9 @@
    arrays and apply the same process to the inner value.
   </para>
   <para>
-   When the value in <parameter>array1</parameter> is scalar, it will be replaced
-   by the value in <parameter>array2</parameter>, may it be scalar or array.
-   When the value in <parameter>array1</parameter> and <parameter>array2</parameter>
+   When the value in the first array is scalar, it will be replaced
+   by the value in the second array, may it be scalar or array.
+   When the value in the first array and the second array
    are both arrays, <function>array_replace_recursive</function> will replace
    their respective value recursively.
   </para>
@@ -48,18 +47,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>array2</parameter></term>
-     <listitem>
-      <para>
-       The array from which elements will be extracted.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
      <term><parameter>...</parameter></term>
      <listitem>
       <para>
-       Optional. More arrays from which elements will be extracted.
+       Optional. Arrays from which elements will be extracted.
       </para>
      </listitem>
     </varlistentry>

Modified: phpdoc/en/trunk/reference/array/functions/array-replace.xml
===================================================================
--- phpdoc/en/trunk/reference/array/functions/array-replace.xml	2018-07-21 07:06:40 \
                UTC (rev 345369)
+++ phpdoc/en/trunk/reference/array/functions/array-replace.xml	2018-07-21 11:52:11 \
UTC (rev 345370) @@ -10,7 +10,6 @@
   <methodsynopsis>
    <type>array</type><methodname>array_replace</methodname>
    <methodparam><type>array</type><parameter>array1</parameter></methodparam>
-   <methodparam><type>array</type><parameter>array2</parameter></methodparam>
    <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam>
  </methodsynopsis>
   <para>
@@ -41,18 +40,10 @@
      </listitem>
     </varlistentry>
     <varlistentry>
-     <term><parameter>array2</parameter></term>
-     <listitem>
-      <para>
-       The array from which elements will be extracted.
-      </para>
-     </listitem>
-    </varlistentry>
-    <varlistentry>
      <term><parameter>...</parameter></term>
      <listitem>
       <para>
-       More arrays from which elements will be extracted.
+       Arrays from which elements will be extracted.
        Values from later arrays overwrite the previous values.
       </para>
      </listitem>



-- 
PHP Documentation Commits Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]