cvs: phpdoc-sk /reference/array/functions array-intersect-assoc.xml array-key-exists.xml array-merge.xml array-multisort.xml array-search.xml array-splice.xml

http://cvs.php.net/diff.php/phpdoc-sk/reference/array/functions/array-intersect-assoc.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc-sk/reference/array/functions/array-intersect-assoc.xml
diff -u phpdoc-sk/reference/array/functions/array-intersect-assoc.xml:1.3 phpdoc-sk/reference/array/functions/array-intersect-assoc.xml:1.4
--- phpdoc-sk/reference/array/functions/array-intersect-assoc.xml:1.3	Wed Feb 11 19:17:07 2004
+++ phpdoc-sk/reference/array/functions/array-intersect-assoc.xml	Mon Jul 19 19:56:56 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
-<!-- EN-Revision: 1.5 Maintainer: joseph Status: ready -->
+<!-- EN-Revision: 1.6 Maintainer: joseph Status: ready -->
   <refentry id="function.array-intersect-assoc">
    <refnamediv>
     <refname>array_intersect_assoc</refname>
http://cvs.php.net/diff.php/phpdoc-sk/reference/array/functions/array-key-exists.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc-sk/reference/array/functions/array-key-exists.xml
diff -u phpdoc-sk/reference/array/functions/array-key-exists.xml:1.4 phpdoc-sk/reference/array/functions/array-key-exists.xml:1.5
--- phpdoc-sk/reference/array/functions/array-key-exists.xml:1.4	Wed Feb 11 19:17:07 2004
+++ phpdoc-sk/reference/array/functions/array-key-exists.xml	Mon Jul 19 19:56:56 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
-<!-- EN-Revision: 1.7 Maintainer: joseph Status: ready -->
+<!-- EN-Revision: 1.8 Maintainer: joseph Status: ready -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.119 -->
   <refentry id="function.array-key-exists">
    <refnamediv>
@@ -36,7 +36,7 @@
     </para>
     <note>
      <simpara>
-      V PHP verzií 4.0.6 sa táto funkcia nazýva <function>key_exists</function>.
+      V PHP 4.0.6 sa táto funkcia nazýva <function>key_exists</function>.
      </simpara>
     </note>
     <para>
http://cvs.php.net/diff.php/phpdoc-sk/reference/array/functions/array-merge.xml?r1=1.5&r2=1.6&ty=u
Index: phpdoc-sk/reference/array/functions/array-merge.xml
diff -u phpdoc-sk/reference/array/functions/array-merge.xml:1.5 phpdoc-sk/reference/array/functions/array-merge.xml:1.6
--- phpdoc-sk/reference/array/functions/array-merge.xml:1.5	Wed Feb 11 19:17:07 2004
+++ phpdoc-sk/reference/array/functions/array-merge.xml	Mon Jul 19 19:56:56 2004
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
-<!-- EN-Revision: 1.12 Maintainer: joseph Status: ready -->
+<!-- EN-Revision: 1.13 Maintainer: joseph Status: ready -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-merge">
    <refnamediv>
     <refname>array_merge</refname>
-    <refpurpose>Spojí dve alebo viacero polí</refpurpose>
+    <refpurpose>Spojí jedno alebo viac polí</refpurpose>
    </refnamediv>
    <refsect1>
     <title>Popis</title>
      <methodsynopsis>
       <type>array</type><methodname>array_merge</methodname>
       <methodparam><type>array</type><parameter>pole1</parameter></methodparam>
-      <methodparam><type>array</type><parameter>pole2</parameter></methodparam>
+      <methodparam choice="opt"><type>array</type><parameter>pole2</parameter></methodparam>
       <methodparam choice="opt"><type>array</type><parameter>...</parameter></methodparam>
      </methodsynopsis>
     <para>
@@ -26,6 +26,11 @@
      hodnotu, ale pripojí sa k nej.
     </para>
     <para>
+     Ak je dané iba jedno pole a pole je indexované numericky, kµúèe
+     sa preindexujú súvislým spôsobom. Pre asociatívne polia, duplikátne
+     polo¾ky sa spoja do posledného. Pozrite si príklad tri pre detaily.
+    </para>
+    <para>
      <example>
       <title><function>array_merge</function> príklad</title>
       <programlisting role="php">
@@ -101,6 +106,43 @@
 Array
 (
     [1] => data
+)
+]]>
+      </screen>
+     </example>
+      <example>
+      <title><function>array_merge</function> príklad</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);
+?>
+]]>
+      </programlisting>
+      <para>
+       Výstup je: 
+      </para>
+      <screen role="php">
+<![CDATA[
+Array
+(
+    [0] => jay
+    [1] => bob
+    [2] => dante
+)
+Array
+(
+    [jay] => jason
+    [randal] => dante
 )
 ]]>
       </screen>
http://cvs.php.net/diff.php/phpdoc-sk/reference/array/functions/array-multisort.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc-sk/reference/array/functions/array-multisort.xml
diff -u phpdoc-sk/reference/array/functions/array-multisort.xml:1.4 phpdoc-sk/reference/array/functions/array-multisort.xml:1.5
--- phpdoc-sk/reference/array/functions/array-multisort.xml:1.4	Wed Feb 11 19:17:07 2004
+++ phpdoc-sk/reference/array/functions/array-multisort.xml	Mon Jul 19 19:56:56 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
-<!-- EN-Revision: 1.7 Maintainer: joseph Status: ready -->
+<!-- EN-Revision: 1.10 Maintainer: joseph Status: ready -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.11 -->
   <refentry id="function.array-multisort">
    <refnamediv>
