cvs: /phpdoc/functions array.sgml
| From: | Egon Schmid | Date: | Fri, 16 Jul 1999 18:49:12 +0000 |
| Subject: | cvs: /phpdoc/functions array.sgml | ||
| Groups: | php.dev | ||
| Request: | Send a blank email to php-dev+get-8634@lists.php.net to get a copy of this message | ||
eschmid Fri Jul 16 18:49:12 1999 EDT
Modified files:
/phpdoc/functions array.sgml
Log:
Andrey, I will look tomorrow to it.
Index: phpdoc/functions/array.sgml
diff -u phpdoc/functions/array.sgml:1.14 phpdoc/functions/array.sgml:1.15
--- phpdoc/functions/array.sgml:1.14 Fri Jul 16 18:30:38 1999
+++ phpdoc/functions/array.sgml Fri Jul 16 18:49:11 1999
@@ -304,9 +304,11 @@
<paramdef>array <parameter>input</parameter></paramdef>
<paramdef>int <parameter>offset</parameter></paramdef>
<paramdef>int
- <parameter><optional>length</optional></parameter></paramdef>
+ <parameter><optional>length</optional></parameter>
+ </paramdef>
<paramdef>array
-
<parameter><optional>replacement</optional></parameter></paramdef>
+ <parameter><optional>replacement</optional></parameter>
+ </paramdef>
</funcsynopsis>
<para>
@@ -408,7 +410,7 @@
$array2 = array("a", "b", "color" => "green",
"shape" => "trapezoid");
array_merge($array1, $array2);
</programlisting>
-
+ <para>
Resulting array will be array("color" => "green", 2, 4, "a",
"b", "shape" => "trapezoid").
</example>
@@ -478,6 +480,7 @@
</example>
<note>
+ <para>
This function was added in PHP 4.0.
</note>
</refsect1>