Mailing-List: contact commits-help@commons.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@commons.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1657375 -
 /commons/proper/compress/trunk/src/changes/release-notes.vm
Date: Wed, 04 Feb 2015 19:06:58 -0000
To: commits@commons.apache.org
From: sebb@apache.org
Message-Id: <20150204190658.DD10EAC003E@hades.apache.org>

Author: sebb
Date: Wed Feb  4 19:06:58 2015
New Revision: 1657375

URL: http://svn.apache.org/r1657375
Log:
Fix indentation and alignment to agree with Release Notes
Can now generate the RN file as follows:
mvn changes:announcement-generate -Prelease-notes -Dchanges.version=1.10

Modified:
    commons/proper/compress/trunk/src/changes/release-notes.vm

Modified: commons/proper/compress/trunk/src/changes/release-notes.vm
URL: http://svn.apache.org/viewvc/commons/proper/compress/trunk/src/changes/release-notes.vm?rev=1657375&r1=1657374&r2=1657375&view=diff
==============================================================================
--- commons/proper/compress/trunk/src/changes/release-notes.vm (original)
+++ commons/proper/compress/trunk/src/changes/release-notes.vm Wed Feb  4 19:06:58 2015
@@ -27,13 +27,11 @@ $release.description.replaceAll("  ", "
 
 ## Fix up indentation for multi-line action descriptions
 #macro ( indent )
-#set($action=$action.replaceAll("(?m)^  +","                 "))
+#set($action=$action.replaceAll("(?m)^  +","  "))
 #end
 #if ($release.getActions().size() == 0)
 No changes defined in this version.
 #else
-Changes in this version include:
-
 #if ($release.getActions('add').size() !=0)
 New features:
 #foreach($actionItem in $release.getActions('add'))
@@ -51,7 +49,12 @@ New features:
 #else
 #set($dueto="")
 #end
-o#if($!issue != "") $issue: #end ${action} #if($!dueto != "")Thanks to $dueto. #end
+o ${action}##
+#if($!issue != "")
+
+  Issue: $issue. #if($!dueto != "")Thanks to $dueto. #end
+#else#if($!dueto != "") Thanks to $dueto. #end
+#end
 
 #set($issue="")
 #set($dueto="")
@@ -75,7 +78,12 @@ Fixed Bugs:
 #else
 #set($dueto="")
 #end
-o#if($!issue != "") $issue: #end ${action} #if($!dueto != "")Thanks to $dueto. #end
+o ${action}##
+#if($!issue != "")
+
+  Issue: $issue. #if($!dueto != "")Thanks to $dueto. #end
+#else#if($!dueto != "") Thanks to $dueto. #end
+#end
 
 #set($issue="")
 #set($dueto="")
@@ -99,7 +107,12 @@ Changes:
 #else
 #set($dueto="")
 #end
-o#if($!issue != "") $issue: #end ${action} #if($!dueto != "")Thanks to $dueto. #end
+o ${action}##
+#if($!issue != "")
+
+  Issue: $issue. #if($!dueto != "")Thanks to $dueto. #end
+#else#if($!dueto != "") Thanks to $dueto. #end
+#end
 
 #set($issue="")
 #set($dueto="")
@@ -123,7 +136,12 @@ Removed:
 #else
 #set($dueto="")
 #end
-o#if($!issue != "") $issue. #end ${action} #if($!dueto != "")Thanks to $dueto. #end
+o ${action}##
+#if($!issue != "")
+
+  Issue: $issue. #if($!dueto != "")Thanks to $dueto. #end
+#else#if($!dueto != "") Thanks to $dueto. #end
+#end
 
 #set($issue="")
 #set($dueto="")
@@ -131,11 +149,14 @@ o#if($!issue != "") $issue. #end ${actio
 #end
 ## End of main loop
 #end
- 
-For complete information on ${project.name}, including instructions on how to submit bug reports,
-patches, or suggestions for improvement, see the ${project.name} website:
+#macro ( fixurl $url )
+$url.replaceAll("proper/commons-","")
+#end
+For complete information on ${project.name}, including instructions
+on how to submit bug reports, patches, or suggestions for improvement,
+see the ${project.name} website:
 
-${project.url}
+#fixurl ( ${project.url} )
 
 Old Release Notes
 =================