cvs: phpdoc /en/reference/mysql/functions mysql-client-encoding.xml mysql-set-charset.xml /en/reference/mysqli/mysqli set-charset.xml
| From: | Hannes Magnusson | Date: | Fri, 08 Aug 2008 08:01:09 +0000 |
| Subject: | cvs: phpdoc /en/reference/mysql/functions mysql-client-encoding.xml mysql-set-charset.xml /en/reference/mysqli/mysqli set-charset.xml | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-2006@lists.php.net to get a copy of this message | ||
bjori Fri Aug 8 08:01:09 2008 UTC
Modified files:
/phpdoc/en/reference/mysqli/mysqli set-charset.xml
/phpdoc/en/reference/mysql/functions mysql-set-charset.xml
mysql-client-encoding.xml
Log:
- Add a note about SET NAMES
- Cross link mysql_set_charset() and mysql_client_encoding()
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/mysqli/mysqli/set-charset.xml?r1=1.4&r2=1.5&diff_format=u
Index: phpdoc/en/reference/mysqli/mysqli/set-charset.xml
diff -u phpdoc/en/reference/mysqli/mysqli/set-charset.xml:1.4
phpdoc/en/reference/mysqli/mysqli/set-charset.xml:1.5
--- phpdoc/en/reference/mysqli/mysqli/set-charset.xml:1.4 Fri Apr 18 22:13:58 2008
+++ phpdoc/en/reference/mysqli/mysqli/set-charset.xml Fri Aug 8 08:01:09 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.4 $ -->
+<!-- $Revision: 1.5 $ -->
<refentry xml:id="mysqli.set-charset" xmlns="http://docbook.org/ns/docbook"
xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>mysqli::set_charset</refname>
@@ -58,6 +58,13 @@
version 4.1.11 or above (for MySQL 5.0 you need 5.0.6 or above).
</para>
</note>
+ <note>
+ <para>
+ This is the preferred way to change the charset. Using
+ <function>mysqli::query</function> to execute <literal>SET NAMES
..</literal>
+ is not reccomended.
+ </para>
+ </note>
</refsect1>
<refsect1 role="examples">
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/mysql/functions/mysql-set-charset.xml?r1=1.3&r2=1.4&diff_format=u
Index: phpdoc/en/reference/mysql/functions/mysql-set-charset.xml
diff -u phpdoc/en/reference/mysql/functions/mysql-set-charset.xml:1.3
phpdoc/en/reference/mysql/functions/mysql-set-charset.xml:1.4
--- phpdoc/en/reference/mysql/functions/mysql-set-charset.xml:1.3 Fri Apr 18 22:13:58 2008
+++ phpdoc/en/reference/mysql/functions/mysql-set-charset.xml Fri Aug 8 08:01:09 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.3 $ -->
+<!-- $Revision: 1.4 $ -->
<refentry xmlns="http://docbook.org/ns/docbook"
xml:id="function.mysql-set-charset" xmlns:xlink="http://www.w3.org/1999/xlink">
<refnamediv>
<refname>mysql_set_charset</refname>
@@ -49,12 +49,20 @@
This function requires MySQL 5.0.7 or later.
</para>
</note>
+ <note>
+ <para>
+ This is the preferred way to change the charset. Using
+ <function>mysql_query</function> to execute <literal>SET NAMES
..</literal>
+ is not reccomended.
+ </para>
+ </note>
</refsect1>
<refsect1 role="seealso">
&reftitle.seealso;
<para>
<simplelist>
+ <member><function>mysql_client_encoding</function></member>
<member><link xlink:href="&url.mysql.charsets;">List of character
sets that MySQL supports</link></member>
</simplelist>
</para>
http://cvs.php.net/viewvc.cgi/phpdoc/en/reference/mysql/functions/mysql-client-encoding.xml?r1=1.10&r2=1.11&diff_format=u
Index: phpdoc/en/reference/mysql/functions/mysql-client-encoding.xml
diff -u phpdoc/en/reference/mysql/functions/mysql-client-encoding.xml:1.10
phpdoc/en/reference/mysql/functions/mysql-client-encoding.xml:1.11
--- phpdoc/en/reference/mysql/functions/mysql-client-encoding.xml:1.10 Wed Jun 20 22:25:00 2007
+++ phpdoc/en/reference/mysql/functions/mysql-client-encoding.xml Fri Aug 8 08:01:09 2008
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="iso-8859-1"?>
-<!-- $Revision: 1.10 $ -->
+<!-- $Revision: 1.11 $ -->
<refentry xml:id="function.mysql-client-encoding" xmlns="http://docbook.org/ns/docbook">
<refnamediv>
<refname>mysql_client_encoding</refname>
@@ -62,6 +62,7 @@
&reftitle.seealso;
<para>
<simplelist>
+ <member><function>mysql_set_charset</function></member>
<member><function>mysql_real_escape_string</function></member>
</simplelist>
</para>