9 files changed, 21 insertions, 26 deletions
diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl
index 9e5cd4466..63fe7345e 100644
--- a/template/en/default/attachment/diff-header.html.tmpl
+++ b/template/en/default/attachment/diff-header.html.tmpl
@@ -41,18 +41,19 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %]
                                      javascript_urls = "js/attachment.js"
                                      style_urls = ['skins/standard/attachment.css'] %]
 [% ELSE %]
+  <!DOCTYPE html>
   <html>
-  <head>
-  <link href="[% 'skins/standard/global.css' FILTER mtime %]"
-        rel="stylesheet" type="text/css">
-  <link href="[% 'skins/standard/attachment.css' FILTER mtime %]"
-        rel="stylesheet" type="text/css">
-  <script src="[% 'js/attachment.js' FILTER mtime %]" 
-          type="text/javascript"></script>
-  </head>
-  <body onload="[% onload FILTER html %]">
+    <head>
+      <link href="[% 'skins/standard/global.css' FILTER mtime %]"
+            rel="stylesheet" type="text/css">
+      <link href="[% 'skins/standard/attachment.css' FILTER mtime %]"
+            rel="stylesheet" type="text/css">
+      <script src="[% 'js/attachment.js' FILTER mtime %]"
+              type="text/javascript"></script>
+    </head>
+    <body onload="[% onload FILTER html %]">
 [% END %]
-  
+
 [%# If we have attachid, we are in diff, otherwise we're in interdiff %]
 [% IF attachid %]
   [%# HEADER %]
diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl
index ea00eeef5..7d39ab909 100644
--- a/template/en/default/global/header.html.tmpl
+++ b/template/en/default/global/header.html.tmpl
@@ -75,8 +75,7 @@
   # set header's default value here only if it is undefined. %]
 [% IF !header.defined %][% header = title %][% END %]
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-                      "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 <html lang="en">
   <head>
     [% Hook.process("start") %]
diff --git a/template/en/default/list/list-simple.html.tmpl b/template/en/default/list/list-simple.html.tmpl
index 24e2bcf5a..01f784d59 100644
--- a/template/en/default/list/list-simple.html.tmpl
+++ b/template/en/default/list/list-simple.html.tmpl
@@ -12,8 +12,8 @@
 
 [% DEFAULT title = "$terms.Bug List" %]
 
+<!DOCTYPE html>
 <html>
-
   <head>
     <title>[% title FILTER html %]</title>
     <base href="[% urlbase FILTER html %]">
@@ -28,5 +28,4 @@
       [% PROCESS list/table.html.tmpl %]
     [% END %]
   </body>
-
 </html>
diff --git a/template/en/default/list/server-push.html.tmpl b/template/en/default/list/server-push.html.tmpl
index f19d6cbe0..f666d9c8c 100644
--- a/template/en/default/list/server-push.html.tmpl
+++ b/template/en/default/list/server-push.html.tmpl
@@ -11,6 +11,7 @@
   # query: string. The SQL query which makes the buglist.
   #%]
 
+<!DOCTYPE html>
 <html>
   <head>
     <title>[% terms.Bugzilla %] is pondering your search</title>
diff --git a/template/en/default/reports/duplicates-simple.html.tmpl b/template/en/default/reports/duplicates-simple.html.tmpl
index 6f586546a..95185c414 100644
--- a/template/en/default/reports/duplicates-simple.html.tmpl
+++ b/template/en/default/reports/duplicates-simple.html.tmpl
@@ -10,8 +10,7 @@
   # You need to fulfill the interface to duplicates-table.html.tmpl.
   #%]
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-                      "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 <html>
   [% IF product.size %]
     [% title = BLOCK %]
diff --git a/template/en/default/reports/report-simple.html.tmpl b/template/en/default/reports/report-simple.html.tmpl
index 17b87c6a6..9be2f0113 100644
--- a/template/en/default/reports/report-simple.html.tmpl
+++ b/template/en/default/reports/report-simple.html.tmpl
@@ -10,16 +10,13 @@
   # You need to fulfill the interface to report-table.html.tmpl.
   #%]
 
+<!DOCTYPE html>
 <html>
-
-  [% title = "$terms.Bug List" %]
-
   <head>
-    <title>[% title FILTER html %]</title>
+    <title>[% "$terms.Bug List" FILTER html %]</title>
   </head>
 
   <body>
     [% PROCESS "reports/report-table.html.tmpl" %]
   </body>
-
 </html>
diff --git a/template/en/default/rest.html.tmpl b/template/en/default/rest.html.tmpl
index 0b8321dd1..2afd50a40 100644
--- a/template/en/default/rest.html.tmpl
+++ b/template/en/default/rest.html.tmpl
@@ -5,8 +5,8 @@
   # This Source Code Form is "Incompatible With Secondary Licenses", as
   # defined by the Mozilla Public License, v. 2.0.
   #%]
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-                      "http://www.w3.org/TR/html4/loose.dtd">
+
+<!DOCTYPE html>
 <html>
   <head>
     <title>Bugzilla::REST::API</title>
diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl
index a7d687fe0..7ac013feb 100644
--- a/template/en/default/setup/strings.txt.pl
+++ b/template/en/default/setup/strings.txt.pl
@@ -360,8 +360,7 @@ WARNING: We are about to convert your table storage format to UTF-8. This
          recommend that you stop checksetup.pl NOW and run contrib/recode.pl.
 END
     no_checksetup_from_cgi => <<END,
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-          "http://www.w3.org/TR/html4/strict.dtd">
+<!DOCTYPE html>
 <html>
   <head>
     <title>checksetup.pl cannot run from a web browser</title>
diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl
index 3a2fc65a6..ed030237d 100644
--- a/template/en/default/whine/mail.html.tmpl
+++ b/template/en/default/whine/mail.html.tmpl
@@ -18,7 +18,7 @@
   # recipient: user object for the intended recipient of the message
   #%]
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<!DOCTYPE html>
 <html>
   <head>
     <title>