@@ -18,7 +18,8 @@
     <para>
      <function>array_multisort</function> sa mô¾e pou¾i» na triedenie
      niekoµkých polí naraz alebo multi-dimenzionálne pole podµa jednej
-     z viacerých dimenzií. Pri triedení sa zachováva asociácia kµúèov.
+     z viacerých dimenzií. Poèas reindexovania numerických kµúèov sa
+     sa asociatívne (re»azcové) kµúèe zachovajú.
     </para>
     <para>
      Vstupné polia sa spracujú ako ståpce tabuµky, ktorá sa má triedi»
@@ -37,32 +38,32 @@
      Návesti smeru zoradenia:
      <itemizedlist>
       <listitem>
-       <simpara>SORT_ASC - zoradi» vzostupne</simpara>
+       <simpara><constant>SORT_ASC</constant> - zoradi» vzostupne</simpara>
       </listitem>
       <listitem>
-       <simpara>SORT_DESC - zoradi» zostupne</simpara>
+       <simpara><constant>SORT_DESC</constant> - zoradi» zostupne</simpara>
       </listitem>
      </itemizedlist>
     </para>
     <para>
-     Návesti typov zoradenia:
+     Návestia typov zoradenia:
      <itemizedlist>
       <listitem>
-       <simpara>SORT_REGULAR - porovnáva» polo¾ky normálne</simpara>
+       <simpara><constant>SORT_REGULAR</constant> - porovnáva» polo¾ky normálne</simpara>
       </listitem>
       <listitem>
-       <simpara>SORT_NUMERIC - porovnáva» polo¾ky èíselné</simpara>
+       <simpara><constant>SORT_NUMERIC</constant> - porovnáva» polo¾ky èíselné</simpara>
       </listitem>
       <listitem>
-       <simpara>SORT_STRING - porovnáva» polo¾ky ako re»azce</simpara>
+       <simpara><constant>SORT_STRING</constant> - porovnáva» polo¾ky ako re»azce</simpara>
       </listitem>
      </itemizedlist>
     </para>
     <para>
      Po ka¾dom poli mô¾te ¹pecifikova» jednu náves» ka¾dého typu.
-     Trediace návesti ¹pecifikované po argumente poµa sa aplikujú
-     iba na toto pole - pred ka¾dým novým argumentom poµa sa resetujú
-     na defaultné ORT_ASC a SORT_REGULAR.
+     Trediace návesti ¹pecifikované po argumente poµa sa aplikujú iba na
+     toto pole - pred ka¾dým novým argumentom poµa sa resetujú na defaultné
+     <constant>ORT_ASC</constant> a <constant>SORT_REGULAR</constant>.
     </para>
     <para>
      &return.success;
http://cvs.php.net/diff.php/phpdoc-sk/reference/array/functions/array-search.xml?r1=1.3&r2=1.4&ty=u
Index: phpdoc-sk/reference/array/functions/array-search.xml
diff -u phpdoc-sk/reference/array/functions/array-search.xml:1.3 phpdoc-sk/reference/array/functions/array-search.xml:1.4
--- phpdoc-sk/reference/array/functions/array-search.xml:1.3	Wed Feb 11 19:17:07 2004
+++ phpdoc-sk/reference/array/functions/array-search.xml	Mon Jul 19 19:56:56 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
-<!-- EN-Revision: 1.8 Maintainer: joseph Status: ready -->
+<!-- EN-Revision: 1.9 Maintainer: joseph Status: ready -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.array-search">
    <refnamediv>
@@ -30,7 +30,7 @@
     <note>
      <para>
       Pred PHP 4.2.0, <function>array_search</function> pri chybe
-      vracala <constant>NULL</constant> namiesto &false;.
+      vracala &null; namiesto &false;.
      </para>
     </note>
     <para>
http://cvs.php.net/diff.php/phpdoc-sk/reference/array/functions/array-splice.xml?r1=1.4&r2=1.5&ty=u
Index: phpdoc-sk/reference/array/functions/array-splice.xml
diff -u phpdoc-sk/reference/array/functions/array-splice.xml:1.4 phpdoc-sk/reference/array/functions/array-splice.xml:1.5
--- phpdoc-sk/reference/array/functions/array-splice.xml:1.4	Wed Feb 11 19:17:07 2004
+++ phpdoc-sk/reference/array/functions/array-splice.xml	Mon Jul 19 19:56:56 2004
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-2"?>
-<!-- EN-Revision: 1.9 Maintainer: joseph Status: ready -->
+<!-- EN-Revision: 1.10 Maintainer: joseph Status: ready -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.14 -->
   <refentry id="function.array-splice">
    <refnamediv>
@@ -83,7 +83,7 @@
         array_shift($vstup)
        </entry>
        <entry>
-        array_splice($vstup, -1)
+        array_splice($vstup, 0, 1)
        </entry>
       </row>
       <row>