cvs: phpdoc-ru /reference/array/functions array-merge.xml
| From: | Antony Dovgal | Date: | Sun, 27 Mar 2005 17:28:56 +0000 |
| Subject: | cvs: phpdoc-ru /reference/array/functions array-merge.xml | ||
| Groups: | php.doc.ru | ||
| Request: | Send a blank email to doc-ru+get-657@lists.php.net to get a copy of this message | ||
tony2001 Sun Mar 27 12:28:56 2005 EDT
Modified files:
/phpdoc-ru/reference/array/functions array-merge.xml
Log:
make test before commit! =)
http://cvs.php.net/diff.php/phpdoc-ru/reference/array/functions/array-merge.xml?r1=1.6&r2=1.7&ty=u
Index: phpdoc-ru/reference/array/functions/array-merge.xml
diff -u phpdoc-ru/reference/array/functions/array-merge.xml:1.6
phpdoc-ru/reference/array/functions/array-merge.xml:1.7
--- phpdoc-ru/reference/array/functions/array-merge.xml:1.6 Sun Mar 27 12:20:54 2005
+++ phpdoc-ru/reference/array/functions/array-merge.xml Sun Mar 27 12:28:55 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- EN-Revision: 1.18 Maintainer: tronic Status: ready -->
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.array-merge">
<refnamediv>
@@ -41,9 +41,8 @@
print_r($result);
]]>
</programlisting>
- <para>
&example.outputs;
- <screen role="php">
+ <screen role="php">
<![CDATA[
Array
(
@@ -56,8 +55,7 @@
[4] => 4
)
]]>
- </screen>
- </para>
+ </screen>
</example>
</para>
<para>