Author: kkolinko
Date: Tue Jan 8 19:11:23 2013
New Revision: 1430451
URL: http://svn.apache.org/viewvc?rev=1430451&view=rev
Log:
Correct versions.
Merges r1430445 r1430448 from tomcat/trunk
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/BUILDING.txt
tomcat/tc7.0.x/trunk/RUNNING.txt
tomcat/tc7.0.x/trunk/build.xml
tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
Merged /tomcat/trunk:r1430445,1430448
Modified: tomcat/tc7.0.x/trunk/BUILDING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/BUILDING.txt?rev=1430451&r1=1430450&r2=1430451&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/BUILDING.txt (original)
+++ tomcat/tc7.0.x/trunk/BUILDING.txt Tue Jan 8 19:11:23 2013
@@ -22,7 +22,7 @@ $Id$
====================================================
This subproject contains the source code for Tomcat @VERSION_MAJOR_MINOR@, a
container that
-implements the Servlet 3.0 and JSP 2.1 specifications from the Java
+implements the Servlet 3.0 and JSP 2.2 specifications from the Java
Community Process <http://www.jcp.org/>.
Note: If you just need to run Apache Tomcat, it is not necessary to build
Modified: tomcat/tc7.0.x/trunk/RUNNING.txt
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/RUNNING.txt?rev=1430451&r1=1430450&r2=1430451&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/RUNNING.txt (original)
+++ tomcat/tc7.0.x/trunk/RUNNING.txt Tue Jan 8 19:11:23 2013
@@ -22,16 +22,16 @@ $Id$
===================================================
Apache Tomcat @VERSION_MAJOR_MINOR@ requires a Java Standard Edition Runtime
-Environment (JRE) version 6.0 or later.
+Environment (JRE) version 6 or later.
=============================
-Running With JRE 6.0 Or Later
+Running With JRE 6 Or Later
=============================
(1) Download and Install a Java SE Runtime Environment (JRE)
(1.1) Download a Java SE Runtime Environment (JRE),
- release version 6.0 or later, from
+ release version 6 or later, from
http://www.oracle.com/technetwork/java/javase/downloads/index.html
(1.2) Install the JRE according to the instructions included with the
Modified: tomcat/tc7.0.x/trunk/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/build.xml?rev=1430451&r1=1430450&r2=1430451&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/build.xml (original)
+++ tomcat/tc7.0.x/trunk/build.xml Tue Jan 8 19:11:23 2013
@@ -2188,7 +2188,7 @@ Apache Tomcat ${version} native binaries
notice="${tomcat.manifests}/servlet-api.jar.notice"
license="${tomcat.manifests}/servlet-api.jar.license" />
- <!-- JSP 2.1 Implementation JAR File -->
+ <!-- JSP 2.2 Implementation JAR File -->
<jarIt jarfile="${jsp-api-src.jar}"
filesDir="java"
filesId="files.jsp-api"
@@ -2196,7 +2196,7 @@ Apache Tomcat ${version} native binaries
notice="${tomcat.manifests}/jsp-api.jar.notice"
license="${tomcat.manifests}/jsp-api.jar.license" />
- <!-- JSP 2.1 EL Implementation JAR File -->
+ <!-- JSP 2.2 EL Implementation JAR File -->
<jarIt jarfile="${el-api-src.jar}"
filesDir="java"
filesId="files.el-api"
Modified: tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml?rev=1430451&r1=1430450&r2=1430451&view=diff
==============================================================================
--- tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml (original)
+++ tomcat/tc7.0.x/trunk/webapps/docs/appdev/deployment.xml Tue Jan 8 19:11:23
2013
@@ -136,7 +136,7 @@ drivers that are required for both your
<p>Out of the box, a standard Tomcat installation includes a variety
of pre-installed shared library files, including:</p>
<ul>
-<li>The <em>Servlet 3.0</em> and <em>JSP 2.1</em> APIs that are fundamental
+<li>The <em>Servlet 3.0</em> and <em>JSP 2.2</em> APIs that are fundamental
to writing servlets and JavaServer Pages.<br/><br/></li>
<li>An <em>XML Parser</em> compliant with the JAXP (version 1.2) APIs, so
your application can perform DOM-based or SAX-based processing of
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
