cvs: phpdoc-da /reference/array/functions array-diff-assoc.xml array-diff-uassoc.xml array-diff-ukey.xml array-intersect-assoc.xml array-map.xml array-merge.xml array-multisort.xml array-splice.xml array-walk-recursive.xml array-walk.xml compact.xml count.xml

http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-diff-assoc.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc-da/reference/array/functions/array-diff-assoc.xml
diff -u phpdoc-da/reference/array/functions/array-diff-assoc.xml:1.2 phpdoc-da/reference/array/functions/array-diff-assoc.xml:1.3
--- phpdoc-da/reference/array/functions/array-diff-assoc.xml:1.2	Mon Nov  1 17:52:38 2004
+++ phpdoc-da/reference/array/functions/array-diff-assoc.xml	Fri Mar 25 21:32:07 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
 <!-- EN-Revision: 1.5 Maintainer: lauer Status: ready -->
   <refentry id="function.array-diff-assoc">
    <refnamediv>
@@ -18,9 +18,8 @@
     <para>
      <function>array_diff_assoc</function> returnerer et <type>array</type>
      som inderholder alle de værdier fra <parameter>array1</parameter>
-     der ikke findes i nogen af de andre angivende arrays. Bemærk at nøglerne 
-     også bruges til at tjekke for forskellige modsat 
-     <function>array_diff</function>.
+     der ikke findes i nogen af de andre angivende arrays. Bemærk, at nøglerne 
+     bliver brugt til sammenligning, modsat <function>array_diff</function>.
     </para>
     <para>
      <example>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-diff-uassoc.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc-da/reference/array/functions/array-diff-uassoc.xml
diff -u phpdoc-da/reference/array/functions/array-diff-uassoc.xml:1.2 phpdoc-da/reference/array/functions/array-diff-uassoc.xml:1.3
--- phpdoc-da/reference/array/functions/array-diff-uassoc.xml:1.2	Mon Nov  1 17:52:39 2004
+++ phpdoc-da/reference/array/functions/array-diff-uassoc.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.6 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.7 Maintainer: lauer Status: ready -->
   <refentry id="function.array-diff-uassoc">
    <refnamediv>
     <refname>array_diff_uassoc</refname>
@@ -21,9 +21,10 @@
     <para>
      <function>array_diff_uassoc</function> returnerer et <type>array</type>
      som inderholder alle de værdier fra <parameter>array1</parameter>
-     der ikke findes i nogen af de andre angivende arrays. Bemærk at nøglerne 
-     også bruges til at tjekke for forskellige modsat 
-     <function>array_diff</function>.
+     der ikke findes i nogen af de andre angivende arrays. Bemærk, at nøglerne 
+     bliver brugt til sammenligning, modsat <function>array_diff</function>.
+    </para>
+    <para>
      Denne sammenligning bliver gjort ved hjælp af en callback funktion.
      Denne funktion skal returnerer et tal mindre end, det samme som eller 
      større end nul hvis det første argument skal bestemmes til at være enten
@@ -48,6 +49,7 @@
 $array1 = array("a" => "green", "b" => "brown", "c" => "blue", "red");
 $array2 = array("a" => "green", "yellow", "red");
 $result = array_diff_uassoc($array1, $array2, "key_compare_func");
+print_r($result);
 ?>
 ]]>
       </programlisting>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-diff-ukey.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc-da/reference/array/functions/array-diff-ukey.xml
diff -u phpdoc-da/reference/array/functions/array-diff-ukey.xml:1.2 phpdoc-da/reference/array/functions/array-diff-ukey.xml:1.3
--- phpdoc-da/reference/array/functions/array-diff-ukey.xml:1.2	Mon Nov  1 17:52:39 2004
+++ phpdoc-da/reference/array/functions/array-diff-ukey.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.2 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.3 Maintainer: lauer Status: ready -->
   <refentry id="function.array-diff-ukey">
    <refnamediv>
     <refname>array_diff_ukey</refname>
@@ -66,12 +66,6 @@
       </screen>
      </example>
     </para>
-    <simpara>
-     To nøgler <emphasis>key =&gt; value</emphasis> bliver betegnet kun 
-     betegnet som ens hvis <literal>(string) $key1 === (string)
-     $key2 </literal>. Altså hvis de er ens selvom de begge bliver lavet om
-     til strenge.
-    </simpara>
     <note>
      <simpara>
       Denne funktion tjekker kun en dimension af et multidimensioneret array.
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-intersect-assoc.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc-da/reference/array/functions/array-intersect-assoc.xml
diff -u phpdoc-da/reference/array/functions/array-intersect-assoc.xml:1.1 phpdoc-da/reference/array/functions/array-intersect-assoc.xml:1.2
--- phpdoc-da/reference/array/functions/array-intersect-assoc.xml:1.1	Mon Oct 11 16:56:14 2004
+++ phpdoc-da/reference/array/functions/array-intersect-assoc.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<!-- EN-Revision: 1.7 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.8 Maintainer: lauer Status: ready -->
   <refentry id="function.array-intersect-assoc">
    <refnamediv>
     <refname>array_intersect_assoc</refname>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-map.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc-da/reference/array/functions/array-map.xml
