db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1514383 - in /db/derby/docs/trunk/src: devguide/ ref/ tools/ tuning/
Date Thu, 15 Aug 2013 17:17:13 GMT
Author: chaase3
Date: Thu Aug 15 17:17:12 2013
New Revision: 1514383

URL: http://svn.apache.org/r1514383
Log:
DERBY-4628  The Derby docs would be clearer if we replaced our jargon term "territory" with the term "locale" which is used commonly across the Java ecosystem.  

Modified 5 Reference Manual topics (and map), 3 Developer's Guide topics (and map), 5 Tools Guide topics (and map), and 1 Tuning Derby topic.

Patch: DERBY-4628.diff

Modified:
    db/derby/docs/trunk/src/devguide/cdevcollation.dita
    db/derby/docs/trunk/src/devguide/cdevin10613.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap
    db/derby/docs/trunk/src/devguide/tdevdvlpcollation.dita
    db/derby/docs/trunk/src/ref/crefmpref23947.dita
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefattrib26867.dita
    db/derby/docs/trunk/src/ref/rrefattrib56769.dita
    db/derby/docs/trunk/src/ref/rrefattribcollation.dita
    db/derby/docs/trunk/src/ref/rrefsqlj75638.dita
    db/derby/docs/trunk/src/tools/ctools1004764.dita
    db/derby/docs/trunk/src/tools/ctoolsijtools11318.dita
    db/derby/docs/trunk/src/tools/ctoolsijtools45180.dita
    db/derby/docs/trunk/src/tools/derbytools.ditamap
    db/derby/docs/trunk/src/tools/rtoolsijlocale.dita
    db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita
    db/derby/docs/trunk/src/tuning/rtuntransform208.dita

Modified: db/derby/docs/trunk/src/devguide/cdevcollation.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevcollation.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcollation.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcollation.dita Thu Aug 15 17:17:12 2013
@@ -19,61 +19,79 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cdevcollation" xml:lang="en-us">
-<title>Character-based collation in <ph conref="../conrefs.dita#prod/productshortname"></ph></title>
+<title>Character-based collation in
+<ph conref="../conrefs.dita#prod/productshortname"></ph></title>
 <shortdesc>A character set is a set of symbols and encodings. Character data
-types are represented as Unicode 2.0 sequences in <ph conref="../conrefs.dita#prod/productshortname"></ph>. </shortdesc>
+types are represented as Unicode 2.0 sequences in
+<ph conref="../conrefs.dita#prod/productshortname"></ph>. </shortdesc>
 <prolog><metadata>
 <keywords><indexterm>collation<indexterm>overview</indexterm></indexterm>
 <indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<section><title>How collation works in <ph conref="../conrefs.dita#prod/productshortname"></ph></title><p><ph
-conref="../conrefs.dita#prod/productshortname"></ph> supports a wide range
-of character sets and encodes all of the character sets by using the Unicode
-support provided by the java.lang.Character  class in the Java Virtual Machine
-(JVM) in which the <ph conref="../conrefs.dita#prod/productshortname"></ph> database
-runs. See the Java API documentation for the java.lang.Character class for
-the exact level of Unicode Standard that is supported.</p><p>A collation is
-a set of rules for comparing characters in a character set.  In <ph conref="../conrefs.dita#prod/productshortname"></ph> the
-collation rules affect comparisons of the CHAR and VARCHAR data  types. Collation
+<section><title>How collation works in
+<ph conref="../conrefs.dita#prod/productshortname"></ph></title>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports a wide
+range of character sets and encodes all of the character sets by using the
+Unicode support provided by the <i>java.lang.Character</i> class in the Java
+Virtual Machine (JVM) in which the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> database runs. See the
+Java API documentation for the <i>java.lang.Character</i> class for
+the exact level of Unicode Standard that is supported.</p>
+<p>A collation is a set of rules for comparing characters in a character set.
+In <ph conref="../conrefs.dita#prod/productshortname"></ph>, the
+collation rules affect comparisons of the CHAR and VARCHAR data types. Collation
 rules also affect how the LIKE Boolean operator processes the CHAR, VARCHAR,
-CLOB, and LONG VARCHAR data types.</p><p>The default <ph conref="../conrefs.dita#prod/productshortname"></ph> collation
-rule is based on the binary Unicode values of the characters. So a character
-is greater than (&lt;), equal to (=), or less than (>) another character based
-on the numeric comparison of the Unicode values. This rule allows for very
-efficient comparisons of character strings.</p><note>When LIKE comparisons
+CLOB, and LONG VARCHAR data types.</p>
+<p>The default <ph conref="../conrefs.dita#prod/productshortname"></ph>
+collation rule is based on the binary Unicode values of the characters. So a
+character is greater than (&gt;), equal to (=), or less than (&lt;) another
+character based on the numeric comparison of the Unicode values. This rule
+allows for very efficient comparisons of character strings.</p>
+<note>When LIKE comparisons
 are used, <ph conref="../conrefs.dita#prod/productshortname"></ph> compares
-one character at a time for non-metacharacters. This is different than the
-way <ph conref="../conrefs.dita#prod/productshortname"></ph> processes = comparisons.
+one character at a time for non-metacharacters. This is different from the
+way <ph conref="../conrefs.dita#prod/productshortname"></ph>
+processes = comparisons.
 The comparisons with the = operator compare the entire character string on
 left side of the = operator with the entire character string on the right
-side of the = operator. See the <xref href="cdevcollation.dita#cdevcollation/territorylike"></xref> section
+side of the = operator. See the
+<xref href="cdevcollation.dita#cdevcollation/territorylike"></xref> section
 below.</note></section>
