Bug 132209 Many XUL documents are invalid XML (<!DOCTYPE window ...>) patch by riceman+bmo@mail.rit.edu r=timeless sr=jag moa=sspitzer

2003-03-17 04:59:12 +00:00 · 2003-03-17 04:59:12 +00:00 · a2b62b16f2
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@ -2,7 +2,7 @@

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-addressing.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/addressbook/pref-addressing.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      xmlns:nc="http://home.netscape.com/NC-rdf#"
--- a/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-directory-add.xul
@ -26,7 +26,7 @@

 <?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-directory-add.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/pref-directory-add.dtd">

 <dialog id="addDirectory"
        style="width: &newDirectoryWidth;"
--- a/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-editdirectories.xul
@ -21,7 +21,7 @@ Rights Reserved.

 <?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/pref-directory.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/pref-directory.dtd">

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mailnews/addrbook/resources/content/abCardOverlay.xul
+++ b/mailnews/addrbook/resources/content/abCardOverlay.xul
@ -21,7 +21,7 @@ Rights Reserved.

 <?xml-stylesheet href="chrome://messenger/skin/addressbook/cardDialog.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abCardOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abCardOverlay.dtd">

 <overlay id="editcardOverlay"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mailnews/addrbook/resources/content/abCardViewOverlay.xul
+++ b/mailnews/addrbook/resources/content/abCardViewOverlay.xul
@ -19,7 +19,7 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abCardViewOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abCardViewOverlay.dtd">

 <overlay xmlns:html="http://www.w3.org/1999/xhtml"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mailnews/addrbook/resources/content/abDirTreeOverlay.xul
+++ b/mailnews/addrbook/resources/content/abDirTreeOverlay.xul
@ -24,7 +24,7 @@ Contributors:

 <?xml-stylesheet href="chrome://messenger/skin/addressbook/addressPanes.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abDirTreeOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abDirTreeOverlay.dtd">

 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
     xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mailnews/addrbook/resources/content/abEditListDialog.xul
+++ b/mailnews/addrbook/resources/content/abEditListDialog.xul
@ -23,7 +23,7 @@ Rights Reserved.

 <?xul-overlay href="chrome://messenger/content/addressbook/abListOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mailnews/addrbook/resources/content/abListOverlay.xul
+++ b/mailnews/addrbook/resources/content/abListOverlay.xul
@ -22,7 +22,7 @@ Rights Reserved.
 <?xml-stylesheet href="chrome://messenger/skin/addressingWidget.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/addressbook/cardDialog.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">

 <overlay id="editListOverlay"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mailnews/addrbook/resources/content/abMailListDialog.xul
+++ b/mailnews/addrbook/resources/content/abMailListDialog.xul
@ -23,7 +23,7 @@ Rights Reserved.

 <?xul-overlay href="chrome://messenger/content/addressbook/abListOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:nc="http://home.netscape.com/NC-rdf#"
--- a/mailnews/addrbook/resources/content/abResultsPaneOverlay.xul
+++ b/mailnews/addrbook/resources/content/abResultsPaneOverlay.xul
@ -37,7 +37,7 @@

 <?xml-stylesheet href="chrome://messenger/skin/addressbook/abResultsPane.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abResultsPaneOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/addressbook/abResultsPaneOverlay.dtd">

 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>

--- a/mailnews/addrbook/resources/content/addressbook-panel.xul
+++ b/mailnews/addrbook/resources/content/addressbook-panel.xul
@ -30,7 +30,7 @@

 <?xul-overlay href="chrome://messenger/content/addressbook/abDirTreeOverlay.xul"?>

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % abSelectAddressesDialogDTD SYSTEM "chrome://messenger/locale/addressbook/abSelectAddressesDialog.dtd" >
 %abSelectAddressesDialogDTD;
 <!ENTITY % abResultsPaneOverlayDTD SYSTEM "chrome://messenger/locale/addressbook/abResultsPaneOverlay.dtd" >
--- a/mailnews/base/prefs/resources/content/AccountManager.xul
+++ b/mailnews/base/prefs/resources/content/AccountManager.xul
@ -2,7 +2,7 @@

 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/AccountManager.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/AccountManager.dtd" >
 <dialog id="account-manager" 
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        title="&accountManagerTitle.label;"
--- a/mailnews/base/prefs/resources/content/AccountWizard.xul
+++ b/mailnews/base/prefs/resources/content/AccountWizard.xul
@ -21,7 +21,7 @@ Rights Reserved.

 <?xml-stylesheet href="chrome://messenger/skin/accountWizard.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/AccountWizard.dtd">
+<!DOCTYPE wizard SYSTEM "chrome://messenger/locale/AccountWizard.dtd">

 <wizard id="AccountWizard" title="&windowTitle.label;"
        onwizardcancel="return onCancel();"
--- a/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
+++ b/mailnews/base/prefs/resources/content/SmtpServerEdit.xul
@ -30,7 +30,7 @@

 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/smtpEditOverlay.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/smtpEditOverlay.dtd">

 <dialog title="&smtpEditTitle.label;"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mailnews/base/prefs/resources/content/SmtpServerList.xul
+++ b/mailnews/base/prefs/resources/content/SmtpServerList.xul
@ -27,7 +27,7 @@

 -->

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/SmtpServerList.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/SmtpServerList.dtd">

 <dialog title="&smtpListTitle.label;"
  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mailnews/base/prefs/resources/content/am-addressing.xul
+++ b/mailnews/base/prefs/resources/content/am-addressing.xul
@ -27,7 +27,7 @@ Contributors:

 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-addressing.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-addressing.dtd" >

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="onLoad();">
--- a/mailnews/base/prefs/resources/content/am-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-advanced.xul
@ -2,7 +2,7 @@

 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-advanced.dtd" >

 <page  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

--- a/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mailnews/base/prefs/resources/content/am-copies.xul
@ -4,7 +4,7 @@

 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-copies.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.onPanelLoaded('am-copies.xul');">

--- a/mailnews/base/prefs/resources/content/am-identity-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-identity-advanced.xul
@ -25,7 +25,7 @@

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-identity-advanced.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-identity-advanced.dtd">

 <page
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/mailnews/base/prefs/resources/content/am-imap-advanced.xul
+++ b/mailnews/base/prefs/resources/content/am-imap-advanced.xul
@ -4,7 +4,7 @@

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-imap-advanced.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-imap-advanced.dtd" >

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      style="padding: 10px"
--- a/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mailnews/base/prefs/resources/content/am-main.xul
@ -2,7 +2,7 @@

 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-main.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-main.dtd" >

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.onPanelLoaded('am-main.xul');">
--- a/mailnews/base/prefs/resources/content/am-offline.xul
+++ b/mailnews/base/prefs/resources/content/am-offline.xul
@ -26,7 +26,7 @@ Contributors:

 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-offline.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-offline.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.onPanelLoaded('am-offline.xul');">
--- a/mailnews/base/prefs/resources/content/am-server-top.xul
+++ b/mailnews/base/prefs/resources/content/am-server-top.xul
@ -2,7 +2,7 @@

 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-server-top.dtd" >

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

--- a/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mailnews/base/prefs/resources/content/am-server.xul
@ -27,7 +27,7 @@ Contributors:

 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-server-top.dtd" >

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.onPanelLoaded('am-server.xul');">
--- a/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
+++ b/mailnews/base/prefs/resources/content/am-serverwithnoidentities.xul
@ -2,7 +2,7 @@

 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.onPanelLoaded('am-serverwithnoidentities.xul');">
--- a/mailnews/base/prefs/resources/content/am-smtp.xul
+++ b/mailnews/base/prefs/resources/content/am-smtp.xul
@ -4,7 +4,7 @@

 <?xul-overlay href="chrome://messenger/content/smtpEditOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-advanced.dtd" >

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="onLoad();">
--- a/mailnews/base/prefs/resources/content/aw-accname.xul
+++ b/mailnews/base/prefs/resources/content/aw-accname.xul
@ -25,7 +25,7 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>


-<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-accname.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/aw-accname.dtd" >
 <page id="accnamepage" 
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.wizardManager.onPageLoad('accname');">
--- a/mailnews/base/prefs/resources/content/aw-accounttype.xul
+++ b/mailnews/base/prefs/resources/content/aw-accounttype.xul
@ -24,7 +24,7 @@ Rights Reserved.

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-accounttype.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/aw-accounttype.dtd" >
 <page id="accounttype" 
    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    xmlns:nc="http://home.netscape.com/NC-rdf#"
--- a/mailnews/base/prefs/resources/content/aw-done.xul
+++ b/mailnews/base/prefs/resources/content/aw-done.xul
@ -23,7 +23,7 @@ Rights Reserved.

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-done.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/aw-done.dtd" >
 <page id="done" 
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.wizardManager.onPageLoad('done');">
--- a/mailnews/base/prefs/resources/content/aw-identity.xul
+++ b/mailnews/base/prefs/resources/content/aw-identity.xul
@ -24,7 +24,7 @@ Rights Reserved.

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-identity.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/aw-identity.dtd" >
 <page id="identitypage"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.wizardManager.onPageLoad('identity');">
