diff --git a/webapps/docs/annotationapi/index.html b/webapps/docs/annotationapi/index.html
index 2c633f558353..61aba84d272b 100644
--- a/webapps/docs/annotationapi/index.html
+++ b/webapps/docs/annotationapi/index.html
@@ -15,12 +15,11 @@
limitations under the License.
-->
-
+
-
+
API docs
-
The Annotation API Javadoc is not installed by default. Download and install
diff --git a/webapps/docs/api/index.html b/webapps/docs/api/index.html
index 246dc78bc0b7..b32af2b386e1 100644
--- a/webapps/docs/api/index.html
+++ b/webapps/docs/api/index.html
@@ -15,12 +15,11 @@
limitations under the License.
-->
-
-
-
+
+
+
API docs
-
Tomcat's internal javadoc is not installed by default. Download and install
diff --git a/webapps/docs/appdev/sample/index.html b/webapps/docs/appdev/sample/index.html
index 589bd71d067c..07bf1bbbcf80 100644
--- a/webapps/docs/appdev/sample/index.html
+++ b/webapps/docs/appdev/sample/index.html
@@ -15,41 +15,41 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
-
-
-Sample Application
+
+
+ Sample Application
-
Sample Application
-
- The example app has been packaged as a war file and can be downloaded
- here (Note: make sure your browser doesn't
- change file extension or append a new one).
-
-
- The easiest way to run this application is simply to move the war file
- to your CATALINA_BASE/webapps directory. A default Tomcat install
- will automatically expand and deploy the application for you. You can
- view it with the following URL (assuming that you're running tomcat on
- port 8080 which is the default):
-
- http://localhost:8080/sample
-
-
- If you just want to browse the contents, you can unpack the war file
- with the jar command.
-
-
- jar -xvf sample.war
-
-
- Note: CATALINA_BASE is usually the directory in which you
- unpacked the Tomcat distribution. For more information on
- CATALINA_HOME, CATALINA_BASE and the difference between
- them see RUNNING.txt in the directory you unpacked your Tomcat
- distribution.
-
+
Sample Application
+
+ The example app has been packaged as a war file and can be downloaded
+ here (Note: make sure your browser doesn't
+ change file extension or append a new one).
+
+
+ The easiest way to run this application is simply to move the war file
+ to your CATALINA_BASE/webapps directory. A default Tomcat install
+ will automatically expand and deploy the application for you. You can
+ view it with the following URL (assuming that you're running tomcat on
+ port 8080 which is the default):
+
+ http://localhost:8080/sample
+
+
+ If you just want to browse the contents, you can unpack the war file
+ with the jar command.
+
+
+ jar -xvf sample.war
+
+
+ Note: CATALINA_BASE is usually the directory in which you
+ unpacked the Tomcat distribution. For more information on
+ CATALINA_HOME, CATALINA_BASE and the difference between
+ them see RUNNING.txt in the directory you unpacked your Tomcat
+ distribution.
+
\ No newline at end of file
diff --git a/webapps/docs/appdev/sample/web/hello.jsp b/webapps/docs/appdev/sample/web/hello.jsp
index bd5680addd41..8f4a1ca39936 100644
--- a/webapps/docs/appdev/sample/web/hello.jsp
+++ b/webapps/docs/appdev/sample/web/hello.jsp
@@ -16,21 +16,20 @@
--%>
<%@ page session="false" pageEncoding="UTF-8" contentType="text/html; charset=UTF-8" %>
-
+
-
-Sample Application JSP Page
+
+ Sample Application JSP Page
-
+
Sample Application JSP Page
This is the output of a JSP page that is part of the Hello, World
application.
-
<%= new String("Hello!") %>
diff --git a/webapps/docs/appdev/sample/web/index.html b/webapps/docs/appdev/sample/web/index.html
index 1c6938a66806..5504d941d813 100644
--- a/webapps/docs/appdev/sample/web/index.html
+++ b/webapps/docs/appdev/sample/web/index.html
@@ -14,26 +14,23 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
-
-Sample "Hello, World" Application
+
+ Sample "Hello, World" Application
-
-
-
-
-
Sample "Hello, World" Application
-
This is the home page for a sample application used to illustrate the
-source directory organization of a web application utilizing the principles
-outlined in the Application Developer's Guide.
-
-
To prove that they work, you can execute either of the following links:
This is the home page for a sample application used to illustrate the
+ source directory organization of a web application utilizing the principles
+ outlined in the Application Developer's Guide.
+
To prove that they work, you can execute either of the following links:
diff --git a/webapps/docs/elapi/index.html b/webapps/docs/elapi/index.html
index 00c72fedf6d8..7559378d44ce 100644
--- a/webapps/docs/elapi/index.html
+++ b/webapps/docs/elapi/index.html
@@ -15,12 +15,11 @@
limitations under the License.
-->
-
-
-
+
+
+
API docs
-
The EL Javadoc is not installed by default. Download and install
diff --git a/webapps/docs/jaspicapi/index.html b/webapps/docs/jaspicapi/index.html
index e4f31a26882b..652a2c64d336 100644
--- a/webapps/docs/jaspicapi/index.html
+++ b/webapps/docs/jaspicapi/index.html
@@ -15,12 +15,11 @@
limitations under the License.
-->
-
+
-
+
API docs
-
The JASPIC Javadoc is not installed by default. Download and install
diff --git a/webapps/docs/jspapi/index.html b/webapps/docs/jspapi/index.html
index 4d0d1274827f..407cb981cb2b 100644
--- a/webapps/docs/jspapi/index.html
+++ b/webapps/docs/jspapi/index.html
@@ -15,12 +15,11 @@
limitations under the License.
-->
-
-
-
+
+
+
API docs
-
The JSP Javadoc is not installed by default. Download and install
diff --git a/webapps/docs/servletapi/index.html b/webapps/docs/servletapi/index.html
index b8a7a6697841..f21a5cb5e041 100644
--- a/webapps/docs/servletapi/index.html
+++ b/webapps/docs/servletapi/index.html
@@ -15,12 +15,11 @@
limitations under the License.
-->
-
-
-
+
+
+
API docs
-
The Servlet Javadoc is not installed by default. Download and install
diff --git a/webapps/docs/websocketapi/index.html b/webapps/docs/websocketapi/index.html
index 19cd77817d08..81e7021dcda8 100644
--- a/webapps/docs/websocketapi/index.html
+++ b/webapps/docs/websocketapi/index.html
@@ -15,12 +15,11 @@
limitations under the License.
-->
-
-
-
+
+
+
API docs
-
The WebSocket Javadoc is not installed by default. Download and install
diff --git a/webapps/examples/index.html b/webapps/examples/index.html
index 0799e10f7227..3ebe842d79b6 100644
--- a/webapps/examples/index.html
+++ b/webapps/examples/index.html
@@ -14,17 +14,18 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-
-Apache Tomcat Examples
-
-
-
diff --git a/webapps/examples/jsp/cal/login.html b/webapps/examples/jsp/cal/login.html
index 2c4aa55e0f7c..14f894bdce76 100644
--- a/webapps/examples/jsp/cal/login.html
+++ b/webapps/examples/jsp/cal/login.html
@@ -1,4 +1,4 @@
-
+
-
- Login page for the calendar.
+ Login page for the calendar.
+
-
-
-
-
- Please Enter the following information:
-
-
-
-
- Note: This application does not implement the complete
-functionality of a typical calendar application. It demonstrates a way JSP can
-be used with html tables and forms.
-
-
+
+
+ Note: This application does not implement the complete
+ functionality of a typical calendar application. It demonstrates a way JSP can
+ be used with html tables and forms.
+
diff --git a/webapps/examples/jsp/checkbox/CheckTest.html b/webapps/examples/jsp/checkbox/CheckTest.html
index 284d9ec3bce2..a26e190af7cc 100644
--- a/webapps/examples/jsp/checkbox/CheckTest.html
+++ b/webapps/examples/jsp/checkbox/CheckTest.html
@@ -1,4 +1,4 @@
-
+
+
+checkbox.CheckTest Bean Properties
+
+
+
+
diff --git a/webapps/examples/jsp/colors/colors.html b/webapps/examples/jsp/colors/colors.html
index 900651e2c6db..aa6f49903f68 100644
--- a/webapps/examples/jsp/colors/colors.html
+++ b/webapps/examples/jsp/colors/colors.html
@@ -1,4 +1,5 @@
-
+
+
-
-
-
-
-
-This web page is an example using JSP and BEANs.
-
-Guess my favorite two colors
-
-
If you fail to guess both of them - you get yellow on red.
-
-
If you guess one of them right, either your foreground or
- your background will change to the color that was guessed right.
-
-
Guess them both right and your browser foreground/background
- will change to my two favorite colors to display this page.
-
-
-
-
-
+
+ Example using JSP and BEANs.
+
+
+
+
+ This web page is an example using JSP and BEANs.
+
Guess my favorite two colors
+
+
If you fail to guess both of them - you get yellow on red.
+
+
If you guess one of them right, either your foreground or
+ your background will change to the color that was guessed right.
+
+
Guess them both right and your browser foreground/background
+ will change to my two favorite colors to display this page.
+
+
+
diff --git a/webapps/examples/jsp/colors/colrs.jsp b/webapps/examples/jsp/colors/colrs.jsp
index ec3af887c4fd..acdd09ea0584 100644
--- a/webapps/examples/jsp/colors/colrs.jsp
+++ b/webapps/examples/jsp/colors/colrs.jsp
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
+
@@ -23,8 +23,8 @@
cb.processRequest();
%>
->
->
+
+
<% if (cb.getHint()==true) { %>
@@ -50,19 +50,13 @@
diff --git a/webapps/examples/jsp/error/err.jsp b/webapps/examples/jsp/error/err.jsp
index d188456b3040..830acd6d2a9c 100644
--- a/webapps/examples/jsp/error/err.jsp
+++ b/webapps/examples/jsp/error/err.jsp
@@ -14,14 +14,18 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
-
-
+
+
+
+
+
+
<%@ page errorPage="errorpge.jsp" %>
<%
String name = null;
-
if (request.getParameter("name") == null) {
%>
<%@ include file="error.html" %>
@@ -33,7 +37,7 @@
if (name.equalsIgnoreCase("acura")) {
%>
-
+
diff --git a/webapps/examples/jsp/error/errorpge.jsp b/webapps/examples/jsp/error/errorpge.jsp
index 5c6eb0a38718..c7372b8f0992 100644
--- a/webapps/examples/jsp/error/errorpge.jsp
+++ b/webapps/examples/jsp/error/errorpge.jsp
@@ -14,12 +14,16 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-
-
-
-
+
+
+
+
+
+
<%@ page isErrorPage="true" %>
The exception <%= exception.getMessage() %> tells me you
- made a wrong choice.
+ made a wrong choice.
diff --git a/webapps/examples/jsp/jsptoserv/jts.html b/webapps/examples/jsp/jsptoserv/jts.html
index a4e16794a3af..23ea9fe0a940 100644
--- a/webapps/examples/jsp/jsptoserv/jts.html
+++ b/webapps/examples/jsp/jsptoserv/jts.html
@@ -15,22 +15,25 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+
-
-Untitled Document
-
+
+ Untitled Document
+
-
-
diff --git a/webapps/examples/jsp/plugin/plugin.jsp b/webapps/examples/jsp/plugin/plugin.jsp
index a07dda3af581..ca542960bebf 100644
--- a/webapps/examples/jsp/plugin/plugin.jsp
+++ b/webapps/examples/jsp/plugin/plugin.jsp
@@ -15,7 +15,7 @@
limitations under the License.
--%>
- Plugin example
+Plugin example
Current time is :
diff --git a/webapps/examples/jsp/security/protected/index.jsp b/webapps/examples/jsp/security/protected/index.jsp
index 31122eb361fd..00f038c7bdae 100644
--- a/webapps/examples/jsp/security/protected/index.jsp
+++ b/webapps/examples/jsp/security/protected/index.jsp
@@ -69,7 +69,7 @@ To check whether your user name has been granted a particular role,
enter it here:
@@ -77,7 +77,7 @@ To add some data to the authenticated session, enter it here:
diff --git a/webapps/examples/jsp/security/protected/login.jsp b/webapps/examples/jsp/security/protected/login.jsp
index e11a898c7dbf..02af060a53b5 100644
--- a/webapps/examples/jsp/security/protected/login.jsp
+++ b/webapps/examples/jsp/security/protected/login.jsp
@@ -17,6 +17,7 @@
Login Page for Examples
+