-<section><title>Territory-based collation</title><p><ph conref="../conrefs.dita#prod/productshortname"></ph> also
-supports the ability to define collation rules that are appropriate to a territory,
-and is referred to as <i><term>territory-based collation</term></i>.  <ph
-conref="../conrefs.dita#prod/productshortname"></ph> supports the territories
-that Java supports.</p><p>You can specifically set the territory of a database
-when you create the database. If you do not specify a territory, <ph conref="../conrefs.dita#prod/productshortname"></ph> uses
-the default territory of the JVM in which the database is created. Each JVM
-can support many territories that are independent from the default territory
-for the JVM. Collation support for these additional territories is provided
-through the <codeph>java.text.RuleBasedCollator</codeph> class and the set
-of rules for these territories. Refer to the JVM specification for details
-of how these rules are used to provide territory specific collation. <ph conref="../conrefs.dita#prod/productshortname"></ph> currently
+<section><title>Locale-based collation</title>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> also
+supports the ability to define collation rules that are appropriate to a
+locale. This is referred to as <i><term>locale-based collation</term></i>.
+<ph conref="../conrefs.dita#prod/productshortname"></ph> supports the locales
+that the Java programming language supports.</p>
+<p>You can specifically set the locale of a database when you create the
+database. (See
+<xref href="tdevdvlpcollation.dita#tdevdvlpcollation"></xref>
+for details.) If you do not specify a locale,
+<ph conref="../conrefs.dita#prod/productshortname"></ph> uses
+the default locale of the JVM in which the database is created. Each JVM
+can support many locales that are independent of the default locale
+for the JVM. Collation support for these additional locales is provided
+through the <i>java.text.RuleBasedCollator</i> class and the set
+of rules for these locales. Refer to the JVM specification for details
+of how these rules are used to provide locale-specific collation.
+<ph conref="../conrefs.dita#prod/productshortname"></ph> currently
 supports only running those rules that can be loaded dynamically from the
-running JVM based on the territory attribute. Overrides to these rules by
-the user are not supported. </p><p>The territory-based collation in <ph conref="../conrefs.dita#prod/productshortname"></ph> affects
-how the CHAR and VARCHAR data types are compared. Specifying territory-based
+running JVM based on the <i>territory=ll_CC</i> attribute. Overrides to these
+rules by the user are not supported.</p>
+<p>The locale-based collation in
+<ph conref="../conrefs.dita#prod/productshortname"></ph> affects
+how the CHAR and VARCHAR data types are compared. Specifying locale-based
 collation also impacts how the LIKE Boolean operator processes CHAR, VARCHAR,
-CLOB, and LONG VARCHAR data. </p><p>Territory-based collation does add extra
-processing overhead to all character-based comparison operations.</p></section>
-<section><title>Database attributes that control collation</title><p>When
-you create a <ph conref="../conrefs.dita#prod/productshortname"></ph> database,
-the attributes that you set determine the collation that is used with all
-of character data in the database. The following table shows some examples.</p>
+CLOB, and LONG VARCHAR data.</p>
+<p>Locale-based collation does add extra processing overhead to all
+character-based comparison operations.</p></section>
+<section><title>Database attributes that control collation</title>
+<p>When you create a <ph conref="../conrefs.dita#prod/productshortname"></ph>
+database, the attributes that you set determine the collation that is used with
+all character data in the database. The following table shows some examples.</p>
 <table>
-<title>The create database attributes that control collation</title>
+<title>The database creation attributes that control collation</title>
 <desc>This table shows how collation is controlled with various database creation attributes.</desc>
 <tgroup cols="2" colsep="1" rowsep="1">
 <colspec colname="col1" colnum="1" colwidth="70*"/>
@@ -88,27 +106,29 @@ of character data in the database. The f
 <row>
 <entry colname="col1">jdbc:derby:abcDB;create=true</entry>
 <entry colname="col2">Unicode codepoint collation (UCS_BASIC), which is the
-default collation for <ph conref="../conrefs.dita#prod/productshortname"></ph> databases. </entry>
+default collation for <ph conref="../conrefs.dita#prod/productshortname"></ph>
+databases.</entry>
 </row>
 <row>
 <entry colname="col1">jdbc:derby:abcDB;create=true;territory=es_MX</entry>
-<entry colname="col2">Unicode codepoint collation (UCS_BASIC). The <codeph>collation</codeph> attribute
-is not set.</entry>
+<entry colname="col2">Unicode codepoint collation (UCS_BASIC). The
+<i>collation=collation</i> attribute is not set.</entry>
 </row>
 <row>
 <entry colname="col1">jdbc:derby:abcDB;create=true;collation=TERRITORY_BASED</entry>
-<entry colname="col2">The territory of the JVM, since the <codeph>territory</codeph> attribute
-is not set. <note type="tip">To determine the territory of the JVM, run <codeph>Locale.getDefault()</codeph>.</note></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>
 </row>
 <row>
 <entry colname="col1">jdbc:derby:abcDB;create=true;territory=es_MX;collation=TERRITORY_BASED</entry>
-<entry colname="col2">The <codeph>territory</codeph> attribute.</entry>
+<entry colname="col2">The <i>territory=ll_CC</i> attribute.</entry>
 </row>
 </tbody>
 </tgroup>
 </table></section>
 <section><title>Collation examples</title><p>With Unicode codepoint collation
-(UCS_BASIC), the numerical values of the Unicode encoding of the characters
+(UCS_BASIC), the numeric values of the Unicode encoding of the characters
 are used directly for ordering. For example, the FRUIT table contains the NAME
 column that uses the VARCHAR(20) data type. The contents of the NAME column
 are:<sl>
@@ -117,17 +137,18 @@ are:<sl>
 <sli>Banana</sli>
 <sli>Pineapple</sli>
 <sli>Grape</sli>
-</sl></p><p>UCS_BASIC collation sorts all lower case letters before upper
-case letters. The statement <codeph>SELECT * FROM FRUIT ORDER BY NAME</codeph> returns: <sl>
+</sl></p><p>UCS_BASIC collation sorts all lowercase letters before uppercase
+letters. The statement <codeph>SELECT * FROM FRUIT ORDER BY NAME</codeph>
+returns: <sl>
 <sli>apple</sli>
 <sli>orange</sli>
 <sli>Banana</sli>
 <sli>Grape</sli>
 <sli>Pineapple</sli>
