From: Date: February 16 2006 8:57pm
Subject: svn commit - mysqldoc@docsrva: r1352 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-common
List-Archive: http://lists.mysql.com/commits/2747
Message-Id: <200602161957.k1GJvms1031751@docsrva.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Author: paul
Date: 2006-02-16 20:57:47 +0100 (Thu, 16 Feb 2006)
New Revision: 1352

Log:
 r7622@frost:  paul | 2006-02-16 13:53:57 -0600
 Add production directives for szlig character.
 Update a 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:7620
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3157
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:7622
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:3157

Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml	2006-02-16 17:18:53 UTC (rev 1351)
+++ trunk/refman-4.1/charset.xml	2006-02-16 19:57:47 UTC (rev 1352)
@@ -3260,6 +3260,10 @@
         Mari.
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
       <para>
         The most significant feature in
         <literal>utf8_unicode_ci</literal> is that it supports
@@ -3295,6 +3299,10 @@
         <literal>utf8_general_ci</literal>:
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
 <programlisting>
 ß = s
 </programlisting>
@@ -3303,6 +3311,10 @@
         Whereas this is true for <literal>utf8_unicode_ci</literal>:
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
 <programlisting>
 ß = ss
 </programlisting>
@@ -3317,6 +3329,10 @@
         languages.
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
       <para>
         <literal>utf8_general_ci</literal> also is satisfactory for both
         German and French, except that
@@ -3564,6 +3580,10 @@
                 <literal>latin1_german1_ci</literal> (dictionary) rules:
               </para>
 
+              <remark role="production-directive">
+                NOTE: Following text contains [szlig] character
+              </remark>
+
 <programlisting>
 Ä = A
 Ö = O
@@ -3577,6 +3597,10 @@
                 <literal>latin1_german2_ci</literal> (phone-book) rules:
               </para>
 
+              <remark role="production-directive">
+                NOTE: Following text contains [szlig] character
+              </remark>
+
 <programlisting>
 Ä = AE
 Ö = OE

Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml	2006-02-16 17:18:53 UTC (rev 1351)
+++ trunk/refman-5.0/charset.xml	2006-02-16 19:57:47 UTC (rev 1352)
@@ -2780,6 +2780,10 @@
         Mari.
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
       <para>
         The most significant feature in
         <literal>utf8_unicode_ci</literal> is that it supports
@@ -2815,6 +2819,10 @@
         <literal>utf8_general_ci</literal>:
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
 <programlisting>
 ß = s
 </programlisting>
@@ -2823,6 +2831,10 @@
         Whereas this is true for <literal>utf8_unicode_ci</literal>:
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
 <programlisting>
 ß = ss
 </programlisting>
@@ -2837,6 +2849,10 @@
         languages.
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
       <para>
         <literal>utf8_general_ci</literal> also is satisfactory for both
         German and French, except that
@@ -3084,6 +3100,10 @@
                 <literal>latin1_german1_ci</literal> (dictionary) rules:
               </para>
 
+              <remark role="production-directive">
+                NOTE: Following text contains [szlig] character
+              </remark>
+
 <programlisting>
 Ä = A
 Ö = O
@@ -3097,6 +3117,10 @@
                 <literal>latin1_german2_ci</literal> (phone-book) rules:
               </para>
 
+              <remark role="production-directive">
+                NOTE: Following text contains [szlig] character
+              </remark>
+
 <programlisting>
 Ä = AE
 Ö = OE

Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml	2006-02-16 17:18:53 UTC (rev 1351)
+++ trunk/refman-5.1/charset.xml	2006-02-16 19:57:47 UTC (rev 1352)
@@ -2770,6 +2770,10 @@
         Mari.
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
       <para>
         The most significant feature in
         <literal>utf8_unicode_ci</literal> is that it supports
@@ -2805,6 +2809,10 @@
         <literal>utf8_general_ci</literal>:
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
 <programlisting>
 ß = s
 </programlisting>
@@ -2813,6 +2821,10 @@
         Whereas this is true for <literal>utf8_unicode_ci</literal>:
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
 <programlisting>
 ß = ss
 </programlisting>
@@ -2827,6 +2839,10 @@
         languages.
       </para>
 
+      <remark role="production-directive">
+        NOTE: Following text contains [szlig] character
+      </remark>
+
       <para>
         <literal>utf8_general_ci</literal> also is satisfactory for both
         German and French, except that
@@ -3074,6 +3090,10 @@
                 <literal>latin1_german1_ci</literal> (dictionary) rules:
               </para>
 
+              <remark role="production-directive">
+                NOTE: Following text contains [szlig] character
+              </remark>
+
 <programlisting>
 Ä = A
 Ö = O
@@ -3087,6 +3107,10 @@
                 <literal>latin1_german2_ci</literal> (phone-book) rules:
               </para>
 
+              <remark role="production-directive">
+                NOTE: Following text contains [szlig] character
+              </remark>
+
 <programlisting>
 Ä = AE
 Ö = OE

Modified: trunk/refman-common/titles.en.ent
===================================================================
--- trunk/refman-common/titles.en.ent	2006-02-16 17:18:53 UTC (rev 1351)
+++ trunk/refman-common/titles.en.ent	2006-02-16 19:57:47 UTC (rev 1352)
@@ -148,7 +148,7 @@
 <!ENTITY title-charset-general "Character Sets and Collations in General">
 <!ENTITY title-charset-literal "Character String Literal Character Set and Collation">
 <!ENTITY title-charset-map "4.0 Character Sets and Corresponding 4.1 Character Set/Collation Pairs">
-<!ENTITY title-charset-metadata "UTF8 for Metadata">
+<!ENTITY title-charset-metadata "UTF-8 for Metadata">
 <!ENTITY title-charset-mysql "Character Sets and Collations in MySQL">
 <!ENTITY title-charset-national "National Character Set">
 <!ENTITY title-charset-operations "Operations Affected by Character Set Support">