Author: markt
Date: Thu Nov  6 10:37:07 2014
New Revision: 1637068

URL: http://svn.apache.org/r1637068
Log:
Configure javadoc tool to read sources as ISO-8859-1, suppress timestamp 
comments and enable charset header.

Motivation:
Timestamp comments: It makes diff between javadoc versions smaller. The diff 
between versions will still change almost every file, because of Tomcat version 
(6.0.41) in title of the pages, but the change will be a bit smaller.

Modified:
    tomcat/tc6.0.x/trunk/STATUS.txt
    tomcat/tc6.0.x/trunk/dist.xml
    tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1637068&r1=1637067&r2=1637068&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov  6 10:37:07 2014
@@ -107,23 +107,6 @@ PATCHES PROPOSED TO BACKPORT:
              allow 'ALL' to include TLSv1.1 and TLSv1.2
   -1:
 
-* Configure javadoc tool to read sources as ISO-8859-1, suppress timestamp
-  comments and enable charset header.
-
-  Motivation:
-  Timestamp comments: It makes diff between javadoc versions smaller. The
-  diff between versions will still change almost every file, because of
-  Tomcat version (6.0.41) in title of the pages, but the change will be a
-  bit smaller.
-
-  Charset header: The rest of Tomcat 6 documentation already has <META>
-  header with charset information in generated HTML. This enables it for
-  Javadoc as well.
-
-  
https://people.apache.org/~kkolinko/patches/2014-10-26_tc6_javadoc_timestamp.patch
-  +1: kkolinko, markt, remm
-  -1:
-
 
 PATCHES/ISSUES THAT ARE STALLED:
 

Modified: tomcat/tc6.0.x/trunk/dist.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/dist.xml?rev=1637068&r1=1637067&r2=1637068&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/dist.xml (original)
+++ tomcat/tc6.0.x/trunk/dist.xml Thu Nov  6 10:37:07 2014
@@ -232,7 +232,10 @@
       doctitle="Apache Tomcat ${version} API"
       header="&lt;b&gt;Apache Tomcat ${version}&lt;/b&gt;"
       bottom="Copyright &amp;#169; 2000-${year} Apache Software Foundation. 
All Rights Reserved."
-      additionalparam="-breakiterator"
+      encoding="ISO-8859-1"
+      docencoding="ISO-8859-1"
+      charset="ISO-8859-1"
+      additionalparam="-breakiterator -notimestamp"
       maxmemory="256m" >
     </javadoc>
     <patch-javadoc dir="${tomcat.dist}/webapps/docs/api"

Modified: tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml?rev=1637068&r1=1637067&r2=1637068&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml Thu Nov  6 10:37:07 2014
@@ -56,6 +56,14 @@
       </add>
     </changelog>
   </subsection>
+  <subsection name="Web applications">
+    <changelog>
+      <fix>
+        Configure the Javadoc tool to read sources as ISO-8859-1, suppress
+        timestamp comments and enable charset header. (kkolinko)
+      </fix>
+    </changelog>
+  </subsection>
   <subsection name="Other">
     <changelog>
       <update>



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org

Reply via email to