You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2005/07/01 11:16:00 UTC
svn commit: r208734 [4/4] - in /incubator/derby/docs/trunk/src: adminguide/
devguide/ getstart/ ref/ tools/
Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp14496.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp14496.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp14496.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp14496.dita Fri Jul 1 02:15:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp20349.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp20349.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp20349.dita Fri Jul 1 02:15:43 2005
@@ -2,7 +2,7 @@
<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
"../dtd/task.dtd">
<!--
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@
the application shuts down the <ph conref="devconrefs.dita#prod/productshortname"></ph> system
by issuing the following JDBC call:</p><codeblock>DriverManager.getConnection("jdbc:derby:cs;shutdown=true");</codeblock><p>Shutdown
commands always raise <i>SQLExceptions</i>.</p><p>When a <ph conref="devconrefs.dita#prod/productshortname"></ph> system
-shuts down, a message goes to the error log:</p><codeblock>Sat Jan 10 14:31:54 PDT 2004:
+shuts down, a message goes to the error log:</p><codeblock>Sat Jan 10 14:31:54 PDT 2005:
Shutting down instance 80000001-00d0-8bdf-d115-000a0a0b2d00</codeblock><p>Typically,
an application using an embedded <ph conref="devconrefs.dita#prod/productshortname"></ph> engine
shuts down <ph conref="devconrefs.dita#prod/productshortname"></ph> just before
Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp36289.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp36289.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp36289.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp36289.dita Fri Jul 1 02:15:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp38381.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp38381.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp38381.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp38381.dita Fri Jul 1 02:15:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp39090.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp39090.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp39090.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp39090.dita Fri Jul 1 02:15:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp40140.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp40140.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp40140.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp40140.dita Fri Jul 1 02:15:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/derby/docs/trunk/src/devguide/tdevdvlp40464.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevdvlp40464.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevdvlp40464.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevdvlp40464.dita Fri Jul 1 02:15:43 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/derby/docs/trunk/src/devguide/tdevpreupgrade.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevpreupgrade.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevpreupgrade.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevpreupgrade.dita Fri Jul 1 02:15:43 2005
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2004, v.4002-->
<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
"../dtd/task.dtd">
<!--
@@ -27,14 +26,6 @@
<context> <p>Upgrading occurs the first time the new <ph conref="devconrefs.dita#prod/productshortname"></ph> software
connects to the old database. Before connecting with the new software:</p></context>
<steps>
-<step><cmd>Force a checkpoint with the earlier version of <ph conref="devconrefs.dita#prod/productshortname"></ph>.
-To force a checkpoint, connect to the database with the older version of the <ph
-conref="devconrefs.dita#prod/productshortname"></ph> software and issue a
-shutdown request using the <codeph>shutdown=true</codeph> attribute on the
-database connection URL, as shown in the following example:</cmd><info><codeblock>/* in a java program */
-DriverManager.getConnection("jdbc:derby:sample;shutdown=true");</codeblock></info>
-<stepresult>Forcing a checkpoint avoids having to run recovery during the
-upgrade and minimizes the time for the upgrade to complete.</stepresult></step>
<step><cmd>Back up your database to a safe location using <ph conref="devconrefs.dita#prod/productshortname"></ph> online/offline
backup procedures.</cmd><info>For more information on backup, see the <ph
conref="devconrefs.dita#pub/citadmin"></ph>.</info><stepresult>If you do not
Modified: incubator/derby/docs/trunk/src/devguide/tdevupgradedb.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevupgradedb.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevupgradedb.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevupgradedb.dita Fri Jul 1 02:15:43 2005
@@ -2,7 +2,7 @@
<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
"../dtd/task.dtd">
<!--
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/derby/docs/trunk/src/devguide/tdevupgradesoft.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/devguide/tdevupgradesoft.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/devguide/tdevupgradesoft.dita (original)
+++ incubator/derby/docs/trunk/src/devguide/tdevupgradesoft.dita Fri Jul 1 02:15:43 2005
@@ -2,7 +2,7 @@
<!DOCTYPE task PUBLIC "-//IBM//DTD DITA Task//EN"
"../dtd/task.dtd">
<!--
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
Modified: incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ incubator/derby/docs/trunk/src/getstart/getstartderby.ditamap Fri Jul 1 02:15:43 2005
@@ -35,20 +35,20 @@
</topicref>
<topicref collection-type="family" href="cgsinsta.dita" navtitle="Installing and working with Derby">
<topicref href="cgsinstallingderby.dita" navtitle="Installing Derby"></topicref>
-<topicref href="tgssetupjavaenvir.dita" navtitle="Setting up your Java environment">
+<topicref href="tgssetupjavaenvir.dita" navtitle=" Setting up your Java environment">
</topicref>
<topicref collection-type="family" href="cgsusingtoolsutils.dita" navtitle="Using the tools and startup utilities">
<topicref href="cgsusingsysinfo.dita" navtitle="Using sysinfo"></topicref>
<topicref href="tgsrunningij.dita" navtitle="Running ij"></topicref>
</topicref>
-<topicref collection-type="family" href="cgsmanuallysetting.dita" navtitle="Manually setting environment variables and paths">
-<topicref href="tgs36360.dita" navtitle="Set the DERBY_INSTALL environment variable">
+<topicref collection-type="family" href="cgsmanuallysetting.dita" navtitle="Manually setting environment variables and paths ">
+<topicref href="tgs36360.dita" navtitle=" Set the DERBY_INSTALL environment variable">
</topicref>
-<topicref href="tgs26250.dita" navtitle="Set the classpath"></topicref>
+<topicref href="tgs26250.dita" navtitle=" Set the classpath"></topicref>
</topicref>
</topicref>
-<topicref collection-type="family" href="cgsquck19524.dita" navtitle="Quick start for experienced JDBC users">
-<topicref collection-type="family" href="cgsquck70629.dita" navtitle="Environment quick start">
+<topicref collection-type="family" href="cgsquck19524.dita" navtitle="Quick start guide for experienced JDBC users">
+<topicref collection-type="family" href="cgsquck70629.dita" navtitle="Environments in which Derby can run">
<topicref href="cgsquck35643.dita" navtitle="Embedded environment"></topicref>
<topicref href="cgsquck13780.dita" navtitle="Client/server environment"></topicref>
</topicref>
@@ -58,13 +58,13 @@
</topicref>
<topicref collection-type="family" href="rgsdocs37966.dita" navtitle="Documentation conventions">
<topicref href="rgsdocs99397.dita" navtitle="Terminology"></topicref>
-<topicref href="rgsdocs10012.dita" navtitle="Syntax"></topicref>
-<topicref href="rgsdocs18277.dita" navtitle="Typography"></topicref>
+<topicref href="rgsdocs10012.dita" navtitle="SQL syntax"></topicref>
+<topicref href="rgsdocs18277.dita" navtitle="Typographical conventions"></topicref>
</topicref>
-<topicref collection-type="family" href="cgslib19524.dita" navtitle="Derby libraries and scripts: complete reference">
-<topicref href="rgslib46043.dita" navtitle="Libraries Provided by Derby">
+<topicref collection-type="family" href="cgslib19524.dita" navtitle="Derby libraries and scripts: complete reference ">
+<topicref href="rgslib46043.dita" navtitle="Libraries provided by Derby">
</topicref>
-<topicref href="rgslib56653.dita" navtitle="Libraries not provided by Derby">
+<topicref href="rgslib56653.dita" navtitle=" Libraries not provided by Derby">
</topicref>
<topicref href="rgslib27507.dita" navtitle="Scripts provided by Derby"></topicref>
</topicref>
Modified: incubator/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/refderby.ditamap?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ incubator/derby/docs/trunk/src/ref/refderby.ditamap Fri Jul 1 02:15:43 2005
@@ -290,8 +290,8 @@
</topicref>
</topicref>
<topicref href="rrefkeywords29722.dita" navtitle="SQL reserved words"></topicref>
-<topicref href="rrefsql9241891.dita" navtitle="Derby support for
-SQL-92 features "></topicref>
+<topicref href="rrefsql9241891.dita" navtitle="Derby support for SQL-92 features ">
+</topicref>
<topicref collection-type="family" href="rrefsistabs38369.dita" navtitle="Derby System Tables">
<topicref href="rrefsistabs28114.dita" navtitle="SYSALIASES"></topicref>
<topicref href="rrefsistabs26665.dita" navtitle="SYSCHECKS"></topicref>
@@ -324,8 +324,8 @@
<topicref href="rrefjdbc37352.dita" navtitle="Syntax of database connection URLs for applications with embedded databases ">
</topicref>
<topicref href="crefjavgcasyn.dita" navtitle="Additional SQL syntax"></topicref>
-<topicref href="rrefjdbc10889.dita" navtitle="Attributes of the Derby database
-connection URL "></topicref>
+<topicref href="rrefjdbc10889.dita" navtitle="Attributes of the Derby database connection URL ">
+</topicref>
</topicref>
<topicref href="rrefjdbc34954.dita" navtitle="java.sql.Driver.getPropertyInfo ">
</topicref>
@@ -341,7 +341,7 @@
</topicref>
<topicref collection-type="family" href="rrefjdbc15905.dita" navtitle="java.sql.DatabaseMetaData ">
<topicref href="rrefdmrs.dita" navtitle="DatabaseMetaData result sets"></topicref>
-<topicref href="rrefgpc1.dita" navtitle="getProcedureColumns DatabaseMetaData.getProcedureColumns">
+<topicref href="rrefgpc1.dita" navtitle="getProcedureColumnsgetProcedureColumns">
</topicref>
<topicref href="rrefpgc1.dita" navtitle="Parameters to getProcedureColumns">
</topicref>
Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc88908.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc88908.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc88908.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc88908.dita Fri Jul 1 02:15:43 2005
@@ -91,7 +91,8 @@
<li>SQL_TSI_YEAR</li>
</ul></section>
<example><title>Examples of TIMESTAMPADD and TIMESTAMPDIFF</title><codeblock><b>{fn TIMESTAMPADD( SQL_TSI_MONTH, 1, CURRENT_TIMESTAMP)}</b></codeblock
-><p>Returns a timestamp value one month later than the current timestamp.</p><codeblock><b>{fn TIMESTAMPDIFF(SQL_TSI_WEEK, CURRENT_TIMESTAMP, timestamp('2001-01-01-12.00.00.000000'))}</b
+><p>Returns a timestamp value one month later than the current timestamp.</p><codeblock><b>{fn TIMESTAMPDIFF(SQL_TSI_WEEK, CURRENT_TIMESTAMP,
+ timestamp('2001-01-01-12.00.00.000000'))}</b
></codeblock><p>Returns the number of weeks between now and the specified
time on January 1, 2001.</p></example>
</refbody>
Modified: incubator/derby/docs/trunk/src/ref/rrefsistabs22441.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsistabs22441.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsistabs22441.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsistabs22441.dita Fri Jul 1 02:15:43 2005
@@ -82,7 +82,7 @@
<entry colname="5">unique identifier for the default value </entry>
</row>
<row>
-<entry colname="1">AUTOINCREMENTCOLUMNVALUE</entry>
+<entry colname="1">AUTOINCREMENT COLUMNVALUE</entry>
<entry colname="2">BIGINT</entry>
<entry colname="3"></entry>
<entry colname="4">true</entry>
@@ -90,7 +90,7 @@
an identity column</entry>
</row>
<row>
-<entry colname="1">AUTOINCREMENTCOLUMNSTART</entry>
+<entry colname="1">AUTOINCREMENT COLUMNSTART</entry>
<entry colname="2">BIGINT</entry>
<entry colname="3"></entry>
<entry colname="4">true</entry>
@@ -98,7 +98,7 @@
column</entry>
</row>
<row>
-<entry colname="1">AUTOINCREMENTCOLUMNINC</entry>
+<entry colname="1">AUTOINCREMENT COLUMNINC</entry>
<entry colname="2">BIGINT</entry>
<entry colname="3"></entry>
<entry colname="4">true</entry>
Modified: incubator/derby/docs/trunk/src/ref/rrefsistabs79888.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsistabs79888.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsistabs79888.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsistabs79888.dita Fri Jul 1 02:15:43 2005
@@ -20,10 +20,10 @@
<title>SYSTRIGGERS</title>
<refbody>
<section><p>Describes the database's triggers. <table expanse="page" frame="all">
-<tgroup cols="5" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="29*"/>
-<colspec colname="2" colnum="2" colwidth="23*"/><colspec colname="3" colnum="3"
-colwidth="11*"/><colspec colname="4" colnum="4" colwidth="14*"/><colspec colname="5"
-colnum="5" colwidth="24*"/>
+<tgroup cols="5" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="2784*"/>
+<colspec colname="2" colnum="2" colwidth="2185*"/><colspec colname="3" colnum="3"
+colwidth="814*"/><colspec colname="4" colnum="4" colwidth="1003*"/><colspec
+colname="5" colnum="5" colwidth="2902*"/>
<thead>
<row>
<entry align="left" colname="1" valign="bottom">Column Name</entry>
Modified: incubator/derby/docs/trunk/src/tools/rtoolsijpropref25589.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/tools/rtoolsijpropref25589.dita?rev=208734&r1=208733&r2=208734&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/tools/rtoolsijpropref25589.dita (original)
+++ incubator/derby/docs/trunk/src/tools/rtoolsijpropref25589.dita Fri Jul 1 02:15:43 2005
@@ -37,6 +37,7 @@
ij version 10.1
ij> <b>Connect 'sample';</b>
ij> <b>VLUES 1;</b>
-ERROR 42X01: Syntax error: Encountered "VLUES" at line 1, column 1. (errorCode = 30000)
+ERROR 42X01: Syntax error: Encountered "VLUES"
+at line 1, column 1. (errorCode = 30000)
ij></codeblock>
</example></refbody></reference>