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 2013/03/19 13:57:19 UTC

svn commit: r1458262 - in /db/derby/code/branches/10.10: ./ index.html published_api_overview.html

Author: rhillegas
Date: Tue Mar 19 12:57:18 2013
New Revision: 1458262

URL: http://svn.apache.org/r1458262
Log:
DERBY-6104: Port 1458256 from trunk to 10.10 branch.

Modified:
    db/derby/code/branches/10.10/   (props changed)
    db/derby/code/branches/10.10/index.html
    db/derby/code/branches/10.10/published_api_overview.html

Propchange: db/derby/code/branches/10.10/
------------------------------------------------------------------------------
  Merged /db/derby/code/trunk:r1458256

Modified: db/derby/code/branches/10.10/index.html
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/index.html?rev=1458262&r1=1458261&r2=1458262&view=diff
==============================================================================
--- db/derby/code/branches/10.10/index.html (original)
+++ db/derby/code/branches/10.10/index.html Tue Mar 19 12:57:18 2013
@@ -43,7 +43,7 @@ Derby's JDBC API is documented in two se
 <ul>
 <li><a href="javadoc/jdbc3/index.html">JDBC 3.0 Public API</a> - Consult
 this javadoc if your application runs on
-J2SE 1.4, or J2SE 5.0. Also consult this javadoc if your
+J2SE 5.0. Also consult this javadoc if your
 application runs with the Java ME CDC/Foundation 1.1 Profile (JSR-169).</li>
 <li><a href="javadoc/jdbc4/index.html">JDBC 4.1 Public API</a> - Consult this
 javadoc if your application runs on Java SE 6 or higher.</li>

Modified: db/derby/code/branches/10.10/published_api_overview.html
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.10/published_api_overview.html?rev=1458262&r1=1458261&r2=1458262&view=diff
==============================================================================
--- db/derby/code/branches/10.10/published_api_overview.html (original)
+++ db/derby/code/branches/10.10/published_api_overview.html Tue Mar 19 12:57:18 2013
@@ -18,7 +18,8 @@
 Apache Derby is a pure Java, standards-based relational database engine.
 Derby provides an easy to use data management solution for
 software developers with zero administration for end users.
-Derby runs on any J2SE 1.4.2 or higher virtual machine and supports Java ME/CDC/Foundation.
+Derby runs on Java SE 5 and higher with JDBC 3.0, 4.0, 4.1, and
+4.2. Derby also supports CDC/Foundation Profile 1.1.
 Derby's database format is platform independent allowing databases to be copied to
 any machine type.
 <P>