List:Commits« Previous MessageNext Message »
From:paul Date:May 27 2008 5:23pm
Subject:svn commit - mysqldoc@docsrva: r10842 - in trunk: . refman-6.0
View as plain text  
Author: paul
Date: 2008-05-27 19:23:16 +0200 (Tue, 27 May 2008)
New Revision: 10842

Log:
 r31708@frost:  paul | 2008-05-27 12:02:49 -0500
 Adding-collation revisions


Modified:
   trunk/refman-6.0/collation-tmp.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31700
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31442
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:31708
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:31442


Modified: trunk/refman-6.0/collation-tmp.xml
===================================================================
--- trunk/refman-6.0/collation-tmp.xml	2008-05-27 17:23:09 UTC (rev 10841)
+++ trunk/refman-6.0/collation-tmp.xml	2008-05-27 17:23:16 UTC (rev 10842)
Changed blocks: 3, Lines Added: 13, Lines Deleted: 1; 1053 bytes

@@ -947,7 +947,17 @@
 
 <p>\u0047</p>
 </programlisting>
+      </listitem>
 
+    </itemizedlist>
+
+    <para>
+      Examples of the use of these rules:
+    </para>
+
+    <itemizedlist>
+
+      <listitem>
         <para>
           The following combination of reset and shift rules indicates
           that <literal>'G'</literal> is greater than

@@ -960,8 +970,10 @@
 &lt;reset&gt;A&lt;reset&gt;
 &lt;p&gt;G&lt;/p&gt;
 </programlisting>
+      </listitem>
 
 <!--
+      <listitem>
         <para>
           Secondary and tertiary shift rules can be used to specify
           accent and lettercase differences. However, MySQL does not use

@@ -977,8 +989,8 @@
 &lt;s&gt;\u00DC&lt;/s&gt;
 &lt;t&gt;\u00FC&lt;/t&gt;
 </programlisting>
+      </listitem>
 -->
-      </listitem>
 
       <listitem>
         <para>
Thread
• svn commit - mysqldoc@docsrva: r10842 - in trunk: . refman-6.0paul27 May