svn commit: r1445404 - in /db/derby/docs/trunk/src/devguide: cdevcsecureroles.dita derbydev.ditamap tdevupgradedb.dita tdevupgradesoft.dita

[ch...@apache.org]

Author: chaase3
Date: Tue Feb 12 21:48:18 2013
New Revision: 1445404

URL: http://svn.apache.org/r1445404
Log:
DERBY-6061  Upgrade language is inconsistent

Modified two Dev Guide topics and removed another.

Patch: DERBY-6061-3.diff

Removed:
    db/derby/docs/trunk/src/devguide/tdevupgradesoft.dita
Modified:
    db/derby/docs/trunk/src/devguide/cdevcsecureroles.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap
    db/derby/docs/trunk/src/devguide/tdevupgradedb.dita

Modified: db/derby/docs/trunk/src/devguide/cdevcsecureroles.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevcsecureroles.dita?rev=1445404&r1=1445403&r2=1445404&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevcsecureroles.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevcsecureroles.dita Tue Feb 12 21:48:18 2013
@@ -47,8 +47,9 @@ revoke, and drop roles is an implementat
 <p>Roles are available only when SQL authorization mode is enabled (that is,
 when the property <codeph>derby.database.sqlAuthorization</codeph> is set to
 <codeph>TRUE</codeph>).</p>
-<p>Old databases must be (hard) upgraded to at least Release 10.5 before roles
-can be used.</p>
+<p>Old databases must be fully upgraded to at least Release 10.5 before roles
+can be used. See <xref href="cdevupgrades.dita#cdevupgrades"></xref> for
+more information.</p>
 <p>If SQL authorization mode is enabled, the database owner can use the
 CREATE ROLE statement to create roles. The database owner can then use the GRANT
 statement to grant a role to one or more users, to PUBLIC, or to another role.

Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=1445404&r1=1445403&r2=1445404&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Tue Feb 12 21:48:18 2013
@@ -37,25 +37,7 @@ limitations under the License.
 </relcell>
 <relcell>
 <topicref href="tdevupgradedb.dita" navtitle="Upgrading a database"></topicref>
-<topicref href="tdevupgradesoft.dita" navtitle="Soft upgrade limitations">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="tdevupgradedb.dita" navtitle="Upgrading a database"></topicref>
 </relcell>
-<relcell>
-<topicref href="tdevupgradesoft.dita" navtitle="Soft upgrade limitations">
-</topicref>
-</relcell>
-</relrow>
-<relrow>
-<relcell>
-<topicref href="tdevupgradesoft.dita" navtitle="Soft upgrade limitations">
-</topicref>
-</relcell>
-<relcell></relcell>
 </relrow>
 <relrow>
 <relcell>
@@ -1537,7 +1519,6 @@ limitations under the License.
 <topicref href="cdevupgrades.dita" navtitle="Upgrades">
 <topicref href="tdevpreupgrade.dita" navtitle="Preparing to upgrade"></topicref>
 <topicref href="tdevupgradedb.dita" navtitle="Upgrading a database"></topicref>
-<topicref href="tdevupgradesoft.dita" navtitle="Soft upgrade"></topicref>
 </topicref>
 <topicref href="cdevdvlp19524.dita" navtitle="JDBC applications and Derby basics">
 <topicref href="cdevdvlp14839.dita" navtitle="Application development overview">

Modified: db/derby/docs/trunk/src/devguide/tdevupgradedb.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevupgradedb.dita?rev=1445404&r1=1445403&r2=1445404&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevupgradedb.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevupgradedb.dita Tue Feb 12 21:48:18 2013
@@ -40,16 +40,23 @@ or soft upgrade:<ul>
 <li>A full upgrade is a complete upgrade of the <ph conref="../conrefs.dita#prod/productshortname"></ph> database.
 When you perform a full upgrade, you cannot connect to the database with an
 older version of <ph conref="../conrefs.dita#prod/productshortname"></ph> and
-you cannot revert back to the previous version. </li>
+you cannot revert back to the previous version. Elsewhere in the documentation,
+when the term "upgrade" is used without any qualification, it means a full
+upgrade.</li>
 <li>A soft upgrade allows you to run a newer version of <ph conref="../conrefs.dita#prod/productshortname"></ph> against
 an existing database without having to fully upgrade the database. This means
 that you can continue to run an older version of <ph conref="../conrefs.dita#prod/productshortname"></ph> against
 the database. However, if you perform a soft upgrade, certain features will
-not be available to you until you perform a full upgrade.</li>
+not be available to you until you perform a full upgrade. Specifically, new
+features that affect the structure of a database are not available with a soft
+upgrade. For a list of the new features in a release, see the Release Notes for
+that release.</li>
 </ul></p></context>
 <steps>
 <step><cmd>To upgrade the database, select the type of upgrade that you want
-to perform. The following table shows the upgrade types.</cmd>
+to perform. The following table shows the upgrade types. In both examples,
+<codeph>sample</codeph> is a database from a previous version of
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</cmd>
 <info>
 <table>
 <title>Upgrade types</title>
@@ -68,14 +75,16 @@ to perform. The following table shows th
 <entry colname="col1">Full upgrade</entry>
 <entry colname="col2">Connect to the database using the
 <codeph>upgrade=true</codeph> database connection URL attribute. For example:
-<codeblock>jdbc:derby:sample;upgrade=true</codeblock></entry>
+<codeblock>jdbc:derby:sample;upgrade=true</codeblock>
+<p>See "upgrade=true attribute" in the
+<ph conref="../conrefs.dita#pub/citref"></ph> for more information about
+this attribute.</p></entry>
 </row>
 <row>
 <entry colname="col1">Soft upgrade</entry>
 <entry colname="col2">Connect to the database. For example:
 <codeblock>connect 'jdbc:derby:sample'</codeblock>
-In this example, <codeph>sample</codeph> is a database from a previous version
-of <ph conref="../conrefs.dita#prod/productshortname"></ph>.</entry>
+</entry>
 </row>
 </tbody>
 </tgroup>