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 rh...@apache.org on 2018/11/18 19:32:05 UTC

svn commit: r1846854 - in /db/derby/docs/trunk/src: adminguide/ devguide/ getstart/ security/

Author: rhillegas
Date: Sun Nov 18 19:32:05 2018
New Revision: 1846854

URL: http://svn.apache.org/viewvc?rev=1846854&view=rev
Log:
DERBY-6980: Clean up stale verbiage in the user docs; commit derby-6980-05-aa-miscCleanup.diff.

Modified:
    db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
    db/derby/docs/trunk/src/adminguide/cadminjmxoverview.dita
    db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
    db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita
    db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
    db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
    db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita
    db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
    db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita
    db/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita
    db/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy15325.dita
    db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp27610.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp30653.dita
    db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita
    db/derby/docs/trunk/src/devguide/cdevspecial.dita
    db/derby/docs/trunk/src/devguide/cdevstart19524.dita
    db/derby/docs/trunk/src/devguide/cdevstart98282.dita
    db/derby/docs/trunk/src/devguide/cdevtricks19707.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap
    db/derby/docs/trunk/src/devguide/rdevresman79556.dita
    db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
    db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
    db/derby/docs/trunk/src/devguide/tdevpreupgrade.dita
    db/derby/docs/trunk/src/devguide/tdevupgradedb.dita
    db/derby/docs/trunk/src/getstart/tgssetupverify.dita
    db/derby/docs/trunk/src/security/cseccsecuregrantrevokeaccess.dita
    db/derby/docs/trunk/src/security/csecjavasecurity.dita
    db/derby/docs/trunk/src/security/csecnetservfileperms.dita

Modified: db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminappsxawthdriver.dita Sun Nov 18 19:32:05 2018
@@ -28,11 +28,7 @@ client driver's XA DataSource interface.
 <conbody>
 <section>
 <p>You can use the <codeph>org.apache.derby.jdbc.ClientXADataSource</codeph>
-class on all supported Java SE versions except Java SE 8 Compact Profile 2. On
-Java SE 8 Compact Profile 2, you must use the
-<codeph>org.apache.derby.jdbc.BasicClientXADataSource40</codeph> class. For more
-information, see "JDBC support for Java SE 8 Compact Profiles" in the
-<ph conref="../conrefs.dita#pub/citref"></ph>.</p>
+class on all supported Java SE versions.</p>
 </section>
 <example><p>The following example illustrates how to obtain an XA connection
 with the network client driver:</p>

Modified: db/derby/docs/trunk/src/adminguide/cadminjmxoverview.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminjmxoverview.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminjmxoverview.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminjmxoverview.dita Sun Nov 18 19:32:05 2018
@@ -48,7 +48,7 @@ security features to enable this access.
 automatically available when
 <ph conref="../conrefs.dita#prod/productshortname"></ph> is started in a JVM
 that supports the platform MBean server. Most versions of the Java SE platform
-support JMX technology (Java SE 8 Compact Profile 2, for example, does not).</p>
+support JMX technology.</p>
 <p>You start <ph conref="../conrefs.dita#prod/productshortname"></ph> by loading
 the <ph conref="../conrefs.dita#prod/productshortname"></ph> embedded driver. If
 you are using the <ph conref="../conrefs.dita#prod/productshortname"></ph>

Modified: db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminnsdatasources.dita Sun Nov 18 19:32:05 2018
@@ -29,12 +29,7 @@ Client driver <codeph>DataSource</codeph
 <conbody>
 <p>You can use the <codeph>org.apache.derby.jdbc.ClientDataSource</codeph> and
 <codeph>org.apache.derby.jdbc.ClientConnectionPoolDataSource</codeph> classes
-on all supported Java SE versions except Java SE 8 Compact Profile 2. On
-Java SE 8 Compact Profile 2, you must use the
-<codeph>org.apache.derby.jdbc.BasicClientDataSource40</codeph> and
-<codeph>org.apache.derby.jdbc.BasicClientConnectionPoolDataSource40</codeph>
-classes. For more information, see "JDBC support for Java SE 8 Compact Profiles"
-in the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
+on all supported Java SE versions.</p>
 <section><title>Using statement caching</title>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports JDBC
 statement caching, which can improve the performance of applications that use

Modified: db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita (original)
+++ db/derby/docs/trunk/src/adminguide/cadminpreface23947.dita Sun Nov 18 19:32:05 2018
@@ -18,7 +18,7 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cadminpreface23947">
 <title>How this guide is organized</title>
-<shortdesc>This guide includes the following two parts.</shortdesc>
+<shortdesc>This guide describes how to run and manage the Derby network server.</shortdesc>
 <prolog>
 </prolog>
 <conbody>

Modified: db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Sun Nov 18 19:32:05 2018
@@ -188,7 +188,7 @@
 <topicref collection-type="family" href="cadminapps59125.dita" navtitle="Using the Network Server with preexisting Derby applications">
 <topicref href="cadminappsthenetworkserverandjvms.dita" navtitle="The Network Server and Java Virtual Machines (JVMs)">
 </topicref>
