dams Tue May 4 15:56:19 2004 EDT
Modified files:
/phpdoc/en/reference/array/functions array-multisort.xml
array-search.xml each.xml
sort.xml usort.xml
Log:
added constanst, literal and varname tags for cosmetic update
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-multisort.xml?r1=1.9&r2=1.10&ty=u
Index: phpdoc/en/reference/array/functions/array-multisort.xml
diff -u phpdoc/en/reference/array/functions/array-multisort.xml:1.9
phpdoc/en/reference/array/functions/array-multisort.xml:1.10
--- phpdoc/en/reference/array/functions/array-multisort.xml:1.9 Wed Mar 31 03:15:11
2004
+++ phpdoc/en/reference/array/functions/array-multisort.xml Tue May 4 15:56:18
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.9 $ -->
+<!-- $Revision: 1.10 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.11 -->
<refentry id="function.array-multisort">
<refnamediv>
@@ -38,10 +38,10 @@
Sorting order flags:
<itemizedlist>
<listitem>
- <simpara>SORT_ASC - sort in ascending order</simpara>
+ <simpara><constant>SORT_ASC</constant> - sort in ascending order</simpara>
</listitem>
<listitem>
- <simpara>SORT_DESC - sort in descending order</simpara>
+ <simpara><constant>SORT_DESC</constant> - sort in descending order</simpara>
</listitem>
</itemizedlist>
</para>
@@ -49,21 +49,21 @@
Sorting type flags:
<itemizedlist>
<listitem>
- <simpara>SORT_REGULAR - compare items normally</simpara>
+ <simpara><constant>SORT_REGULAR</constant> - compare items normally</simpara>
</listitem>
<listitem>
- <simpara>SORT_NUMERIC - compare items numerically</simpara>
+ <simpara><constant>SORT_NUMERIC</constant> - compare items
numerically</simpara>
</listitem>
<listitem>
- <simpara>SORT_STRING - compare items as strings</simpara>
+ <simpara><constant>SORT_STRING</constant> - compare items as strings</simpara>
</listitem>
</itemizedlist>
</para>
<para>
No two sorting flags of the same type can be specified after each
array. The sorting flags specified after an array argument apply
- only to that array - they are reset to default SORT_ASC and
- SORT_REGULAR before each new array argument.
+ only to that array - they are reset to default <constant>SORT_ASC</constant> and
+ <constant>SORT_REGULAR</constant> before each new array argument.
</para>
<para>
&return.success;
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/array-search.xml?r1=1.8&r2=1.9&ty=u
Index: phpdoc/en/reference/array/functions/array-search.xml
diff -u phpdoc/en/reference/array/functions/array-search.xml:1.8
phpdoc/en/reference/array/functions/array-search.xml:1.9
--- phpdoc/en/reference/array/functions/array-search.xml:1.8 Thu Jan 1 01:44:47
2004
+++ phpdoc/en/reference/array/functions/array-search.xml Tue May 4 15:56:18
2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.array-search">
<refnamediv>
@@ -31,7 +31,7 @@
<note>
<para>
Prior to PHP 4.2.0, <function>array_search</function> returns
- <constant>NULL</constant> on failure instead of &false;.
+ &null; on failure instead of &false;.
</para>
</note>
<para>
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/each.xml?r1=1.13&r2=1.14&ty=u
Index: phpdoc/en/reference/array/functions/each.xml
diff -u phpdoc/en/reference/array/functions/each.xml:1.13
phpdoc/en/reference/array/functions/each.xml:1.14
--- phpdoc/en/reference/array/functions/each.xml:1.13 Mon Dec 15 11:47:04 2003
+++ phpdoc/en/reference/array/functions/each.xml Tue May 4 15:56:18 2004
@@ -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.each">
<refnamediv>
@@ -19,12 +19,12 @@
Returns the current key and value pair from the array
<parameter>array</parameter> and advances the array cursor. This
pair is returned in a four-element array, with the keys
- <emphasis>0</emphasis>, <emphasis>1</emphasis>,
- <emphasis>key</emphasis>, and
- <emphasis>value</emphasis>. Elements <emphasis>0</emphasis> and
- <emphasis>key</emphasis> contain the key name of the array
- element, and <emphasis>1</emphasis> and
- <emphasis>value</emphasis> contain the data.
+ <literal>0</literal>, <literal>1</literal>,
+ <literal>key</literal>, and
+ <literal>value</literal>. Elements <literal>0</literal> and
+ <literal>key</literal> contain the key name of the array
+ element, and <literal>1</literal> and
+ <literal>value</literal> contain the data.
</para>
<para>
If the internal pointer for the array points past the end of the
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/sort.xml?r1=1.10&r2=1.11&ty=u
Index: phpdoc/en/reference/array/functions/sort.xml
diff -u phpdoc/en/reference/array/functions/sort.xml:1.10
phpdoc/en/reference/array/functions/sort.xml:1.11
--- phpdoc/en/reference/array/functions/sort.xml:1.10 Thu Jan 1 17:59:00 2004
+++ phpdoc/en/reference/array/functions/sort.xml Tue May 4 15:56:18 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.sort">
<refnamediv>
@@ -68,13 +68,13 @@
Sorting type flags:
<itemizedlist>
<listitem>
- <simpara>SORT_REGULAR - compare items normally</simpara>
+ <simpara><constant>SORT_REGULAR</constant> - compare items normally</simpara>
</listitem>
<listitem>
- <simpara>SORT_NUMERIC - compare items numerically</simpara>
+ <simpara><constant>SORT_NUMERIC</constant> - compare items
numerically</simpara>
</listitem>
<listitem>
- <simpara>SORT_STRING - compare items as strings</simpara>
+ <simpara><constant>SORT_STRING</constant> - compare items as strings</simpara>
</listitem>
</itemizedlist>
</para>
http://cvs.php.net/diff.php/phpdoc/en/reference/array/functions/usort.xml?r1=1.17&r2=1.18&ty=u
Index: phpdoc/en/reference/array/functions/usort.xml
diff -u phpdoc/en/reference/array/functions/usort.xml:1.17
phpdoc/en/reference/array/functions/usort.xml:1.18
--- phpdoc/en/reference/array/functions/usort.xml:1.17 Thu Jan 15 07:42:01 2004
+++ phpdoc/en/reference/array/functions/usort.xml Tue May 4 15:56:18 2004
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.17 $ -->
+<!-- $Revision: 1.18 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.usort">
<refnamediv>
@@ -110,8 +110,8 @@
]]>
</programlisting>
<para>
- When sorting a multi-dimensional array, $a and $b contain
- references to the first index of the array.
+ When sorting a multi-dimensional array, <varname>$a</varname> and
+ <varname>$b</varname> contain references to the first index of the array.
</para>
<para>
This example would display:
