db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@apache.org
Subject svn commit: r484667 - in /db/derby/docs/branches/10.2/src: adminguide/ devguide/ ref/ tools/
Date Fri, 08 Dec 2006 17:34:02 GMT
Author: jta
Date: Fri Dec  8 09:34:00 2006
New Revision: 484667

URL: http://svn.apache.org/viewvc?view=rev&rev=484667
Log:
DERBY-2129 Remove JDBC 4 disclaimer from docs in the 10.2 branch.

Originally I had hoped that simply blanking out the message in the
jdbc4disclaimer variable in the conref files would work well. But 
it leaves a noticeable vertical blank space in the generated PDF files,
which I think we would find annoying, especially for a warning that
is now past. So I also removed the jdbc4disclaimer references in the 
dita files.

Modified:
    db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita
    db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita
    db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita
    db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita
    db/derby/docs/branches/10.2/src/devguide/devconrefs.dita
    db/derby/docs/branches/10.2/src/ref/refconrefs.dita
    db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita
    db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita
    db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita
    db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita
    db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita

Modified: db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/adminconrefs.dita Fri Dec  8 09:34:00 2006
@@ -37,23 +37,6 @@
 <title>Version and release numbers</title>
 <conbody>
 <p><ph id="fullversionnumber">Version 10.2</ph></p>
-<p><ph id="jdbc4disclaimer"><note type="attention">
-<ph conref="adminconrefs.dita#prod/productshortname"></ph>
-<ph conref="adminconrefs.dita#vers/fullversionnumber"></ph> 
-includes JDBC 4.0 functionality based on a pre-release of Java SE 6. 
-When you use <ph conref="adminconrefs.dita#prod/productshortname"></ph>
-with a Java SE 6 virtual machine, 
-<ph conref="adminconrefs.dita#prod/productshortname"></ph>
-will use its JDBC 3.0 drivers, just as with 1.4 and 1.5 virtual
-machines. JDBC 4.0 is available only to developers who download Java SE
-6 and use it to build in support for JDBC 4.0. The Release Notes explain
-how to build the JDBC 4.0 functionality with 
-<ph conref="adminconrefs.dita#prod/productshortname"></ph>
-<ph conref="adminconrefs.dita#vers/fullversionnumber"></ph>.
-A follow-on <ph conref="adminconrefs.dita#prod/productshortname"></ph>
-release will include JDBC 4.0 functionality based on the final
-JDBC 4.0 specification once Java SE 6 becomes generally available.
-</note></ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">

Modified: db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/radminappsclientxmp.dita Fri Dec  8 09:34:00
2006
@@ -20,7 +20,6 @@
 <reference id="radminappsclientxmp" xml:lang="en-us">
 <title>Network client driver examples</title>
 <refbody>
-<section><p><ph conref="adminconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>The following examples specify the user and password URL attributes. 
 To enable user authentication, the  property <i>derby.connection.requireAuthentication</i>

Modified: db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita (original)
+++ db/derby/docs/branches/10.2/src/adminguide/radminembeddedserverex.dita Fri Dec  8 09:34:00
2006
@@ -23,7 +23,6 @@
 <keywords><indexterm>Embedded server example</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="adminconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section><p>You can start the Network Server in another thread automatically
 when <ph conref="adminconrefs.dita#prod/productshortname"></ph> starts by setting
 the <i>derby.drda.startNetworkServer</i> property (see <xref href="tadminconfigsettingnetwrokserverproperties.dita#tadminconfigsettingnetwrokserverproperties"></xref>),
or you can start it by using a program. The following example shows how to start the Network
Server by using a program:</p></section>

Modified: db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/cdevdvlp19524.dita Fri Dec  8 09:34:00 2006
@@ -25,6 +25,5 @@
 conref="devconrefs.dita#prod/productshortname"></ph> embedded in a Java application.</shortdesc>
 <prolog></prolog>
 <conbody>
-<p><ph conref="devconrefs.dita#vers/jdbc4disclaimer"></ph></p>
 </conbody>
 </concept>

Modified: db/derby/docs/branches/10.2/src/devguide/devconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/devguide/devconrefs.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/devguide/devconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/devguide/devconrefs.dita Fri Dec  8 09:34:00 2006
@@ -38,23 +38,6 @@
 <conbody>
 <p><ph id="fullversionnumber">Version 10.2</ph></p>
 <p><ph id="shortversionnumber">10.2</ph></p>
-<p><ph id="jdbc4disclaimer"><note type="attention">
-<ph conref="devconrefs.dita#prod/productshortname"></ph>
-<ph conref="devconrefs.dita#vers/fullversionnumber"></ph> 
-includes JDBC 4.0 functionality based on a pre-release of Java SE 6. 
-When you use <ph conref="devconrefs.dita#prod/productshortname"></ph>
-with a Java SE 6 virtual machine, 
-<ph conref="devconrefs.dita#prod/productshortname"></ph>
-will use its JDBC 3.0 drivers, just as with 1.4 and 1.5 virtual
-machines. JDBC 4.0 is available only to developers who download Java SE
-6 and use it to build in support for JDBC 4.0. The Release Notes explain
-how to build the JDBC 4.0 functionality with 
-<ph conref="devconrefs.dita#prod/productshortname"></ph>
-<ph conref="devconrefs.dita#vers/fullversionnumber"></ph>.
-A follow-on <ph conref="devconrefs.dita#prod/productshortname"></ph>
-release will include JDBC 4.0 functionality based on the final
-JDBC 4.0 specification once Java SE 6 becomes generally available.
-</note></ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">