-</sl></p><p>If the database is created with the territory attribute set to
-en_US (English language, United States country code), and the collation attribute
-set to TERRITORY_BASED, the results of the statement <codeph>SELECT * FROM
-FRUIT ORDER BY NAME</codeph> returns: <sl>
+</sl></p><p>If the database is created with the <i>territory=ll_CC</i> attribute
+set to <i>en_US</i> (English language, United States country code) and the
+<i>collation=collation</i> attribute set to TERRITORY_BASED, the statement
+<codeph>SELECT * FROM FRUIT ORDER BY NAME</codeph> returns: <sl>
 <sli>apple</sli>
 <sli>Banana</sli>
 <sli>Grape</sli>
@@ -136,30 +157,35 @@ FRUIT ORDER BY NAME</codeph> returns: <s
 </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       Territory-based collation
-                Grape                                Grape
-                Pineapple                           orange
-                                                          Pineapple</lines></p>
+<lines>      UCS_BASIC collation       Locale-based collation
+                Grape                             Grape
+                Pineapple                       orange
+                                                       Pineapple</lines></p>
 <p>For information on creating case-insensitive databases, see
-<xref href="tdevdvlpcollation.dita#tdevdvlpcollation"></xref>.</p>
+<xref href="tdevdvlpcollation.dita#tdevdvlpcollation/caseinsensitive"></xref>.</p>
 </section>
 <section id="territorylike"><title>Differences between LIKE and equal (=)
-comparisons</title><p>When you use territory-based collation, the comparisons
+comparisons</title><p>When you use locale-based collation, the comparisons
 can return different results when you use the LIKE and equal
-(=) operators. For example, suppose that the <ph conref="../conrefs.dita#prod/productshortname"></ph> database
-is set to use a territory where the character 'z' has same collation elements
-as 'xy'. Consider the following two WHERE clauses: <ol>
+(=) operators. For example, suppose that the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> database is set to use
+a locale where the character 'z' has the same collation elements as 'xy'. 
+Consider the following two WHERE clauses:</p>
+<ol>
 <li>WHERE 'zcb' = 'xycb'</li>
 <li>WHERE 'zcb' LIKE 'xy_b'</li>
-</ol></p><p>For WHERE clause 1, <ph conref="../conrefs.dita#prod/productshortname"></ph> returns
-TRUE because the collation elements for the entire string 'zcb' will match
-the collation elements of the entire string 'xycb'.  </p><p>For WHERE clause
-2, <ph conref="../conrefs.dita#prod/productshortname"></ph> returns FALSE
-because collation element for character 'z' does not match the collation element
-for character 'x'. In addition, when metacharacter such as an underscore is
-used with the LIKE operator, the metacharacter counts for one character in
-the string value. A clause like WHERE 'xycb' LIKE '_cb' returns FALSE because
-'x' is compared to the metacharacter _ and 'y' does not match 'c'.</p></section>
+</ol>
+<p>For WHERE clause 1, <ph conref="../conrefs.dita#prod/productshortname"></ph>
+returns TRUE, because the collation elements for the entire string 'zcb' will
+match the collation elements of the entire string 'xycb'.</p>
+<p>For WHERE clause 2, <ph conref="../conrefs.dita#prod/productshortname"></ph>
+returns FALSE, because the collation element for the character 'z' does not
+match the collation element for the character 'x'. In addition, when a
+metacharacter such as an underscore is used with the LIKE operator, the
+metacharacter counts for one character in the string value. A clause such as
+<codeph>WHERE 'xycb' LIKE '_cb'</codeph> returns FALSE, because
+'x' is compared to the metacharacter '_' and 'y' does not match 'c'.</p>
+</section>
 </conbody>
 </concept>
-<?Pub *0000009279?>
+

Modified: db/derby/docs/trunk/src/devguide/cdevin10613.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevin10613.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevin10613.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevin10613.dita Thu Aug 15 17:17:12 2013
@@ -19,24 +19,27 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cdevin10613" xml:lang="en-us">
-<title>Localizing Derby</title>
+<title>Localizing <ph conref="../conrefs.dita#prod/productshortname"></ph></title>
 <shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> offers
 support for locales.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>Localization</indexterm><indexterm>Internationalization</indexterm>
+<keywords>
+<indexterm>Localization</indexterm>
+<indexterm>Internationalization</indexterm>
 <indexterm>Locales<indexterm>definition</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
 <p>The word <i>locale</i> in the Java platform refers to an instance of a
 class that identifies a particular combination of language and region. If
 a Java class varies its behavior according to <i>locale</i>, it is said to
-be locale-sensitive. <ph conref="../conrefs.dita#prod/productshortname"></ph> provides
-some support for locales for databases and other components such as the tools
-and the installer.</p>
-<p>It also provides a feature to support databases in many different languages,
-a feature which is independent of a particular territory.</p>
-<p>When you create or upgrade a database, you can use the territory attribute
-to associate a non-default territory with the database. For information about
-how to use the territory attribute, see the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.</p>
+be locale-sensitive. <ph conref="../conrefs.dita#prod/productshortname"></ph>
+provides some support for locales for databases and for other components, such
+as the tools and the installer.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> also provides a
+feature to support databases in many different languages, a feature which is
+independent of a particular locale. When you create or upgrade a database, you
+can use the <i>territory=ll_CC</i> attribute to associate a non-default locale
+with the database. For information on how to use the <i>territory=ll_CC</i>
+attribute, see the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Thu Aug 15 17:17:12 2013
@@ -1578,7 +1578,7 @@ limitations under the License.
 </topicref>
 <topicref href="tdevdvlp12233.dita" navtitle="Providing a user name and password">
 </topicref>
-<topicref href="tdevdvlpcollation.dita" navtitle="Creating a database with territory-based collation">
+<topicref href="tdevdvlpcollation.dita" navtitle="Creating a database with locale-based collation">
 </topicref>
 <topicref href="tdevdvlp36289.dita" navtitle="Specifying attributes in a properties object">
 </topicref>

