Author: paul
Date: 2006-03-09 14:19:43 +0100 (Thu, 09 Mar 2006)
New Revision: 1540
Log:
r8504@frost: paul | 2006-03-09 06:55:51 -0600
Add note about --character-set-client-handshake.
Entity-ize section title.
Modified:
trunk/
trunk/refman-4.1/charset.xml
trunk/refman-5.0/charset.xml
trunk/refman-5.1/charset.xml
trunk/refman-common/titles.en.ent
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8458
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3795
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:8504
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3795
Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml 2006-03-09 12:23:49 UTC (rev 1539)
+++ trunk/refman-4.1/charset.xml 2006-03-09 13:19:43 UTC (rev 1540)
@@ -4399,7 +4399,7 @@
<section id="charset-cp932">
- <title>The <literal>cp932</literal> Character Set</title>
+ <title>&title-charset-cp932;</title>
<para>
<emphasis role="bold">Why is <literal>cp932</literal>
@@ -4795,6 +4795,13 @@
</itemizedlist>
+ <para>
+ Users of any Japanese character sets should be aware that
+ using <option>--character-set-client-handshake</option> (or
+ <option>--skip-character-set-client-handshake</option>) has an
+ important effect. See <xref linkend="server-options"/>.
+ </para>
+
</section>
</section>
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2006-03-09 12:23:49 UTC (rev 1539)
+++ trunk/refman-5.0/charset.xml 2006-03-09 13:19:43 UTC (rev 1540)
@@ -3920,7 +3920,7 @@
<section id="charset-cp932">
- <title>The <literal>cp932</literal> Character Set</title>
+ <title>&title-charset-cp932;</title>
<para>
<emphasis role="bold">Why is <literal>cp932</literal>
@@ -4325,6 +4325,13 @@
</itemizedlist>
+ <para>
+ Users of any Japanese character sets should be aware that
+ using <option>--character-set-client-handshake</option> (or
+ <option>--skip-character-set-client-handshake</option>) has an
+ important effect. See <xref linkend="server-options"/>.
+ </para>
+
</section>
</section>
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2006-03-09 12:23:49 UTC (rev 1539)
+++ trunk/refman-5.1/charset.xml 2006-03-09 13:19:43 UTC (rev 1540)
@@ -3916,7 +3916,7 @@
<section id="charset-cp932">
- <title>The <literal>cp932</literal> Character Set</title>
+ <title>&title-charset-cp932;</title>
<para>
<emphasis role="bold">Why is <literal>cp932</literal>
@@ -4320,6 +4320,13 @@
</itemizedlist>
+ <para>
+ Users of any Japanese character sets should be aware that
+ using <option>--character-set-client-handshake</option> (or
+ <option>--skip-character-set-client-handshake</option>) has an
+ important effect. See <xref linkend="server-options"/>.
+ </para>
+
</section>
</section>
Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent 2006-03-09 12:23:49 UTC (rev 1539)
+++ trunk/refman-common/titles.en.ent 2006-03-09 13:19:43 UTC (rev 1540)
@@ -144,6 +144,7 @@
<!ENTITY title-charset-connection "Connection Character Sets and Collations">
<!ENTITY title-charset-conversion "Converting 4.0 Character Columns to 4.1 Format">
<!ENTITY title-charset-convert "<literal>CONVERT()</literal> and <literal>CAST()</literal>">
+<!ENTITY title-charset-cp932 "The <literal>cp932</literal> Character Set">
<!ENTITY title-charset-cyrillic-sets "Cyrillic Character Sets">
<!ENTITY title-charset-database "Database Character Set and Collation">
<!ENTITY title-charset-examples "Examples of Character Set and Collation Assignment">
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r1540 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common | paul | 9 Mar |
