From 96b5ab3aac24c25f478b8299110dfd02ca0e1507 Mon Sep 17 00:00:00 2001
From: John Bampton <jbampton@users.noreply.github.com>
Date: Sat, 4 Jul 2020 09:28:13 +1000
Subject: [PATCH] Fix case of JavaScript.

Changes were:

- `javascript` to `JavaScript`
- `Javascript` to `JavaScript`
---
 conf/web.xml                                        | 2 +-
 java/org/apache/catalina/filters/ExpiresFilter.java | 2 +-
 webapps/docs/config/filter.xml                      | 2 +-
 webapps/docs/ssi-howto.xml                          | 2 +-
 webapps/docs/ssl-howto.xml                          | 2 +-
 webapps/examples/websocket/chat.xhtml               | 4 ++--
 webapps/examples/websocket/drawboard.xhtml          | 4 ++--
 webapps/examples/websocket/echo.xhtml               | 4 ++--
 webapps/examples/websocket/snake.xhtml              | 4 ++--
 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/conf/web.xml b/conf/web.xml
index ef80563e274b..a6859476a749 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -548,7 +548,7 @@
   <!-- this to work you will need to uncomment the .shtml mime type         -->
   <!-- definition towards the bottom of this file.                          -->
   <!-- The contentType init param allows you to apply SSI processing to JSP -->
-  <!-- pages, javascript, or any other content you wish.  This filter       -->
+  <!-- pages, JavaScript, or any other content you wish.  This filter       -->
   <!-- supports the following initialization parameters (default values are -->
   <!-- in square brackets):                                                 -->
   <!--                                                                      -->
diff --git a/java/org/apache/catalina/filters/ExpiresFilter.java b/java/org/apache/catalina/filters/ExpiresFilter.java
index be907833b5cc..16c9c8dafea2 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -81,7 +81,7 @@
  * </p>
  * <h2>Filter Configuration</h2><h3>Basic configuration to add
  * '{@code Expires}' and '{@code Cache-Control: max-age=}'
- * headers to images, css and javascript</h3>
+ * headers to images, css and JavaScript</h3>
  *
  * <pre>
  * {@code
diff --git a/webapps/docs/config/filter.xml b/webapps/docs/config/filter.xml
index e6bb2cfd26ee..eef71dfb0120 100644
--- a/webapps/docs/config/filter.xml
+++ b/webapps/docs/config/filter.xml
@@ -508,7 +508,7 @@ HTTP/1.1 200 OK
   <subsection name="Basic configuration sample">
     <p>
     Basic configuration to add '<code>Expires</code>' and '<code>Cache-Control: max-age=</code>'
-    headers to images, css and javascript.
+    headers to images, css and JavaScript.
     </p>
 
     <source><![CDATA[<filter>
diff --git a/webapps/docs/ssi-howto.xml b/webapps/docs/ssi-howto.xml
index f697ac6d1eb4..464a97ec30f7 100644
--- a/webapps/docs/ssi-howto.xml
+++ b/webapps/docs/ssi-howto.xml
@@ -61,7 +61,7 @@ is mapped to the URL pattern "*.shtml".</p>
 is mapped to the URL pattern "*.shtml", though it can be mapped to "*" as
 it will selectively enable/disable SSI processing based on mime types.  The
 contentType init param allows you to apply SSI processing to JSP pages,
-javascript, or any other content you wish.</p>
+JavaScript, or any other content you wish.</p>
 <p>By default SSI support is disabled in Tomcat.</p>
 </section>
 
diff --git a/webapps/docs/ssl-howto.xml b/webapps/docs/ssl-howto.xml
index 4262c4ca1e4b..65708b424aa2 100644
--- a/webapps/docs/ssl-howto.xml
+++ b/webapps/docs/ssl-howto.xml
@@ -155,7 +155,7 @@ scenarios, they are not suitable for any form of production use.</p>
 
 <p>When securing a website with SSL it's important to make sure that all assets
 that the site uses are served over SSL, so that an attacker can&apos;t bypass
-the security by injecting malicious content in a javascript file or similar. To
+the security by injecting malicious content in a JavaScript file or similar. To
 further enhance the security of your website, you should evaluate to use the
 HSTS header. It allows you to communicate to the browser that your site should
 always be accessed over https.</p>
diff --git a/webapps/examples/websocket/chat.xhtml b/webapps/examples/websocket/chat.xhtml
index fca748ca98c4..806c172235ad 100644
--- a/webapps/examples/websocket/chat.xhtml
+++ b/webapps/examples/websocket/chat.xhtml
@@ -122,8 +122,8 @@
     ]]></script>
 </head>
 <body>
-<div class="noscript"><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></div>
+<div class="noscript"><h2 style="color: #ff0000">Seems your browser doesn't support JavaScript! Websockets rely on JavaScript being enabled. Please enable
+    JavaScript and reload this page!</h2></div>
 <div>
     <p>
         <input type="text" placeholder="type and press enter to chat" id="chat" />
diff --git a/webapps/examples/websocket/drawboard.xhtml b/webapps/examples/websocket/drawboard.xhtml
index 82e494f6019d..14c5b2a7bdfc 100644
--- a/webapps/examples/websocket/drawboard.xhtml
+++ b/webapps/examples/websocket/drawboard.xhtml
@@ -858,8 +858,8 @@
     ]]></script>
 </head>
 <body>
-    <div class="noscript"><div style="color: #ff0000; font-size: 16pt;">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</div></div>
+    <div class="noscript"><div style="color: #ff0000; font-size: 16pt;">Seems your browser doesn't support JavaScript! Websockets rely on JavaScript being enabled. Please enable
+    JavaScript and reload this page!</div></div>
     <div id="labelContainer"/>
     <div id="drawContainer"/>
     <div id="console-container"/>
diff --git a/webapps/examples/websocket/echo.xhtml b/webapps/examples/websocket/echo.xhtml
index 89347bbd2169..ac2a732cf156 100644
--- a/webapps/examples/websocket/echo.xhtml
+++ b/webapps/examples/websocket/echo.xhtml
@@ -136,8 +136,8 @@
     ]]></script>
 </head>
 <body>
-<div class="noscript"><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></div>
+<div class="noscript"><h2 style="color: #ff0000">Seems your browser doesn't support JavaScript! Websockets rely on JavaScript being enabled. Please enable
+    JavaScript and reload this page!</h2></div>
 <div>
     <div id="connect-container">
         <div>
diff --git a/webapps/examples/websocket/snake.xhtml b/webapps/examples/websocket/snake.xhtml
index b71077c63a46..f0dee271a9f6 100644
--- a/webapps/examples/websocket/snake.xhtml
+++ b/webapps/examples/websocket/snake.xhtml
@@ -49,8 +49,8 @@
     ]]></style>
 </head>
 <body>
-    <div class="noscript"><h2 style="color: #ff0000">Seems your browser doesn't support Javascript! Websockets rely on Javascript being enabled. Please enable
-    Javascript and reload this page!</h2></div>
+    <div class="noscript"><h2 style="color: #ff0000">Seems your browser doesn't support JavaScript! Websockets rely on JavaScript being enabled. Please enable
+    JavaScript and reload this page!</h2></div>
     <div style="float: left">
         <canvas id="playground" width="640" height="480"/>
     </div>