-<topicref href="tadminappschangingyourclasspath.dita" navtitle="Installing required jar files and adding them to the classpath">
+<topicref href="tadminappschangingyourclasspath.dita" navtitle="Installing required jar files and adding them to the classpath/modulepath">
 </topicref>
 <topicref collection-type="family" href="tadmincbdjhhfd.dita" navtitle="Starting the Network Server">
 <topicref href="tadminconfig814963.dita" navtitle="Starting the Network Server from a Java application">

Modified: db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminappsclientxmp.dita Sun Nov 18 19:32:05 2018
@@ -29,8 +29,8 @@ explicitly set the property
 <codeph>true</codeph>. Otherwise,
 <ph conref="../conrefs.dita#prod/productshortname"></ph> does not require a user
 name and password. For details on how to enable user authentication, see
-"Working with user authentication" in the
-<ph conref="../conrefs.dita#pub/citdevelop"/>.</p>
+"Configuring user authentication" in the
+<ph conref="../conrefs.dita#pub/citsec"/>.</p>
 <p>For a multi-user product, you would typically specify authentication for the
 system in the <codeph>derby.properties</codeph> file for your
 server, since it is in a trusted environment. The following property setting

Modified: db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita (original)
+++ db/derby/docs/trunk/src/adminguide/radminjmxenabledisable.dita Sun Nov 18 19:32:05 2018
@@ -38,8 +38,7 @@ enabled.</p>
 </section>
 <section><title>Local JMX access</title>
 <p>Local JMX management and monitoring are enabled by default on platforms that
-support JMX. (Java SE 8 Compact Profile 2, for example, does not support
-JMX.)</p>
+support JMX.</p>
 </section>
 <section><title>Remote JMX access</title>
 <p>Remote JMX management and monitoring is a powerful Java feature, allowing you

Modified: db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminappschangingyourclasspath.dita Sun Nov 18 19:32:05 2018
@@ -18,9 +18,9 @@ See the License for the specific languag
 limitations under the License.
 -->
 <task id="tadminappschangingyourclasspath" xml:lang="en-us">
-<title>Installing required jar files and adding them to the classpath</title>
+<title>Installing required jar files and adding them to the classpath/modulepath</title>
 <shortdesc>To use the Network Server and network client driver, add the
-following jar file to your server classpath.</shortdesc>
+following jar file to your server classpath/modulepath.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>derbyclient.jar</indexterm><indexterm>derby.jar</indexterm>
 <indexterm>derbynet.jar</indexterm><indexterm>derbyrun.jar</indexterm></keywords>
@@ -30,30 +30,29 @@ following jar file to your server classp
 <ul>
 <li><codeph>derbyrun.jar</codeph></li>
 </ul>
-<p>Adding this file to your classpath has the effect of including all of the
-<ph conref="../conrefs.dita#prod/productshortname"></ph> classes in your 
-classpath. These classes are in the following jar files, which you can also add
-to your classpath separately:</p>
+<p>Adding this file to your classpath/modulepath has the effect of including all of the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> classes. These classes are in the following jar files, which you can also add
+to your classpath/modulepath separately:</p>
 </context>
 <steps-unordered>
 <step><cmd><codeph>derbynet.jar</codeph></cmd><info><p>This jar file contains
-the Network Server code. It must be in your classpath to start the Network
+the Network Server code. It must be in your classpath/modulepath to start the Network
 Server.</p></info></step>
 <step><cmd><codeph>derby.jar</codeph></cmd>
 <info><p>This jar file contains the
 <ph conref="../conrefs.dita#prod/productshortname"></ph> database engine code.
-It must be in the classpath in order for the Network Server to access 
+It must be in the classpath/modulepath in order for the Network Server to access 
 <ph conref="../conrefs.dita#prod/productshortname"></ph> databases. 
 <codeph>derby.jar</codeph> is included in the <codeph>Class-Path</codeph>
 attribute of <codeph>derbynet.jar</codeph>'s manifest file. If you have
-<codeph>derbynet.jar</codeph> in the classpath and <codeph>derby.jar</codeph> is
+<codeph>derbynet.jar</codeph> in the classpath/modulepath and <codeph>derby.jar</codeph> is
 in the same directory as <codeph>derbynet.jar</codeph>, it is not necessary to
 include <codeph>derby.jar</codeph> explicitly.</p></info></step>
 <step><cmd><codeph>derbyclient.jar</codeph></cmd>
 <info><p>This jar file contains the
 <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Client JDBC
 driver that is necessary for communication with the Network Server. It must be
-in the classpath of the application on the client side in order to access 
+in the classpath/modulepath of the application on the client side in order to access 
 <ph conref="../conrefs.dita#prod/productshortname"></ph> databases over a
 network.</p></info>
 </step>
@@ -61,21 +60,19 @@ network.</p></info>
 contains the standard <ph conref="../conrefs.dita#prod/productshortname"></ph>
 tools, such as <codeph>ij</codeph>, <codeph>sysinfo</codeph>,
 and <codeph>dblook</codeph>.
