← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] lp:~wgrant/launchpad/html5-doctype into lp:launchpad

 

William Grant has proposed merging lp:~wgrant/launchpad/html5-doctype into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~wgrant/launchpad/html5-doctype/+merge/98559

Our markup has long been roughly polyglot HTML 4.01 and XHTML 1.0 Transitional, with an XHTML 1.0 doctype but served with Content-Type: text/html. The Content-Type means we're always rendered as HTML, but XML well-formedness is important to some users who still screenscape.

But we've started using HTML5 features around the place, and we can't really validate as either of the schemas that we purport to comply with any more. So let's move to polyglot HTML5/XHTML5. There are semi-official recommendations on how to achieve this at <http://dev.w3.org/html5/html-xhtml-author-guide/>, and we're already sufficiently compliant that flipping the doctype now (to <!DOCTYPE html>) won't hurt.

Now, because we're XHTML 1.0 Transitional (rather than Strict), we currently run in Almost Standards mode. The HTML5 doctype is always strict, so will switch us to full Standards mode. As described on <https://developer.mozilla.org/en/Gecko%27s_Almost_Standards_Mode>, Almost Standards is the same as Standards except with Quirks mode's inline "shrinkwrapping" behaviour (<https://developer.mozilla.org/en/Images%2C_Tables%2C_and_Mysterious_Gaps>).

We've historically relied on this behaviour in the watermark and the pillar involvement config progress bar -- the former is mostly repaired in devel, with the final fix in this branch; and the latter I fixed in devel yesterday. I've looked at other pages around the site and can't see any breakage. Any that I've missed will be subtle extra localised layout spacing, as in the example on the above wiki page.

This branch basically seds the whole tree except tests and a couple of non-app pages. There's also one final CSS fix for the watermark, where CSS wasn't matching the watermark logo if it was also a link.
-- 
https://code.launchpad.net/~wgrant/launchpad/html5-doctype/+merge/98559
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~wgrant/launchpad/html5-doctype into lp:launchpad.
=== modified file 'lib/canonical/launchpad/blocked.html'
--- lib/canonical/launchpad/blocked.html	2010-09-29 03:33:24 +0000
+++ lib/canonical/launchpad/blocked.html	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <title>You have been blocked</title>

=== modified file 'lib/canonical/launchpad/icing/css/layout.css'
--- lib/canonical/launchpad/icing/css/layout.css	2012-03-14 06:57:31 +0000
+++ lib/canonical/launchpad/icing/css/layout.css	2012-03-21 02:47:22 +0000
@@ -82,7 +82,8 @@
 div.watermark-apps-portlet > div.wide {
     width: 75%;
     }
-div.watermark-apps-portlet > div > img {
+div.watermark-apps-portlet > div > img,
+div.watermark-apps-portlet > div > a > img {
     display: block;
     margin: 0 1.5em 0 0;
     }

=== modified file 'lib/canonical/launchpad/offline-maintenance-haproxy.html'
--- lib/canonical/launchpad/offline-maintenance-haproxy.html	2011-12-07 04:57:36 +0000
+++ lib/canonical/launchpad/offline-maintenance-haproxy.html	2012-03-21 02:47:22 +0000
@@ -1,7 +1,7 @@
 HTTP/1.1 503 Service Unavailable
 Content-Type: text/html
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <title>Launchpad is offline for maintenance</title>

=== modified file 'lib/canonical/launchpad/offline-maintenance.html'
--- lib/canonical/launchpad/offline-maintenance.html	2011-12-07 04:57:36 +0000
+++ lib/canonical/launchpad/offline-maintenance.html	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <title>Launchpad is offline for maintenance</title>

=== modified file 'lib/canonical/launchpad/offline-staging-code-update.html'
--- lib/canonical/launchpad/offline-staging-code-update.html	2011-12-07 04:57:36 +0000
+++ lib/canonical/launchpad/offline-staging-code-update.html	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <title>Please try again</title>

=== modified file 'lib/canonical/launchpad/offline-staging-db-update.html'
--- lib/canonical/launchpad/offline-staging-db-update.html	2011-12-07 04:57:36 +0000
+++ lib/canonical/launchpad/offline-staging-db-update.html	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <title>Please try again</title>

=== modified file 'lib/canonical/launchpad/offline-unplanned-haproxy.html'
--- lib/canonical/launchpad/offline-unplanned-haproxy.html	2011-12-07 04:57:36 +0000
+++ lib/canonical/launchpad/offline-unplanned-haproxy.html	2012-03-21 02:47:22 +0000
@@ -1,7 +1,7 @@
 HTTP/1.1 503 Service Unavailable
 Content-Type: text/html
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <title>Please try again</title>

=== modified file 'lib/canonical/launchpad/offline-unplanned.html'
--- lib/canonical/launchpad/offline-unplanned.html	2011-12-07 04:57:36 +0000
+++ lib/canonical/launchpad/offline-unplanned.html	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en">
   <head>
     <title>Please try again</title>

=== modified file 'lib/lp/answers/javascript/tests/test_answercontacts.html'
--- lib/lp/answers/javascript/tests/test_answercontacts.html	2012-02-10 13:51:47 +0000
+++ lib/lp/answers/javascript/tests/test_answercontacts.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/answers/javascript/tests/test_subscribers.html'
--- lib/lp/answers/javascript/tests/test_subscribers.html	2012-02-10 13:51:47 +0000
+++ lib/lp/answers/javascript/tests/test_subscribers.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/browser/tests/base-layout.txt'
--- lib/lp/app/browser/tests/base-layout.txt	2012-02-24 04:54:53 +0000
+++ lib/lp/app/browser/tests/base-layout.txt	2012-03-21 02:47:22 +0000
@@ -39,7 +39,8 @@
     >>> view = MainSideView(user, request)
     >>> html = view.render()
     >>> print html
-    <!DOCTYPE html ...
+    <!DOCTYPE html>
+    ...
       <!--
         Facet name: overview
         Page type: main_side
@@ -62,7 +63,7 @@
     >>> view = MainOnlyView(user, request)
     >>> html = view.render()
     >>> print html
-    <!DOCTYPE html ...
+    <!DOCTYPE html>
     ...
       <!--
         Facet name: overview
@@ -85,7 +86,8 @@
     >>> view = SearchlessView(user, request)
     >>> html = view.render()
     >>> print html
-    <!DOCTYPE html ...
+    <!DOCTYPE html>
+    ...
     ...
       <!--
         Facet name: overview

=== modified file 'lib/lp/app/browser/tests/test_base_layout.py'
--- lib/lp/app/browser/tests/test_base_layout.py	2012-02-24 04:54:53 +0000
+++ lib/lp/app/browser/tests/test_base_layout.py	2012-03-21 02:47:22 +0000
@@ -63,7 +63,7 @@
         # Verify that the document is a html DOCTYPE.
         view = self.makeTemplateView('main_side')
         markup = view()
-        self.assertTrue(markup.startswith('<!DOCTYPE html'))
+        self.assertTrue(markup.startswith('<!DOCTYPE html>'))
 
     def verify_base_layout_html_element(self, content):
         # The html element states the namespace and language information.

=== modified file 'lib/lp/app/javascript/activator/tests/test_activator.html'
--- lib/lp/app/javascript/activator/tests/test_activator.html	2012-02-16 20:35:40 +0000
+++ lib/lp/app/javascript/activator/tests/test_activator.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/anim/tests/test_anim.html'
--- lib/lp/app/javascript/anim/tests/test_anim.html	2012-02-16 20:35:40 +0000
+++ lib/lp/app/javascript/anim/tests/test_anim.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/autocomplete/tests/test_autocomplete.html'
--- lib/lp/app/javascript/autocomplete/tests/test_autocomplete.html	2012-02-16 20:35:40 +0000
+++ lib/lp/app/javascript/autocomplete/tests/test_autocomplete.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/choiceedit/tests/test_choiceedit.html'
--- lib/lp/app/javascript/choiceedit/tests/test_choiceedit.html	2012-02-16 16:10:51 +0000
+++ lib/lp/app/javascript/choiceedit/tests/test_choiceedit.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/confirmationoverlay/tests/test_confirmationoverlay.html'
--- lib/lp/app/javascript/confirmationoverlay/tests/test_confirmationoverlay.html	2012-02-16 16:10:51 +0000
+++ lib/lp/app/javascript/confirmationoverlay/tests/test_confirmationoverlay.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/extras/tests/test_extras.html'
--- lib/lp/app/javascript/extras/tests/test_extras.html	2012-02-10 13:50:16 +0000
+++ lib/lp/app/javascript/extras/tests/test_extras.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/formoverlay/tests/test_formoverlay.html'
--- lib/lp/app/javascript/formoverlay/tests/test_formoverlay.html	2012-02-10 13:50:16 +0000
+++ lib/lp/app/javascript/formoverlay/tests/test_formoverlay.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/formwidgets/tests/test_formwidgets.html'
--- lib/lp/app/javascript/formwidgets/tests/test_formwidgets.html	2012-02-10 13:50:16 +0000
+++ lib/lp/app/javascript/formwidgets/tests/test_formwidgets.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/formwidgets/tests/test_resizing_textarea.html'
--- lib/lp/app/javascript/formwidgets/tests/test_resizing_textarea.html	2012-02-10 13:50:16 +0000
+++ lib/lp/app/javascript/formwidgets/tests/test_resizing_textarea.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/indicator/tests/test_indicator.html'
--- lib/lp/app/javascript/indicator/tests/test_indicator.html	2012-02-16 20:35:40 +0000
+++ lib/lp/app/javascript/indicator/tests/test_indicator.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/inlineedit/tests/test_inline_edit.html'
--- lib/lp/app/javascript/inlineedit/tests/test_inline_edit.html	2012-03-01 20:35:55 +0000
+++ lib/lp/app/javascript/inlineedit/tests/test_inline_edit.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/inlinehelp/tests/test_inlinehelp.html'
--- lib/lp/app/javascript/inlinehelp/tests/test_inlinehelp.html	2012-02-16 20:35:40 +0000
+++ lib/lp/app/javascript/inlinehelp/tests/test_inlinehelp.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/ordering/tests/test_orderby_widget.html'
--- lib/lp/app/javascript/ordering/tests/test_orderby_widget.html	2012-02-16 20:35:40 +0000
+++ lib/lp/app/javascript/ordering/tests/test_orderby_widget.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/overlay/tests/test_overlay.html'
--- lib/lp/app/javascript/overlay/tests/test_overlay.html	2012-02-16 20:35:40 +0000
+++ lib/lp/app/javascript/overlay/tests/test_overlay.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/picker/tests/test_personpicker.html'
--- lib/lp/app/javascript/picker/tests/test_personpicker.html	2012-02-16 11:56:04 +0000
+++ lib/lp/app/javascript/picker/tests/test_personpicker.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/picker/tests/test_picker.html'
--- lib/lp/app/javascript/picker/tests/test_picker.html	2012-02-10 13:48:58 +0000
+++ lib/lp/app/javascript/picker/tests/test_picker.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/picker/tests/test_picker_patcher.html'
--- lib/lp/app/javascript/picker/tests/test_picker_patcher.html	2012-02-10 13:48:58 +0000
+++ lib/lp/app/javascript/picker/tests/test_picker_patcher.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/subscribers/tests/test_subscribers_list.html'
--- lib/lp/app/javascript/subscribers/tests/test_subscribers_list.html	2012-02-10 13:51:00 +0000
+++ lib/lp/app/javascript/subscribers/tests/test_subscribers_list.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/testing/tests/test_mockio.html'
--- lib/lp/app/javascript/testing/tests/test_mockio.html	2012-02-10 13:51:00 +0000
+++ lib/lp/app/javascript/testing/tests/test_mockio.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_ajax_batch_navigator.html'
--- lib/lp/app/javascript/tests/test_ajax_batch_navigator.html	2012-02-10 13:51:00 +0000
+++ lib/lp/app/javascript/tests/test_ajax_batch_navigator.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_ajax_log.html'
--- lib/lp/app/javascript/tests/test_ajax_log.html	2012-02-15 12:45:13 +0000
+++ lib/lp/app/javascript/tests/test_ajax_log.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_beta_notification.html'
--- lib/lp/app/javascript/tests/test_beta_notification.html	2012-02-16 13:25:17 +0000
+++ lib/lp/app/javascript/tests/test_beta_notification.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_configutils.html'
--- lib/lp/app/javascript/tests/test_configutils.html	2012-02-10 13:51:00 +0000
+++ lib/lp/app/javascript/tests/test_configutils.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_expander.html'
--- lib/lp/app/javascript/tests/test_expander.html	2012-02-10 13:51:00 +0000
+++ lib/lp/app/javascript/tests/test_expander.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_foldables.html'
--- lib/lp/app/javascript/tests/test_foldables.html	2012-02-10 13:51:00 +0000
+++ lib/lp/app/javascript/tests/test_foldables.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_hide_comment.html'
--- lib/lp/app/javascript/tests/test_hide_comment.html	2012-02-10 13:51:00 +0000
+++ lib/lp/app/javascript/tests/test_hide_comment.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_listing_navigator.html'
--- lib/lp/app/javascript/tests/test_listing_navigator.html	2012-02-16 13:25:17 +0000
+++ lib/lp/app/javascript/tests/test_listing_navigator.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_longpoll.html'
--- lib/lp/app/javascript/tests/test_longpoll.html	2012-02-17 18:51:38 +0000
+++ lib/lp/app/javascript/tests/test_longpoll.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_lp_client.html'
--- lib/lp/app/javascript/tests/test_lp_client.html	2012-02-10 13:51:47 +0000
+++ lib/lp/app/javascript/tests/test_lp_client.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_lp_links.html'
--- lib/lp/app/javascript/tests/test_lp_links.html	2012-02-10 13:51:47 +0000
+++ lib/lp/app/javascript/tests/test_lp_links.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_lp_names.html'
--- lib/lp/app/javascript/tests/test_lp_names.html	2012-02-10 13:51:47 +0000
+++ lib/lp/app/javascript/tests/test_lp_names.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_multicheckboxwidget.html'
--- lib/lp/app/javascript/tests/test_multicheckboxwidget.html	2012-02-10 13:51:47 +0000
+++ lib/lp/app/javascript/tests/test_multicheckboxwidget.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/javascript/tests/test_privacy.html'
--- lib/lp/app/javascript/tests/test_privacy.html	2012-02-10 13:51:47 +0000
+++ lib/lp/app/javascript/tests/test_privacy.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/app/templates/base-layout.pt'
--- lib/lp/app/templates/base-layout.pt	2012-03-14 06:57:31 +0000
+++ lib/lp/app/templates/base-layout.pt	2012-03-21 02:47:22 +0000
@@ -14,7 +14,7 @@
     feature_scopes request/features/scopes;
     CONTEXTS python:{'template':template, 'context': context, 'view':view};
   "
-><metal:doctype define-slot="doctype"><tal:doctype tal:replace="structure string:&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD XHTML 1.0 Transitional//EN&quot; &quot;http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd&quot;&gt;"; /></metal:doctype>
+><metal:doctype define-slot="doctype"><tal:doctype tal:replace="structure string:&lt;!DOCTYPE html&gt;" /></metal:doctype>
 <html
   xmlns="http://www.w3.org/1999/xhtml";
   xmlns:tal="http://xml.zope.org/namespaces/tal";

=== modified file 'lib/lp/app/tour/api'
--- lib/lp/app/tour/api	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/api	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/branch-hosting-tracking'
--- lib/lp/app/tour/branch-hosting-tracking	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/branch-hosting-tracking	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/bugs'
--- lib/lp/app/tour/bugs	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/bugs	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/community'
--- lib/lp/app/tour/community	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/community	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/community-support'
--- lib/lp/app/tour/community-support	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/community-support	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/feature-tracking'
--- lib/lp/app/tour/feature-tracking	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/feature-tracking	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/index'
--- lib/lp/app/tour/index	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/index	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/join-launchpad'
--- lib/lp/app/tour/join-launchpad	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/join-launchpad	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/ppa'
--- lib/lp/app/tour/ppa	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/ppa	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/release-management'
--- lib/lp/app/tour/release-management	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/release-management	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/app/tour/translation'
--- lib/lp/app/tour/translation	2012-01-03 07:15:56 +0000
+++ lib/lp/app/tour/translation	2012-03-21 02:47:22 +0000
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";>
+<!DOCTYPE html>
 <html xmlns="http://www.w3.org/1999/xhtml"; lang="en-US">
 <head>
     <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />

=== modified file 'lib/lp/bugs/javascript/tests/test_async_comment_loading.html'
--- lib/lp/bugs/javascript/tests/test_async_comment_loading.html	2012-02-10 13:51:47 +0000
+++ lib/lp/bugs/javascript/tests/test_async_comment_loading.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_bug_notification_level.html'
--- lib/lp/bugs/javascript/tests/test_bug_notification_level.html	2012-02-10 13:51:47 +0000
+++ lib/lp/bugs/javascript/tests/test_bug_notification_level.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_bug_subscription_portlet.html'
--- lib/lp/bugs/javascript/tests/test_bug_subscription_portlet.html	2012-02-10 14:25:48 +0000
+++ lib/lp/bugs/javascript/tests/test_bug_subscription_portlet.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_bug_tags_entry.html'
--- lib/lp/bugs/javascript/tests/test_bug_tags_entry.html	2012-02-10 16:33:18 +0000
+++ lib/lp/bugs/javascript/tests/test_bug_tags_entry.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_buglisting.html'
--- lib/lp/bugs/javascript/tests/test_buglisting.html	2012-02-16 13:33:28 +0000
+++ lib/lp/bugs/javascript/tests/test_buglisting.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_buglisting_utils.html'
--- lib/lp/bugs/javascript/tests/test_buglisting_utils.html	2012-02-10 16:56:58 +0000
+++ lib/lp/bugs/javascript/tests/test_buglisting_utils.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_bugtarget_portlet_bugtags.html'
--- lib/lp/bugs/javascript/tests/test_bugtarget_portlet_bugtags.html	2012-02-13 15:18:05 +0000
+++ lib/lp/bugs/javascript/tests/test_bugtarget_portlet_bugtags.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_bugtask_delete.html'
--- lib/lp/bugs/javascript/tests/test_bugtask_delete.html	2012-02-16 13:33:28 +0000
+++ lib/lp/bugs/javascript/tests/test_bugtask_delete.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_filebug_dupefinder.html'
--- lib/lp/bugs/javascript/tests/test_filebug_dupefinder.html	2012-02-10 17:21:16 +0000
+++ lib/lp/bugs/javascript/tests/test_filebug_dupefinder.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_me_too.html'
--- lib/lp/bugs/javascript/tests/test_me_too.html	2012-02-10 17:42:29 +0000
+++ lib/lp/bugs/javascript/tests/test_me_too.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_pre_search.html'
--- lib/lp/bugs/javascript/tests/test_pre_search.html	2012-02-10 17:46:55 +0000
+++ lib/lp/bugs/javascript/tests/test_pre_search.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_subscribers.html'
--- lib/lp/bugs/javascript/tests/test_subscribers.html	2012-02-13 12:48:05 +0000
+++ lib/lp/bugs/javascript/tests/test_subscribers.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/bugs/javascript/tests/test_subscription.html'
--- lib/lp/bugs/javascript/tests/test_subscription.html	2012-02-13 12:51:43 +0000
+++ lib/lp/bugs/javascript/tests/test_subscription.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/javascript/tests/test_branchdiff.html'
--- lib/lp/code/javascript/tests/test_branchdiff.html	2012-02-13 13:31:11 +0000
+++ lib/lp/code/javascript/tests/test_branchdiff.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/javascript/tests/test_branchmergeproposal.nominate.html'
--- lib/lp/code/javascript/tests/test_branchmergeproposal.nominate.html	2012-02-16 13:33:28 +0000
+++ lib/lp/code/javascript/tests/test_branchmergeproposal.nominate.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/javascript/tests/test_branchmergeproposal.updater.html'
--- lib/lp/code/javascript/tests/test_branchmergeproposal.updater.html	2012-02-13 13:47:10 +0000
+++ lib/lp/code/javascript/tests/test_branchmergeproposal.updater.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/javascript/tests/test_branchrevisionexpander.html'
--- lib/lp/code/javascript/tests/test_branchrevisionexpander.html	2012-02-13 14:12:08 +0000
+++ lib/lp/code/javascript/tests/test_branchrevisionexpander.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/javascript/tests/test_bugspeclinks.html'
--- lib/lp/code/javascript/tests/test_bugspeclinks.html	2012-02-13 14:12:08 +0000
+++ lib/lp/code/javascript/tests/test_bugspeclinks.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/javascript/tests/test_productseries-setbranch.html'
--- lib/lp/code/javascript/tests/test_productseries-setbranch.html	2012-03-08 15:29:52 +0000
+++ lib/lp/code/javascript/tests/test_productseries-setbranch.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/code/javascript/tests/test_requestbuild_overlay.html'
--- lib/lp/code/javascript/tests/test_requestbuild_overlay.html	2012-02-13 14:19:21 +0000
+++ lib/lp/code/javascript/tests/test_requestbuild_overlay.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/help/sharing.html'
--- lib/lp/registry/help/sharing.html	2012-03-19 23:02:35 +0000
+++ lib/lp/registry/help/sharing.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-    "http://www.w3.org/TR/html4/loose.dtd";>
+<!DOCTYPE html>
 <html>
   <head>
     <title>Sharing kinds of information</title>

=== modified file 'lib/lp/registry/javascript/distroseries/tests/test_differences.html'
--- lib/lp/registry/javascript/distroseries/tests/test_differences.html	2011-08-10 08:43:17 +0000
+++ lib/lp/registry/javascript/distroseries/tests/test_differences.html	2012-03-21 02:47:22 +0000
@@ -1,6 +1,4 @@
-<!DOCTYPE
-   HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <html>
   <head>
   <title>Launchpad DistroSeries Differences</title>

=== modified file 'lib/lp/registry/javascript/distroseries/tests/test_initseries.html'
--- lib/lp/registry/javascript/distroseries/tests/test_initseries.html	2011-10-17 13:32:20 +0000
+++ lib/lp/registry/javascript/distroseries/tests/test_initseries.html	2012-03-21 02:47:22 +0000
@@ -1,6 +1,4 @@
-<!DOCTYPE
-   HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <html>
   <head>
   <title>Launchpad DistroSeries Initialiazation</title>

=== modified file 'lib/lp/registry/javascript/distroseries/tests/test_widgets.html'
--- lib/lp/registry/javascript/distroseries/tests/test_widgets.html	2011-08-05 08:54:55 +0000
+++ lib/lp/registry/javascript/distroseries/tests/test_widgets.html	2012-03-21 02:47:22 +0000
@@ -1,6 +1,4 @@
-<!DOCTYPE
-   HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <html>
   <head>
   <title>Launchpad DistroSeries Widgets</title>

=== modified file 'lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.html'
--- lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.html	2012-03-21 02:43:15 +0000
+++ lib/lp/registry/javascript/sharing/tests/test_pillarsharingview.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/javascript/sharing/tests/test_shareepicker.html'
--- lib/lp/registry/javascript/sharing/tests/test_shareepicker.html	2012-03-08 03:12:23 +0000
+++ lib/lp/registry/javascript/sharing/tests/test_shareepicker.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/javascript/sharing/tests/test_shareetable.html'
--- lib/lp/registry/javascript/sharing/tests/test_shareetable.html	2012-03-20 06:11:07 +0000
+++ lib/lp/registry/javascript/sharing/tests/test_shareetable.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/javascript/tests/test_distroseriesdifferences_details.html'
--- lib/lp/registry/javascript/tests/test_distroseriesdifferences_details.html	2012-02-16 13:09:52 +0000
+++ lib/lp/registry/javascript/tests/test_distroseriesdifferences_details.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/javascript/tests/test_milestone_creation_failures.html'
--- lib/lp/registry/javascript/tests/test_milestone_creation_failures.html	2012-03-19 17:52:42 +0000
+++ lib/lp/registry/javascript/tests/test_milestone_creation_failures.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/javascript/tests/test_milestone_table.html'
--- lib/lp/registry/javascript/tests/test_milestone_table.html	2012-02-13 15:45:27 +0000
+++ lib/lp/registry/javascript/tests/test_milestone_table.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/javascript/tests/test_structural_subscription.html'
--- lib/lp/registry/javascript/tests/test_structural_subscription.html	2012-02-16 13:36:03 +0000
+++ lib/lp/registry/javascript/tests/test_structural_subscription.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/javascript/tests/test_team.html'
--- lib/lp/registry/javascript/tests/test_team.html	2012-03-02 20:19:50 +0000
+++ lib/lp/registry/javascript/tests/test_team.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-        "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/javascript/tests/test_team_mailinglists.html'
--- lib/lp/registry/javascript/tests/test_team_mailinglists.html	2012-02-16 13:33:28 +0000
+++ lib/lp/registry/javascript/tests/test_team_mailinglists.html	2012-03-21 02:47:22 +0000
@@ -1,6 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/registry/javascript/tests/timeline-iframe.html'
--- lib/lp/registry/javascript/tests/timeline-iframe.html	2012-02-13 16:06:12 +0000
+++ lib/lp/registry/javascript/tests/timeline-iframe.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/scripts/utilities/pageperformancereport.py'
--- lib/lp/scripts/utilities/pageperformancereport.py	2012-01-01 02:58:52 +0000
+++ lib/lp/scripts/utilities/pageperformancereport.py	2012-03-21 02:47:22 +0000
@@ -1013,8 +1013,7 @@
     """
 
     print >> outf, dedent('''\
-        <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-                "http://www.w3.org/TR/html4/loose.dtd";>
+        <!DOCTYPE html>
         <html>
         <head>
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8">

=== modified file 'lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc'
--- lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc	2012-03-14 06:57:31 +0000
+++ lib/lp/services/mailman/monkeypatches/lp-mhonarc-common.mrc	2012-03-21 02:47:22 +0000
@@ -65,8 +65,7 @@
 
 <DefineVar>
 PAGE-TOP-START
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-        "http://www.w3.org/TR/html4/loose.dtd";>
+<!DOCTYPE html>
 <html>
 <head>
 <title>

=== modified file 'lib/lp/soyuz/javascript/tests/test_archive-packages.html'
--- lib/lp/soyuz/javascript/tests/test_archive-packages.html	2012-02-13 16:12:23 +0000
+++ lib/lp/soyuz/javascript/tests/test_archive-packages.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/soyuz/javascript/tests/test_archivesubscribers_index.html'
--- lib/lp/soyuz/javascript/tests/test_archivesubscribers_index.html	2012-02-13 16:18:20 +0000
+++ lib/lp/soyuz/javascript/tests/test_archivesubscribers_index.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/soyuz/javascript/tests/test_lp_dynamic_dom_updater.html'
--- lib/lp/soyuz/javascript/tests/test_lp_dynamic_dom_updater.html	2012-02-13 16:22:04 +0000
+++ lib/lp/soyuz/javascript/tests/test_lp_dynamic_dom_updater.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'lib/lp/testing/tests/test_yuixhr.py'
--- lib/lp/testing/tests/test_yuixhr.py	2012-01-01 02:58:52 +0000
+++ lib/lp/testing/tests/test_yuixhr.py	2012-03-21 02:47:22 +0000
@@ -104,7 +104,7 @@
             path_info='/+yuitest/lp/testing/tests/test_yuixhr_fixture')
         view.initialize()
         content = view.renderHTML()
-        self.assertTrue(content.startswith('<!DOCTYPE HTML'))
+        self.assertTrue(content.startswith('<!DOCTYPE html>'))
         self.assertTextMatchesExpressionIgnoreWhitespace(
             re.escape(
                 'src="/+yuitest/lp/testing/tests/test_yuixhr_fixture.js"'),
@@ -158,7 +158,7 @@
         view = create_traversed_view(
             path_info='/+yuitest/lp/testing/tests/test_yuixhr_fixture')
         content = view()
-        self.assertTrue(content.startswith('<!DOCTYPE HTML'))
+        self.assertTrue(content.startswith('<!DOCTYPE html>'))
         self.assertEqual(
             'text/html',
             view.request.response.getHeader('Content-Type'))

=== modified file 'lib/lp/testing/yuixhr.py'
--- lib/lp/testing/yuixhr.py	2012-03-19 17:52:42 +0000
+++ lib/lp/testing/yuixhr.py	2012-03-21 02:47:22 +0000
@@ -164,8 +164,7 @@
     INDEX = 'INDEX'
 
     page_template = dedent("""\
-        <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-          "http://www.w3.org/TR/html4/strict.dtd";>
+        <!DOCTYPE html>
         <html>
           <head>
           <title>Test</title>
@@ -223,8 +222,7 @@
         """)
 
     index_template = dedent("""\
-        <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-          "http://www.w3.org/TR/html4/strict.dtd";>
+        <!DOCTYPE html>
         <html>
           <head>
           <title>YUI XHR Tests</title>

=== modified file 'lib/lp/translations/javascript/tests/test_sourcepackage_sharing_details.html'
--- lib/lp/translations/javascript/tests/test_sourcepackage_sharing_details.html	2012-02-13 16:24:47 +0000
+++ lib/lp/translations/javascript/tests/test_sourcepackage_sharing_details.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'standard_test_template.html'
--- standard_test_template.html	2012-02-16 16:10:51 +0000
+++ standard_test_template.html	2012-03-21 02:47:22 +0000
@@ -1,5 +1,4 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-  "http://www.w3.org/TR/html4/strict.dtd";>
+<!DOCTYPE html>
 <!--
 Copyright 2012 Canonical Ltd.  This software is licensed under the
 GNU Affero General Public License version 3 (see the file LICENSE).

=== modified file 'utilities/xxxreport.py'
--- utilities/xxxreport.py	2012-01-01 03:10:25 +0000
+++ utilities/xxxreport.py	2012-03-21 02:47:22 +0000
@@ -219,8 +219,7 @@
     bug_link_re = re.compile(r'\b(bugs?:?) #?(\d+)', re.IGNORECASE)
 
     report_top = """\
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+<!DOCTYPE html>
 <html>
   <head>
     <title>XXX Comment report for Launchpad</title>