You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by ma...@apache.org on 2020/07/04 14:23:55 UTC
[tomcat] branch master updated: Fix case of JavaScript.
This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/master by this push:
new 96b5ab3 Fix case of JavaScript.
96b5ab3 is described below
commit 96b5ab3aac24c25f478b8299110dfd02ca0e1507
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Sat Jul 4 09:28:13 2020 +1000
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 ef80563..a685947 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 be90783..16c9c8d 100644
--- a/java/org/apache/catalina/filters/ExpiresFilter.java
+++ b/java/org/apache/catalina/filters/ExpiresFilter.java
@@ -81,7 +81,7 @@ import org.apache.juli.logging.LogFactory;
* </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 e6bb2cf..eef71df 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 f697ac6..464a97e 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 4262c4c..65708b4 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'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 fca748c..806c172 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 82e494f..14c5b2a 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 89347bb..ac2a732 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 b71077c..f0dee27 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>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org