You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by mg...@apache.org on 2020/07/06 08:36:46 UTC
[tomcat] branch 9.0.x updated: Fix case of JavaScript.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/9.0.x by this push:
new 97e3caa Fix case of JavaScript.
97e3caa is described below
commit 97e3caa80ae496006562275dc33b3f354e382390
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`
(cherry picked from commit 96b5ab3aac24c25f478b8299110dfd02ca0e1507)
---
conf/web.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 ++--
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/conf/web.xml b/conf/web.xml
index bd17e85..a9e29ee 100644
--- a/conf/web.xml
+++ b/conf/web.xml
@@ -543,7 +543,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/webapps/docs/ssi-howto.xml b/webapps/docs/ssi-howto.xml
index 8d672de..8f866cc 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 91b5dd2..a508e20 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
Re: [tomcat] branch 9.0.x updated: Fix case of JavaScript.
Posted by Mark Thomas <ma...@apache.org>.
On 06/07/2020 09:36, mgrigorov@apache.org wrote:
Thanks for back-porting these.
Mark
> This is an automated email from the ASF dual-hosted git repository.
>
> mgrigorov pushed a commit to branch 9.0.x
> in repository https://gitbox.apache.org/repos/asf/tomcat.git
>
>
> The following commit(s) were added to refs/heads/9.0.x by this push:
> new 97e3caa Fix case of JavaScript.
> 97e3caa is described below
>
> commit 97e3caa80ae496006562275dc33b3f354e382390
> 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`
>
> (cherry picked from commit 96b5ab3aac24c25f478b8299110dfd02ca0e1507)
> ---
> conf/web.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 ++--
> 7 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/conf/web.xml b/conf/web.xml
> index bd17e85..a9e29ee 100644
> --- a/conf/web.xml
> +++ b/conf/web.xml
> @@ -543,7 +543,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/webapps/docs/ssi-howto.xml b/webapps/docs/ssi-howto.xml
> index 8d672de..8f866cc 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 91b5dd2..a508e20 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
>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org