Author: kkolinko
Date: Tue Feb 25 14:07:40 2014
New Revision: 1571701
URL: http://svn.apache.org/r1571701
Log:
Merge two identical notes into one.
Modified:
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/xdocs/security-6.xml
Modified: tomcat/site/trunk/docs/security-6.html
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=1571701&r1=1571700&r2=1571701&view=diff
==============================================================================
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Tue Feb 25 14:07:40 2014
@@ -306,11 +306,11 @@
<p>
-<i>Note: The issue below was fixed in Apache Tomcat 6.0.38 but the
- release vote for the 6.0.38 release candidate did not pass. Therefore,
- although users must download 6.0.39 to obtain a version that includes a
- fix for these issues, version 6.0.38 is not included in the list of
- affected versions.</i>
+<i>Note: The issues below were fixed in Apache Tomcat 6.0.38 but the
+ release vote for 6.0.38 did not pass.
+ Therefore, although users must download 6.0.39 to obtain a version
+ that includes the fixes for these issues, version 6.0.38 is not
+ included in the list of affected versions.</i>
</p>
@@ -333,15 +333,6 @@
<p>Affects: 6.0.0-6.0.37</p>
-
-
-<p>
-<i>Note: The issues below were fixed in Apache Tomcat 6.0.38 but the
- release vote for 6.0.38 did not pass.
- Therefore, although users must download 6.0.39 to obtain a version
- that includes the fixes for these issues, version 6.0.38 is not
- included in the list of affected versions.</i>
-</p>
<p>
Modified: tomcat/site/trunk/xdocs/security-6.xml
URL:
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=1571701&r1=1571700&r2=1571701&view=diff
==============================================================================
--- tomcat/site/trunk/xdocs/security-6.xml (original)
+++ tomcat/site/trunk/xdocs/security-6.xml Tue Feb 25 14:07:40 2014
@@ -51,11 +51,11 @@
<section name="Fixed in Apache Tomcat 6.0.39" rtext="released 31 January
2014">
- <p><i>Note: The issue below was fixed in Apache Tomcat 6.0.38 but the
- release vote for the 6.0.38 release candidate did not pass. Therefore,
- although users must download 6.0.39 to obtain a version that includes a
- fix for these issues, version 6.0.38 is not included in the list of
- affected versions.</i></p>
+ <p><i>Note: The issues below were fixed in Apache Tomcat 6.0.38 but the
+ release vote for 6.0.38 did not pass.
+ Therefore, although users must download 6.0.39 to obtain a version
+ that includes the fixes for these issues, version 6.0.38 is not
+ included in the list of affected versions.</i></p>
<p><strong>Low: Frame injection in documentation Javadoc</strong>
<cve>CVE-2013-1571</cve></p>
@@ -70,12 +70,6 @@
<p>This issue was published by Oracle on 18 June 2013.</p>
<p>Affects: 6.0.0-6.0.37</p>
-
- <p><i>Note: The issues below were fixed in Apache Tomcat 6.0.38 but the
- release vote for 6.0.38 did not pass.
- Therefore, although users must download 6.0.39 to obtain a version
- that includes the fixes for these issues, version 6.0.38 is not
- included in the list of affected versions.</i></p>
<p><strong>Important: Information disclosure</strong>
<cve>CVE-2013-4286</cve></p>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