diff -u phpdoc-da/reference/array/functions/array-map.xml:1.3 phpdoc-da/reference/array/functions/array-map.xml:1.4
--- phpdoc-da/reference/array/functions/array-map.xml:1.3	Wed Dec 22 17:08:39 2004
+++ phpdoc-da/reference/array/functions/array-map.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.14 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.15 Maintainer: lauer Status: ready -->
   <refentry id="function.array-map">
    <refnamediv>
     <refname>array_map</refname>
@@ -40,9 +40,7 @@
 ?>
 ]]>
       </programlisting>
-      <para>
-       Det får <varname>$b</varname> til at indeholde:
-      </para>
+      &example.outputs;
       <screen>
 <![CDATA[
 Array
@@ -203,8 +201,9 @@
     </para>
     <para>
      Se også <function>array_filter</function>, 
-     <function>array_reduce</function> og
-     <function>array_walk</function>.
+     <function>array_reduce</function>,
+     <function>array_walk</function> og 
+     &seealso.callback;
     </para>
    </refsect1>
   </refentry>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-merge.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc-da/reference/array/functions/array-merge.xml
diff -u phpdoc-da/reference/array/functions/array-merge.xml:1.2 phpdoc-da/reference/array/functions/array-merge.xml:1.3
--- phpdoc-da/reference/array/functions/array-merge.xml:1.2	Mon Nov  1 17:52:40 2004
+++ phpdoc-da/reference/array/functions/array-merge.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.14 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.18 Maintainer: lauer Status: ready -->
   <refentry id="function.array-merge">
    <refnamediv>
     <refname>array_merge</refname>
@@ -30,8 +30,6 @@
     <para>
      Hvis der kun er angivet at array og det array er indekseret med tal,
      vil nøglerne omindekseret med tal i stigende rækkefølge.
-     For associative arrays vil den sidste værdi blive gemt. Se eksempel fire
-     for detaljer.
     </para>
     <para>
      <example>
@@ -46,9 +44,7 @@
 ?>
 ]]>
       </programlisting>
-      <para>
-       <varname>$result</varname> bliver hermed:
-      </para>
+      &example.outputs;
       <screen role="php">
 <![CDATA[
 Array
@@ -114,48 +110,41 @@
 ]]>
       </screen>
      </example>
-     <example>
-      <title><function>array_merge</function> eksempel</title>
-      <programlisting role="php">
+    </para>
+    <warning>
+     <para>
+      Funktionen <function>array_merge</function> blev ændret i PHP 5.  
+      I modsætning til PHP 4, godtager <function>array_merge</function> nu kun
+      paramentre af typen <type>array</type>. Du kan dog tvinge sammenlægningen
+      af forskellige typer, ved at benytte dig af typecasting. Se mere på 
+      eksemplet herunder.
+     </para>
+     <para>
+      <example>
+       <title><function>array_merge</function> PHP 5 eksempel</title>
+       <programlisting role="php">
 <![CDATA[
 <?php
-$array_one = array(0 => "jay", 1 => "bob", 2 => "randal", 3 => "dante");
-$array_two = array("jay" => "bob", "randal" => "dante", "jay" => "jason");
-
-unset($array_one[2]);
-
-$result_one = array_merge($array_one);
-$result_two = array_merge($array_two);
-
-print_r($result_one);
-print_r($result_two);
+$beginning = 'foo';
+$end = array(1 => 'bar');
+$result = array_merge((array)$beginning, (array)$end);
+print_r($result);
 ?>
 ]]>
-      </programlisting>
-      &example.outputs;
-      <screen role="php">
+       </programlisting>
+       &example.outputs;
+       <screen role="php">
 <![CDATA[
 Array
 (
-    [0] => jay
-    [1] => bob
-    [2] => dante
-)
-Array
-(
-    [jay] => jason
-    [randal] => dante
+   [0] => foo
+   [1] => bar
 )
 ]]>
       </screen>
      </example>
-    </para>
-    <note>
-     <para>
-      Nøgler der er delte vil blive overskrevet så den første der kommer
-      bliver beholdt.
      </para>
