Bug 532984 - Stop using long deprecated sript language attribute

The prefferred way is type="text/javascript" for HTML 4.x

Change-Id: I0807cdec177ac1de6684796da1bde444c5f0b923
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

68 files changed, 133 insertions, 133 deletions

diff --git a/org.eclipse.help.webapp/advanced/advanced.jsp b/org.eclipse.help.webapp/advanced/advanced.jsp
index de2429b3a..069d88ee5 100644
--- a/org.eclipse.help.webapp/advanced/advanced.jsp
+++ b/org.eclipse.help.webapp/advanced/advanced.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -103,7 +103,7 @@ input[type="checkbox"] {
 %>
 </style>
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 function doAdvancedSearch()
 {
diff --git a/org.eclipse.help.webapp/advanced/bookmarksView.jsp b/org.eclipse.help.webapp/advanced/bookmarksView.jsp
index 61b9ee31b..8891397d7 100644
--- a/org.eclipse.help.webapp/advanced/bookmarksView.jsp
+++ b/org.eclipse.help.webapp/advanced/bookmarksView.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2010 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -29,10 +29,10 @@
 
 <base target="ContentViewFrame">
 
-<script language="JavaScript" src="utils.js"></script>
-<script language="JavaScript" src="list.js"></script>
+<script type="text/javascript" src="utils.js"></script>
+<script type="text/javascript" src="list.js"></script>
 
-<script language="JavaScript">		
+<script type="text/javascript">		
 
 /**
  * Removes bookmark 
diff --git a/org.eclipse.help.webapp/advanced/confirmShowAll.jsp b/org.eclipse.help.webapp/advanced/confirmShowAll.jsp
index de75e789d..71ef3ab4d 100644
--- a/org.eclipse.help.webapp/advanced/confirmShowAll.jsp
+++ b/org.eclipse.help.webapp/advanced/confirmShowAll.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2010 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -63,7 +63,7 @@ BUTTON {
 
 </style>
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 function onloadHandler() {
 <%
diff --git a/org.eclipse.help.webapp/advanced/deferredView.jsp b/org.eclipse.help.webapp/advanced/deferredView.jsp
index f30777c72..fd63832b5 100644
--- a/org.eclipse.help.webapp/advanced/deferredView.jsp
+++ b/org.eclipse.help.webapp/advanced/deferredView.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2006, 2012 IBM Corporation and others.
+ Copyright (c) 2006, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -25,7 +25,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title><%=ServletResources.getString("Loading", request)%></title>
 
-<script language="JavaScript">
+<script type="text/javascript">
 	function onloadHandler() { 
 		location.href="<%=UrlUtil.JavaScriptEncode(href)%>";
 	}
diff --git a/org.eclipse.help.webapp/advanced/help.jsp b/org.eclipse.help.webapp/advanced/help.jsp
index a21f3c245..52082a1cb 100644
--- a/org.eclipse.help.webapp/advanced/help.jsp
+++ b/org.eclipse.help.webapp/advanced/help.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2010 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -21,7 +21,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title><%=ServletResources.getString("Help", request)%></title>
 
-<script language="JavaScript">
+<script type="text/javascript">
 <%-- map of maximize listener functions indexed by name --%>
 var maximizeListeners=new Object();
 function registerMaximizeListener(name, listener){
diff --git a/org.eclipse.help.webapp/advanced/index.jsp b/org.eclipse.help.webapp/advanced/index.jsp
index 9febf8b04..a78c3cb10 100644
--- a/org.eclipse.help.webapp/advanced/index.jsp
+++ b/org.eclipse.help.webapp/advanced/index.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2010 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -36,7 +36,7 @@ FRAMESET {
 }
 </style>
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 function onloadHandler(e)
 {
diff --git a/org.eclipse.help.webapp/advanced/indexView.jsp b/org.eclipse.help.webapp/advanced/indexView.jsp
index 1d13a5783..d44b09393 100644
--- a/org.eclipse.help.webapp/advanced/indexView.jsp
+++ b/org.eclipse.help.webapp/advanced/indexView.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2005, 2010 Intel Corporation and others.
+ Copyright (c) 2005, 2018 Intel Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -46,18 +46,18 @@
 
 <base target="ContentViewFrame">
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 var loadingMessage = "<%=UrlUtil.JavaScriptEncode(ServletResources.getString("Loading", request))%>";
 </script>
 
-<script language="JavaScript" src="indexView.js"></script>
-<script language="JavaScript" src="resize.js"></script>
-<script language="JavaScript" src="helptree.js"></script>
-<script language="JavaScript" src="helptreechildren.js"></script>
-<script language="JavaScript" src="xmlajax.js"></script>
-<script language="JavaScript" src="utils.js"></script>
-<script language="JavaScript" src="view.js"></script>
+<script type="text/javascript" src="indexView.js"></script>
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="helptree.js"></script>
+<script type="text/javascript" src="helptreechildren.js"></script>
+<script type="text/javascript" src="xmlajax.js"></script>
+<script type="text/javascript" src="utils.js"></script>
+<script type="text/javascript" src="view.js"></script>
 </head>
 
 <body dir="<%=direction%>" onload="onloadHandler()" onresize = "sizeList()">
diff --git a/org.eclipse.help.webapp/advanced/livehelp_js.jsp b/org.eclipse.help.webapp/advanced/livehelp_js.jsp
index b0c6c8da2..b0e3b12a6 100644
--- a/org.eclipse.help.webapp/advanced/livehelp_js.jsp
+++ b/org.eclipse.help.webapp/advanced/livehelp_js.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2005 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
 <%
 	request.setCharacterEncoding("UTF-8");
 %>
-<script language="JavaScript">
+<script type="text/javascript">
 function liveActionInternal(topHelpWindow, pluginId, className, argument)
 {
 <%
diff --git a/org.eclipse.help.webapp/advanced/nav.jsp b/org.eclipse.help.webapp/advanced/nav.jsp
index c82e7beea..783d3c0ea 100644
--- a/org.eclipse.help.webapp/advanced/nav.jsp
+++ b/org.eclipse.help.webapp/advanced/nav.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2010 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -35,7 +35,7 @@ FRAMESET {
 %>
 </style>
 
-<script language="JavaScript">
+<script type="text/javascript">
 var isMozilla = navigator.userAgent.indexOf('Mozilla') != -1 && parseInt(navigator.appVersion.substring(0,1)) >= 5;
 var isMozilla10 = isMozilla && navigator.userAgent.indexOf('rv:1') != -1;
 var isIE = navigator.userAgent.indexOf('MSIE') != -1;
diff --git a/org.eclipse.help.webapp/advanced/printConfirm.jsp b/org.eclipse.help.webapp/advanced/printConfirm.jsp
index 4c1738d46..50f93ff57 100644
--- a/org.eclipse.help.webapp/advanced/printConfirm.jsp
+++ b/org.eclipse.help.webapp/advanced/printConfirm.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2009, 2010 IBM Corporation and others.
+ Copyright (c) 2009, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -30,7 +30,7 @@
 <meta http-equiv="Expires" content="-1">
 <link rel="stylesheet" href="printAlert.css" charset="utf-8" type="text/css">
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 function onloadHandler() {
 	sizeButtons();
diff --git a/org.eclipse.help.webapp/advanced/printError.jsp b/org.eclipse.help.webapp/advanced/printError.jsp
index 9ad0256f4..5bf80c1e8 100644
--- a/org.eclipse.help.webapp/advanced/printError.jsp
+++ b/org.eclipse.help.webapp/advanced/printError.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2009, 2010 IBM Corporation and others.
+ Copyright (c) 2009, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -20,7 +20,7 @@
 <meta http-equiv="Expires" content="-1">
 <link rel="stylesheet" href="printAlert.css" charset="utf-8" type="text/css">
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 function onloadHandler() {
 	sizeButtons();
diff --git a/org.eclipse.help.webapp/advanced/quickSearch.jsp b/org.eclipse.help.webapp/advanced/quickSearch.jsp
index ccae09bce..fd18a50f6 100644
--- a/org.eclipse.help.webapp/advanced/quickSearch.jsp
+++ b/org.eclipse.help.webapp/advanced/quickSearch.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2009, 2011 IBM Corporation and others.
+ Copyright (c) 2009, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -88,10 +88,10 @@ if (data.isMozilla()) {
 
 </style>
 
-<script language="JavaScript" src="resize.js"></script>
-<script language="JavaScript" src="utils.js"></script>
-<script language="JavaScript" src="list.js"></script>
-<script language="JavaScript">
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="utils.js"></script>
+<script type="text/javascript" src="list.js"></script>
+<script type="text/javascript">
 
 var quickSearchType = "<%=quickSearchType%>";
 
diff --git a/org.eclipse.help.webapp/advanced/searchScoped.jsp b/org.eclipse.help.webapp/advanced/searchScoped.jsp
index 1413ee821..4751f5e10 100644
--- a/org.eclipse.help.webapp/advanced/searchScoped.jsp
+++ b/org.eclipse.help.webapp/advanced/searchScoped.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -128,7 +128,7 @@ A {
 %>
 </style>
 
-<script language="JavaScript">
+<script type="text/javascript">
 var isIE = navigator.userAgent.indexOf('MSIE') != -1;
 var isMozilla = navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && parseInt(navigator.appVersion.substring(0,1)) >= 5;
 
diff --git a/org.eclipse.help.webapp/advanced/searchSimple.jsp b/org.eclipse.help.webapp/advanced/searchSimple.jsp
index ae10707e7..d0227f998 100644
--- a/org.eclipse.help.webapp/advanced/searchSimple.jsp
+++ b/org.eclipse.help.webapp/advanced/searchSimple.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -108,7 +108,7 @@ INPUT {
 %>
 </style>
 
-<script language="JavaScript">
+<script type="text/javascript">
 var isIE = navigator.userAgent.indexOf('MSIE') != -1;
 var isMozilla = navigator.userAgent.toLowerCase().indexOf('mozilla') != -1 && parseInt(navigator.appVersion.substring(0,1)) >= 5;
 
diff --git a/org.eclipse.help.webapp/advanced/searchView.jsp b/org.eclipse.help.webapp/advanced/searchView.jsp
index 3a7090305..03c5340d9 100644
--- a/org.eclipse.help.webapp/advanced/searchView.jsp
+++ b/org.eclipse.help.webapp/advanced/searchView.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -29,10 +29,10 @@
 
 
 <base target="ContentViewFrame">
-<script language="JavaScript" src="utils.js"></script>
-<script language="JavaScript" src="list.js"></script>
-<script language="JavaScript" src="view.js"></script>
-<script language="JavaScript">	
+<script type="text/javascript" src="utils.js"></script>
+<script type="text/javascript" src="list.js"></script>
+<script type="text/javascript" src="view.js"></script>
+<script type="text/javascript">	
 
 var cookiesRequired = "<%=UrlUtil.JavaScriptEncode(ServletResources.getString("cookiesRequired", request))%>";	
 var showCategories = <%=data.isShowCategories()%>;
@@ -247,7 +247,7 @@ setTimeout('refresh()', 2000);
 }
 %>
 
-<script language="JavaScript">
+<script type="text/javascript">
 	selectTopicById('<%=UrlUtil.JavaScriptEncode(data.getSelectedTopicId())%>');
 </script>
 
diff --git a/org.eclipse.help.webapp/advanced/tabs.jsp b/org.eclipse.help.webapp/advanced/tabs.jsp
index 2ce59f21e..94cc1af5d 100644
--- a/org.eclipse.help.webapp/advanced/tabs.jsp
+++ b/org.eclipse.help.webapp/advanced/tabs.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -104,7 +104,7 @@ IMG {
 
 </style>
  
-<script language="JavaScript">
+<script type="text/javascript">
 
 var isMozilla = navigator.userAgent.indexOf('Mozilla') != -1 && parseInt(navigator.appVersion.substring(0,1)) >= 5;
 var isIE = navigator.userAgent.indexOf('MSIE') != -1;
diff --git a/org.eclipse.help.webapp/advanced/tocView.jsp b/org.eclipse.help.webapp/advanced/tocView.jsp
index b5fe24012..3a8af527e 100644
--- a/org.eclipse.help.webapp/advanced/tocView.jsp
+++ b/org.eclipse.help.webapp/advanced/tocView.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -27,14 +27,14 @@
 </style>  
     
 <base target="ContentViewFrame">
-<script language="JavaScript" src="helptree.js"></script>
-<script language="JavaScript" src="helptreechildren.js"></script>
-<script language="JavaScript" src="xmlajax.js"></script>
-<script language="JavaScript" src="utils.js"></script>
-<script language="JavaScript" src="tocTree.js"></script>
-<script language="JavaScript" src="view.js"></script>
+<script type="text/javascript" src="helptree.js"></script>
+<script type="text/javascript" src="helptreechildren.js"></script>
+<script type="text/javascript" src="xmlajax.js"></script>
+<script type="text/javascript" src="utils.js"></script>
+<script type="text/javascript" src="tocTree.js"></script>
+<script type="text/javascript" src="view.js"></script>
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 // Preload images
 var imagesDirectory = "<%=prefs.getImagesDirectory()%>";
diff --git a/org.eclipse.help.webapp/advanced/toolbar.jsp b/org.eclipse.help.webapp/advanced/toolbar.jsp
index 655f31626..cf581f4cf 100644
--- a/org.eclipse.help.webapp/advanced/toolbar.jsp
+++ b/org.eclipse.help.webapp/advanced/toolbar.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -160,12 +160,12 @@ HTML {
     for (int s = 0; s < scripts.length; s++) {
         String path = scripts[s];
 %>
-    <script language="JavaScript" src = "<%=path%>" ></script>
+    <script type="text/javascript" src = "<%=path%>" ></script>
 <%
     }
 %>
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 var bRestore = false;
 // Preload images
@@ -426,7 +426,7 @@ function menuExit(e) {
 <%
 if (data.getScript() != null) {
 %>
-<script language="JavaScript" src="<%=UrlUtil.htmlEncode(data.getScript())%>"></script>
+<script type="text/javascript" src="<%=UrlUtil.htmlEncode(data.getScript())%>"></script>
 <%
 }
 %>
diff --git a/org.eclipse.help.webapp/advanced/view.jsp b/org.eclipse.help.webapp/advanced/view.jsp
index 5ebd572bc..afe4ab629 100644
--- a/org.eclipse.help.webapp/advanced/view.jsp
+++ b/org.eclipse.help.webapp/advanced/view.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2010 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -23,7 +23,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title><%=ServletResources.getString(view.getName(), request)%></title>
 
-<script language="JavaScript">
+<script type="text/javascript">
 
 function onloadHandler(e)
 {
diff --git a/org.eclipse.help.webapp/advanced/views.jsp b/org.eclipse.help.webapp/advanced/views.jsp
index 9a8239dbc..fe45ad3bb 100644
--- a/org.eclipse.help.webapp/advanced/views.jsp
+++ b/org.eclipse.help.webapp/advanced/views.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -62,8 +62,8 @@ IFRAME {
 }
 
 </style>
-<script language="JavaScript" src="views.js"></script>
-<script language="Javascript">
+<script type="text/javascript" src="views.js"></script>
+<script type="text/javascript">
 
 var activityFiltering = <%=(new ActivitiesData(application, request, response)).isActivityFiltering()?"true":"false"%>;
 var displayShowAllConfirmation = <%=prefs.isDontConfirmShowAll()?"false":"true"%>;
diff --git a/org.eclipse.help.webapp/advanced/workingSet.jsp b/org.eclipse.help.webapp/advanced/workingSet.jsp
index 1def12faa..6cfd5bd08 100644
--- a/org.eclipse.help.webapp/advanced/workingSet.jsp
+++ b/org.eclipse.help.webapp/advanced/workingSet.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2011 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -165,8 +165,8 @@ input[type="checkbox"] {
 }
 %>
 </style>
-<script language="JavaScript" src="resize.js"></script>
-<script language="JavaScript">
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript">
 
 // Preload images
 var minus = new Image();
diff --git a/org.eclipse.help.webapp/advanced/workingSetManager.jsp b/org.eclipse.help.webapp/advanced/workingSetManager.jsp
index 4800a89ea..e146b5cad 100644
--- a/org.eclipse.help.webapp/advanced/workingSetManager.jsp
+++ b/org.eclipse.help.webapp/advanced/workingSetManager.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2010 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -97,10 +97,10 @@ if (data.isMozilla()) {
 
 </style>
 
-<script language="JavaScript" src="resize.js"></script>
-<script language="JavaScript" src="utils.js"></script>
-<script language="JavaScript" src="list.js"></script>
-<script language="JavaScript">
+<script type="text/javascript" src="resize.js"></script>
+<script type="text/javascript" src="utils.js"></script>
+<script type="text/javascript" src="list.js"></script>
+<script type="text/javascript">
 
 function highlightHandler()
 {
@@ -338,7 +338,7 @@ for (int i=0; i<wsets.length; i++)
 	</table>
 </div>
 </form>
-<script language="JavaScript">
+<script type="text/javascript">
 	var selected = selectTopicById('<%=UrlUtil.JavaScriptEncode(workingSetId)%>');
 	if (!selected)
 		document.getElementById("alldocs").checked = true;
diff --git a/org.eclipse.help.webapp/advancedstate/scopeState.jsp b/org.eclipse.help.webapp/advancedstate/scopeState.jsp
index c9b5b90ec..2f3606e5b 100644
--- a/org.eclipse.help.webapp/advancedstate/scopeState.jsp
+++ b/org.eclipse.help.webapp/advancedstate/scopeState.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2011 IBM Corporation and others.
+ Copyright (c) 2011, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -24,7 +24,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title><%=ServletResources.getString("Loading", request)%></title>
 
-<script language="JavaScript">
+<script type="text/javascript">
 	function onloadHandler() { 
 		location.href="advanced/searchScoped.jsp<%=UrlUtil.JavaScriptEncode(args)%>";
 	}
diff --git a/org.eclipse.help.webapp/advancedstate/workingSetState.jsp b/org.eclipse.help.webapp/advancedstate/workingSetState.jsp
index 9abc5bbef..90e2538b2 100644
--- a/org.eclipse.help.webapp/advancedstate/workingSetState.jsp
+++ b/org.eclipse.help.webapp/advancedstate/workingSetState.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2011 IBM Corporation and others.
+ Copyright (c) 2011, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -24,7 +24,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <title><%=ServletResources.getString("Loading", request)%></title>
 
-<script language="JavaScript">
+<script type="text/javascript">
 	function onloadHandler() { 
 		location.href="advanced/workingSetManager.jsp<%=UrlUtil.JavaScriptEncode(args)%>";
 	}
diff --git a/org.eclipse.help.webapp/basic/livehelp_js.jsp b/org.eclipse.help.webapp/basic/livehelp_js.jsp
index 2143fcc2c..ccd24570c 100644
--- a/org.eclipse.help.webapp/basic/livehelp_js.jsp
+++ b/org.eclipse.help.webapp/basic/livehelp_js.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2000, 2004 IBM Corporation and others.
+ Copyright (c) 2000, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -12,7 +12,7 @@
 <%
 	request.setCharacterEncoding("UTF-8");
 %>
-<script language="JavaScript">
+<script type="text/javascript">
 function liveActionInternal(topHelpWindow, pluginId, className, argument)
 {
 <%
diff --git a/org.eclipse.ua.tests/data/help/dynamic/extension/doc.xhtml b/org.eclipse.ua.tests/data/help/dynamic/extension/doc.xhtml
index c95b7e33f..b985a8420 100644
--- a/org.eclipse.ua.tests/data/help/dynamic/extension/doc.xhtml
+++ b/org.eclipse.ua.tests/data/help/dynamic/extension/doc.xhtml
@@ -8,7 +8,7 @@
 
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
 <title>Test XHTML document</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"> </script>
 </head>
 
 <body bgcolor="#ffffff">
diff --git a/org.eclipse.ua.tests/data/help/dynamic/xhtml.xml b/org.eclipse.ua.tests/data/help/dynamic/xhtml.xml
index a55796793..a8682cb33 100644
--- a/org.eclipse.ua.tests/data/help/dynamic/xhtml.xml
+++ b/org.eclipse.ua.tests/data/help/dynamic/xhtml.xml
@@ -1,5 +1,5 @@
 <!--
-     Copyright (c) 2005, 2007 IBM Corporation and others.
+     Copyright (c) 2005, 2018 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
@@ -19,7 +19,7 @@
 
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
 <title>Exporting files</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" xml:space="preserve"> </script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" xml:space="preserve"> </script>
 </head>
 
 <body bgcolor="#ffffff">
diff --git a/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyAnchor.xhtml b/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyAnchor.xhtml
index c9b70baee..df3a8ff24 100644
--- a/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyAnchor.xhtml
+++ b/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyAnchor.xhtml
@@ -1,5 +1,5 @@
 <!--
-     Copyright (c) 2010 IBM Corporation and others.
+     Copyright (c) 2010, 2018 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@
 
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
 <title>Title</title>
-<script language="JavaScript" src="livehelp.js" type="text/javascript"></script>
+<script src="livehelp.js" type="text/javascript"></script>
 </head>
 
 <body bgcolor="#ffffff">
diff --git a/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyAnchorWithComment.xhtml b/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyAnchorWithComment.xhtml
index afbe9bc94..db6e046a3 100644
--- a/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyAnchorWithComment.xhtml
+++ b/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyAnchorWithComment.xhtml
@@ -1,5 +1,5 @@
 <!--
-     Copyright (c) 2010 IBM Corporation and others.
+     Copyright (c) 2010, 2018 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@
 
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
 <title>Title</title>
-<script language="JavaScript" src="livehelp.js" type="text/javascript"></script>
+<script src="livehelp.js" type="text/javascript"></script>
 </head>
 
 <body bgcolor="#ffffff">
diff --git a/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyDiv.xhtml b/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyDiv.xhtml
index 5c5c7b026..9c529ca09 100644
--- a/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyDiv.xhtml
+++ b/org.eclipse.ua.tests/data/help/dynamic/xhtml/emptyDiv.xhtml
@@ -1,5 +1,5 @@
 <!--
-     Copyright (c) 2010 IBM Corporation and others.
+     Copyright (c) 2010, 2018 IBM Corporation and others.
      All rights reserved. This program and the accompanying materials
      are made available under the terms of the Eclipse Public License v1.0
      which accompanies this distribution, and is available at
@@ -16,7 +16,7 @@
 
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
 <title>Title</title>
-<script language="JavaScript" src="livehelp.js" type="text/javascript"></script>
+<script src="livehelp.js" type="text/javascript"></script>
 </head>
 
 <body bgcolor="#ffffff">
diff --git a/org.eclipse.ua.tests/data/help/dynamic/xhtml_expected.txt b/org.eclipse.ua.tests/data/help/dynamic/xhtml_expected.txt
index 0792f8580..976c61e45 100644
--- a/org.eclipse.ua.tests/data/help/dynamic/xhtml_expected.txt
+++ b/org.eclipse.ua.tests/data/help/dynamic/xhtml_expected.txt
@@ -9,7 +9,7 @@
 
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css" />
 <title>Exporting files</title>
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" xml:space="preserve"> </script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js" xml:space="preserve"> </script>
 </head>
 
 <body bgcolor="#ffffff">
diff --git a/org.eclipse.ua.tests/data/help/jsp/b233466remote.html b/org.eclipse.ua.tests/data/help/jsp/b233466remote.html
index 3ba8c917b..e7bbc706b 100644
--- a/org.eclipse.ua.tests/data/help/jsp/b233466remote.html
+++ b/org.eclipse.ua.tests/data/help/jsp/b233466remote.html
@@ -4,8 +4,8 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 	<title>Bug 233466 -  [Webapp][Security] Site redirection vulnerability in Eclipse Help System</title>
-    <script language="JavaScript" src="server.js"></script>
-	<script language="JavaScript">
+    <script type="text/javascript" src="server.js"></script>
+	<script type="text/javascript">
 	    function loadhandler() {
             showHelpPath();
             patchAnchors();
diff --git a/org.eclipse.ua.tests/data/help/jsp/b317055remote.html b/org.eclipse.ua.tests/data/help/jsp/b317055remote.html
index 6db264197..bc110bb28 100644
--- a/org.eclipse.ua.tests/data/help/jsp/b317055remote.html
+++ b/org.eclipse.ua.tests/data/help/jsp/b317055remote.html
@@ -4,8 +4,8 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 	<title>Bug 317055 -  [Webapp][Security] URLEncode url requests from local users</title>
-	<script language="JavaScript" src="server.js"></script>
-	<script language="JavaScript">
+	<script type="text/javascript" src="server.js"></script>
+	<script type="text/javascript">
 	    function loadhandler() {
             showHelpPath();
             patchAnchors();
diff --git a/org.eclipse.ua.tests/data/help/jsp/b320547remote.html b/org.eclipse.ua.tests/data/help/jsp/b320547remote.html
index 7dd5351b4..0c06b2ebf 100644
--- a/org.eclipse.ua.tests/data/help/jsp/b320547remote.html
+++ b/org.eclipse.ua.tests/data/help/jsp/b320547remote.html
@@ -4,8 +4,8 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 	<title> Bug 320547 -  [Webapp][Security] Misuse of /topic/file</title>
-	<script language="JavaScript" src="server.js"></script>
-	<script language="JavaScript">
+	<script type="text/javascript" src="server.js"></script>
+	<script type="text/javascript">
 	    function loadhandler() {
             showHelpPath();
             patchAnchors();
diff --git a/org.eclipse.ua.tests/data/help/jsp/b320548remote.html b/org.eclipse.ua.tests/data/help/jsp/b320548remote.html
index 202a2bd26..0bd00c79c 100644
--- a/org.eclipse.ua.tests/data/help/jsp/b320548remote.html
+++ b/org.eclipse.ua.tests/data/help/jsp/b320548remote.html
@@ -4,8 +4,8 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 	<title>Bug 320548 -  [Webapp][Security] Ability to read files not in bundles</title>
-	<script language="JavaScript" src="server.js"></script>
-	<script language="JavaScript">
+	<script type="text/javascript" src="server.js"></script>
+	<script type="text/javascript">
 	    function loadhandler() {
             showHelpPath();
             patchAnchors();
diff --git a/org.eclipse.ua.tests/data/help/jsp/getlocation.html b/org.eclipse.ua.tests/data/help/jsp/getlocation.html
index add4da26e..caf1d5e8b 100644
--- a/org.eclipse.ua.tests/data/help/jsp/getlocation.html
+++ b/org.eclipse.ua.tests/data/help/jsp/getlocation.html
@@ -4,7 +4,7 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 	<title>Enter remote host url</title>
-<script language="JavaScript">
+<script type="text/javascript">
 
 function doSubmit() {
     var url = document.getElementById("url").value;
diff --git a/org.eclipse.ua.tests/data/help/jsp/xssremote.html b/org.eclipse.ua.tests/data/help/jsp/xssremote.html
index 117cb42cf..9f0719619 100644
--- a/org.eclipse.ua.tests/data/help/jsp/xssremote.html
+++ b/org.eclipse.ua.tests/data/help/jsp/xssremote.html
@@ -4,8 +4,8 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 	<title>XSS bugs</title>
-	<script language="JavaScript" src="server.js"></script>
-	<script language="JavaScript">
+	<script type="text/javascript" src="server.js"></script>
+	<script type="text/javascript">
 	    function loadhandler() {
             showHelpPath();
             patchAnchors();
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help.htm
index 04305a291..43fa4d6d1 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Help</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content.htm
index e7a9a3231..d0563e152 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Help content</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active.htm
index 76035e8ab..6c00053ea 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Active help</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_action.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_action.htm
index eb80b28ab..18a24c394 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_action.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_action.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Writing the help action</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_debug.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_debug.htm
index fc59ace29..59132f842 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_debug.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_debug.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Tips for debugging active help</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_invoke.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_invoke.htm
index e54d68877..4cc322d91 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_invoke.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_active_invoke.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Invoking the action from HTML</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_command.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_command.htm
index 515b39bac..9d7ac41de 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_command.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_command.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Embedding commands in help</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_command_authoring.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_command_authoring.htm
index 621d90608..97a61689d 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_command_authoring.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_command_authoring.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Authoring a command link</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_files.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_files.htm
index a314da78d..2e845e641 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_files.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_files.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Help server and file locations</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_manifest.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_manifest.htm
index 97c696cba..0b5bcad72 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_manifest.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_manifest.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Completing the plug-in manifest</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_nested.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_nested.htm
index e90e9f591..7512b88a1 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_nested.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_nested.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Building nested documentation structures</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_process.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_process.htm
index 288201d1f..d7177511b 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_process.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_process.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Processing Help Content</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_remote.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_remote.htm
index b06cc5012..f5464438e 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_remote.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_remote.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Remote Help</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_toc.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_toc.htm
index aff0af7e2..e77d3f6c1 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_toc.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_toc.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Table of contents (toc) files</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_xhtml.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_xhtml.htm
index 66219885e..8961aff8b 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_xhtml.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_content_xhtml.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGIN__ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Contributing XHTML help documents</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context.htm
index c17bd0891..2965fbe9b 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Context-sensitive help</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_dynamic.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_dynamic.htm
index e9055fec3..4decad2ed 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_dynamic.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_dynamic.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Dynamic context help</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_id.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_id.htm
index 1c0e98322..de96d69e7 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_id.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_id.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Declaring a context id</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_infopops.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_infopops.htm
index 1db679751..3214edb3b 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_infopops.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_infopops.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Infopops</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_xml.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_xml.htm
index ad7ed8112..491fa4a7b 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_xml.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_context_xml.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Describing and packaging context-sensitive help content</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_menu.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_menu.htm
index 01041f01b..09219581e 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_menu.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_menu.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Help content</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_search.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_search.htm
index c9488e58e..e9ab23694 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_search.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_search.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Help search</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_search_types.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_search_types.htm
index 7274700fe..519b2e565 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_search_types.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_search_types.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Plugging in search engines</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup.htm
index 0e8bed319..2200cc43b 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Configuration/setup</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_infocenter.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_infocenter.htm
index 32888c55d..c09aa82ef 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_infocenter.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_infocenter.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Infocenter</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_preferences.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_preferences.htm
index 080eee7d8..0b6cbcf0b 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_preferences.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_preferences.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Help system customization</title>
 
 <style type="text/css">
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_preindex.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_preindex.htm
index 185c8476e..78cca719a 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_preindex.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_preindex.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Pre-indexing documentation</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_rcp.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_rcp.htm
index 965c06fa9..59b9772d2 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_rcp.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_rcp.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Rich Client Platform (RCP) help</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_standalone.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_standalone.htm
index 8115360af..dd1446839 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_standalone.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_setup_standalone.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Standalone help</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/data/help/performance/search/ua_help_war.htm b/org.eclipse.ua.tests/data/help/performance/search/ua_help_war.htm
index 376c30d42..d07c8be42 100644
--- a/org.eclipse.ua.tests/data/help/performance/search/ua_help_war.htm
+++ b/org.eclipse.ua.tests/data/help/performance/search/ua_help_war.htm
@@ -5,7 +5,7 @@
 <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
 <meta http-equiv="Content-Style-Type" content="text/css">
 <link rel="STYLESHEET" href="../book.css" charset="ISO-8859-1" type="text/css">
-<script language="JavaScript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
+<script type="text/javascript" src="PLUGINS_ROOT/org.eclipse.help/livehelp.js"></script>
 <title>Deploying the infocenter as a Web Archive</title>
 </head>
 <body>
diff --git a/org.eclipse.ua.tests/jsp/advanced/titlesearchView.jsp b/org.eclipse.ua.tests/jsp/advanced/titlesearchView.jsp
index 43fb4657e..fe977fcf0 100644
--- a/org.eclipse.ua.tests/jsp/advanced/titlesearchView.jsp
+++ b/org.eclipse.ua.tests/jsp/advanced/titlesearchView.jsp
@@ -1,5 +1,5 @@
 <%--
- Copyright (c) 2009 IBM Corporation and others.
+ Copyright (c) 2009, 2018 IBM Corporation and others.
  All rights reserved. This program and the accompanying materials 
  are made available under the terms of the Eclipse Public License v1.0
  which accompanies this distribution, and is available at
@@ -22,7 +22,7 @@
 <html>
 <head>
 <base target="ContentViewFrame">
-<script language="JavaScript">
+<script type="text/javascript">
 
 function doSearch(query)
 {