Modified: db/derby/docs/trunk/src/devguide/tdevdvlpcollation.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdvlpcollation.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdvlpcollation.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdvlpcollation.dita Thu Aug 15 17:17:12 2013
@@ -19,35 +19,38 @@ See the License for the specific languag
 limitations under the License.
 -->
 <task id="tdevdvlpcollation" xml:lang="en-us">
-<title>Creating a database with territory-based collation</title>
+<title>Creating a database with locale-based collation</title>
 <shortdesc>By default, <ph conref="../conrefs.dita#prod/productshortname"></ph> uses
-Unicode codepoint collation. However, you can specify territory-based collation
+Unicode codepoint collation. However, you can specify locale-based collation
 when you create the database.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>database attributes <indexterm>territory-based collation</indexterm></indexterm>
-<indexterm>collation <indexterm>territory-based</indexterm></indexterm></keywords>
+<keywords><indexterm>database attributes <indexterm>locale-based collation</indexterm></indexterm>
+<indexterm>collation <indexterm>locale-based</indexterm></indexterm></keywords>
 </metadata></prolog>
 <taskbody>
-<context><p>You can use the <codeph>collation</codeph> and <codeph>territory</codeph> attributes
-to specify territory-based collation. This type of collation applies only
+<context><p>You can use the <i>collation=collation</i> and
+<i>territory=ll_CC</i> connection URL attributes to specify locale-based
+collation (see the <ph conref="../conrefs.dita#pub/citref"></ph> for details on
+these attributes). This type of collation applies only
 to user-defined tables. The system tables use the Unicode codepoint collation. </p><note
-type="restriction">The <codeph>collation</codeph> and
-<codeph>territory</codeph> attributes can be specified
+type="restriction">The <i>collation=collation</i> and
+<i>territory=ll_CC</i> attributes can be specified
 only when you create a database. You cannot specify these attributes on an existing
 database or when you upgrade a database.</note><p>To create a database with
-territory-based collation:</p></context>
+locale-based collation:</p></context>
 <steps>
-<step><cmd>Specify the language and country codes for the <codeph>territory</codeph> attribute,
-and the TERRITORY_BASED value for the <codeph>collation</codeph> attribute
-when you create the database.</cmd><stepxmp><p>For example:</p><codeblock>jdbc:derby:MexicanDB;create=true;territory=es_MX;collation=TERRITORY_BASED </codeblock
-></stepxmp></step>
+<step><cmd>Specify the language and country codes for the <i>territory=ll_CC</i>
+attribute, and the TERRITORY_BASED value for the <i>collation=collation</i>
+attribute, when you create the database.</cmd><stepxmp><p>For example:</p>
+<codeblock>jdbc:derby:MexicanDB;create=true;territory=es_MX;collation=TERRITORY_BASED </codeblock>
+</stepxmp></step>
 </steps>
-<example><title>Creating a case-insensitive database</title>
-<p>The <codeph>collation</codeph> value TERRITORY_BASED uses the default
+<example id="caseinsensitive"><title>Creating a case-insensitive database</title>
+<p>The <i>collation=collation</i> value TERRITORY_BASED uses the default
 collation strength for the locale, usually TERTIARY, which will consider
 character case significant in searches and comparisons. To make the database
 use case-insensitive searches, specify an explicit strength with the
-<codeph>collation</codeph> attribute. The strength name is appended to
+<i>collation=collation</i> attribute. The strength name is appended to
 TERRITORY_BASED with a colon to separate them.</p>
 <p>For example:</p>
 <codeblock>jdbc:derby:SwedishDB;create=true;territory=sv_SE;collation=TERRITORY_BASED:PRIMARY</codeblock>
@@ -59,7 +62,7 @@ respect differences in accent, use stren
 the locale.</p>
 <p>For more information, see
 <xref href="cdevcollation.dita#cdevcollation"></xref> and the documentation of
-the <codeph>collation</codeph> attribute in the
+the <i>collation=collation</i> attribute in the
 <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
 </example>
 </taskbody>

Modified: db/derby/docs/trunk/src/ref/crefmpref23947.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefmpref23947.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefmpref23947.dita (original)
+++ db/derby/docs/trunk/src/ref/crefmpref23947.dita Thu Aug 15 17:17:12 2013
@@ -50,7 +50,7 @@ Java EE platform, in particular support 
 JDBC API.</p></li>
 <li><i><xref href="rrefapi10613.dita#rrefapi10613"></xref></i>   <p>Notes
 about proprietary APIs for <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></li>
-<li><i><xref href="rrefsqlj75638.dita#rrefsqlj75638"></xref></i>  <p>Territories
+<li><i><xref href="rrefsqlj75638.dita#rrefsqlj75638"></xref></i>  <p>Locales
 supported by <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></li>
 <li><i><xref href="rreflimits.dita#rreflimits"></xref></i>  <p>Limitations
 of <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></li>

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Thu Aug 15 17:17:12 2013
@@ -1345,7 +1345,7 @@ URL syntax"></topicref>
 <topicref href="rrefapi1005026.dita" navtitle="Miscellaneous utilities and interfaces">
 </topicref>
 </topicref>
-<topicref href="rrefsqlj75638.dita" navtitle="Supported territories "></topicref>
+<topicref href="rrefsqlj75638.dita" navtitle="Supported locales"></topicref>
 <topicref collection-type="family" href="rreflimits.dita" navtitle="Derby limitations">
 <topicref href="rrefdbmlimits.dita" navtitle="Limitations for database manager values">
 </topicref>

Modified: db/derby/docs/trunk/src/ref/rrefattrib26867.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib26867.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib26867.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib26867.dita Thu Aug 15 17:17:12 2013
@@ -65,8 +65,10 @@ must specify a <i>databaseName</i> (afte
 the database
 connection URL) or a <i><xref href="rrefattrib17246.dita#rrefattrib17246">databaseName=nameofDatabase</xref></i> attribute
 with this attribute.</p> <p>You can combine this attribute with other attributes.
