From 95ac194e3092c03f3244982ce2f751b3af0a4692 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Tue, 29 Sep 2009 23:23:11 +0000
Subject: [PATCH] Do proper nesting of HTML tags and add DOCTYPE declaration.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@820123 13f79535-47bb-0310-9956-ffa450edef68
---
 webapps/manager/401.jsp | 7 ++++---
 webapps/manager/404.jsp | 5 ++++-
 2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/webapps/manager/401.jsp b/webapps/manager/401.jsp
index 716f92191..652425e47 100644
--- a/webapps/manager/401.jsp
+++ b/webapps/manager/401.jsp
@@ -17,10 +17,11 @@
 <%
   response.setHeader("WWW-Authenticate", "Basic realm=\"Tomcat Manager Application\"");
 %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
  <head>
   <title>401 Unauthorized</title>
-  <style>
+  <style type="text/css">
     <!--
     BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;font-size:12px;}
     H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
@@ -41,16 +42,17 @@
     For example, to add the <tt>manager</tt> role to a user named
     <tt>tomcat</tt> with a password of <tt>s3cret</tt>, add the following to the
     config file listed above.
+   </p>
 <pre>
 &lt;role rolename="manager"/&gt;
 &lt;user username="tomcat" password="s3cret" roles="manager"/&gt;
 </pre>
-   </p>
    <p>
     Note that for Tomcat 7 onwards, the roles required to use the manager
     application were changed from the single <tt>manager</tt> role to the
     following four roles. You will need to assign the role(s) required for
     the functionality you wish to access.
+   </p>
     <ul>
       <li><tt>manager</tt> - allows access to the HTML GUI and the status
           pages</li>
@@ -60,7 +62,6 @@
           pages</li>
       <li><tt>manager-status</tt> - allows access to the status pages only</li>
     </ul>
-   </p>
    <p>
     For more information - please see the
     <a href="/docs/manager-howto.html">Manager App HOW-TO</a>.
diff --git a/webapps/manager/404.jsp b/webapps/manager/404.jsp
index ab6b0d73e..86d4f3519 100644
--- a/webapps/manager/404.jsp
+++ b/webapps/manager/404.jsp
@@ -15,10 +15,11 @@
   limitations under the License.
 --%>
 <%@ page import="org.apache.catalina.util.RequestUtil" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
 <html>
  <head>
   <title>404 Not found</title>
-  <style>
+  <style type="text/css">
     <!--
     BODY {font-family:Tahoma,Arial,sans-serif;color:black;background-color:white;font-size:12px;}
     H1 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
@@ -39,12 +40,14 @@
     The Manager application has been re-structured for Tomcat 7 onwards and some
     of URLs have changed. All URLs used to access the Manager application should
     now start with one of the following options:
+   </p>
     <ul>
       <li><%=request.getContextPath()%>/html for the HTML GUI</li>
       <li><%=request.getContextPath()%>/text for the text interface</li>
       <li><%=request.getContextPath()%>/jmxproxy for the JMX proxy</li>
       <li><%=request.getContextPath()%>/status for the status pages</li>
     </ul>
+   <p>
     Note that the URL for the text interface has changed from
     &quot;<%=request.getContextPath()%>&quot; to
     &quot;<%=request.getContextPath()%>/text&quot;.
-- 
2.11.0

