[PHP-DOC] cvs: phpdoc /en language-snippets.ent /en/reference/array/functions rsort.xml shuffle.xml sort.xml usort.xml

[Dan Scott]

dbs             Wed Aug 24 10:15:12 2005 EDT

  Modified files:              
    /phpdoc/en  language-snippets.ent 
    /phpdoc/en/reference/array/functions        rsort.xml shuffle.xml sort.xml 
                                                usort.xml 
  Log:
  Fix bug 34228 (rsort should link to krsort).
  Fix bug 34229 (shuffle and other sort functions clobber key associations).
  
  
http://cvs.php.net/diff.php/phpdoc/en/language-snippets.ent?r1=1.153&r2=1.154&ty=u
Index: phpdoc/en/language-snippets.ent
diff -u phpdoc/en/language-snippets.ent:1.153 
phpdoc/en/language-snippets.ent:1.154
--- phpdoc/en/language-snippets.ent:1.153       Wed Aug  3 16:28:11 2005
+++ phpdoc/en/language-snippets.ent     Wed Aug 24 10:15:11 2005
@@ -1,4 +1,4 @@
-<!-- $Revision: 1.153 $ -->
+<!-- $Revision: 1.154 $ -->
 <!-- Keep 'em sorted -->
 
 
@@ -37,6 +37,11 @@
 <!ENTITY note.not-bin-safe '<warning><simpara>This function
 is not (yet) binary safe!</simpara></warning>'>
 
+<!ENTITY note.no-key-association '<note><simpara>This function
+assigns new keys for the elements in <parameter>array</parameter>.
+It will remove any existing keys you may have assigned, rather
+than just reordering the keys.</simpara></note>'>
+
 <!ENTITY note.no-windows '<note><simpara>This function is not
 implemented on Windows platforms.</simpara></note>'>
 
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/rsort.xml?r1=1.12&r2=1.13&ty=u
Index: phpdoc/en/reference/array/functions/rsort.xml
diff -u phpdoc/en/reference/array/functions/rsort.xml:1.12 
phpdoc/en/reference/array/functions/rsort.xml:1.13
--- phpdoc/en/reference/array/functions/rsort.xml:1.12  Fri Jul  1 09:07:46 2005
+++ phpdoc/en/reference/array/functions/rsort.xml       Wed Aug 24 10:15:11 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.12 $ -->
+<!-- $Revision: 1.13 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.rsort">
    <refnamediv>
@@ -16,6 +16,7 @@
     <para>
      This function sorts an array in reverse order (highest to lowest).
     </para>
+    &note.no-key-association;
     <para>
      &return.success;
     </para>
@@ -55,6 +56,7 @@
     <para>
      See also <function>arsort</function>,
      <function>asort</function>, <function>ksort</function>,
+     <function>krsort</function>,
      <function>sort</function>, and <function>usort</function>.
     </para>
    </refsect1>
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/shuffle.xml?r1=1.13&r2=1.14&ty=u
Index: phpdoc/en/reference/array/functions/shuffle.xml
diff -u phpdoc/en/reference/array/functions/shuffle.xml:1.13 
phpdoc/en/reference/array/functions/shuffle.xml:1.14
--- phpdoc/en/reference/array/functions/shuffle.xml:1.13        Fri Jul  1 
09:07:46 2005
+++ phpdoc/en/reference/array/functions/shuffle.xml     Wed Aug 24 10:15:11 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.13 $ -->
+<!-- $Revision: 1.14 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.shuffle">
    <refnamediv>
@@ -15,6 +15,9 @@
     <para>
      This function shuffles (randomizes the order of the elements in)
      an array. 
+    </para>
+    &note.no-key-association;
+    <para>
      <example>
       <title><function>shuffle</function> example</title>
       <programlisting role="php">
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/sort.xml?r1=1.21&r2=1.22&ty=u
Index: phpdoc/en/reference/array/functions/sort.xml
diff -u phpdoc/en/reference/array/functions/sort.xml:1.21 
phpdoc/en/reference/array/functions/sort.xml:1.22
--- phpdoc/en/reference/array/functions/sort.xml:1.21   Fri Jul  1 09:07:46 2005
+++ phpdoc/en/reference/array/functions/sort.xml        Wed Aug 24 10:15:11 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.21 $ -->
+<!-- $Revision: 1.22 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.sort">
    <refnamediv>
@@ -17,13 +17,7 @@
      This function sorts an array.  Elements will be arranged from
      lowest to highest when this function has completed.
     </para>
-    <note>
-     <simpara>
-      This function assigns new keys for the elements in 
-      <parameter>array</parameter>. It will remove any existing
-      keys you may have assigned, rather than just reordering the keys.
-     </simpara>
-    </note>
+    &note.no-key-association;
     <para>
      &return.success;
     </para>
@@ -94,6 +88,7 @@
     <para>
      See also <function>arsort</function>,
      <function>asort</function>, <function>ksort</function>,
+     <function>krsort</function>, 
      <function>natsort</function>, <function>natcasesort</function>,
      <function>rsort</function>, <function>usort</function>,
      <function>array_multisort</function>, and
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/usort.xml?r1=1.22&r2=1.23&ty=u
Index: phpdoc/en/reference/array/functions/usort.xml
diff -u phpdoc/en/reference/array/functions/usort.xml:1.22 
phpdoc/en/reference/array/functions/usort.xml:1.23
--- phpdoc/en/reference/array/functions/usort.xml:1.22  Fri Jul  1 09:07:47 2005
+++ phpdoc/en/reference/array/functions/usort.xml       Wed Aug 24 10:15:11 2005
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.22 $ -->
+<!-- $Revision: 1.23 $ -->
 <!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
   <refentry id="function.usort">
    <refnamediv>
@@ -37,6 +37,7 @@
       </para>
      </note>
     </para>
+    &note.no-key-association;
     <para>
      &return.success;
     </para>