leszek Tue Mar 8 02:09:34 2005 EDT
Modified files: /phpdoc/en/reference/array/functions array-merge.xml Log: - &example.outputs; http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-merge.xml?r1=1.16&r2=1.17&ty=u Index: phpdoc/en/reference/array/functions/array-merge.xml diff -u phpdoc/en/reference/array/functions/array-merge.xml:1.16 phpdoc/en/reference/array/functions/array-merge.xml:1.17 --- phpdoc/en/reference/array/functions/array-merge.xml:1.16 Wed Feb 16 10:27:02 2005 +++ phpdoc/en/reference/array/functions/array-merge.xml Tue Mar 8 02:09:33 2005 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="iso-8859-1"?> -<!-- $Revision: 1.16 $ --> +<!-- $Revision: 1.17 $ --> <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 --> <refentry id="function.array-merge"> <refnamediv> @@ -43,9 +43,7 @@ ?> ]]> </programlisting> - <para> - The <varname>$result</varname> is: - </para> + &example.outputs; <screen role="php"> <![CDATA[ Array