From 8c78eead70310312b52e10e35acc45189193c5aa Mon Sep 17 00:00:00 2001
From: Andy Lindeman <alindeman@php.net>
Date: Sun, 18 May 2003 02:32:19 +0000
Subject: [PATCH] note integration
git-svn-id: https://svn.php.net/repository/phpdoc/en/trunk@127559 c90b9560-bf6c-de11-be94-00142212c4b1
---
language-snippets.ent | 5 +++++
reference/array/functions/array-change-key-case.xml | 7 ++++++-
reference/array/functions/array-diff.xml | 4 ++--
reference/array/functions/array-keys.xml | 5 +++--
reference/array/functions/array-pop.xml | 4 ++--
reference/mysql/functions/mysql-fetch-array.xml | 3 ++-
reference/mysql/functions/mysql-fetch-assoc.xml | 3 ++-
reference/mysql/functions/mysql-fetch-field.xml | 3 ++-
reference/mysql/functions/mysql-fetch-object.xml | 3 ++-
reference/mysql/functions/mysql-fetch-row.xml | 3 ++-
reference/mysql/functions/mysql-field-name.xml | 3 ++-
11 files changed, 30 insertions(+), 13 deletions(-)
diff --git a/language-snippets.ent b/language-snippets.ent
index ae43193e15..dffbc1f5ef 100644
--- a/language-snippets.ent
+++ b/language-snippets.ent
@@ -183,6 +183,10 @@ extension in order to use these functions.</simpara>'>
<!ENTITY php '<literal>PHP</literal>'>
<!ENTITY safemode '<link linkend="ini.safe-mode">safe mode</link>'>
+<!-- Some MySQL Notes -->
+<!ENTITY mysql.field-case '<note><simpara>Field names returned by this function
+as <emphasize>case-sensitive</emphasize></simpara></note>'>
+
<!-- These are using in reference/$extname/reference.xml and other
supplemental files to mark section titles -->
<!ENTITY reftitle.intro '<title>Introduction</title>'>
@@ -202,3 +206,4 @@ supplemental files to mark section titles -->
<!ENTITY ipv6.php5 '<note><simpara>IPv6 Support was added with <literal>PHP 5.0
</literal>.</simpara></note>'>
+
diff --git a/reference/array/functions/array-change-key-case.xml b/reference/array/functions/array-change-key-case.xml
index df3096a367..196bdc6e02 100644
--- a/reference/array/functions/array-change-key-case.xml
+++ b/reference/array/functions/array-change-key-case.xml
@@ -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.113 -->
<refentry id="function.array-change-key-case">
<refnamediv>
@@ -45,6 +45,11 @@ Array
</screen>
</para>
</example>
+ <para>
+ If an array has indices that will be the same once run through this
+ function (e.g. "keY" and "kEY"), the value that is later in the array
+ will override other indices.
+ </para>
</refsect1>
</refentry>
diff --git a/reference/array/functions/array-diff.xml b/reference/array/functions/array-diff.xml
index 4b7f763b63..e3793ddb5e 100644
--- a/reference/array/functions/array-diff.xml
+++ b/reference/array/functions/array-diff.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.7 $ -->
+<!-- $Revision: 1.8 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.14 -->
<refentry id="function.array-diff">
<refnamediv>
@@ -60,7 +60,7 @@ $result = array_diff ($array1, $array2);
</warning>
<para>
See also <function>array_diff_assoc</function>,
- <function>array_intersect</function> and
+ <function>array_intersect</function>, and
<function>array_intersect_assoc</function>.
</para>
</refsect1>
diff --git a/reference/array/functions/array-keys.xml b/reference/array/functions/array-keys.xml
index c78e2337f2..ac7fd7caed 100644
--- a/reference/array/functions/array-keys.xml
+++ b/reference/array/functions/array-keys.xml
@@ -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.2 -->
<refentry id="function.array-keys">
<refnamediv>
@@ -35,7 +35,8 @@ print_r(array_keys ($array));
$array = array ("blue", "red", "green", "blue", "blue");
print_r(array_keys ($array, "blue"));
-$array = array ("color" => array("blue", "red", "green"), "size" => array("small", "medium", "large"));
+$array = array ("color" => array("blue", "red", "green"),
+ "size" => array("small", "medium", "large"));
print_r(array_keys ($array));
]]>
</programlisting>
diff --git a/reference/array/functions/array-pop.xml b/reference/array/functions/array-pop.xml
index 94cf235ecf..0ef0b841db 100644
--- a/reference/array/functions/array-pop.xml
+++ b/reference/array/functions/array-pop.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/array.xml, last change in rev 1.2 -->
<refentry id="function.array-pop">
<refnamediv>
@@ -46,7 +46,7 @@ Array
)
]]>
</screen>
- and <literal>rasberry</literal> will be assigned to
+ and <literal>raspberry</literal> will be assigned to
<varname>$fruit</varname>.
</para>
</example>
diff --git a/reference/mysql/functions/mysql-fetch-array.xml b/reference/mysql/functions/mysql-fetch-array.xml
index 6e69c090e8..4c98de714a 100644
--- a/reference/mysql/functions/mysql-fetch-array.xml
+++ b/reference/mysql/functions/mysql-fetch-array.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.8 $ -->
+<!-- $Revision: 1.9 $ -->
<!-- splitted from ./en/functions/mysql.xml, last change in rev 1.27 -->
<refentry id="function.mysql-fetch-array">
<refnamediv>
@@ -63,6 +63,7 @@ select table1.field as foo, table2.field as bar from table1, table2
using MYSQL_NUM, you only get number indices (as
<function>mysql_fetch_row</function> works).
</para>
+ &mysql.field-case;
<example>
<title>mysql_fetch_array with MYSQL_NUM</title>
<programlisting role="php">
diff --git a/reference/mysql/functions/mysql-fetch-assoc.xml b/reference/mysql/functions/mysql-fetch-assoc.xml
index 35ea9774cc..eed96a462c 100644
--- a/reference/mysql/functions/mysql-fetch-assoc.xml
+++ b/reference/mysql/functions/mysql-fetch-assoc.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.5 $ -->
+<!-- $Revision: 1.6 $ -->
<!-- splitted from ./en/functions/mysql.xml, last change in rev 1.45 -->
<refentry id="function.mysql-fetch-assoc">
<refnamediv>
@@ -41,6 +41,7 @@
<function>mysql_fetch_row</function>, while it
provides a significant added value.
</para>
+ &mysql.field-case;
<example>
<title>An expanded <function>mysql_fetch_assoc</function> example</title>
<programlisting role="php">
diff --git a/reference/mysql/functions/mysql-fetch-field.xml b/reference/mysql/functions/mysql-fetch-field.xml
index 7325cead35..d5671d50e0 100644
--- a/reference/mysql/functions/mysql-fetch-field.xml
+++ b/reference/mysql/functions/mysql-fetch-field.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
<refentry id="function.mysql-fetch-field">
<refnamediv>
@@ -91,6 +91,7 @@
</listitem>
</itemizedlist>
</para>
+ &mysql.field-case;
<example>
<title><function>mysql_fetch_field</function></title>
<programlisting role="php">
diff --git a/reference/mysql/functions/mysql-fetch-object.xml b/reference/mysql/functions/mysql-fetch-object.xml
index 8f1be2b70a..838a48400f 100644
--- a/reference/mysql/functions/mysql-fetch-object.xml
+++ b/reference/mysql/functions/mysql-fetch-object.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
<refentry id="function.mysql-fetch-object">
<refnamediv>
@@ -23,6 +23,7 @@
that you can only access the data by the field names, and not by
their offsets (numbers are illegal property names).
</para>
+ &mysql.field-case;
<para>
<programlisting role="php">
<![CDATA[
diff --git a/reference/mysql/functions/mysql-fetch-row.xml b/reference/mysql/functions/mysql-fetch-row.xml
index 4cc8ec4419..3d06da384f 100644
--- a/reference/mysql/functions/mysql-fetch-row.xml
+++ b/reference/mysql/functions/mysql-fetch-row.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.2 $ -->
+<!-- $Revision: 1.3 $ -->
<!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
<refentry id="function.mysql-fetch-row">
<refnamediv>
@@ -27,6 +27,7 @@
return the next row in the result set, or &false; if there are no
more rows.
</para>
+ &mysql.field-case;
<para>
See also: <function>mysql_fetch_array</function>,
<function>mysql_fetch_object</function>,
diff --git a/reference/mysql/functions/mysql-field-name.xml b/reference/mysql/functions/mysql-field-name.xml
index 437d88a18f..4c17aa860a 100644
--- a/reference/mysql/functions/mysql-field-name.xml
+++ b/reference/mysql/functions/mysql-field-name.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<!-- splitted from ./en/functions/mysql.xml, last change in rev 1.2 -->
<refentry id="function.mysql-field-name">
<refnamediv>
@@ -30,6 +30,7 @@
of the fourth field would be 3 and so on.
</para>
</note>
+ &mysql.field-case;
<para>
<example>
<title><function>mysql_field_name</function> example</title>