db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r505645 - in /db/derby/code/branches/10.2: build.xml published_api_overview.html
Date Sat, 10 Feb 2007 06:57:36 GMT
Author: fuzzylogic
Date: Fri Feb  9 22:57:35 2007
New Revision: 505645

URL: http://svn.apache.org/viewvc?view=rev&rev=505645
Log:
DERBY-1752: Merge revision 505644 to 10.2 branch

Modified:
    db/derby/code/branches/10.2/build.xml
    db/derby/code/branches/10.2/published_api_overview.html

Modified: db/derby/code/branches/10.2/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/build.xml?view=diff&rev=505645&r1=505644&r2=505645
==============================================================================
--- db/derby/code/branches/10.2/build.xml (original)
+++ db/derby/code/branches/10.2/build.xml Fri Feb  9 22:57:35 2007
@@ -703,7 +703,7 @@
              Windowtitle="Apache Derby ${major}.${minor} API Documentation"
              Doctitle="Apache Derby ${major}.${minor} API Documentation"
              Footer="${javadoc.Footer}"
-             bottom="Apache Derby ${major}.${minor} API Documentation  -  <i>Copyright
© 1997,2006 The Apache Software Foundation or its licensors, as applicable.</i>">
+             bottom="Apache Derby ${major}.${minor} API Documentation  -  <i>Copyright
© 2004,2007 The Apache Software Foundation. All Rights Reserved.</i>">
       <fileset dir="${derby.engine.src.dir}"
                includesfile="${javadoc.inclusions}"/>
       <fileset dir="${derby.client.src.dir}"
@@ -750,7 +750,7 @@
         windowtitle="Apache Derby V${major}.${minor} Internals"
         doctitle="Apache Derby V${major}.${minor} Internals"
         Footer="${javadoc.Footer}"
-        bottom="Apache Derby V${major}.${minor} Internals - &lt;i&gt;Copyright &amp;copy;
1997,2006 The Apache Software Foundation or its licensors, as applicable.&lt;/i&gt;"
+        bottom="Apache Derby V${major}.${minor} Internals - &lt;i&gt;Copyright &amp;copy;
2004,2007 The Apache Software Foundation. All Rights Reserved.&lt;/i&gt;"
         source="1.4">
         <taglet name="org.apache.derbyBuild.javadoc.FormatIdTaglet" 
                 path="${basedir}/classes"/>

Modified: db/derby/code/branches/10.2/published_api_overview.html
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/published_api_overview.html?view=diff&rev=505645&r1=505644&r2=505645
==============================================================================
--- db/derby/code/branches/10.2/published_api_overview.html (original)
+++ db/derby/code/branches/10.2/published_api_overview.html Fri Feb  9 22:57:35 2007
@@ -22,8 +22,8 @@
 Derby's database format is platform independent allowing databases to be copied to
 any machine type.
 <P>
-Apache Derby is an open source subproject of the Apache DB project,
-licensed under the Apache License, Version 2.0.
+Apache Derby is a subproject of the Apache DB project, and is
+licensed under the Apache License, Version 2.0 (the "License"); you may not use these files
except in compliance with the License. You may obtain a copy of the License at:
 <BR>
 <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>
 



Mime
View raw message