--- a/mailnews/base/prefs/resources/content/aw-login.xul
+++ b/mailnews/base/prefs/resources/content/aw-login.xul
@ -24,7 +24,7 @@ Rights Reserved.

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-login.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/aw-login.dtd" >
 <page id="loginpage"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.wizardManager.onPageLoad('login');">
--- a/mailnews/base/prefs/resources/content/aw-newsserver.xul
+++ b/mailnews/base/prefs/resources/content/aw-newsserver.xul
@ -24,7 +24,7 @@ Rights Reserved.

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-server.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/aw-server.dtd" >
 <page id="serverpage"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.wizardManager.onPageLoad('newsserver');">
--- a/mailnews/base/prefs/resources/content/aw-server.xul
+++ b/mailnews/base/prefs/resources/content/aw-server.xul
@ -24,7 +24,7 @@ Rights Reserved.

 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/aw-server.dtd" >
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/aw-server.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.wizardManager.onPageLoad('server');">

--- a/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
+++ b/mailnews/base/prefs/resources/content/mailPrefsOverlay.xul
@ -1,6 +1,6 @@
 <?xml version="1.0"?>

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % mailPrefsOverlayDTD SYSTEM "chrome://messenger/locale/mailPrefsOverlay.dtd" >
 %mailPrefsOverlayDTD;
 ]>
--- a/mailnews/base/prefs/resources/content/pref-labels.xul
+++ b/mailnews/base/prefs/resources/content/pref-labels.xul
@ -43,7 +43,7 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-labels.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/pref-labels.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-labels.xul');"
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@ -27,7 +27,7 @@ Contributor(s):
 <?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-mailnews.xul');"
--- a/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mailnews/base/prefs/resources/content/pref-receipts.xul
@ -40,7 +40,7 @@
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-receipts.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/pref-receipts.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-receipts.xul');"
--- a/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
+++ b/mailnews/base/prefs/resources/content/pref-viewing_messages.xul
@ -3,7 +3,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/prefPanels.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-viewing_messages.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/pref-viewing_messages.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/pref-viewing_messages.xul');"
--- a/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
+++ b/mailnews/base/prefs/resources/content/smtpEditOverlay.xul
@ -24,7 +24,7 @@

 -->

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/smtpEditOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/smtpEditOverlay.dtd">

 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mailnews/base/resources/content/folderPane.xul
+++ b/mailnews/base/resources/content/folderPane.xul
@ -28,7 +28,7 @@
 <?xml-stylesheet href="chrome://messenger/skin/folderPaneExtras.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/fakeAccount.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/folderpane.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/folderpane.dtd">

 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mailnews/base/resources/content/mac/platformMailOverlay.xul
+++ b/mailnews/base/resources/content/mac/platformMailOverlay.xul
@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- mac version of platformMailOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailOverlay.dtd">

 <overlay id="platformMailOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mailnews/base/resources/content/mailABOverlay.xul
+++ b/mailnews/base/resources/content/mailABOverlay.xul
@ -3,7 +3,7 @@
 <!-- platform specific commands -->
 <?xul-overlay href="chrome://messenger/content/platformMailOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailOverlay.dtd">

 <overlay id="mailABOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mailnews/base/resources/content/mailEditorOverlay.xul
+++ b/mailnews/base/resources/content/mailEditorOverlay.xul
@ -3,7 +3,7 @@
 <!-- retrieve generic commands -->
 <?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailEditorOverlay.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailEditorOverlay.dtd" >

 <overlay id="mailEditorOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mailnews/base/resources/content/mailNavigatorOverlay.xul
+++ b/mailnews/base/resources/content/mailNavigatorOverlay.xul
@ -3,7 +3,7 @@
 <!-- retrieve generic commands -->
 <?xul-overlay href="chrome://messenger/content/mailOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailNavigatorOverlay.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailNavigatorOverlay.dtd" >

 <overlay id="mailNavigatorOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mailnews/base/resources/content/mailOverlay.xul
+++ b/mailnews/base/resources/content/mailOverlay.xul
@ -3,7 +3,7 @@
 <!-- platform specific commands -->
 <?xul-overlay href="chrome://messenger/content/platformMailOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/mailOverlay.dtd">
 <overlay id="mailOverlay.xul"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

