Update the Servlet, JSP & EL javadoc links and add spec links.

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

diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 81ceb45..5d92670 100644 (file)
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -161,6 +161,10 @@
         <bug>49585</bug>: Update JSVC documentation to reflect new packaging
         of Commons Daemon. (markt)
       </fix>
+      <update>
+        Update the Servlet, JSP and EL Javadoc links to link to the
+        specifications and the relevant part of the Java EE 6 Javadoc. (markt)
+      </update>
     </changelog>
   </subsection>
   <subsection name="Other">

diff --git a/webapps/docs/index.xml b/webapps/docs/index.xml
index a93eb4c..b913b8d 100644 (file)
--- a/webapps/docs/index.xml
+++ b/webapps/docs/index.xml
@@ -149,11 +149,19 @@ are responsible for installing, configuring, and operating an Apache Tomcat serv
     - Complete documentation and HOWTOs on the JK native webserver connector,
       used to interface Apache Tomcat with servers like Apache HTTPd, IIS
       and others.</li>
-<!--  TODO SERVLET3 Update when URL is available -->
-<li><a href="http://java.sun.com/products/servlet/2.5/docs/servlet-2_5-mr2/index.html">
-    <strong>Servlet API Javadocs</strong></a> - The Servlet 2.5 API Javadocs.</li>
-<li><a href="http://java.sun.com/products/jsp/2.1/docs/jsp-2_1-pfd2/index.html">
-    <strong>JSP API Javadocs</strong></a> - The JSP 2.1 API Javadocs.</li>
+<li>Servlet 3.0 
+    <a href="http://jcp.org/aboutJava/communityprocess/final/jsr315/index.html">
+    <strong>Specification</strong></a> and
+    <a href="http://download.oracle.com/javaee/6/api/index.html?javax/servlet/package-summary.html">
+    <strong>Javadoc</strong></a>
+    </li>
+<li><a href="http://jcp.org/aboutJava/communityprocess/mrel/jsr245/index.html">
+    <strong>JSP 2.2 and EL 2.2 Specifications</strong></a>,
+    <a href="http://download.oracle.com/javaee/6/api/index.html?javax/servlet/jsp/package-summary.html">
+    <strong>JSP 2.2 Javadoc (note it is labelled as JSP 2.1)</strong></a>,
+    <a href="http://download.oracle.com/javaee/6/api/index.html?javax/el/package-summary.html">
+    <strong>EL 2.2 Javadoc</strong></a>
+    </li>
 </ul>
 
 </section>