-To specify a territory when creating a database, use the <i><xref href="rrefattrib56769.dita#rrefattrib56769">territory=ll_CC</xref></i> attribute.
-</p> </section>
+To specify a locale when creating a database, use the
+<i><xref href="rrefattrib56769.dita#rrefattrib56769">territory=ll_CC</xref></i>
+attribute.</p>
+</section>
 <example><title>Examples</title>
 <p>Creating a file system database:</p>
 <codeblock><b><ph>-- create a file system database</ph>

Modified: db/derby/docs/trunk/src/ref/rrefattrib56769.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattrib56769.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattrib56769.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattrib56769.dita Thu Aug 15 17:17:12 2013
@@ -22,19 +22,21 @@ limitations under the License.
 <title>territory=ll_CC attribute</title>
 <prolog><metadata>
 <keywords><indexterm>territory=ll_CC database connection URL attribute</indexterm>
-<indexterm>Databases<indexterm>territory</indexterm></indexterm><indexterm>territory<indexterm>database</indexterm></indexterm>
-<indexterm>Internationalization features<indexterm>territory</indexterm></indexterm>
+<indexterm>Databases<indexterm>locale</indexterm></indexterm>
+<indexterm>locale<indexterm>database</indexterm></indexterm>
+<indexterm>Internationalization features<indexterm>setting locale</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
 <section><title>Function</title> <p>When creating a database,
-use this attribute to associate a non-default territory with the database.
-Setting the <i>territory</i> attribute overrides the default system territory
-for that database. The default system territory is found using <i>java.util.Locale.getDefault()</i>.</p> <p>Specify
-a territory in the form <i>ll_CC</i>, where <i>ll</i> is the two-letter language
+use this attribute to associate a non-default locale with the database.
+Setting the <i>territory=ll_CC</i> attribute overrides the default system locale
+for that database. To find the default system locale, use the
+<i>java.util.Locale.getDefault</i> method.</p> <p>Specify
+a locale in the form <i>ll_CC</i>, where <i>ll</i> is the two-letter language
 code, and <i>CC</i> is the two-letter country code. </p> <p>Language codes
-consist of a pair of lowercase letters that conform to ISO-639. The following
-table shows some examples.</p> 
+consist of a pair of lowercase letters that conform to ISO 639-1. The following
+table shows some examples.</p>
 <table frame="all">
 <title>Sample language codes</title>
 <desc>This table lists and describes some examples of language codes.</desc>
@@ -67,9 +69,10 @@ table shows some examples.</p> 
 </tbody>
 </tgroup>
 </table>
-<p>To see a full list of ISO-639 codes, go to <xref format="html"
-href="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt" scope="external"><i>http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</i></xref>.</p>
-<p>Country codes consist of two uppercase letters that conform to ISO-3166. The
+<p>To see a full list of ISO 639 codes, go to <xref format="html"
+href="http://www.loc.gov/standards/iso639-2/php/code_list.php" scope="external">
+<i>http://www.loc.gov/standards/iso639-2/php/code_list.php</i></xref>.</p>
+<p>Country codes consist of two uppercase letters that conform to ISO 3166. The
 following table shows some examples.</p>
 <table frame="all">
 <title>Sample country codes</title>
@@ -106,13 +109,21 @@ following table shows some examples.</p>
 </row>
 </tbody>
 </tgroup>
-</table> <p>A copy of ISO-3166 can be found at <xref format="html" href="http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html"
-scope="external"><i>http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</i></xref>.</p> </section>
-<section><title>Combining with other attributes</title> <p>The <i>territory</i> attribute
-is used only when creating a database.</p><p>In the following example, the
-new database has a territory of Spanish language and Mexican nationality.</p> <codeblock><b>jdbc:derby:MexicanDB;create=true;territory=es_MX</b></codeblock
-><p>You can use the <xref href="rrefattribcollation.dita#rrefattribcollation"><codeph>collation</codeph> attribute</xref> with
-the <codeph>territory</codeph> attribute to specify that collation is based
-on the territory instead of based on Unicode codepoint collation,</p></section>
+</table>
+<p>A copy of ISO 3166  can be found at <xref format="html" 
+href="http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html"
+scope="external"><i>http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</i>
+</xref>.</p> </section>
+<section><title>Combining with other attributes</title>
+<p>Use the <i>territory=ll_CC</i> attribute only when you create a database.</p>
+<p>In the following example, the new database has a locale of Spanish language
+and Mexican nationality.</p>
+<codeblock><b>jdbc:derby:MexicanDB;create=true;territory=es_MX</b></codeblock>
+<p>You can use the
+<xref href="rrefattribcollation.dita#rrefattribcollation">
+<i>collation=collation</i></xref> attribute with
+the <i>territory=ll_CC</i> attribute to specify that collation is based
+on the locale, instead of being based on Unicode codepoint collation</p>
+</section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefattribcollation.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefattribcollation.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefattribcollation.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefattribcollation.dita Thu Aug 15 17:17:12 2013
@@ -27,10 +27,10 @@ limitations under the License.
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title><p>The <codeph>collation</codeph> attribute
+<section><title>Function</title><p>The <i>collation=collation</i> attribute
 is an optional attribute that specifies whether collation is based on the
-territory specified for the database or Unicode codepoint collation. The valid
-values for the <codeph>collation</codeph> attribute are:</p>
+locale specified for the database or on Unicode codepoint collation. The valid
+values for the <i>collation=collation</i> attribute are:</p>
 <dl>
 <dlentry>
 <dt>UCS_BASIC</dt>
@@ -38,14 +38,16 @@ values for the <codeph>collation</codeph
 </dlentry>
 <dlentry>
 <dt>TERRITORY_BASED</dt>