--- a/mailnews/base/resources/content/mailTasksOverlay.xul
+++ b/mailnews/base/resources/content/mailTasksOverlay.xul
@ -1,6 +1,6 @@
 <?xml version="1.0"?>

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % mailTasksOverlayDTD SYSTEM "chrome://messenger/locale/mailTasksOverlay.dtd" >
 %mailTasksOverlayDTD;
 ]>
--- a/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mailnews/base/resources/content/mailWindowOverlay.xul
@ -26,7 +26,7 @@ Rights Reserved.
 <?xul-overlay href="chrome://communicator/content/viewZoomOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/mailWindowExtrasOverlay.xul"?>

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
 %messengerDTD;
 <!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
--- a/mailnews/base/resources/content/msgAccountCentral.xul
+++ b/mailnews/base/resources/content/msgAccountCentral.xul
@ -22,7 +22,7 @@ Rights Reserved.

 <?xml-stylesheet href="chrome://messenger/skin/accountCentral.css" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % acctCentralDTD SYSTEM "chrome://messenger/locale/msgAccountCentral.dtd">
--- a/mailnews/base/resources/content/msgFolderPickerOverlay.xul
+++ b/mailnews/base/resources/content/msgFolderPickerOverlay.xul
@ -21,7 +21,7 @@ Rights Reserved.

 <?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/msgFolderPickerOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/msgFolderPickerOverlay.dtd">

 <overlay id="msgFolderPicker"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
--- a/mailnews/base/resources/content/msgHdrViewOverlay.xul
+++ b/mailnews/base/resources/content/msgHdrViewOverlay.xul
@ -19,7 +19,7 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 -->

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/msgHdrViewOverlay.dtd">

 <?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/messageKeywords.css" type="text/css"?>
--- a/mailnews/base/resources/content/msgSelectOffline.xul
+++ b/mailnews/base/resources/content/msgSelectOffline.xul
@ -26,7 +26,7 @@ Contributors:
 <?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/msgSynchronize.dtd" >
 <dialog	xmlns:nc="http://home.netscape.com/NC-rdf#"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@ -21,7 +21,7 @@ Rights Reserved.

 <?xml-stylesheet href="chrome://messenger/skin/subscribe.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/subscribe.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/subscribe.dtd">

 <dialog xmlns:NC="http://home.netscape.com/NC-rdf#" 
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mailnews/base/search/resources/content/FilterEditor.xul
@ -29,7 +29,7 @@ Contributor(s):
 <?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterEditor.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/FilterEditor.dtd">

 <dialog id="FilterEditor"
  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mailnews/base/search/resources/content/searchTermOverlay.xul
+++ b/mailnews/base/search/resources/content/searchTermOverlay.xul
@ -23,7 +23,7 @@
 Hkan Waara <hwaara@chello.se>
 -->

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/searchTermOverlay.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/searchTermOverlay.dtd" >

 <overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

--- a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@ -2,7 +2,7 @@

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/pref-composing_messages.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/messengercompose/pref-composing_messages.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://messenger/content/messengercompose/pref-composing_messages.xul');"
--- a/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mailnews/compose/prefs/resources/content/pref-formatting.xul
@ -2,7 +2,7 @@

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/pref-formatting.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/messengercompose/pref-formatting.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="Init()"
--- a/mailnews/compose/resources/content/addressingWidgetOverlay.xul
+++ b/mailnews/compose/resources/content/addressingWidgetOverlay.xul
@ -19,7 +19,7 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/addressingWidgetOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://messenger/locale/messengercompose/addressingWidgetOverlay.dtd">


 <overlay xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mailnews/extensions/mdn/resources/content/am-mdn.xul
+++ b/mailnews/extensions/mdn/resources/content/am-mdn.xul
@ -21,7 +21,7 @@ Rights Reserved.

 <?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://messenger/locale/am-mdn.dtd">
+<!DOCTYPE page SYSTEM "chrome://messenger/locale/am-mdn.dtd">

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
    onload="parent.onPanelLoaded('am-mdn.xul');">
--- a/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul
+++ b/mailnews/mapi/resources/content/pref-mailnewsOverlay.xul
@ -20,7 +20,7 @@ Contributor(s):
  Srilatha Moturi <srilatha@netscape.com>
 -->

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefMailnewsOverlayDTD SYSTEM "chrome://messenger-mapi/locale/pref-mailnewsOverlay.dtd" >