-    </note>
+    </warning>
     <para>
      Se også <function>array_merge_recursive</function>,
      <function> array_combine</function> og
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-multisort.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc-da/reference/array/functions/array-multisort.xml
diff -u phpdoc-da/reference/array/functions/array-multisort.xml:1.2 phpdoc-da/reference/array/functions/array-multisort.xml:1.3
--- phpdoc-da/reference/array/functions/array-multisort.xml:1.2	Wed Dec 22 17:08:39 2004
+++ phpdoc-da/reference/array/functions/array-multisort.xml	Fri Mar 25 21:32:07 2005
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.14 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.15 Maintainer: lauer Status: ready -->
   <refentry id="function.array-multisort">
    <refnamediv>
     <refname>array_multisort</refname>
     <refpurpose>Sorterer flere eller flere-dimensionelle arrays</refpurpose>
    </refnamediv>
    <refsect1>
-    <title>Beskrivelse</title>
+    &reftitle.description;
     <methodsynopsis>
      <type>bool</type><methodname>array_multisort</methodname>
      <methodparam><type>array</type><parameter>ar1</parameter></methodparam>
@@ -274,7 +274,6 @@
       </screen>
      </example>
     </para>
-
    </refsect1>
   </refentry>
 
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-splice.xml?r1=1.2&r2=1.3&ty=u
Index: phpdoc-da/reference/array/functions/array-splice.xml
diff -u phpdoc-da/reference/array/functions/array-splice.xml:1.2 phpdoc-da/reference/array/functions/array-splice.xml:1.3
--- phpdoc-da/reference/array/functions/array-splice.xml:1.2	Thu Nov 11 17:54:51 2004
+++ phpdoc-da/reference/array/functions/array-splice.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
-<!-- EN-Revision: 1.13 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.3 $ -->
+<!-- EN-Revision: 1.15 Maintainer: lauer Status: ready -->
   <refentry id="function.array-splice">
    <refnamediv>
     <refname>array_splice</refname>
@@ -50,9 +50,11 @@
      Hvis <parameter>offset</parameter> og <parameter>length</parameter> 
      falder sammen så ingenting bliver fjernet, vil elementerne fra
      <parameter>replacement</parameter> arrayet blive indsat det sted som er 
-     angivet ved <parameter>offset</parameter>. Tip: Hvis udskifningen 
-     kun indeholder et element, er det ikke nødvendigt at sætte det ind i en 
-     <literal>array()</literal>, med mindre at elementet er et array i sig selv.
+     angivet ved <parameter>offset</parameter>. Bemærk, at nøglerne fra det 
+     angivne array ikke vil blive bevaret.
+     Hvis <parameter>replacement</parameter> kun indeholer et element, er det 
+     ikke nødvendig at indsætte det i en <literal>array()</literal>, med mindre
+     at elementet er et array i sig selv.
     </para>
     <para>
      De følgende eksempler ændre værdierne af <varname>$input</varname>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-walk-recursive.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc-da/reference/array/functions/array-walk-recursive.xml
diff -u phpdoc-da/reference/array/functions/array-walk-recursive.xml:1.3 phpdoc-da/reference/array/functions/array-walk-recursive.xml:1.4
--- phpdoc-da/reference/array/functions/array-walk-recursive.xml:1.3	Thu Nov 11 17:54:51 2004
+++ phpdoc-da/reference/array/functions/array-walk-recursive.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='iso-8859-1'?>
-<!-- $Revision: 1.3 $ -->
-<!-- EN-Revision: 1.7 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.4 $ -->
+<!-- EN-Revision: 1.8 Maintainer: lauer Status: ready -->
 <refentry id="function.array-walk-recursive">
  <refnamediv>
   <refname>array_walk_recursive</refname>
@@ -72,7 +72,7 @@
    </example>
   </para>
   <simpara>
-   Se også <function>array_walk</function>.
+   Se også <function>array_walk</function> og &seealso.callback;.
   </simpara>
  </refsect1>
 </refentry>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/array-walk.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc-da/reference/array/functions/array-walk.xml
diff -u phpdoc-da/reference/array/functions/array-walk.xml:1.4 phpdoc-da/reference/array/functions/array-walk.xml:1.5
--- phpdoc-da/reference/array/functions/array-walk.xml:1.4	Mon Dec 13 11:58:16 2004
+++ phpdoc-da/reference/array/functions/array-walk.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
-<!-- EN-Revision: 1.23 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.5 $ -->
+<!-- EN-Revision: 1.24 Maintainer: lauer Status: ready -->
   <refentry id="function.array-walk">
    <refnamediv>
     <refname>array_walk</refname>
@@ -119,8 +119,8 @@
      <function>list</function>,
      <link linkend="control-structures.foreach">foreach</link>, 
      <function>each</function>,
-     <function>call_user_func_array</function> og
-     <function>array_map</function>.
+     <function>call_user_func_array</function>,
+     <function>array_map</function> og &seealso.callback;.
     </simpara>
    </refsect1>
   </refentry>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/compact.xml?r1=1.1&r2=1.2&ty=u