Modified: db/derby/docs/branches/10.2/src/ref/refconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/refconrefs.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/refconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/refconrefs.dita Fri Dec  8 09:34:00 2006
@@ -37,23 +37,6 @@
 <title>Version and release numbers</title>
 <conbody>
 <p><ph id="fullversionnumber">Version 10.2</ph></p>
-<p><ph id="jdbc4disclaimer"><note type="attention">
-<ph conref="refconrefs.dita#prod/productshortname"></ph>
-<ph conref="refconrefs.dita#vers/fullversionnumber"></ph> 
-includes JDBC 4.0 functionality based on a pre-release of Java SE 6. 
-When you use <ph conref="refconrefs.dita#prod/productshortname"></ph>
-with a Java SE 6 virtual machine, 
-<ph conref="refconrefs.dita#prod/productshortname"></ph>
-will use its JDBC 3.0 drivers, just as with 1.4 and 1.5 virtual
-machines. JDBC 4.0 is available only to developers who download Java SE
-6 and use it to build in support for JDBC 4.0. The Release Notes explain
-how to build the JDBC 4.0 functionality with 
-<ph conref="refconrefs.dita#prod/productshortname"></ph>
-<ph conref="refconrefs.dita#vers/fullversionnumber"></ph>.
-A follow-on <ph conref="refconrefs.dita#prod/productshortname"></ph>
-release will include JDBC 4.0 functionality based on the final
-JDBC 4.0 specification once Java SE 6 becomes generally available.
-</note></ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">

Modified: db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefapi1003363.dita Fri Dec  8 09:34:00 2006
@@ -36,7 +36,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section><p>These classes are all related to <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
 implementation of <i>javax.sql.DataSource</i> and related APIs. For more information,
 see the <cite><ph

Modified: db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjavsqlprst.dita Fri Dec  8 09:34:00 2006
@@ -26,7 +26,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section><p><i>setXXXStream</i> requests stream data between the
application
 and the database.</p></section>
 <section><p>JDBC allows an IN parameter to be set to a Java input stream for

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc32052.dita Fri Dec  8 09:34:00 2006
@@ -24,7 +24,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section><p>The class that loads <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
 local JDBC driver is the class <i>org.apache.derby.jdbc.EmbeddedDriver</i>.
 Listed below are some of the ways to create instances of that class. Do not use the class
directly through the <i>java.sql.Driver</i> interface.

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0connection.dita Fri Dec  8 09:34:00 2006
@@ -28,7 +28,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 JDBC 4.0 adds new capabilities to Connections:

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0dataSource.dita Fri Dec  8 09:34:00 2006
@@ -27,7 +27,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 JDBC 4.0 introduces a simpler mechanism for

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0databaseMetaData.dita Fri Dec  8 09:34:00
2006
@@ -30,7 +30,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 <ph conref="refconrefs.dita#prod/productshortname"></ph>

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0sqlexception.dita Fri Dec  8 09:34:00 2006
@@ -25,7 +25,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 If your application runs on JDK 1.6 or higher, exceptions raised by

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0statement.dita Fri Dec  8 09:34:00 2006
@@ -27,7 +27,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 <ph conref="refconrefs.dita#prod/productshortname"></ph>'s

Modified: db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita (original)
+++ db/derby/docs/branches/10.2/src/ref/rrefjdbc4_0summary.dita Fri Dec  8 09:34:00 2006
@@ -33,7 +33,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p><ph conref="refconrefs.dita#vers/jdbc4disclaimer"></ph></p></section>
 <section>
 <p>
 JDBC 4.0 adds some functionality to the core API. This section

Modified: db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/rtoolsijproprefdatasource.dita Fri Dec  8 09:34:00
2006
@@ -24,9 +24,6 @@
 </metadata></prolog>
 <refbody>
 <section>
-<p><ph conref="toolsconrefs.dita#vers/jdbc4disclaimer"></ph></p>
-</section>
-<section>
 <title>Function</title><p>The <codeph>ij.dataSource</codeph>
property
 specifies the datasource to be used to access the database. When specifying
 a datasource, <ph conref="toolsconrefs.dita#prod/productshortname"></ph> does

Modified: db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita?view=diff&rev=484667&r1=484666&r2=484667
==============================================================================
--- db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita (original)
+++ db/derby/docs/branches/10.2/src/tools/toolsconrefs.dita Fri Dec  8 09:34:00 2006
@@ -37,23 +37,6 @@
 <conbody>
 <p><ph id="fullversionnumber">Version 10.2</ph></p>
 <p><ph id="shortversionnumber">10.2</ph></p>
-<p><ph id="jdbc4disclaimer"> <note type="attention">
-<ph conref="toolsconrefs.dita#prod/productshortname"></ph>
-<ph conref="toolsconrefs.dita#vers/fullversionnumber"></ph> 
-includes JDBC 4.0 functionality based on a pre-release of Java SE 6. 
-When you use <ph conref="toolsconrefs.dita#prod/productshortname"></ph>
-with a Java SE 6 virtual machine, 
-<ph conref="toolsconrefs.dita#prod/productshortname"></ph>
-will use its JDBC 3.0 drivers, just as with 1.4 and 1.5 virtual
-machines. JDBC 4.0 is available only to developers who download Java SE
-6 and use it to build in support for JDBC 4.0. The Release Notes explain
-how to build the JDBC 4.0 functionality with 
-<ph conref="toolsconrefs.dita#prod/productshortname"></ph>
-<ph conref="toolsconrefs.dita#vers/fullversionnumber"></ph>.
-A follow-on <ph conref="toolsconrefs.dita#prod/productshortname"></ph>
-release will include JDBC 4.0 functionality based on the final
-JDBC 4.0 specification once Java SE 6 becomes generally available.
-</note></ph></p>
 </conbody>
 </concept>
 <concept id="pub" xml:lang="en-us">



Mime
View raw message