db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kahat...@apache.org
Subject svn commit: r1096746 - in /db/derby/code/branches/10.8: ./ java/build/org/apache/derbyBuild/GeneratorBase.java java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java releaseSummary.xml
Date Tue, 26 Apr 2011 13:16:20 GMT
Author: kahatlen
Date: Tue Apr 26 13:16:19 2011
New Revision: 1096746

URL: http://svn.apache.org/viewvc?rev=1096746&view=rev
Log:
DERBY-5204: Misplaced p tags in release notes

Merged revision 1096741 from trunk.

Modified:
    db/derby/code/branches/10.8/   (props changed)
    db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/GeneratorBase.java
    db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
    db/derby/code/branches/10.8/releaseSummary.xml

Propchange: db/derby/code/branches/10.8/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Apr 26 13:16:19 2011
@@ -1,2 +1,2 @@
 /db/derby/code/branches/10.7:1061570,1061578,1082235
-/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728
+/db/derby/code/trunk:1063809,1088633,1091000,1091221,1091285,1092067,1092795,1094315,1094572,1094728,1096741

Modified: db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/GeneratorBase.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/GeneratorBase.java?rev=1096746&r1=1096745&r2=1096746&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/GeneratorBase.java (original)
+++ db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/GeneratorBase.java Tue Apr
26 13:16:19 2011
@@ -62,6 +62,7 @@ public class GeneratorBase extends Task 
     private static final String NAME = "name";
     protected static final String PARAGRAPH = "p";
     private static final String ROW = "tr";
+    protected static final String SPAN = "span";
     private static final String TABLE = "table";
 
     // tags in summary xml

Modified: db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java?rev=1096746&r1=1096745&r2=1096746&view=diff
==============================================================================
--- db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
(original)
+++ db/derby/code/branches/10.8/java/build/org/apache/derbyBuild/ReleaseNotesGenerator.java
Tue Apr 26 13:16:19 2011
@@ -393,7 +393,7 @@ public class ReleaseNotesGenerator exten
 
                 String key = "Note for DERBY-" + issue.getKey();
                 //println("Release note: "+issue.getKey()+" - "+issue.getTitle());
-                Element paragraph = outputDoc.createElement(PARAGRAPH);
+                Element paragraph = outputDoc.createElement(SPAN);
                 paragraph.appendChild(outputDoc.createTextNode(key + ": "));
                 cloneChildren(summaryText, paragraph);
                 insertLine(issuesSection);

Modified: db/derby/code/branches/10.8/releaseSummary.xml
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.8/releaseSummary.xml?rev=1096746&r1=1096745&r2=1096746&view=diff
==============================================================================
--- db/derby/code/branches/10.8/releaseSummary.xml (original)
+++ db/derby/code/branches/10.8/releaseSummary.xml Tue Apr 26 13:16:19 2011
@@ -99,13 +99,13 @@ Derby functionality includes:
 
 <p>
 Java and JDBC versions supported:
+</p>
 <ul>
   <li>Java SE 1.4 and higher with
     JDBC 2.1, 3.0, 4.0 and 4.1</li>
   <li>Java ME CDC/Foundation Profile 1.1 with
     JSR-169 JDBC Optional Package for CDC/Foundation Profile.</li>
 </ul>
-</p>
 </overview>
 
 <newFeatures>



Mime
View raw message