[PHP-DOC] cvs: phpdoc /de Translators /it/functions array.xml From: Egon Schmid (eschmid <email protected>)
Date: 07/03/00

eschmid Mon Jul 3 09:39:12 2000 EDT

  Modified files:
    /phpdoc/it/functions array.xml
    /phpdoc/de Translators
  Log:
  Updated the Italian manual.
  
Index: phpdoc/it/functions/array.xml
diff -u phpdoc/it/functions/array.xml:1.4 phpdoc/it/functions/array.xml:1.5
--- phpdoc/it/functions/array.xml:1.4 Sun Jul 2 02:37:08 2000
+++ phpdoc/it/functions/array.xml Mon Jul 3 09:39:12 2000
@@ -190,22 +190,22 @@
      the end of the previous one. It returns the resulting array.
     </para>
     <para>
- If the input arrays had the same string keys, then the later
- value for that key will overwrite previous one. If, however, the
- arrays have the same numeric key, this does not happen since the
- values are appended.
+ If the input arrays have the same string keys, then the later
+ value for that key will overwrite the previous one. If, however,
+ the arrays have the same numeric key, the later value will not
+ overwrite the original value, but will be appended.
     </para>
     <para>
      <example>
       <title><function>array_merge</function> example</title>
       <programlisting role="php">
 $array1 = array ("color" => "red", 2, 4);
-$array2 = array ("a", "b", "color" => "green", "shape" => "trapezoid");
+$array2 = array ("a", "b", "color" => "green", "shape" => "trapezoid", 4);
 array_merge ($array1, $array2);
       </programlisting>
       <para>
        Resulting array will be array("color" => "green", 2, 4, "a",
- "b", "shape" => "trapezoid").
+ "b", "shape" => "trapezoid", 4).
       </para>
      </example>
      <note>
@@ -540,7 +540,7 @@
      </funcprototype>
     </funcsynopsis>
     <para>
- <function>array_splice</function> removed the elements designated
+ <function>array_splice</function> removes the elements designated
      by <parameter>offset</parameter> and
      <parameter>length</parameter> from the
      <parameter>input</parameter> array, and replaces them with the
@@ -813,8 +813,9 @@
       <programlisting role="php">
 $fruits = array ("d"=>"lemon", "a"=>"orange", "b"=>"banana", "c"=>"apple");
 arsort ($fruits);
-for (reset ($fruits); $key = key ($fruits); next ($fruits)) {
- echo "fruits[$key] = ".$fruits[$key]."\n";
+reset($fruits);
+while(list($key,$val)=each($fruits)) {
+ echo "$key = $val\n";
 }
       </programlisting>
      </example>
@@ -858,8 +859,9 @@
       <programlisting role="php">
 $fruits = array ("d"=>"lemon", "a"=>"orange", "b"=>"banana", "c"=>"apple");
 asort ($fruits);
-for (reset ($fruits); $key = key ($fruits); next ($fruits)) {
- echo "fruits[$key] = ".$fruits[$key]."\n";
+reset($fruits);
+while(list($key,$val)=each($fruits)) {
+ echo "$key = $val\n";
 }
       </programlisting>
      </example>
@@ -1360,8 +1362,9 @@
       <programlisting role="php">
 $fruits = array ("d"=>"lemon", "a"=>"orange", "b"=>"banana", "c"=>"apple");
 krsort ($fruits);
-for (reset ($fruits); $key = key ($fruits); next ($fruits)) {
- echo "fruits[$key] = ".$fruits[$key]."\n";
+reset($fruits);
+while(list($key,$val)=each($fruits)) {
+ echo "$key -> $val\n";
 }
       </programlisting>
      </example>
@@ -1402,8 +1405,9 @@
       <programlisting role="php">
 $fruits = array ("d"=>"lemon", "a"=>"orange", "b"=>"banana", "c"=>"apple");
 ksort ($fruits);
-for (reset ($fruits); $key = key ($fruits); next ($fruits)) {
- echo "fruits[$key] = ".$fruits[$key]."\n";
+reset($fruits);
+while(list($key,$val)=each($fruits)) {
+ echo "$key -> $val\n";
 }
       </programlisting>
      </example>
@@ -1656,8 +1660,9 @@
         <programlisting role="php">
 $fruits = array ("lemon", "orange", "banana", "apple");
 rsort ($fruits);
-for (reset ($fruits); list ($key, $value) = each ($fruits); ) {
- echo "fruits[$key] = ", $value, "\n";
+reset($fruits);
+while(list($key,$val)=each($fruits)) {
+ echo "$key -> $val\n";
 }
       </programlisting>
      </example>
@@ -1757,8 +1762,9 @@
         <programlisting role="php">
 $fruits = array ("lemon", "orange", "banana", "apple");
 sort ($fruits);
-for (reset ($fruits); $key = key ($fruits); next ($fruits)) {
- echo "fruits[$key] = ".$fruits[$key]."\n";
+reset($fruits);
+while(list($key,$val)=each($fruits)) {
+ echo "$key -> $val\n";
 }
       </programlisting>
      </example>
Index: phpdoc/de/Translators
diff -u phpdoc/de/Translators:1.88 phpdoc/de/Translators:1.89
--- phpdoc/de/Translators:1.88 Mon Jun 26 22:32:53 2000
+++ phpdoc/de/Translators Mon Jul 3 09:39:12 2000
@@ -42,7 +42,7 @@
 ------- functions -----------------------------------------------------------
 adabas.xml Johann-Peter Hartmann fertig
 apache.xml Johann-Peter Hartmann fertig
-array.xml Michael Kaiser in Arbeit
+array.xml Michael Kaiser in Arbeit + Änderungen
 aspell.xml Uwe Steinmann fertig
 bc.xml Uwe Steinmann fertig
 calendar.xml Hartmut Holzgraefe fertig