Return-Path: 
 <dev-return-108937-apmail-tomcat-dev-archive=tomcat.apache.org@tomcat.apache.org>
Delivered-To: apmail-tomcat-dev-archive@www.apache.org
Received: (qmail 30201 invoked from network); 2 Sep 2010 09:10:13 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 2 Sep 2010 09:10:13 -0000
Received: (qmail 33126 invoked by uid 500); 2 Sep 2010 09:10:13 -0000
Delivered-To: apmail-tomcat-dev-archive@tomcat.apache.org
Received: (qmail 32923 invoked by uid 500); 2 Sep 2010 09:10:10 -0000
Mailing-List: contact dev-help@tomcat.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@tomcat.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@tomcat.apache.org>
List-Post: <mailto:dev@tomcat.apache.org>
List-Id: <dev.tomcat.apache.org>
Reply-To: "Tomcat Developers List" <dev@tomcat.apache.org>
Delivered-To: mailing list dev@tomcat.apache.org
Received: (qmail 32913 invoked by uid 99); 2 Sep 2010 09:10:09 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Sep 2010 09:10:09 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 02 Sep 2010 09:10:06 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 4006423889B3; Thu,  2 Sep 2010 09:08:47 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r991867 - in /tomcat/trunk/webapps/docs: changelog.xml
 index.xml
Date: Thu, 02 Sep 2010 09:08:47 -0000
To: dev@tomcat.apache.org
From: markt@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20100902090847.4006423889B3@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: markt
Date: Thu Sep  2 09:08:46 2010
New Revision: 991867

URL: http://svn.apache.org/viewvc?rev=991867&view=rev
Log:
Update the Servlet, JSP & EL javadoc links and add spec links.

Modified:
    tomcat/trunk/webapps/docs/changelog.xml
    tomcat/trunk/webapps/docs/index.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=991867&r1=991866&r2=991867&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Sep  2 09:08:46 2010
@@ -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">

Modified: tomcat/trunk/webapps/docs/index.xml
URL: http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/index.xml?rev=991867&r1=991866&r2=991867&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/index.xml (original)
+++ tomcat/trunk/webapps/docs/index.xml Thu Sep  2 09:08:46 2010
@@ -149,11 +149,19 @@ are responsible for installing, configur
     - 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>



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