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 2010/10/15 20:41:45 UTC
svn commit: r1023066 - in /db/derby/docs/trunk: ./ src/ src/adminguide/
src/devguide/ src/getstart/ src/ref/ src/tools/ src/tuning/
Author: rhillegas
Date: Fri Oct 15 18:41:44 2010
New Revision: 1023066
URL: http://svn.apache.org/viewvc?rev=1023066&view=rev
Log:
DERBY-4851: Parameterize the short version number in the user docs so that it can be set by the master release-build script.
Modified:
db/derby/docs/trunk/build.xml
db/derby/docs/trunk/docs.properties
db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
db/derby/docs/trunk/src/conrefs.dita
db/derby/docs/trunk/src/devguide/derbydev.ditamap
db/derby/docs/trunk/src/getstart/getstartderby.ditamap
db/derby/docs/trunk/src/ref/refderby.ditamap
db/derby/docs/trunk/src/tools/derbytools.ditamap
db/derby/docs/trunk/src/tuning/tuningderby.ditamap
Modified: db/derby/docs/trunk/build.xml
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/build.xml?rev=1023066&r1=1023065&r2=1023066&view=diff
==============================================================================
--- db/derby/docs/trunk/build.xml (original)
+++ db/derby/docs/trunk/build.xml Fri Oct 15 18:41:44 2010
@@ -307,6 +307,7 @@ limitations under the License.
<fileset dir="${source.dir}" includes="${inclusions}"/>
<filterset>
<filter token="COPYRIGHT_YEAR" value="${copyright.year}"/>
+ <filter token="RELEASE_ID_SHORT" value="${release.id.short}"/>
</filterset>
</copy>
</target>
Modified: db/derby/docs/trunk/docs.properties
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/docs.properties?rev=1023066&r1=1023065&r2=1023066&view=diff
==============================================================================
--- db/derby/docs/trunk/docs.properties (original)
+++ db/derby/docs/trunk/docs.properties Fri Oct 15 18:41:44 2010
@@ -11,4 +11,5 @@ dita.lib.dir=${basedir}/lib
dita.extname=.dita
temp.source=${basedir}/temp_source
copyright.year=2010
+release.id.short=10.7
args.csspath=
Modified: db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap?rev=1023066&r1=1023065&r2=1023066&view=diff
==============================================================================
--- db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap (original)
+++ db/derby/docs/trunk/src/adminguide/derbyadmin.ditamap Fri Oct 15 18:41:44 2010
@@ -30,7 +30,7 @@
</copyright>
<prodinfo>
<prodname>Derby Server and Administration Guide</prodname>
-<vrmlist><vrm version="10.6"/></vrmlist>
+<vrmlist><vrm version="@RELEASE_ID_SHORT@"/></vrmlist>
<brand>Apache Derby</brand></prodinfo>
</topicmeta>
<topicref href="radmincopyright.dita" navtitle="Copyright"></topicref>
Modified: db/derby/docs/trunk/src/conrefs.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/conrefs.dita?rev=1023066&r1=1023065&r2=1023066&view=diff
==============================================================================
--- db/derby/docs/trunk/src/conrefs.dita (original)
+++ db/derby/docs/trunk/src/conrefs.dita Fri Oct 15 18:41:44 2010
@@ -36,8 +36,8 @@ with trademarks.</p>
<concept id="vers" xml:lang="en-us">
<title>Version and release numbers</title>
<conbody>
-<p><ph id="fullversionnumber">Version 10.6</ph></p>
-<p><ph id="shortversionnumber">10.6</ph></p>
+<p><ph id="fullversionnumber">Version @RELEASE_ID_SHORT@</ph></p>
+<p><ph id="shortversionnumber">@RELEASE_ID_SHORT@</ph></p>
</conbody>
</concept>
<concept id="pub" xml:lang="en-us">
Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=1023066&r1=1023065&r2=1023066&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Fri Oct 15 18:41:44 2010
@@ -26,7 +26,7 @@ limitations under the License.
</copyright>
<prodinfo>
<prodname>Derby Developer's Guide</prodname>
-<vrmlist><vrm version="10.6"/></vrmlist>
+<vrmlist><vrm version="@RELEASE_ID_SHORT@"/></vrmlist>
<brand>Apache Derby</brand></prodinfo>
</topicmeta>
<!--YOU MUST ADD THE NEW TOPIC TO THE RELTABLE (FOR RELATED LINKS) AND TO THE TOPICREF LIST BELOW THE RELTABLE (TO APPEAR IN THE BOOK TOC AND PDF)-->
Modified: db/derby/docs/trunk/src/getstart/getstartderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/getstart/getstartderby.ditamap?rev=1023066&r1=1023065&r2=1023066&view=diff
==============================================================================
--- db/derby/docs/trunk/src/getstart/getstartderby.ditamap (original)
+++ db/derby/docs/trunk/src/getstart/getstartderby.ditamap Fri Oct 15 18:41:44 2010
@@ -26,7 +26,7 @@ limitations under the License.
</copyright>
<prodinfo>
<prodname>Getting Started with Derby</prodname>
-<vrmlist><vrm version="10.6"/></vrmlist>
+<vrmlist><vrm version="@RELEASE_ID_SHORT@"/></vrmlist>
<brand>Apache Derby</brand></prodinfo>
</topicmeta>
<reltable>
Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=1023066&r1=1023065&r2=1023066&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Fri Oct 15 18:41:44 2010
@@ -26,7 +26,7 @@ limitations under the License.
</copyright>
<prodinfo>
<prodname>Derby Reference Manual</prodname>
-<vrmlist><vrm version="10.6"/></vrmlist>
+<vrmlist><vrm version="@RELEASE_ID_SHORT@"/></vrmlist>
<brand>Apache Derby</brand></prodinfo>
</topicmeta>
<!--BELOW - This relationship table is not complete. There wasn't a reltable for the ref manual, so it was added for 10.2 to document the new SQL statements and to enable a link to the Dev Guide. Each topic (preferably in the order that they appear in the book) should be listed in the reltable and links added. The left side represents the source topic and the right side represents the topics that the source should link to.-->
Modified: db/derby/docs/trunk/src/tools/derbytools.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tools/derbytools.ditamap?rev=1023066&r1=1023065&r2=1023066&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tools/derbytools.ditamap (original)
+++ db/derby/docs/trunk/src/tools/derbytools.ditamap Fri Oct 15 18:41:44 2010
@@ -26,7 +26,7 @@ limitations under the License.
</copyright>
<prodinfo>
<prodname>Derby Tools and Utilities Guide</prodname>
-<vrmlist><vrm version="10.6"/></vrmlist>
+<vrmlist><vrm version="@RELEASE_ID_SHORT@"/></vrmlist>
<brand>Apache Derby</brand></prodinfo>
</topicmeta>
<!--The following relationship table is only for the Import and Export topics. The remaining topics need to be added to this table.-->
Modified: db/derby/docs/trunk/src/tuning/tuningderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/tuning/tuningderby.ditamap?rev=1023066&r1=1023065&r2=1023066&view=diff
==============================================================================
--- db/derby/docs/trunk/src/tuning/tuningderby.ditamap (original)
+++ db/derby/docs/trunk/src/tuning/tuningderby.ditamap Fri Oct 15 18:41:44 2010
@@ -26,7 +26,7 @@ limitations under the License.
</copyright>
<prodinfo>
<prodname>Tuning Derby</prodname>
-<vrmlist><vrm version="10.6"/></vrmlist>
+<vrmlist><vrm version="@RELEASE_ID_SHORT@"/></vrmlist>
<brand>Apache Derby</brand></prodinfo>
</topicmeta>
<topicref href="rtuncopyright.dita" navtitle="Copyright"></topicref>