-The <codeph>derbytools.jar</codeph> file is not needed in your classpath
-to run the Network Server, but it is automatically included
-by <codeph>derbyrun.jar</codeph>.</p></info></step>
+This jar file also contains the <ph conref="../conrefs.dita#prod/productshortname"></ph> DataSources.</p></info></step>
 <step><cmd><codeph>derbyoptionaltools.jar</codeph></cmd><info><p>This jar file
 contains additional <ph conref="../conrefs.dita#prod/productshortname"></ph>
 tools, such as the Lucene plug-in.
 The <codeph>derbyoptionaltools.jar</codeph> file is not needed in
-your classpath to run the Network Server, but it is automatically included
+your classpath/modulepath to run the Network Server, but it is automatically included
 by <codeph>derbyrun.jar</codeph>.</p></info></step>
 </steps-unordered>
 <example><p>All of the jar files are in the 
 <codeph>$<ph conref="../conrefs.dita#prod/productinstallpath"></ph>/lib</codeph>
 directory.</p>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> provides script
-files for setting the classpath to work with the Network Server. The scripts are
+files for setting the classpath/modulepath to work with the Network Server. The scripts are
 located in the
 <codeph>$<ph conref="../conrefs.dita#prod/productinstallpath"></ph>/bin</codeph>
 directory.</p><ul>
@@ -86,6 +83,6 @@ directory.</p><ul>
 </ul></example>
 <postreq>See <xref href="cadminconfig86869.dita#cadminconfig86869"></xref> and
 <ph conref="../conrefs.dita#pub/citgetstart"></ph> for more information on
-setting the classpath.</postreq>
+setting the classpath/modulepath.</postreq>
 </taskbody>
 </task>

Modified: db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadmincbdjhhfd.dita Sun Nov 18 19:32:05 2018
@@ -50,7 +50,7 @@ and "Policy File Creation and Management
 href="http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html"
 scope="external">http://docs.oracle.com/javase/7/docs/technotes/guides/security/PolicyGuide.html</xref>.
 </p>
-<p>If you are running Java SE 7 or later, and if you start the
+<p>If you start the
 <ph conref="../conrefs.dita#prod/productshortname"></ph> Network Server from the
 command line as described here, access to databases and to other
 <ph conref="../conrefs.dita#prod/productshortname"></ph> files is by default
@@ -151,7 +151,7 @@ or
 <li><p>If you are familiar with both the Java programming language and
 <ph conref="../conrefs.dita#prod/productshortname"></ph>, you have already set 
 <codeph><ph conref="../conrefs.dita#prod/productinstallpath"></ph></codeph>. 
-Set your classpath to include the 
+Set your classpath/modulepath to include the 
 <ph conref="../conrefs.dita#prod/productshortname"></ph>
 jar files. Then use a <codeph>java</codeph> command to invoke the 
 <codeph>NetworkServerControl</codeph> class directly, as shown in the following

Modified: db/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminconfigsettingnetwrokserverproperties.dita Sun Nov 18 19:32:05 2018
@@ -28,7 +28,7 @@ ways.</shortdesc>
 <taskbody>
 <context><ul>
 <li>On the command line</li>
