Author: sebb
Date: Tue Oct 4 18:57:14 2011
New Revision: 1178903
URL: http://svn.apache.org/viewvc?rev=1178903&view=rev
Log:
Bug 51954 - Generated documents include </br> entries which cause extra blank
lines
Modified:
jakarta/jmeter/trunk/build.xml
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=1178903&r1=1178902&r2=1178903&view=diff
==============================================================================
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Tue Oct 4 18:57:14 2011
@@ -1724,6 +1724,8 @@ run JMeter unless all the JMeter jars ar
includes="**/*.xml" lastModifiedCheck="true"
velocityPropertiesFile="${src.docs}/velocity.properties"/>
<echo level="info">Fixing EOL</echo>
<fixcrlf srcdir="${dest.docs}/" includes="**/*.html" excludes="api/**"
fixlast="false"/>
+ <echo level="info">Removing unnecessary </br> tags</echo>
+ <replace dir="${dest.docs}/" includes="**/*.html" token="</br>"
value=""/>
<echo level="info">Copying files</echo>
<copy todir="${dest.docs}/css">
<fileset dir="${src.css}"/>
@@ -1750,6 +1752,8 @@ run JMeter unless all the JMeter jars ar
includes="**/*.xml" lastModifiedCheck="true"
velocityPropertiesFile="${src.docs}/velocity.properties"/>
<echo level="info">Fixing EOL</echo>
<fixcrlf srcdir="${dest.printable_docs}/" includes="**/*.html"
fixlast="false"/>
+ <echo level="info">Removing unnecessary </br> tags</echo>
+ <replace dir="${dest.printable_docs}/" includes="**/*.html"
token="</br>" value=""/>
<!--
Share images with non-printable version
Means printable version won't work on web-site
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1178903&r1=1178902&r2=1178903&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Oct 4 18:57:14 2011
@@ -156,6 +156,7 @@ This has been corrected; can still rever
<li>fixes to build.xml: support scripts; localise re-usable property names</li>
<li>Bug 51923 - Counter function bug or documentation issue ? (fixed docs)</li>
<li>Update velocity.jar to 1.7 (from 1.6.2)</li>
+<li>Bug 51954 - Generated documents include </br> entries which cause extra
blank lines </li>
</ul>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