-<dd>Based on the language specified with the territory attribute. The default
+<dd>Based on the language specified with the
+<i><xref href="rrefattrib56769.dita#rrefattrib56769">territory=ll_CC</xref></i>
+attribute. The default
 collation strength for the locale is used. The default for
 <ph conref="../conrefs.dita#prod/productshortname"></ph> is commonly TERTIARY,
 in which character case is significant in searches and comparisons.</dd>
 </dlentry>
 <dlentry>
 <dt>TERRITORY_BASED:PRIMARY</dt>
-<dd>Territory based with collation strength PRIMARY. Specify this value to make
+<dd>Locale based with collation strength PRIMARY. Specify this value to make
 <ph conref="../conrefs.dita#prod/productshortname"></ph> behave similarly to
 many other databases, for which PRIMARY is commonly the default. PRIMARY
 typically means that only differences in base letters are considered
@@ -54,45 +56,49 @@ significant.</dd>
 </dlentry>
 <dlentry>
 <dt>TERRITORY_BASED:SECONDARY</dt>
-<dd>Territory based with collation strength SECONDARY. SECONDARY typically means
+<dd>Locale based with collation strength SECONDARY. SECONDARY typically means
 that differences in base letters or accents are considered significant, whereas
 differences in case are not considered significant.</dd>
 </dlentry>
 <dlentry>
 <dt>TERRITORY_BASED:TERTIARY</dt>
-<dd>Territory based with collation strength TERTIARY. TERTIARY typically means
+<dd>Locale based with collation strength TERTIARY. TERTIARY typically means
 that differences in base letters, accents, or case are all considered
 significant.</dd>
 </dlentry>
 <dlentry>
 <dt>TERRITORY_BASED:IDENTICAL</dt>
-<dd>Territory based with collation strength IDENTICAL. IDENTICAL means that all
+<dd>Locale based with collation strength IDENTICAL. IDENTICAL means that all
 differences are considered significant.</dd>
 </dlentry>
 </dl>
 <note
-type="restriction">The <codeph>collation</codeph> attribute can be specified
+type="restriction">The <i>collation=collation</i> attribute can be specified
 only when you create a database. You cannot specify this attribute on an existing
 database or when you upgrade a database.</note>
-<p>If you specify the <codeph>collation</codeph> attribute with the value
+<p>If you specify the <i>collation=collation</i> attribute with the value
 TERRITORY_BASED, or one of its variants with a specific collation strength, the
 collation is based on the language and country codes that you specify
-with the <codeph>territory</codeph> attribute.</p><p>If you do not specify
-the <codeph>territory</codeph> attribute when you create the database, <ph
-conref="../conrefs.dita#prod/productshortname"></ph> uses the <codeph>java.util.Locale.getDefault</codeph> method
+with the <i>territory=ll_CC</i> attribute.</p><p>If you do not specify
+the <i>territory=ll_CC</i> attribute when you create the database, <ph
+conref="../conrefs.dita#prod/productshortname"></ph> uses the
+<i>java.util.Locale.getDefault</i> method
 to determine the current value of the default locale for this instance of
-the Java Virtual Machine (JVM).</p><note>The <codeph>collation</codeph> attribute
+the Java Virtual Machine (JVM).</p><note>The <i>collation=collation</i> attribute
 applies only to user-defined tables. The system tables use the Unicode codepoint
 collation.</note>
 <p>For information on how
 <ph conref="../conrefs.dita#prod/productshortname"></ph> handles collation, see
-"Creating a database with territory-based collation" and "Character-based
+"Creating a database with locale-based collation" and "Character-based
 collation in <ph conref="../conrefs.dita#prod/productshortname"></ph>" in the
 <ph conref="../conrefs.dita#pub/citdevelop"></ph>.</p></section>
 <example><title>Example</title><p>The following example shows the URL to create
-the <codeph>MexicanDB</codeph> database. The territory attribute specifies
-Spanish for the language code and Mexico for the country code. The <codeph>collation</codeph> attribute
-specifies that the collation for the database is territory based.</p><codeblock>jdbc:derby:MexicanDB;create=true;territory=es_MX;collation=TERRITORY_BASED </codeblock
-> </example>
+the <i>MexicanDB</i> database. The <i>territory=ll_CC</i>
+attribute specifies
+Spanish for the language code and Mexico for the country code. The
+<i>collation=collation</i> attribute
+specifies that the collation for the database is locale based.</p>
+<codeblock>jdbc:derby:MexicanDB;create=true;territory=es_MX;collation=TERRITORY_BASED </codeblock>
+</example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj75638.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj75638.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj75638.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj75638.dita Thu Aug 15 17:17:12 2013
@@ -19,28 +19,28 @@ limitations under the License.
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefsqlj75638" xml:lang="en-us">
-<title>Supported territories </title>
+<title>Supported locales </title>
 <prolog><metadata>
-<keywords><indexterm>Territories<indexterm>supported</indexterm></indexterm>
+<keywords><indexterm>Locales<indexterm>supported</indexterm></indexterm>
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p>The following table lists the territories supported by
+<section><p>The following table lists the locales supported by
 <ph conref="../conrefs.dita#prod/productshortname"></ph>. Use the
 <i><xref href="rrefattrib56769.dita#rrefattrib56769">territory=ll_CC</xref></i>
 URL attribute to set the
-<ph conref="../conrefs.dita#prod/productshortname"></ph> territory.</p>
+<ph conref="../conrefs.dita#prod/productshortname"></ph> locale.</p>
 <table>
-<title>Supported territories</title>
-<desc>This table lists the territories supported by <ph conref="../conrefs.dita#prod/productshortname"></ph>.</desc>
+<title>Supported locales</title>
+<desc>This table lists the locales supported by <ph conref="../conrefs.dita#prod/productshortname"></ph>.</desc>
 <tgroup cols="2" colsep="1" rowsep="1">
 <colspec colname="col1" colnum="1" colwidth="50*"/>
 <colspec colname="col2" colnum="2" colwidth="50*"/>
 <thead>
 <row valign="bottom">