-<li>In the <codeph>.bat</codeph> or <codeph>.ksh</codeph> files (load the
+<li>In the <codeph>.bat</codeph> or unix shell script files (load the
 properties by executing <codeph>java -D</codeph>)</li>
 <li>In the <codeph>derby.properties</codeph> file</li>
 </ul>

Modified: db/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita (original)
+++ db/derby/docs/trunk/src/adminguide/tadminconfigverifyingstartup.dita Sun Nov 18 19:32:05 2018
@@ -31,7 +31,7 @@ currently running, use the <codeph>ping<
 ways:</p></context>
 <steps-unordered>
 <step><cmd>You can use the script <codeph>NetworkServerControl.bat</codeph> for
-Windows systems or <codeph>NetworkServerControl.ksh</codeph> for UNIX systems
+Windows systems or <codeph>NetworkServerControl</codeph> for UNIX systems
 with the <codeph>ping</codeph> command. For example:</cmd>
 <stepxmp><codeblock>NetworkServerControl ping [-h &lt;<i>hostname</i>&gt;;] [-p &lt;<i>portnumber</i>&gt;]</codeblock>
 </stepxmp>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts839085.dita Sun Nov 18 19:32:05 2018
@@ -23,8 +23,7 @@ limitations under the License.
 <shortdesc>You should explicitly close <codeph><i>Statements</i></codeph>,
 <codeph><i>ResultSets</i></codeph>, and <codeph><i>Connections</i></codeph> when
 you no longer need them, unless you declare them in a
-<codeph><i>try</i></codeph>-with-resources statement (available in JDK 7 and
-after).</shortdesc>
+<codeph><i>try</i></codeph>-with-resources statement.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Explicit close of JDBC objects</indexterm></keywords>
 </metadata></prolog>
@@ -39,7 +38,7 @@ use its <codeph><i>close</i></codeph> me
 must explicitly commit or roll back active transactions before you close the
 connection.</p>
 <p>Statements, result sets, and connections extend
-<codeph><i>AutoCloseable</i></codeph> in JDK 7 and after. If you declare a
+<codeph><i>AutoCloseable</i></codeph>. If you declare a
 connection in a <codeph><i>try</i></codeph>-with-resources statement and there
 is an error that the code does not catch, the JRE will attempt to close the
 connection automatically.</p>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy15325.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy15325.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy15325.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy15325.dita Sun Nov 18 19:32:05 2018
@@ -18,8 +18,7 @@ limitations under the License.
 <!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN" "../dtd/concept.dtd">
 <concept xml:lang="en-us" id="cdevdeploy15325">
 <title>Creating Derby databases for read-only use</title>
-<shortdesc>You can create <ph conref="../conrefs.dita#prod/productshortname"></ph> databases for use on read-only media such as
-CD-ROMs.</shortdesc>
+<shortdesc>You can create <ph conref="../conrefs.dita#prod/productshortname"></ph> databases for use on read-only media such as thumb-drives.</shortdesc>
 <prolog><metadata>
 <keywords>
 <indexterm>Read-only databases<indexterm>working with</indexterm></indexterm>

Modified: db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy82529.dita Sun Nov 18 19:32:05 2018
@@ -20,7 +20,7 @@ limitations under the License.
 -->
 <concept id="cdevdeploy82529" xml:lang="en-us">
 <title>Databases on read-only media and DatabaseMetaData</title>
-<shortdesc>Databases on read-only media return true for <i>DatabaseMetaData.isReadOnly</i>.</shortdesc>
+<shortdesc>Databases on read-only media return true for <i>java.sql.DatabaseMetaData.isReadOnly</i>.</shortdesc>
 <prolog></prolog>
 <conbody></conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita Sun Nov 18 19:32:05 2018
@@ -28,8 +28,8 @@ to access relational databases from Java
 <conbody>
 <p>The JDBC API is part of the Java Platform, Standard Edition and is
 not specific to <ph conref="../conrefs.dita#prod/productshortname"></ph>.
-It consists of the <i>java.sql</i> and <i>javax.sql</i> packages, which is
-a set of classes and interfaces that make it possible to access databases
+It consists of the <i>java.sql</i> and <i>javax.sql</i> packages, which contain
+classes and interfaces that make it possible to access databases
 (from a number of different vendors, not just <ph conref="../conrefs.dita#prod/productshortname"></ph>)
 from a Java application.</p>
 <p>To develop <ph conref="../conrefs.dita#prod/productshortname"></ph> applications

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp19297.dita Sun Nov 18 19:32:05 2018
@@ -21,7 +21,8 @@ limitations under the License.
 <concept id="cdevdvlp19297" xml:lang="en-us">
 <title>Recommended practices</title>
 <shortdesc>When developing <ph conref="../conrefs.dita#prod/productshortname"></ph> applications,
-create a single directory to hold your database or databases.</shortdesc>
+create a single directory to hold your database or databases, preferably in a secured branch
+of the file system such as one owned by the account which boots the JVM.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>System directory<indexterm>creating and naming directory
 for</indexterm></indexterm></keywords>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp19700.dita Sun Nov 18 19:32:05 2018
@@ -20,8 +20,8 @@ limitations under the License.
 -->
 <concept id="cdevdvlp19700" xml:lang="en-us">
 <title>Special database access</title>
-<shortdesc>You can also access databases from the classpath or from a jar
-file (in the classpath or not) as read-only databases.</shortdesc>
+<shortdesc>You can also access databases from the classpath/modulepath or from a jar
+file (in the classpath/modulepath or not) as read-only databases.</shortdesc>
 <prolog></prolog>
 <conbody>
 <p>You can create in-memory databases for use in testing and development and for

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp24155.dita Sun Nov 18 19:32:05 2018
@@ -21,7 +21,7 @@ limitations under the License.
 <concept id="cdevdvlp24155" xml:lang="en-us">
 <title>Accessing databases from a jar or zip file</title>
 <shortdesc>It is possible to access databases from a jar file. The jar file
-does not have to be on the classpath.</shortdesc>
+does not have to be on the classpath/modulepath.</shortdesc>
 <prolog></prolog>
 <conbody>
 <note>All such databases are read-only.</note>
@@ -30,7 +30,7 @@ a file called <i>jar1.jar</i>. This arch
 start up <ph conref="../conrefs.dita#prod/productshortname"></ph>. You can
 access <i>jarDB1</i> with the following connection URL</p>
 <codeblock>jdbc:derby:classpath:jarDB1</codeblock>
-<p>To access a database in a jar file that is not on the classpath, use the
+<p>To access a database in a jar file that is not on the classpath/modulepath, use the
 <i>jar</i> subprotocol. </p>
 <p>For example, suppose you have archived the database <i>jarDB2</i> into
 a file called <i>jar2.jar</i>. This archive is not in the classpath. You can

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp27610.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp27610.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp27610.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp27610.dita Sun Nov 18 19:32:05 2018
@@ -60,7 +60,7 @@ automatically becomes part of the curren
 <p>When you use the embedded driver,
 <ph conref="../conrefs.dita#prod/productshortname"></ph> database files and log
 files normally have whatever default permissions you specify for your file
-system. If you are running with Java SE 7 or later, however, you can enhance
+system. However, you can enhance
 security by restricting file access to the user who creates the database. To do
 this, set the system property <i>derby.storage.useDefaultFilePermissions</i> to
 false. See the <ph conref="../conrefs.dita#pub/citref"></ph> for details.</p>

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp30653.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp30653.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp30653.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp30653.dita Sun Nov 18 19:32:05 2018
@@ -28,7 +28,7 @@ have a few limitations.</shortdesc>
 </metadata></prolog>
 <conbody>
 <section><title>Indexes</title><p>Indexes are not supported for columns defined
-on CLOB, BLOB, LONG VARCHAR, and XML data types.</p><p>If the length of the
+on CLOB, BLOB, LONG VARCHAR, XML, and user-defined data types.</p><p>If the length of the
 key columns in an index is larger than half the page size of the index, creating
 an index on those key columns for the table fails. For existing indexes, an
 insert of new rows for which the key columns are larger than half of the index

Modified: db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp91854.dita Sun Nov 18 19:32:05 2018
@@ -19,9 +19,9 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cdevdvlp91854" xml:lang="en-us">
-<title>Accessing databases from the classpath</title>
+<title>Accessing databases from the classpath/modulepath</title>
 <shortdesc>In most cases, you access databases from the file system. However,
-it is also possible to access databases from the classpath. The databases
+it is also possible to access databases from the classpath/modulepath. The databases
 can be archived into a jar or zip file or left as is.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Classpath<indexterm>accessing databases from</indexterm></indexterm>
@@ -40,7 +40,7 @@ directory in the classpath and access <i
 jdbc:derby:classpath:sample
 </codeblock>
 <p>If only <i>C:\<ph conref="../conrefs.dita#prod/productlowercase"></ph></i>
-were in the classpath, you could access <i>sample</i> (read-only) like this:</p>
+were in the classpath/modulepath, you could access <i>sample</i> (read-only) like this:</p>
 <codeblock>
 jdbc:derby:classpath:demo/databases/sample
 </codeblock>

Modified: db/derby/docs/trunk/src/devguide/cdevspecial.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevspecial.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevspecial.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevspecial.dita Sun Nov 18 19:32:05 2018
@@ -21,7 +21,7 @@ limitations under the License.
 <title>Derby server-side programming</title>
 <shortdesc>This section discusses special programming for <ph conref="../conrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <conbody>
-<p>In particular, this section discusses how to program database-side JDBC routines,
-triggers, and table functions.</p>
+<p>In particular, this section discusses how to program database-side routines,
+triggers, table functions, types, and aggregates.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart19524.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevstart19524.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart19524.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart19524.dita Sun Nov 18 19:32:05 2018
@@ -32,6 +32,6 @@ See the Release Notes for information on
 affect your existing applications, defect information, and recent documentation
 updates. See <cite><ph conref="../conrefs.dita#pub/citgetstart"></ph></cite> for
 basic product descriptions, information on getting started, and directions
-for setting the path and the classpath. </p>
+for setting the path and the classpath/modulepath. </p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstart98282.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevstart98282.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstart98282.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstart98282.dita Sun Nov 18 19:32:05 2018
@@ -19,14 +19,14 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cdevstart98282" xml:lang="en-us">
-<title>Derby libraries and classpath</title>
+<title>Derby libraries and classpath/modulepath</title>
 <shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> libraries
 are located in the /<i>lib</i> subdirectory of the <ph conref="../conrefs.dita#prod/productshortname"></ph> base
-directory. You must set the classpath on your development machine to include
+directory. You must set the classpath/modulepath on your development machine to include
 the appropriate libraries.</shortdesc>
 <prolog></prolog>
 <conbody>
 <p><cite><ph conref="../conrefs.dita#pub/citgetstart"></ph></cite><cite> </cite> explains
-how to set the classpath in a development environment.</p>
+how to set the classpath/modulepath in a development environment.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevtricks19707.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevtricks19707.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks19707.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks19707.dita Sun Nov 18 19:32:05 2018
@@ -19,10 +19,10 @@ See the License for the specific languag
 limitations under the License.
 -->
 <concept id="cdevtricks19707" xml:lang="en-us">
-<title>Retrieving the database connection URL</title>
-<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> does not
-have a built-in function that returns the name of the database. However, you
-can use <codeph>DatabaseMetaData</codeph> to return the connection URL of
+<title>Retrieving the database name and connection URL</title>
+<shortdesc>To retrieve the database name, invoke the <i>SYSCS_UTIL.SYSCS_GET_DATABASE_NAME()</i> system function,
+as documented in the Derby Reference Manual. You
+can also use <codeph>DatabaseMetaData</codeph> to return the connection URL of
 any local <codeph>Connection</codeph>.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>Database connection URL<indexterm>retrieving from database</indexterm></indexterm>

Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Sun Nov 18 19:32:05 2018
@@ -340,7 +340,7 @@ limitations under the License.
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevdvlp91854.dita" navtitle="Accessing databases from the classpath">
+<topicref href="cdevdvlp91854.dita" navtitle="Accessing databases from the classpath/modulepath">
 </topicref>
 </relcell>
 <relcell>
@@ -382,7 +382,7 @@ limitations under the License.
 </topicref>
 </relcell>
 <relcell>
-<topicref href="cdevstart98282.dita" navtitle="Derby libraries and classpath">
+<topicref href="cdevstart98282.dita" navtitle="Derby libraries and classpath/modulepath">
 </topicref>
 <topicref href="cdevstart41260.dita" navtitle="UNIX-specific issues"></topicref>
 </relcell>
@@ -1184,7 +1184,7 @@ limitations under the License.
 </relrow>
 <relrow>
 <relcell>
-<topicref href="cdevtricks19707.dita" navtitle="Retrieving the database connection URL">
+<topicref href="cdevtricks19707.dita" navtitle="Retrieving the database name and connection URL">
 </topicref>
 </relcell>
 <relcell>
@@ -1367,7 +1367,7 @@ limitations under the License.
 <topicref href="cdevdvlp40350.dita" navtitle="Conventions for specifying the database path">
 </topicref>
 <topicref href="cdevdvlp19700.dita" navtitle="Special database access">
-<topicref href="cdevdvlp91854.dita" navtitle="Accessing databases from the classpath">
+<topicref href="cdevdvlp91854.dita" navtitle="Accessing databases from the classpath/modulepath">
 </topicref>
 <topicref href="cdevdvlp24155.dita" navtitle="Accessing databases from a jar or zip file">
 </topicref>

Modified: db/derby/docs/trunk/src/devguide/rdevresman79556.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevresman79556.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevresman79556.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevresman79556.dita Sun Nov 18 19:32:05 2018
@@ -35,10 +35,10 @@ API.</shortdesc>
 </metadata></prolog>
 <refbody>
 <section>
-<p>Most applications will use the first variant. However, applications that run
-on Java SE 8 Compact Profile 2 must use the second variant (the one whose class
-name begins with "Basic"). For more information, see "JDBC support for Java SE 8
-Compact Profiles" in the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
+<p>Most applications will use the first variant. However, applications that were coded to run
+on Java SE 8 Compact Profile 2 may use the second variant (the one whose class
+name begins with "Basic"). The Compact Profile 2 classes are maintained for backward
+compatibility.</p>
 <p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> implementation
 classes for the <i>DataSource</i> interfaces are as follows:</p>
 <ul>

Modified: db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdeploy39856.dita Sun Nov 18 19:32:05 2018
@@ -19,9 +19,9 @@ See the License for the specific languag
 limitations under the License.
 -->
 <task id="tdevdeploy39856" xml:lang="en-us">
-<title>Accessing databases within a jar file using the classpath</title>
+<title>Accessing databases within a jar file using the classpath/modulepath</title>
 <shortdesc>Once an archive containing one or more <ph conref="../conrefs.dita#prod/productshortname"></ph> databases
-has been created it can be placed in the classpath. This allows access to
+has been created it can be placed in the classpath/modulepath. This allows access to
 a database from within an application without the application's knowing the
 path of the archive.</shortdesc>
 <prolog><metadata>
@@ -30,12 +30,12 @@ path of the archive.</shortdesc>
 </keywords>
 </metadata></prolog>
 <taskbody>
-<context> <p>When jar or zip files are part of the classpath, you specify the
+<context> <p>When jar or zip files are part of the classpath/modulepath, you specify the
 <i>classpath</i> subsubprotocol instead of the <i>jar</i> subsubprotocol to
 connect to them.</p><p>To access a database
-in a zip or jar file in the classpath:</p></context>
+in a zip or jar file in the classpath/modulepath:</p></context>
 <steps>
-<step><cmd>Set the classpath to include the jar or zip file before starting
+<step><cmd>Set the classpath/modulepath to include the jar or zip file before starting
 up <ph conref="../conrefs.dita#prod/productshortname"></ph>:</cmd><info><codeblock>CLASSPATH="C:\dbs.jar;%CLASSPATH%"</codeblock></info>
 </step>
 <step><cmd>Connect to a database within the jar or zip file with the

Modified: db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevdvlp20349.dita Sun Nov 18 19:32:05 2018
@@ -41,7 +41,7 @@ Shutting down instance a816c00e-0139-bfe
 database directory C:\sampledb with class loader 
 sun.misc.Launcher$AppClassLoader@9931f5 
 ----------------------------------------------------------------</codeblock>
-<p>If you are running with a security manager on JDK 8 or higher, you must grant
+<p>If you are running with a security manager, you must grant
 <ph conref="../conrefs.dita#prod/productshortname"></ph> permission to
 deregister the embedded driver in order to fully shut down the system. See
 "Configuring Java security" in the <ph conref="../conrefs.dita#pub/citsec"></ph>

Modified: db/derby/docs/trunk/src/devguide/tdevpreupgrade.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevpreupgrade.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevpreupgrade.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevpreupgrade.dita Sun Nov 18 19:32:05 2018
@@ -32,15 +32,15 @@ connects to the old database.</shortdesc
 <step><cmd>Back up your database to a safe location using <ph conref="../conrefs.dita#prod/productshortname"></ph> online/offline
 backup procedures.</cmd><info>For more information on backup, see the <ph
 conref="../conrefs.dita#pub/citadmin"></ph>.</info></step>
-<step><cmd>Update your CLASSPATH with the latest jar files.</cmd></step>
+<step><cmd>Update your CLASSPATH or modulepath with the latest jar files.</cmd></step>
 <step><cmd>Make sure that there are no older versions of the <ph conref="../conrefs.dita#prod/productshortname"></ph> jar
-files in your CLASSPATH. You can determine if you have multiple versions of <ph conref="../conrefs.dita#prod/productshortname"></ph> in your CLASSPATH by using the sysinfo tool.</cmd>
+files in your CLASSPATH or modulepath. You can determine if you have multiple versions of <ph conref="../conrefs.dita#prod/productshortname"></ph> in your CLASSPATH or modulepath by using the sysinfo tool.</cmd>
 <stepxmp>To use the <codeph>sysinfo</codeph> tool,
 execute the following command:<codeblock>java org.apache.derby.tools.sysinfo</codeblock>The <codeph>sysinfo</codeph> tool
 uses information found in the <ph conref="../conrefs.dita#prod/productshortname"></ph> jar
-files to determine the version of any <ph conref="../conrefs.dita#prod/productshortname"></ph> jar in your CLASSPATH. Be sure that you have only one version of
+files to determine the version of any <ph conref="../conrefs.dita#prod/productshortname"></ph> jar in your CLASSPATH or modulepath. Be sure that you have only one version of
 the <ph conref="../conrefs.dita#prod/productshortname"></ph> jar files specified
-in your CLASSPATH.</stepxmp></step>
+there.</stepxmp></step>
 </steps>
 </taskbody>
 </task>

Modified: db/derby/docs/trunk/src/devguide/tdevupgradedb.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/tdevupgradedb.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/tdevupgradedb.dita (original)
+++ db/derby/docs/trunk/src/devguide/tdevupgradedb.dita Sun Nov 18 19:32:05 2018
@@ -33,7 +33,7 @@ first time you connect to the database w
 steps</xref> before you upgrade:<ul>
 <li>Back up your database before you upgrade.</li>
 <li>Ensure that only the new <ph conref="../conrefs.dita#prod/productshortname"></ph> jar
-files are in your CLASSPATH.</li>
+files are in your CLASSPATH or modulepath.</li>
 </ul></prereq>
 <context> <p>When you upgrade the database, you can perform a full upgrade
 or soft upgrade:<ul>

Modified: db/derby/docs/trunk/src/getstart/tgssetupverify.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/tgssetupverify.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/tgssetupverify.dita (original)
+++ db/derby/docs/trunk/src/getstart/tgssetupverify.dita Sun Nov 18 19:32:05 2018
@@ -40,9 +40,9 @@ configuration:</p></context>
 @MINIMUM_JDK@ or higher, is in your command execution PATH by opening a command
 window and running the <codeph>java -version</codeph> command.</cmd>
 <stepresult>The output from the command looks something like this:
-<codeblock><systemoutput>java version &quot;1.7.0_07&quot;  
-Java(TM) SE Runtime Environment (build 1.7.0_07-b10)  
-Java HotSpot(TM) Client VM (build 23.3-b01, mixed mode, sharing)</systemoutput></codeblock>
+<codeblock><systemoutput>java version &quot;9&quot;
+Java(TM) SE Runtime Environment (build 9+181)
+Java HotSpot(TM) 64-Bit Server VM (build 9+181, mixed mode)</systemoutput></codeblock>
 The output you see might be different from what is shown here because the
 <codeph>java -version</codeph> command outputs vendor-specific information. If
 the command produces an error or the version listed is not @MINIMUM_JDK@ or

Modified: db/derby/docs/trunk/src/security/cseccsecuregrantrevokeaccess.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/security/cseccsecuregrantrevokeaccess.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/security/cseccsecuregrantrevokeaccess.dita (original)
+++ db/derby/docs/trunk/src/security/cseccsecuregrantrevokeaccess.dita Sun Nov 18 19:32:05 2018
@@ -49,7 +49,7 @@ revoke privileges and role grants. The g
 <li>TRIGGER</li>
 <li>UPDATE</li>
 </ul></p>
-<p>When a table, view, function, or procedure is created, the person that
+<p>When a table, view, function, procedure, type, or aggregate is created, the person that
 creates the object is referred to as the <i>owner</i> of the object. Only the
 object owner and the <xref href="cseccsecuredbowner.dita">Database Owner</xref>
 have full privileges on the object. No other users have privileges on the

Modified: db/derby/docs/trunk/src/security/csecjavasecurity.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/security/csecjavasecurity.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/security/csecjavasecurity.dita (original)
+++ db/derby/docs/trunk/src/security/csecjavasecurity.dita Sun Nov 18 19:32:05 2018
@@ -37,7 +37,7 @@ database backup files.</li>
 <li><b>Imports and exports</b>: You control where the engine imports data from
 and where it exports data to.</li>
 <li><b>Jar files</b>: You control where the engine obtains jar files of
-customer-coded functions and procedures.</li>
+customer-coded functions, procedures, types, and aggregates.</li>
 <li><b>Sockets</b>: You control what machines can connect to the server and
 what machines the server can connect to.</li>
 </ul>

Modified: db/derby/docs/trunk/src/security/csecnetservfileperms.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/security/csecnetservfileperms.dita?rev=1846854&r1=1846853&r2=1846854&view=diff
==============================================================================
--- db/derby/docs/trunk/src/security/csecnetservfileperms.dita (original)
+++ db/derby/docs/trunk/src/security/csecnetservfileperms.dita Sun Nov 18 19:32:05 2018
@@ -20,8 +20,7 @@ limitations under the License.
 <concept id="csecnetservfileperms" xml:lang="en-us">
 <title>Restricting file permissions</title>
 <shortdesc>Additional file protections are available on some file systems,
-including Windows NTFS, Unix, and Linux. If you are running a Java 7 or higher
-VM, you can configure <ph conref="../conrefs.dita#prod/productshortname"></ph>
+including Windows NTFS, Unix, and Linux. You can configure <ph conref="../conrefs.dita#prod/productshortname"></ph>
 to take advantage of these extra file protections.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>derby.storage.useDefaultFilePermissions property</indexterm>
@@ -38,8 +37,7 @@ configure <ph conref="../conrefs.dita#pr
 those default permissions and to restrict access to just that account. If you
 configure <ph conref="../conrefs.dita#prod/productshortname"></ph> this way,
 only that account can access the directories and files created by
-<ph conref="../conrefs.dita#prod/productshortname"></ph>. If you are running on
-a Java 7 or higher VM, you can configure this extra protection by setting the
+<ph conref="../conrefs.dita#prod/productshortname"></ph>. You can configure this extra protection by setting the
 following system property, either on the VM command line or in
 <codeph>derby.properties</codeph>:</p>
 <codeblock>derby.storage.useDefaultFilePermissions=false</codeblock>
@@ -53,8 +51,7 @@ helpful in enhancing default security fo
 <ph conref="../conrefs.dita#prod/productshortname"></ph> engine is started, and
 the presence or absence and specified value of the property
 <codeph>derby.storage.useDefaultFilePermissions</codeph>.</p>
-<p>The two tables that follow show how file access works with Java SE 7 and
-later JVMs and with Java SE 6. In both tables,</p>
+<p>The following table shows how file access works. In this table,</p>
 <ul>
 <li>"Environment" means that access is controlled entirely by the JVM
 environment and the file location only (that is, by the umask setting on UNIX
@@ -63,12 +60,12 @@ and Linux systems and by the default fil
 <ph conref="../conrefs.dita#prod/productshortname"></ph> restricts access to the
 operating system account that started the JVM.</li>
 </ul>
-<p>The following table shows how file access works on Java SE 7 and later
-systems with various settings of the
+<p>The following table shows how file access works
+with various settings of the
 <codeph>derby.storage.useDefaultFilePermissions</codeph> property.</p>
 <table>
-<title>File access on Java SE 7 and later systems</title>
-<desc>This table shows how access to <ph conref="../conrefs.dita#prod/productshortname"></ph> files is controlled on Java SE 7 and later systems.</desc>
+<title>File access</title>
+<desc>This table shows how access to <ph conref="../conrefs.dita#prod/productshortname"></ph> files is controlled.</desc>
 <tgroup cols="3" colsep="1" rowsep="1">
 <colspec colname="col1" colnum="1" colwidth="20*"/>
 <colspec colname="col2" colnum="2" colwidth="40*"/>
@@ -99,32 +96,5 @@ systems with various settings of the
 </tbody>
 </tgroup>
 </table>
-<p>The following table shows how file access works on Java SE 6 systems.</p>
-<table>
-<title>File access on Java SE 6 systems</title>
-<desc>This table shows how access to <ph conref="../conrefs.dita#prod/productshortname"></ph> files is controlled on Java SE 6 systems.</desc>
-<tgroup cols="3" colsep="1" rowsep="1">
-<colspec colname="col1" colnum="1" colwidth="20*"/>
-<colspec colname="col2" colnum="2" colwidth="40*"/>
-<colspec colname="col3" colnum="3" colwidth="40*"/>
-<thead>
-<row valign="bottom">
-<entry colname="col1">Property Setting</entry>
-<entry colname="col2">Server Started from Command Line</entry>
-<entry colname="col3">Server Started Programmatically or Embedded</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry colname="col1">Not applicable</entry>
-<entry colname="col2">Environment</entry>
-<entry colname="col3">Environment</entry>
-</row>
-</tbody>
-</tgroup>
-</table>
-<p>If you are running on a Java 6 or earlier VM, then you may want to adjust
-your account's default file permissions before using
-<ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
 </conbody>
 </concept>