Fix broken links

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1033941 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/build.xml b/build.xml
index c2aaa8a..a9c0571 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -615,7 +615,6 @@
     <copy todir="${tomcat.build}/webapps">
       <fileset dir="webapps">
         <include name="docs/images/**"/>
-        <include name="docs/**/*.html"/>
         <include name="docs/WEB-INF/**"/>
         <include name="docs/appdev/*.txt"/>
         <include name="docs/appdev/sample/**"/>
@@ -625,6 +624,12 @@
         <exclude name="docs/architecture/*.xml"/>
       </fileset>
     </copy>
+    <copy todir="${tomcat.build}/webapps" encoding="ISO-8859-1">
+      <filterset refid="version.filters"/>
+      <fileset dir="webapps">
+        <include name="docs/**/*.html"/>
+      </fileset>
+    </copy>
     <copy todir="${tomcat.build}/webapps/docs" encoding="ISO-8859-1">
       <filterset refid="version.filters"/>
       <fileset dir=".">

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index b168ce2..ee472d9 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -218,6 +218,9 @@
         WebDAV via the provision of a new configuration option,
         allowSpecialPaths. (markt) 
       </add>
+      <fix>
+        Correct broken links for on-line JavaDocs. (markt)
+      </fix>
     </changelog>
   </subsection>
   <subsection name="Other">