Index: phpdoc-da/reference/array/functions/compact.xml
diff -u phpdoc-da/reference/array/functions/compact.xml:1.1 phpdoc-da/reference/array/functions/compact.xml:1.2
--- phpdoc-da/reference/array/functions/compact.xml:1.1	Sat Oct  9 11:19:59 2004
+++ phpdoc-da/reference/array/functions/compact.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<!-- EN-Revision: 1.7 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.2 $ -->
+<!-- EN-Revision: 1.8 Maintainer: lauer Status: ready -->
   <refentry id="function.compact">
    <refnamediv>
     <refname>compact</refname>
@@ -9,7 +9,7 @@
     </refpurpose>
    </refnamediv>
    <refsect1>
-    <title>Beskrivelse</title>
+    &reftitle.description;
      <methodsynopsis>
       <type>array</type><methodname>compact</methodname>
       <methodparam><type>mixed</type><parameter>varname</parameter></methodparam>
@@ -30,8 +30,18 @@
      Den returnerer et array med alle variabler tilføjet i sig.
     </para>
     <para>
-     Alle strenge som ikke er sat, vil blive overset.
+     Alle strenge som ikke er sat, vil blive sprunget over.
     </para>
+    <note>
+     <title>Bemærk</title>
+      <para>
+       Fordi <link linkend="language.variables.variable">variable
+       variabler</link> ikke kan bruges til at fremstille 
+       <link linkend="language.variables.superglobals">Superglobals
+       arrays</link>, Superglobal arrays skal derfor ikke køres igennem 
+       <function>compact</function>.
+      </para>
+     </note>
     <para>
      <example>
       <title><function>compact</function> eksempel</title>
http://cvs.php.net/diff.php/phpdoc-da/reference/array/functions/count.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc-da/reference/array/functions/count.xml
diff -u phpdoc-da/reference/array/functions/count.xml:1.5 phpdoc-da/reference/array/functions/count.xml:1.6
--- phpdoc-da/reference/array/functions/count.xml:1.5	Fri Nov 12 10:30:53 2004
+++ phpdoc-da/reference/array/functions/count.xml	Fri Mar 25 21:32:07 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
-<!-- EN-Revision: 1.15 Maintainer: lauer Status: ready -->
+<!-- $Revision: 1.6 $ -->
+<!-- EN-Revision: 1.17 Maintainer: lauer Status: ready -->
   <refentry id="function.count">
    <refnamediv>
     <refname>count</refname>
@@ -15,21 +15,19 @@
      </methodsynopsis>
     <para>
      Returner antallet af elementer i en <parameter>var</parameter>, hvilket 
-     ofte er et <type>array</type>. (Da alle andre typer ud over objekter,
-     kun har et element).
+     ofte er et <type>array</type>, da alle andre type kun har et element.
     </para>
     <para>
-     Ved klasser vil <function>count</function> returnere antallet af ikke 
-     statiske variabler, samtidig med at den ikke tager hensyn til om variablen
-     er synlig eller ej. Hvis du har <link linkend="ref.spl">SPL</link> 
-     installeret, kan du gå ind og påvirke <function>count</function> ved at 
+     Ved klasser vil du, hvis du har <link linkend="ref.spl">SPL</link> 
+     installeret, kunne gå ind og påvirke <function>count</function> ved at 
      laver et interface der hedder <literal>Countable</literal>. Det interface
      skal kun have en metode, <function>count</function>, hvilket returnere
      værdien i stedet for den værdi den almindelige <function>count</function> 
      ville gøre.
     </para>
     <para>
-     Hvis <parameter>var</parameter> ikke er et array eller klasse vil 
+     Hvis <parameter>var</parameter> ikke er et array eller klasse med et 
+     <literal>Countable</literal> interface, vil 
      <literal>1</literal> blive returneret. Der er en undtagelse, hvilket
      er hvis <parameter>var</parameter> er &null;, da funktionen så vil 
      returnere <literal>0</literal>.
@@ -77,19 +75,13 @@
 $b[5]  = 9;
 $b[10] = 11;
 $result = count($b);
-// $result == 3;
+// $result == 3
 
 $result = count(null);
-// $result == 0;
+// $result == 0
 
 $result = count(false);
-// $result == 1;
-
-$obj = new StdClass;
-$obj->foo = 'A property';
-$obj->bar = 'Another property';
-$result = count($obj);
-// $result == 2;
+// $result == 1
 ?>
 ]]>
       </programlisting>
@@ -110,7 +102,7 @@
 echo count($food, COUNT_RECURSIVE);  // output 8
 
 // normal count
-echo count($food);                  // output 2
+echo count($food); // output 2
 
 ?>
 ]]>