Author: kkolinko
Date: Tue Oct 18 12:52:22 2011
New Revision: 1185629
URL: http://svn.apache.org/viewvc?rev=1185629&view=rev
Log:
CTR: docs
Backport of revision 1185626 from tomcat/trunk:
Replace links to Servlet and JSP specifications with a link to our wiki page.
Replace Standard Taglib link to point to http://tomcat.apache.org/taglibs/
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml
tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
tomcat/tc6.0.x/trunk/webapps/docs/index.xml
tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml
tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml
tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml
Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/processes.xml Tue Oct 18 12:52:22
2011
@@ -161,7 +161,7 @@ cvs commit
Note that this is only an example web.xml file. The full definition
of the deployment descriptor file is in the
-<a href="http://java.sun.com/products/servlet";>Servlet Specification.</a>
+<a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
Specification.</a>
</subsection>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/appdev/source.xml Tue Oct 18 12:52:22 2011
@@ -87,7 +87,7 @@ is discussed below. All of these compon
<li><strong>web/WEB-INF/</strong> - The special configuration files required
for your application, including the web application deployment descriptor
(<code>web.xml</code>, defined in the
- <a href="http://java.sun.com/products/servlet";>Servlet Specification</a>),
+ <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
Specification</a>),
tag library descriptors for custom tag libraries
you have created, and other resource files you wish to include within
your web application. Even though this directory appears to be a
Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/context.xml Tue Oct 18 12:52:22
2011
@@ -50,7 +50,7 @@
unpacked contents, as described in the Servlet Specification (version
2.2 or later). For more information about web application archives,
you can download the
- <a href="http://java.sun.com/products/servlet/download.html";>Servlet
+ <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
Specification</a>, and review the Tomcat
<a href="../appdev/index.html">Application Developer's Guide</a>.</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/index.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/index.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/index.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/index.xml Tue Oct 18 12:52:22 2011
@@ -60,8 +60,8 @@ Apache Tomcat 6, and using many of the A
Apache Tomcat on a variety of platforms.</li>
<li><a href="appdev/index.html"><strong>First web application</strong></a>
- An introduction to the concepts of a <em>web application</em> as defined
- in the <a href="http://java.sun.com/products/servlet/download.html";>Servlet
- 2.4 Specification</a>. Covers basic organization of your web application
+ in the <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
+ 2.5 Specification</a>. Covers basic organization of your web application
source tree, the structure of a web application archive, and an
introduction to the web application deployment descriptor
(<code>/WEB-INF/web.xml</code>).</li>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/introduction.xml Tue Oct 18 12:52:22 2011
@@ -46,10 +46,10 @@ help.</p>
<section name="Terminology">
-<p>In the course of reading these documents, you'll run across a number of
+<p>In the course of reading these documents, you will run across a number of
terms; some specific to Tomcat, and others defined by the
-<a href="http://java.sun.com/products/servlet/";>Servlet</a> or
-<a href="http://java.sun.com/products/jsp/";>JSP</a> specifications.</p>
+<a href="http://wiki.apache.org/tomcat/Specifications";>Servlet and
+JSP specifications</a>.</p>
<ul>
<li><strong>Context</strong> - In a nutshell, a Context is a
Modified: tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jasper-howto.xml Tue Oct 18 12:52:22 2011
@@ -37,7 +37,7 @@
<section name="Introduction">
<p>Tomcat 6.0 uses the Jasper 2 JSP Engine to implement
-the <a href="http://java.sun.com/products/jsp/";>JavaServer Pages 2.0</a>
+the <a href="http://wiki.apache.org/tomcat/Specifications";>JavaServer Pages
2.1</a>
specification.</p>
<p>Jasper 2 has been redesigned to significantly improve performance over
Modified: tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml
(original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jndi-datasource-examples-howto.xml Tue
Oct 18 12:52:22 2011
@@ -290,7 +290,12 @@ select id, foo, bar from testdata
</source>
</p>
-<p>That JSP page makes use of <a
href="http://java.sun.com/products/jsp/jstl";>JSTL</a>'s SQL and Core taglibs.
You can get it from Sun's <a
href="http://java.sun.com/webservices/downloads/webservicespack.html";>Java Web
Services Developer Pack</a> or <a
href="http://jakarta.apache.org/taglibs/doc/standard-doc/intro.html";>Jakarta
Taglib Standard 1.1</a> project - just make sure you get a 1.1.x release. Once
you have JSTL, copy <code>jstl.jar</code> and <code>standard.jar</code> to your
web app's <code>WEB-INF/lib</code> directory.
+<p>That JSP page makes use of <a
href="http://java.sun.com/products/jsp/jstl";>JSTL</a>'s
+SQL and Core taglibs. You can get it from
+<a href="http://tomcat.apache.org/taglibs/standard/";>Apache Tomcat Taglibs -
Standard Tag Library</a>
+project — just make sure you get a 1.1.x release. Once you have JSTL,
+copy <code>jstl.jar</code> and <code>standard.jar</code> to your web app's
+<code>WEB-INF/lib</code> directory.
</p>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/jndi-resources-howto.xml Tue Oct 18
12:52:22 2011
@@ -282,7 +282,7 @@ public class MyBean {
<p><strong>WARNING</strong> - Be sure you respect the element ordering
that is required by the DTD for web application deployment descriptors!
See the
- <a href="http://java.sun.com/products/servlet/download.html";>Servlet
+ <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
Specification</a> for details.</p>
<h3>3. Code Your Application's Use Of This Resource</h3>
@@ -444,7 +444,7 @@ writer.println("foo = " + bean.getFoo()
<p><strong>WARNING</strong> - Be sure you respect the element ordering
that is required by the DTD for web application deployment descriptors!
See the
- <a href="http://java.sun.com/products/servlet/download.html";>Servlet
+ <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
Specification</a> for details.</p>
<h3>2. Code Your Application's Use Of This Resource</h3>
@@ -604,7 +604,7 @@ Transport.send(message);
<p><strong>WARNING</strong> - Be sure you respect the element ordering
that is required by the DTD for web application deployment descriptors!
See the
- <a href="http://java.sun.com/products/servlet/download.html";>Servlet
+ <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
Specification</a> for details.</p>
<h3>3. Code Your Application's Use Of This Resource</h3>
@@ -906,7 +906,7 @@ public class MyBeanFactory implements Ob
<p><strong>WARNING</strong> - Be sure you respect the element ordering
that is required by the DTD for web application deployment descriptors!
See the
- <a href="http://java.sun.com/products/servlet/download.html";>Servlet
+ <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
Specification</a> for details.</p>
<h3>3. Code Your Application's Use Of This Resource</h3>
Modified: tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml?rev=1185629&r1=1185628&r2=1185629&view=diff
==============================================================================
--- tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/realm-howto.xml Tue Oct 18 12:52:22 2011
@@ -47,7 +47,7 @@ to authenticate themselves. If you are
safely skip this document.</p>
<p>For fundamental background information about container managed security,
-see the <a href="http://java.sun.com/products/servlet/download.html";>Servlet
+see the <a href="http://wiki.apache.org/tomcat/Specifications";>Servlet
Specification (Version 2.4)</a>, Section 12.</p>
<p>For information about utilizing the <em>Single Sign On</em> feature of
@@ -905,7 +905,7 @@ loads information about all users, and t
document (by default, this document is loaded from
<code>$CATALINA_BASE/conf/tomcat-users.xml</code>). The users, their passwords
and their roles may all be editing dynamically, typically via JMX. Changes may
-be saved and will be reflected in the XMl file.</p>
+be saved and will be reflected in the XML file.</p>
<h3>Realm Element Attributes</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