-<entry colname="col1">Territory</entry>
+<entry colname="col1">Locale</entry>
 <entry colname="col2"><ph conref="../conrefs.dita#prod/productshortname"></ph>
-Territory Setting</entry>
+<i>territory=ll_CC</i> Setting</entry>
 </row>
 </thead>
 <tbody>

Modified: db/derby/docs/trunk/src/tools/ctools1004764.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ctools1004764.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/ctools1004764.dita (original)
+++ db/derby/docs/trunk/src/tools/ctools1004764.dita Thu Aug 15 17:17:12 2013
@@ -26,16 +26,16 @@ limitations under the License.
 <conbody>
 <p>In the <ph conref="../conrefs.dita#prod/productshortname"></ph> documentation, we refer to three locales:  
 <ul>
-<li><i>Java System locale</i>  
+<li><i>Java system locale</i>  
 <p>This is the locale of your machine, which is automatically
 detected by your JVM.   For <ph conref="../conrefs.dita#prod/productshortname"></ph> and <ph conref="../conrefs.dita#prod/productshortname"></ph> tools, the Java system
 locale determines the default locale.</p></li>
-<li><i>Database territory</i>  
-<p>This is the territory associated
+<li><i>Database locale</i>  
+<p>This is the locale associated
 with your database when it is created. By default, this is the same as the 
-Java System locale. The database territory determines
+Java system locale. The database locale determines
 the language of database errors.</p></li>
-<li><i>Tools Session locale</i>  
+<li><i>Tools session locale</i>  
     <p>This locale is associated with your session,
         when using <ph conref="../conrefs.dita#prod/productshortname"></ph>
         tools such as <codeph>ij</codeph> or <codeph>dblook</codeph>.

Modified: db/derby/docs/trunk/src/tools/ctoolsijtools11318.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ctoolsijtools11318.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/ctoolsijtools11318.dita (original)
+++ db/derby/docs/trunk/src/tools/ctoolsijtools11318.dita Thu Aug 15 17:17:12 2013
@@ -18,12 +18,17 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="ctoolsijtools11318">
 <title>Tools and localization</title>
-<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> tools provide support for common localization features such as localized message files and GUI, locale-appropriate formatting of data, codesets, unicode identifiers and data, and database territories.</shortdesc>
+<shortdesc>The <ph conref="../conrefs.dita#prod/productshortname"></ph> tools
+provide support for common localization features such as localized message
+files and GUI, locale-appropriate formatting of data, codesets, unicode
+identifiers and data, and database locales.</shortdesc>
 <prolog><metadata>
 <keywords>
 </keywords>
 </metadata>
 </prolog>
 <conbody>
-<p>For general information about international <ph conref="../conrefs.dita#prod/productshortname"></ph> systems, see the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>.</p>
+<p>For general information about localizing
+<ph conref="../conrefs.dita#prod/productshortname"></ph> systems, see the
+<ph conref="../conrefs.dita#pub/citdevelop"></ph>.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/tools/ctoolsijtools45180.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/ctoolsijtools45180.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/ctoolsijtools45180.dita (original)
+++ db/derby/docs/trunk/src/tools/ctoolsijtools45180.dita Thu Aug 15 17:17:12 2013
@@ -17,14 +17,15 @@ limitations under the License.
 -->
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="ctoolsijtools45180">
-<title>Database territory</title>
+<title>Database locale</title>
 <prolog>
 </prolog>
 <conbody>
-<p>To specify a database territory, use the <i>territory</i> attribute
+<p>To specify a database locale, use the <i>territory=ll_CC</i> attribute
 on the URL connection when creating the database.  
 <note>You cannot
-modify a database's territory after the database has been created.</note></p>
-<p>For information about database territories, see the Internationalization
-appendix in the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>.</p>
+modify a database's locale after the database has been created.</note></p>
+<p>For information about database locales, see "Localizing
+<ph conref="../conrefs.dita#prod/productshortname"></ph>" in the
+<ph conref="../conrefs.dita#pub/citdevelop"></ph>.</p>
 </conbody></concept>

Modified: db/derby/docs/trunk/src/tools/derbytools.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/derbytools.ditamap?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/derbytools.ditamap (original)
+++ db/derby/docs/trunk/src/tools/derbytools.ditamap Thu Aug 15 17:17:12 2013
@@ -56,7 +56,7 @@ limitations under the License.
 </topicref>
 <topicref collection-type="family" href="ctoolsijtools11318.dita" navtitle="Tools and localization">
 <topicref href="ctools1004764.dita" navtitle="About locales"></topicref>
-<topicref href="ctoolsijtools45180.dita" navtitle="Database territory"></topicref>
+<topicref href="ctoolsijtools45180.dita" navtitle="Database locale"></topicref>
 <topicref href="ctoolsijtools70959.dita" navtitle="Specifying an alternate codeset">
 </topicref>
 <topicref collection-type="family" href="ctoolsijtools90477.dita" navtitle="Formatting display of locale-sensitive data">

Modified: db/derby/docs/trunk/src/tools/rtoolsijlocale.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijlocale.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijlocale.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijlocale.dita Thu Aug 15 17:17:12 2013
@@ -21,8 +21,8 @@ limitations under the License.
 <reference id="rtoolsijlocale" xml:lang="en-us">
 <title>derby.ui.locale property</title>
 <prolog><metadata>
-<keywords><indexterm>derby.ui.locale (tool property)</indexterm><indexterm>Internationalization
-features<indexterm>locale</indexterm></indexterm></keywords>
+<keywords><indexterm>derby.ui.locale (tool property)</indexterm>
+<indexterm>Internationalization features<indexterm>locale</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
     <section><title>Function</title>
@@ -33,22 +33,19 @@ features<indexterm>locale</indexterm></i
             dates, times and timestamps, as well as the language of the
             messages from the
             <ph conref="../conrefs.dita#prod/productshortname"></ph> tools.
