svn commit: r1518714 - /db/derby/docs/branches/10.10/src/devguide/cdevcollationattribs.dita

[ch...@apache.org]

Author: chaase3
Date: Thu Aug 29 17:22:45 2013
New Revision: 1518714

URL: http://svn.apache.org/r1518714
Log:
DERBY-4627  Document how to install your own custom collation for use in sorting and comparing string data values.

Merged patch DERBY-4627-2.diff to 10.10 doc branch from trunk revision 1517667.

Modified:
    db/derby/docs/branches/10.10/src/devguide/cdevcollationattribs.dita

Modified: db/derby/docs/branches/10.10/src/devguide/cdevcollationattribs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.10/src/devguide/cdevcollationattribs.dita?rev=1518714&r1=1518713&r2=1518714&view=diff
==============================================================================
--- db/derby/docs/branches/10.10/src/devguide/cdevcollationattribs.dita (original)
+++ db/derby/docs/branches/10.10/src/devguide/cdevcollationattribs.dita Thu Aug 29 17:22:45 2013
@@ -59,7 +59,7 @@ databases.</entry>
 <entry colname="col1">jdbc:derby:abcDB;create=true;collation=TERRITORY_BASED</entry>
 <entry colname="col2">The locale of the JVM, since the <i>territory=ll_CC</i>
 attribute is not set. <note type="tip">To determine the locale of the JVM,
-call the <i>Locale.getDefault</i>.</note></entry>
+call the <i>Locale.getDefault</i> method.</note></entry>
 </row>
 <row>
 <entry colname="col1">jdbc:derby:abcDB;create=true;territory=es_MX;collation=TERRITORY_BASED</entry>
@@ -107,12 +107,29 @@ set to <i>en_US</i> (English language, U
 </sl></p>
 <p>The collation set for the database also impacts comparison operators
 on character data types. For example, the statement <codeph>SELECT * FROM
-FRUIT WHERE NAME > 'Banana' ORDER BY NAME</codeph> returns: 
-<lines>      UCS_BASIC collation       Locale-based collation
-                Grape                             Grape
-                Pineapple                       orange
-                apple                              Pineapple
-                orange</lines></p>
+FRUIT WHERE NAME > 'Banana' ORDER BY NAME</codeph> returns:</p>
+<simpletable frame="none">
+<sthead>
+<stentry>UCS_BASIC collation</stentry>
+<stentry>Locale-based collation</stentry>
+</sthead>
+<strow>
+<stentry>Grape</stentry>
+<stentry>Grape</stentry>
+</strow>
+<strow>
+<stentry>Pineapple</stentry>
+<stentry>orange</stentry>
+</strow>
+<strow>
+<stentry>apple</stentry>
+<stentry>Pineapple</stentry>
+</strow>
+<strow>
+<stentry>orange</stentry>
+<stentry>&nbsp;</stentry>
+</strow>
+</simpletable>
 <p>For information on creating case-insensitive databases, see
 <xref href="tdevdvlpcaseinscoll.dita#tdevdvlpcaseinscoll"></xref>.</p>
 </section>