db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1418461 - in /db/derby/docs/branches/10.9/src: devguide/tdevdvlpcollation.dita ref/rrefattrib56769.dita
Date Fri, 07 Dec 2012 20:25:06 GMT
Author: chaase3
Date: Fri Dec  7 20:25:05 2012
New Revision: 1418461

URL: http://svn.apache.org/viewvc?rev=1418461&view=rev
Log:
DERBY-6002  Reference manual is unclear on when territory can be set

Merged patch DERBY-6002.diff to 10.9 doc branch from trunk revision 1413904.

Modified:
    db/derby/docs/branches/10.9/src/devguide/tdevdvlpcollation.dita
    db/derby/docs/branches/10.9/src/ref/rrefattrib56769.dita

Modified: db/derby/docs/branches/10.9/src/devguide/tdevdvlpcollation.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.9/src/devguide/tdevdvlpcollation.dita?rev=1418461&r1=1418460&r2=1418461&view=diff
==============================================================================
--- db/derby/docs/branches/10.9/src/devguide/tdevdvlpcollation.dita (original)
+++ db/derby/docs/branches/10.9/src/devguide/tdevdvlpcollation.dita Fri Dec  7 20:25:05 2012
@@ -31,8 +31,9 @@ when you create the database.</shortdesc
 <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
 to user-defined tables. The system tables use the Unicode codepoint collation. </p><note
-type="restriction">The <codeph>collation</codeph> attribute can be specified
-only when you create a database. You cannot specify this attribute on an existing
+type="restriction">The <codeph>collation</codeph> and
+<codeph>territory</codeph> 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>
 <steps>

Modified: db/derby/docs/branches/10.9/src/ref/rrefattrib56769.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.9/src/ref/rrefattrib56769.dita?rev=1418461&r1=1418460&r2=1418461&view=diff
==============================================================================
--- db/derby/docs/branches/10.9/src/ref/rrefattrib56769.dita (original)
+++ db/derby/docs/branches/10.9/src/ref/rrefattrib56769.dita Fri Dec  7 20:25:05 2012
@@ -27,7 +27,7 @@ limitations under the License.
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><title>Function</title> <p>When creating or upgrading a
database,
+<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



Mime
View raw message