cvs: phpdoc /en/reference/array versions.xml /en/reference/array/functions array-replace-recursive.xml array-replace.xml
| From: | Richard Quadling | Date: | Wed, 24 Jun 2009 09:20:29 +0000 |
| Subject: | cvs: phpdoc /en/reference/array versions.xml /en/reference/array/functions array-replace-recursive.xml array-replace.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-4229@lists.php.net to get a copy of this message | ||
rquadling Wed Jun 24 09:20:29 2009 UTC
Modified files:
/phpdoc/en/reference/array/functions array-replace-recursive.xml
array-replace.xml
/phpdoc/en/reference/array versions.xml
Log:
Added versions and some typos
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-replace-recursive.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/array/functions/array-replace-recursive.xml
diff -u phpdoc/en/reference/array/functions/array-replace-recursive.xml:1.2
phpdoc/en/reference/array/functions/array-replace-recursive.xml:1.3
--- phpdoc/en/reference/array/functions/array-replace-recursive.xml:1.2 Tue Jun 23 16:44:57 2009
+++ phpdoc/en/reference/array/functions/array-replace-recursive.xml Wed Jun 24 09:20:29 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry xml:id="function.array-replace-recursive" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>array_replace_recursive</refname>
@@ -11,28 +11,28 @@
<type>array</type><methodname>array_replace_recursive</methodname>
<methodparam><type>array</type><parameter
role="reference">array</parameter></methodparam>
<methodparam><type>array</type><parameter
role="reference">array1</parameter></methodparam>
- <methodparam><type>array</type><parameter
role="reference">array2</parameter></methodparam>
- <methodparam><type>array</type><parameter
role="reference">...</parameter></methodparam>
+ <methodparam choice="opt"><type>array</type><parameter
role="reference">array2</parameter></methodparam>
+ <methodparam choice="opt"><type>array</type><parameter
role="reference">...</parameter></methodparam>
</methodsynopsis>
<para>
- <function>array_replace_recursively</function> replaces the values of the first
+ <function>array_replace_recursive</function> replaces the values of the first
<parameter>array</parameter> with the same values from all the following
arrays. If a key from the first array exists in the second array, its value
- will be replace by the value from the second array. If the key exists in the
+ will be replaced by the value from the second array. If the key exists in the
second array, and not the first, it will be created in the first array.
If a key only exists in the first array, it will be left as is.
- If several array are passed for replacement, they will be processed
- in order, the former array overwritting the previous values.
+ If several arrays are passed for replacement, they will be processed
+ in order, the later array overwriting the previous values.
</para>
<para>
- <function>array_replace_recursive</function> is recursive : it will recurse into
+ <function>array_replace_recursive</function> is recursive : it will recurse into
arrays and apply the same process to the inner value.
</para>
<para>
When the value in <parameter>array</parameter> is scalar, it will be replaced
- by the value in <parameter>array1</parameter>, may it be scalar or array.
+ by the value in <parameter>array1</parameter>, may it be scalar or array.
When the value in <parameter>array</parameter> and
<parameter>array1</parameter>
- are both arrays, <function>array_replace_recursively</function> will replace
+ are both arrays, <function>array_replace_recursive</function> will replace
their respective value recursively.
</para>
</refsect1>
@@ -44,7 +44,7 @@
<term><parameter>array</parameter></term>
<listitem>
<para>
- The array in which elements are replace.
+ The array in which elements are replaced.
</para>
</listitem>
</varlistentry>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/functions/array-replace.xml?r1=1.2&r2=1.3&diff_format=u
Index: phpdoc/en/reference/array/functions/array-replace.xml
diff -u phpdoc/en/reference/array/functions/array-replace.xml:1.2
phpdoc/en/reference/array/functions/array-replace.xml:1.3
--- phpdoc/en/reference/array/functions/array-replace.xml:1.2 Tue Jun 23 16:44:57 2009
+++ phpdoc/en/reference/array/functions/array-replace.xml Wed Jun 24 09:20:29 2009
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<refentry xml:id="function.array-replace" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>array_replace</refname>
@@ -11,18 +11,18 @@
<type>array</type><methodname>array_replace</methodname>
<methodparam><type>array</type><parameter
role="reference">array</parameter></methodparam>
<methodparam><type>array</type><parameter
role="reference">array1</parameter></methodparam>
- <methodparam><type>array</type><parameter
role="reference">array2</parameter></methodparam>
- <methodparam><type>array</type><parameter
role="reference">...</parameter></methodparam>
+ <methodparam choice="opt"><type>array</type><parameter
role="reference">array2</parameter></methodparam>
+ <methodparam choice="opt"><type>array</type><parameter
role="reference">...</parameter></methodparam>
</methodsynopsis>
<para>
<function>array_replace</function> replaces the values of the first
<parameter>array</parameter> with the same values from all the following
arrays. If a key from the first array exists in the second array, its value
- will be replace by the value from the second array. If the key exists in the
+ will be replaced by the value from the second array. If the key exists in the
second array, and not the first, it will be created in the first array.
- If a key only exists in the first array, it will be left as is.
- If several array are passed for replacement, they will be processed
- in order, the former array overwritting the previous values.
+ If a key only exists in the first array, it will be left as is.
+ If several arrays are passed for replacement, they will be processed
+ in order, the later arrays overwriting the previous values.
</para>
<para>
<function>array_replace</function> is not recursive : it will replace
@@ -37,7 +37,7 @@
<term><parameter>array</parameter></term>
<listitem>
<para>
- The array in which elements are replace.
+ The array in which elements are replaced.
</para>
</listitem>
</varlistentry>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/array/versions.xml?r1=1.1&r2=1.2&diff_format=u
Index: phpdoc/en/reference/array/versions.xml
diff -u phpdoc/en/reference/array/versions.xml:1.1 phpdoc/en/reference/array/versions.xml:1.2
--- phpdoc/en/reference/array/versions.xml:1.1 Wed Dec 31 18:13:25 2008
+++ phpdoc/en/reference/array/versions.xml Wed Jun 24 09:20:29 2009
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
-<!-- $Revision: 1.1 $ -->
+<!-- $Revision: 1.2 $ -->
<!--
Do NOT translate this file
-->
@@ -35,6 +35,8 @@
<function name='array_push' from='PHP 4, PHP 5'/>
<function name='array_rand' from='PHP 4, PHP 5'/>
<function name='array_reduce' from='PHP 4 >= 4.0.5, PHP 5'/>
+ <function name='array_replace' from='PHP 5 >= 5.3.0'/>
+ <function name='array_replace_recursive' from='PHP 5 >= 5.3.0'/>
<function name='array_reverse' from='PHP 4, PHP 5'/>
<function name='array_search' from='PHP 4 >= 4.0.5, PHP 5'/>
<function name='array_shift' from='PHP 4, PHP 5'/>