Return-Path: 
 <derby-commits-return-17480-apmail-db-derby-commits-archive=db.apache.org@db.apache.org>
X-Original-To: apmail-db-derby-commits-archive@www.apache.org
Delivered-To: apmail-db-derby-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id B8297101E3
	for <apmail-db-derby-commits-archive@www.apache.org>;
 Mon, 26 Aug 2013 19:59:24 +0000 (UTC)
Received: (qmail 7849 invoked by uid 500); 26 Aug 2013 19:59:24 -0000
Delivered-To: apmail-db-derby-commits-archive@db.apache.org
Received: (qmail 7781 invoked by uid 500); 26 Aug 2013 19:59:21 -0000
Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:derby-commits-help@db.apache.org>
list-unsubscribe: <mailto:derby-commits-unsubscribe@db.apache.org>
List-Post: <mailto:derby-commits@db.apache.org>
Reply-To: "Derby Development" <derby-dev@db.apache.org>
List-Id: <derby-commits.db.apache.org>
Delivered-To: mailing list derby-commits@db.apache.org
Received: (qmail 7771 invoked by uid 99); 26 Aug 2013 19:59:19 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Aug 2013 19:59:19 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 26 Aug 2013 19:59:17 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 7EEB123888A6;
	Mon, 26 Aug 2013 19:58:56 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1517667 -
 /db/derby/docs/trunk/src/devguide/cdevcollationattribs.dita
Date: Mon, 26 Aug 2013 19:58:56 -0000
To: derby-commits@db.apache.org
From: chaase3@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130826195856.7EEB123888A6@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: chaase3
Date: Mon Aug 26 19:58:56 2013
New Revision: 1517667

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

Modified a Developer's Guide topic to add a missing word and fix formatting.

Patch: DERBY-4627-2.diff

Modified:
    db/derby/docs/trunk/src/devguide/cdevcollationattribs.dita

Modified: db/derby/docs/trunk/src/devguide/cdevcollationattribs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevcollationattribs.dita?rev=1517667&r1=1517666&r2=1517667&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcollationattribs.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcollationattribs.dita Mon Aug 26 19:58:56 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>