Merge pull request #364 from jbampton/fix-word-case

martin-g · web-flow · commit c4a789ebddda · 2020-09-16T12:01:04.000+03:00
Fix case of HTML and SHTML
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -520,8 +520,8 @@ public String toString() {
 
     /**
      * Expiration configuration starting point. Either the time the
-     * html-page/servlet-response was served ({@link StartingPoint#ACCESS_TIME})
-     * or the last time the html-page/servlet-response was modified (
+     * HTML-page/servlet-response was served ({@link StartingPoint#ACCESS_TIME})
+     * or the last time the HTML-page/servlet-response was modified (
      * {@link StartingPoint#LAST_MODIFICATION_TIME}).
      */
     protected enum StartingPoint {
diff --git a/java/org/apache/catalina/ssi/SSIFilter.java b/java/org/apache/catalina/ssi/SSIFilter.java
@@ -143,7 +143,7 @@ public void doFilter(ServletRequest request, ServletResponse response,
             Matcher shtmlMatcher =
                 shtmlRegEx.matcher(responseIncludeWrapper.getContentType());
             if (shtmlMatcher.matches()) {
-                // Convert shtml mime type to ordinary html mime type but preserve
+                // Convert SHTML mime type to ordinary HTML mime type but preserve
                 // encoding, if any.
                 String enc = shtmlMatcher.group(1);
                 res.setContentType("text/html" + ((enc != null) ? enc : ""));
diff --git a/test/org/apache/catalina/authenticator/TestFormAuthenticator.java b/test/org/apache/catalina/authenticator/TestFormAuthenticator.java
@@ -53,7 +53,7 @@
  *    as a path parameter appended to ALL urls within its response. That is
  *    achievable with servlets, jsps, jstl (all of which which can ask for an
  *    encoded url to be inserted into the dynamic web page). It cannot work
- *    with static html.
+ *    with static HTML.
  *    note: this test class uses the Tomcat sample jsps, which conform.
  *
  * 3. Therefore, any webapp that MIGHT need to authenticate a client that
@@ -534,7 +534,7 @@ private void doRequest(String request[]) throws Exception {
         }
 
         /*
-         * verify the server response html body is the page we expect,
+         * verify the server response HTML body is the page we expect,
          * based on the dialogue position within doTest.
          */
         @Override
@@ -543,7 +543,7 @@ public boolean isResponseBodyOK() {
         }
 
         /*
-         * verify the server response html body is the page we expect,
+         * verify the server response HTML body is the page we expect,
          * based on the dialogue position given by the caller.
          */
         public boolean isResponseBodyOK(int testPhase) {
diff --git a/test/org/apache/catalina/startup/SimpleHttpClient.java b/test/org/apache/catalina/startup/SimpleHttpClient.java
@@ -362,7 +362,7 @@ public void extractUriElements() {
     }
 
     /*
-     * Scan an html body for a given html uri element, starting from the
+     * Scan an HTML body for a given HTML uri element, starting from the
      * given index into the source string. If any are found, simply
      * accumulate them as literal strings, including angle brackets.
      * note: nested elements will not be collected.
diff --git a/test/org/apache/catalina/startup/TesterServletEncodeUrl.java b/test/org/apache/catalina/startup/TesterServletEncodeUrl.java
@@ -37,7 +37,7 @@ public class TesterServletEncodeUrl extends HttpServlet {
      * <p>
      * The request parameter <code>nextUrl</code> specifies the url to which the
      * caller would like to go next. If supplied, put an encoded url into the
-     * returned html page as a hyperlink.
+     * returned HTML page as a hyperlink.
      */
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp)
diff --git a/webapps/examples/WEB-INF/classes/RequestInfoExample.java b/webapps/examples/WEB-INF/classes/RequestInfoExample.java
@@ -56,7 +56,7 @@ public void doGet(HttpServletRequest request,
         out.println("</head>");
         out.println("<body bgcolor=\"white\">");
 
-        // img stuff not req'd for source code html showing
+        // img stuff not req'd for source code HTML showing
         // all links relative!
 
         // XXX
diff --git a/webapps/examples/WEB-INF/classes/RequestParamExample.java b/webapps/examples/WEB-INF/classes/RequestParamExample.java
@@ -56,7 +56,7 @@ public void doGet(HttpServletRequest request,
         out.println("</head>");
         out.println("<body bgcolor=\"white\">");
 
-        // img stuff not req'd for source code html showing
+        // img stuff not req'd for source code HTML showing
 
        // all links relative
 
diff --git a/webapps/examples/WEB-INF/classes/SessionExample.java b/webapps/examples/WEB-INF/classes/SessionExample.java
@@ -60,7 +60,7 @@ public void doGet(HttpServletRequest request,
         out.println("</head>");
         out.println("<body bgcolor=\"white\">");
 
-        // img stuff not req'd for source code html showing
+        // img stuff not req'd for source code HTML showing
         // relative links everywhere!
 
         // XXX
diff --git a/webapps/examples/jsp/cal/cal1.jsp b/webapps/examples/jsp/cal/cal1.jsp
@@ -31,7 +31,7 @@
     if (table.getProcessError() == false) {
 %>
 
-<!-- html table goes here -->
+<!-- HTML table goes here -->
 <CENTER>
 <TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15>
 <TR>
diff --git a/webapps/examples/jsp/cal/login.html b/webapps/examples/jsp/cal/login.html
@@ -40,7 +40,7 @@
 <hr>
 <font size=3 color="red"> 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.</font>
+be used with HTML tables and forms.</font>
 
 </center>
 </body>

Original file line number	Diff line number	Diff line change
`@@ -362,7 +362,7 @@ public void extractUriElements() {`
`362`	`362`	`}`
`363`	`363`
`364`	`364`	`/*`
`365`		`- * Scan an html body for a given html uri element, starting from the`
	`365`	`+ * Scan an HTML body for a given HTML uri element, starting from the`
`366`	`366`	`* given index into the source string. If any are found, simply`
`367`	`367`	`* accumulate them as literal strings, including angle brackets.`
`368`	`368`	`* note: nested elements will not be collected.`