manuzhai Fri Jan 10 17:22:40 2003 EDT
Modified files:
/phpdoc/en/reference/array/functions array-diff-assoc.xml
array-diff.xml
array-intersect-assoc.xml
array-intersect.xml
Log:
See also consistence.
Index: phpdoc/en/reference/array/functions/array-diff-assoc.xml
diff -u phpdoc/en/reference/array/functions/array-diff-assoc.xml:1.1
phpdoc/en/reference/array/functions/array-diff-assoc.xml:1.2
--- phpdoc/en/reference/array/functions/array-diff-assoc.xml:1.1 Thu Nov 14
19:14:32 2002
+++ phpdoc/en/reference/array/functions/array-diff-assoc.xml Fri Jan 10 17:22:39
+2003
@@ -1,94 +1,95 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
-<!-- splitted from ./en/functions/array.xml, last change in rev 1.14 -->
- <refentry id="function.array-diff-assoc">
- <refnamediv>
- <refname>array_diff_assoc</refname>
- <refpurpose>Computes the difference of arrays with additional index
check</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Description</title>
- <methodsynopsis>
- <type>array</type><methodname>array_diff_assoc</methodname>
- <methodparam><type>array</type><parameter>array1</parameter></methodparam>
- <methodparam><type>array</type><parameter>array2</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>
...</parameter></methodparam>
- </methodsynopsis>
- <para>
- <function>array_diff_assoc</function> returns an <type>array</type>
- containing all the values from <parameter>array1</parameter>
- that are not present in any of the other arguments.
- Note that the keys are used in the comparison unlike
- <function>array_diff</function>.
- </para>
- <para>
- <example>
- <title><function>array_diff_assoc</function> example</title>
- <programlisting role="php">
-<![CDATA[
-<?php
-$array1 = array ("a" => "green", "b" => "brown", "c" => "blue", "red");
-$array2 = array ("a" => "green", "yellow", "red");
-$result = array_diff_assoc ($array1, $array2);
-
-/* The result is:
-Array
-(
- [b] => brown
- [c] => blue
- [0] => red
-)
-*/
-?>
-]]>
- </programlisting>
- </example>
- </para>
- <simpara>
- In our example above you see the <literal>"a" => "green"</literal>
- pair is present in both arrays and thus it is not in the ouput from the
- function. Unlike this, the pair <literal>0 => "red"</literal>
- is in the ouput because in the second argument <literal>"red"</literal>
- has key which is <literal>1</literal>.
- </simpara>
- <simpara>
- Two values from <emphasis>key => value</emphasis> pairs are
- considered equal only if <literal>(string) $elem1 === (string)
- $elem2 </literal>. In other words a strict check takes place so
- the string representations must be the same.
- <!-- TODO: example of it... -->
- </simpara>
- <note>
- <simpara>
- Please note that this function only checks one dimension of a n-dimensional
- array. Of course you can check deeper dimensions by using, for example,
- <literal>array_diff_assoc($array1[0], $array2[0]);</literal>.
- </simpara>
- </note>
- <para>
- See also <function>array_diff</function>, <function>array_intersect</function>,
- and <function>array_intersect_assoc</function>.
- </para>
- </refsect1>
- </refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"../../../../manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.2 $ -->
+<!-- splitted from ./en/functions/array.xml, last change in rev 1.14 -->
+ <refentry id="function.array-diff-assoc">
+ <refnamediv>
+ <refname>array_diff_assoc</refname>
+ <refpurpose>Computes the difference of arrays with additional index
+check</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Description</title>
+ <methodsynopsis>
+ <type>array</type><methodname>array_diff_assoc</methodname>
+ <methodparam><type>array</type><parameter>array1</parameter></methodparam>
+ <methodparam><type>array</type><parameter>array2</parameter></methodparam>
+ <methodparam choice="opt"><type>array</type><parameter>
+...</parameter></methodparam>
+ </methodsynopsis>
+ <para>
+ <function>array_diff_assoc</function> returns an <type>array</type>
+ containing all the values from <parameter>array1</parameter>
+ that are not present in any of the other arguments.
+ Note that the keys are used in the comparison unlike
+ <function>array_diff</function>.
+ </para>
+ <para>
+ <example>
+ <title><function>array_diff_assoc</function> example</title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+$array1 = array ("a" => "green", "b" => "brown", "c" => "blue", "red");
+$array2 = array ("a" => "green", "yellow", "red");
+$result = array_diff_assoc ($array1, $array2);
+
+/* The result is:
+Array
+(
+ [b] => brown
+ [c] => blue
+ [0] => red
+)
+*/
+?>
+]]>
+ </programlisting>
+ </example>
+ </para>
+ <simpara>
+ In our example above you see the <literal>"a" => "green"</literal>
+ pair is present in both arrays and thus it is not in the ouput from the
+ function. Unlike this, the pair <literal>0 => "red"</literal>
+ is in the ouput because in the second argument <literal>"red"</literal>
+ has key which is <literal>1</literal>.
+ </simpara>
+ <simpara>
+ Two values from <emphasis>key => value</emphasis> pairs are
+ considered equal only if <literal>(string) $elem1 === (string)
+ $elem2 </literal>. In other words a strict check takes place so
+ the string representations must be the same.
+ <!-- TODO: example of it... -->
+ </simpara>
+ <note>
+ <simpara>
+ Please note that this function only checks one dimension of a n-dimensional
+ array. Of course you can check deeper dimensions by using, for example,
+ <literal>array_diff_assoc($array1[0], $array2[0]);</literal>.
+ </simpara>
+ </note>
+ <para>
+ See also <function>array_diff</function>,
+ <function>array_intersect</function>,
+ and <function>array_intersect_assoc</function>.
+ </para>
+ </refsect1>
+ </refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
Index: phpdoc/en/reference/array/functions/array-diff.xml
diff -u phpdoc/en/reference/array/functions/array-diff.xml:1.6
phpdoc/en/reference/array/functions/array-diff.xml:1.7
--- phpdoc/en/reference/array/functions/array-diff.xml:1.6 Fri Jan 10 16:55:43
2003
+++ phpdoc/en/reference/array/functions/array-diff.xml Fri Jan 10 17:22:40 2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.6 $ -->
+<!-- $Revision: 1.7 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.14 -->
<refentry id="function.array-diff">
<refnamediv>
@@ -59,8 +59,9 @@
</simpara>
</warning>
<para>
- See also <function>array_intersect</function> and
- <function>array_diff_assoc</function>.
+ See also <function>array_diff_assoc</function>,
+ <function>array_intersect</function> and
+ <function>array_intersect_assoc</function>.
</para>
</refsect1>
</refentry>
Index: phpdoc/en/reference/array/functions/array-intersect-assoc.xml
diff -u phpdoc/en/reference/array/functions/array-intersect-assoc.xml:1.1
phpdoc/en/reference/array/functions/array-intersect-assoc.xml:1.2
--- phpdoc/en/reference/array/functions/array-intersect-assoc.xml:1.1 Thu Nov 14
19:35:47 2002
+++ phpdoc/en/reference/array/functions/array-intersect-assoc.xml Fri Jan 10
+17:22:40 2003
@@ -1,87 +1,88 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.1 $ -->
- <refentry id="function.array-intersect-assoc">
- <refnamediv>
- <refname>array_intersect_assoc</refname>
- <refpurpose>Computes the intersection of arrays with additional index
check</refpurpose>
- </refnamediv>
- <refsect1>
- <title>Description</title>
- <methodsynopsis>
- <type>array</type><methodname>array_intersect_assoc</methodname>
- <methodparam><type>array</type><parameter>array1</parameter></methodparam>
- <methodparam><type>array</type><parameter>array2</parameter></methodparam>
- <methodparam choice="opt"><type>array</type><parameter>
...</parameter></methodparam>
- </methodsynopsis>
- <simpara>
- <function>array_intersect_assoc</function> returns an array
- containing all the values of <parameter>array1</parameter>
- that are present in all the arguments. Note that the keys are used in
- the comparison unlike in <function>array_intersect</function>.
- </simpara>
- <para>
- <example>
- <title><function>array_intersect_assoc</function> example</title>
- <programlisting role="php">
-<![CDATA[
-<?php
-$array1 = array ("a" => "green", "b" => "brown", "c" => "blue", "red");
-$array2 = array ("a" => "green", "yellow", "red");
-$result_array = array_intersect_assoc ($array1, $array2);
-
-/* $result_array will look like:
-
-Array
-(
- [a] => green
-)
-
-*/
-?>
-]]>
- </programlisting>
- </example>
- </para>
- <simpara>
- In our example you see that only the pair <literal>"a" =>
- "green"</literal> is present in both arrays and thus is returned.
- The value <literal>"red"</literal> is not returned because in
- <varname>$array1</varname> it's key is <literal>2</literal> while
- the key of "red" in <varname>$array2</varname> it is
- <literal>1</literal>.
- </simpara>
- <simpara>
- The two values from the <literal>key => value</literal> pairs are
- considered equal only if
- <literal>(string) $elem1 === (string) $elem2 </literal>. In otherwords
- a strict type check is executed so the string representation must be
- the same.
- <!-- TODO: example of it... -->
- </simpara>
- <simpara>
- See also <function>array_diff</function> and
- <function>array_intersect</function>.
- </simpara>
- </refsect1>
- </refentry>
-
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:t
-sgml-shorttag:t
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-indent-tabs-mode:nil
-sgml-parent-document:nil
-sgml-default-dtd-file:"../../../../manual.ced"
-sgml-exposed-tags:nil
-sgml-local-catalogs:nil
-sgml-local-ecat-files:nil
-End:
-vim600: syn=xml fen fdm=syntax fdl=2 si
-vim: et tw=78 syn=sgml
-vi: ts=1 sw=1
--->
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- $Revision: 1.2 $ -->
+ <refentry id="function.array-intersect-assoc">
+ <refnamediv>
+ <refname>array_intersect_assoc</refname>
+ <refpurpose>Computes the intersection of arrays with additional index
+check</refpurpose>
+ </refnamediv>
+ <refsect1>
+ <title>Description</title>
+ <methodsynopsis>
+ <type>array</type><methodname>array_intersect_assoc</methodname>
+ <methodparam><type>array</type><parameter>array1</parameter></methodparam>
+ <methodparam><type>array</type><parameter>array2</parameter></methodparam>
+ <methodparam choice="opt"><type>array</type><parameter>
+...</parameter></methodparam>
+ </methodsynopsis>
+ <simpara>
+ <function>array_intersect_assoc</function> returns an array
+ containing all the values of <parameter>array1</parameter>
+ that are present in all the arguments. Note that the keys are used in
+ the comparison unlike in <function>array_intersect</function>.
+ </simpara>
+ <para>
+ <example>
+ <title><function>array_intersect_assoc</function> example</title>
+ <programlisting role="php">
+<![CDATA[
+<?php
+$array1 = array ("a" => "green", "b" => "brown", "c" => "blue", "red");
+$array2 = array ("a" => "green", "yellow", "red");
+$result_array = array_intersect_assoc ($array1, $array2);
+
+/* $result_array will look like:
+
+Array
+(
+ [a] => green
+)
+
+*/
+?>
+]]>
+ </programlisting>
+ </example>
+ </para>
+ <simpara>
+ In our example you see that only the pair <literal>"a" =>
+ "green"</literal> is present in both arrays and thus is returned.
+ The value <literal>"red"</literal> is not returned because in
+ <varname>$array1</varname> it's key is <literal>2</literal> while
+ the key of "red" in <varname>$array2</varname> it is
+ <literal>1</literal>.
+ </simpara>
+ <simpara>
+ The two values from the <literal>key => value</literal> pairs are
+ considered equal only if
+ <literal>(string) $elem1 === (string) $elem2 </literal>. In otherwords
+ a strict type check is executed so the string representation must be
+ the same.
+ <!-- TODO: example of it... -->
+ </simpara>
+ <simpara>
+ See also <function>array_intersect</function>,
+ <function>array_diff</function> and
+ <function>array_diff_assoc</function>.
+ </simpara>
+ </refsect1>
+ </refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:1
+sgml-indent-data:t
+indent-tabs-mode:nil
+sgml-parent-document:nil
+sgml-default-dtd-file:"../../../../manual.ced"
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+vim600: syn=xml fen fdm=syntax fdl=2 si
+vim: et tw=78 syn=sgml
+vi: ts=1 sw=1
+-->
Index: phpdoc/en/reference/array/functions/array-intersect.xml
diff -u phpdoc/en/reference/array/functions/array-intersect.xml:1.4
phpdoc/en/reference/array/functions/array-intersect.xml:1.5
--- phpdoc/en/reference/array/functions/array-intersect.xml:1.4 Sun May 12 04:19:28
2002
+++ phpdoc/en/reference/array/functions/array-intersect.xml Fri Jan 10 17:22:40
+2003
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.14 -->
<refentry id="function.array-intersect">
<refnamediv>
@@ -59,7 +59,9 @@
</simpara>
</warning>
<para>
- See also <function>array_diff</function>.
+ See also <function>array_intersect_assoc</function>,
+ <function>array_diff</function>,
+ <function>array_diff_assoc</function>.
</para>
</refsect1>
</refentry>
--
PHP Documentation Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