-            Note that some pages in the
-            <ph conref="../conrefs.dita#prod/productshortname"></ph>
-            documentation guides refer to a "locale" as a "territory".
 </p> </section>
 <refsyn><title>Syntax</title> <codeblock><b>derby.ui.locale=<b><i>derbyval</i></b></b></codeblock> <p>where <i>derbyval</i> is
         a supported locale name, in the form <i>ll_CC</i>, where <i>ll</i>
         is the two-letter language code, and <i>CC</i> is the two-letter
-        country code; for example, ja_JP.</p> </refsyn>
-<example><title>Example</title> <p>The following command specifies to run <codeph>ij</codeph> using
-the Japanese territory (<i>derby.ui.locale=ja_JP</i>) using Japanese Latin
-Kanji mixed encoding (<i>codeset=Cp939</i>): </p>
+        country code; for example, <codeph>ja_JP</codeph>.</p> </refsyn>
+<example><title>Example</title> <p>The following command runs
+<codeph>ij</codeph> using the Japanese locale (<i>derby.ui.locale=ja_JP</i>)
+and Japanese Latin Kanji mixed encoding (<i>derby.ui.codeset=Cp939</i>):</p>
 <codeblock><b>java -Dderby.ui.locale=ja_JP -Dderby.ui.codeset=Cp939 
     -Dij.protocol=jdbc:derby:
     org.apache.derby.tools.ij</b></codeblock>
 <p>Language codes consist of a pair of lowercase letters that
-    conform to ISO-639. The following table shows some examples.</p>  
+    conform to ISO 639-1. The following table shows some examples.</p>  
 <table frame="all">
 <title>Sample language codes</title>
 <desc>This table lists and describes some examples of language codes.</desc>
@@ -80,10 +77,10 @@ Kanji mixed encoding (<i>codeset=Cp939</
 </row>
 </tbody>
 </tgroup>
-</table> <p>To see a full list of ISO-639 codes, go to <xref format="html"
-href="http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt" scope="external"><i>http://www.ics.uci.edu/pub/ietf/http/related/iso639.txt</i></xref
->.</p>
-<p>Country codes consist of two uppercase letters that conform to ISO-3166. The
+</table> <p>To see a full list of ISO 639 codes, go to <xref format="html"
+href="http://www.loc.gov/standards/iso639-2/php/code_list.php" scope="external">
+<i>http://www.loc.gov/standards/iso639-2/php/code_list.php</i></xref>.</p>
+<p>Country codes consist of two uppercase letters that conform to ISO 3166. The
 following table shows some examples.</p>
 <table frame="all">
 <title>Sample country codes</title>
@@ -120,8 +117,10 @@ following table shows some examples.</p>
 </row>
 </tbody>
 </tgroup>
-</table> <p>A copy of ISO-3166 can be found at <xref format="html" href="http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html"
-scope="external"><i>http://www.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</i></xref>.</p>
+</table> <p>A copy of ISO 3166 can be found at <xref format="html" 
+href="http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html"
+scope="external"><i>http://userpage.chemie.fu-berlin.de/diverse/doc/ISO_3166.html</i>
+</xref>.</p>
 </example>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita (original)
+++ db/derby/docs/trunk/src/tools/rtoolsijpropref97949.dita Thu Aug 15 17:17:12 2013
@@ -32,16 +32,17 @@ with a language not supported by your de
 a supported character encoding value, for example, UTF8 (see the table later
 in this topic).</p>
 </refsyn>
-<example><title>Example</title> <p>The following command specifies to run <codeph>ij</codeph> using
-the Japanese territory (<i>derby.ui.locale=ja_JP</i>) using Japanese Latin
-Kanji mixed encoding (<i>codeset=Cp939</i>): </p><codeblock><b>java -Dderby.ui.locale=ja_JP -Dderby.ui.codeset=Cp939 
+<example><title>Example</title> <p>The following command runs
+<codeph>ij</codeph> using the Japanese locale (<i>derby.ui.locale=ja_JP</i>)
+and Japanese Latin Kanji mixed encoding (<i>derby.ui.codeset=Cp939</i>):</p>
+<codeblock><b>java -Dderby.ui.locale=ja_JP -Dderby.ui.codeset=Cp939 
     -Dij.protocol=jdbc:derby:
     org.apache.derby.tools.ij</b></codeblock> <p>The following table contains
 a sampling of character encodings. Supported encodings vary from product to
 product.  For example, to see the full list of the character encodings that
-are supported by the Java Platform, Standard Edition 6 Software Development Kit,
-go to <xref format="html" href="http://download.oracle.com/javase/6/docs/technotes/guides/intl/encoding.doc.html"
-scope="external">http://download.oracle.com/javase/6/docs/technotes/guides/intl/encoding.doc.html</xref>.</p>
+are supported by the Java Platform, Standard Edition 7 Software Development Kit,
+go to <xref format="html" href="http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html"
+scope="external">http://docs.oracle.com/javase/7/docs/technotes/guides/intl/encoding.doc.html</xref>.</p>
 <table frame="all">
 <title>Sample character encodings</title>
 <desc>This table lists and describes some of the available character encodings.</desc>

Modified: db/derby/docs/trunk/src/tuning/rtuntransform208.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/rtuntransform208.dita?rev=1514383&r1=1514382&r2=1514383&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/rtuntransform208.dita (original)
+++ db/derby/docs/trunk/src/tuning/rtuntransform208.dita Thu Aug 15 17:17:12 2013
@@ -29,9 +29,9 @@ limitations under the License.
 <p>This section describes using LIKE transformations as a comparison operator.
 </p>
 <note>LIKE transformations and optimizations are disabled when you use
-territory-based collation. See "Character-based collation in
+locale-based collation. See "Character-based collation in
 <ph conref="../conrefs.dita#prod/productshortname"></ph>" in the
 <ph conref="../conrefs.dita#pub/citdevelop"></ph> for information about
-territory-based collation.</note>
+locale-based collation.</note>
 </section>
 </refbody></reference>



Mime
View raw message