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

git-svn-id: svn://10.0.0.236/trunk@128655 18797224-902f-48f8-a5cc-f745e15eee43
2002-09-02 03:36:38 +00:00
parent 90eb230ec6
commit 5903d72194
81 changed files with 81 additions and 81 deletions
--- a/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul
@@ -40,7 +40,7 @@

 <?xml-stylesheet href="chrome://navigator/skin/linkToolbar.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-<!DOCTYPE window SYSTEM "chrome://navigator/locale/linkToolbar.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://navigator/locale/linkToolbar.dtd">

 <overlay id="linkToolbarOverlay" 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -30,7 +30,7 @@
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
 %navigatorDTD;
 <!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
--- a/mozilla/xpfe/browser/resources/content/turboDialog.xul
+++ b/mozilla/xpfe/browser/resources/content/turboDialog.xul
@@ -24,7 +24,7 @@

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

-<!DOCTYPE window [
+<!DOCTYPE dialog [
  <!ENTITY % turboDialogDTD SYSTEM "chrome://navigator/locale/turboDialog.dtd" >
  %turboDialogDTD;
  <!ENTITY % dialogOverlayDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
--- a/mozilla/xpfe/browser/resources/content/unix/platformNavigationBindings.xul
+++ b/mozilla/xpfe/browser/resources/content/unix/platformNavigationBindings.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>

-<!DOCTYPE window SYSTEM "chrome://navigator-platform/locale/platformNavigationBindings.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://navigator-platform/locale/platformNavigationBindings.dtd">

 <overlay id="platformNavigationBindings"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mozilla/xpfe/browser/resources/content/viewSourceOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/viewSourceOverlay.xul
@@ -37,7 +37,7 @@

 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % sourceDTD SYSTEM "chrome://navigator/locale/viewSource.dtd" >
--- a/mozilla/xpfe/communicator/resources/content/askViewZoom.xul
+++ b/mozilla/xpfe/communicator/resources/content/askViewZoom.xul
@@ -36,7 +36,7 @@

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

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

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  id="askViewZoom"
--- a/mozilla/xpfe/communicator/resources/content/contentAreaContextOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/contentAreaContextOverlay.xul
@@ -20,7 +20,7 @@
   - Contributor(s):
   -   Blake Ross <blakeross@telocity.com>
   -->
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
 <overlay id="contentAreaContextOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">

--- a/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- mac version of platformCommunicatorOverlay.xul -->

-<!DOCTYPE window [
+<!DOCTYPE overlay [

 <!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
 %platformCommunicationDTD;
--- a/mozilla/xpfe/communicator/resources/content/openLocation.xul
+++ b/mozilla/xpfe/communicator/resources/content/openLocation.xul
@@ -27,7 +27,7 @@

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

-<!DOCTYPE window [
+<!DOCTYPE dialog [
  <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
  %brandDTD;
  <!ENTITY % openDialogDTD SYSTEM "chrome://communicator/locale/openLocation.dtd" >
--- a/mozilla/xpfe/communicator/resources/content/os2/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/os2/platformCommunicatorOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- os2 version of platformCommunicatorOverlay.xul -->

-<!DOCTYPE window [
+<!DOCTYPE overlay [

 <!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
 %platformCommunicationDTD;
--- a/mozilla/xpfe/communicator/resources/content/printPageSetup.xul
+++ b/mozilla/xpfe/communicator/resources/content/printPageSetup.xul
@@ -31,7 +31,7 @@ Contributor(s):

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/printing.css" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/printPageSetup.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/printPageSetup.dtd">

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  onload="onLoad();"
--- a/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> 

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % taskbarDTD SYSTEM "chrome://communicator/locale/taskbarOverlay.dtd" >
--- a/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://communicator/skin/tasksOverlay.css" type="text/css"?> 

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % tasksDTD SYSTEM "chrome://communicator/locale/tasksOverlay.dtd" >
 %tasksDTD;
 ]>
--- a/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- unix version of platformCommunicatorOverlay.xul -->

-<!DOCTYPE window [
+<!DOCTYPE overlay [

 <!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
 %platformCommunicationDTD;
--- a/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
@@ -2,7 +2,7 @@

 <?xul-overlay href="chrome://communicator/content/platformCommunicatorOverlay.xul"?>

-<!DOCTYPE window [
+<!DOCTYPE overlay [

 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
 %brandDTD;
--- a/mozilla/xpfe/communicator/resources/content/viewZoomOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/viewZoomOverlay.xul
@@ -34,7 +34,7 @@
   - GPL.
  -->

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

 <overlay id="viewZoomOverlay"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- win version of platformCommunicatorOverlay.xul -->

-<!DOCTYPE window [
+<!DOCTYPE overlay [

 <!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
 %platformCommunicationDTD;
--- a/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul
@@ -29,7 +29,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css"?>
 <?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % addBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/addBookmark.dtd">
--- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -34,7 +34,7 @@
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">

 <page id="bookmarksPanel"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
@@ -25,7 +25,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % bmpropsDTD SYSTEM "chrome://communicator/locale/bookmarks/bm-props.dtd">
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.xul
@@ -24,7 +24,7 @@
    Ben Goodger <ben@netscape.com> (Original Author) 
 -->

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd">

 <overlay id="bookmarksOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul
@@ -29,7 +29,7 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/findBookmark.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/bookmarks/findBookmark.dtd">

 <dialog id="findBookmarkWindow" style="width: 36em;"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul
@@ -22,7 +22,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/pref-bookmarks.dtd">
--- a/mozilla/xpfe/components/directory/directory.xul
+++ b/mozilla/xpfe/components/directory/directory.xul
@@ -25,7 +25,7 @@

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

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/directory/directory.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/directory/directory.dtd">

 <page
  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mozilla/xpfe/components/filepicker/res/content/filepicker.xul
+++ b/mozilla/xpfe/components/filepicker/res/content/filepicker.xul
@@ -28,7 +28,7 @@

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

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

 <dialog id="main-window"
  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mozilla/xpfe/components/find/resources/finddialog.xul
+++ b/mozilla/xpfe/components/find/resources/finddialog.xul
@@ -31,7 +31,7 @@ Contributor(s):

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

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

 <dialog id="findDialog"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/mozilla/xpfe/components/history/resources/findHistory.xul
+++ b/mozilla/xpfe/components/history/resources/findHistory.xul
@@ -27,7 +27,7 @@
  -->

 <?xml-stylesheet href="chrome://communicator/skin/"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/history/findHistory.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/history/findHistory.dtd">

 <dialog id="findHistoryWindow" style="width: 36em;"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/mozilla/xpfe/components/history/resources/history-panel.xul
+++ b/mozilla/xpfe/components/history/resources/history-panel.xul
@@ -27,7 +27,7 @@
 <?xul-overlay href="chrome://communicator/content/history/historyTreeOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/history/history.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/history/history.dtd" >

 <page id="history-panel" orient="vertical"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
--- a/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
+++ b/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
@@ -24,7 +24,7 @@
    Alec Flett <alecf@netscape.com>
 -->

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % historyDTD SYSTEM "chrome://communicator/locale/history/historyTreeOverlay.dtd" >
 %historyDTD;
 <!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -22,7 +22,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % prefAdvancedDTD SYSTEM "chrome://communicator/locale/pref/pref-advanced.dtd"> %prefAdvancedDTD;
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@@ -24,7 +24,7 @@

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

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefAppearanceDTD SYSTEM "chrome://communicator/locale/pref/pref-appearance.dtd" >
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
@@ -25,7 +25,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/"?>
 <?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-applications-edit.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref-applications-edit.dtd">

 <dialog id="pickAppHandler"
        style="width: 30em;"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -24,7 +24,7 @@

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

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -24,7 +24,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefCacheDTD SYSTEM "chrome://communicator/locale/pref/pref-cache.dtd" >
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul
@@ -21,7 +21,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/sidebar/customize.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-charset.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref-charset.dtd" >

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        title="&charset.customize.title.label;"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -25,7 +25,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-colors.xul');"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
@@ -22,7 +22,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug.xul');"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul
@@ -22,7 +22,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug1.xul');"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul
@@ -22,7 +22,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-debug2.xul');"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -24,7 +24,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-download.xul');"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -22,7 +22,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');"
      headertitle="&lHeader;">
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
@@ -24,7 +24,7 @@

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

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-http.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-http.xul
@@ -39,7 +39,7 @@

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

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-http.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-http.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-http.xul');checkPipelining();checkPipeliningProxy();"
      headertitle="&lHeader;">
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
@@ -22,7 +22,7 @@

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

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      title="&languages.customize.add.title.label;"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -20,7 +20,7 @@

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

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="Init();"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@@ -25,7 +25,7 @@

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

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % platformDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
 %platformDTD;
 <!ENTITY % prefMousewheelDTD SYSTEM "chrome://communicator/locale/pref/pref-mousewheel.dtd" >
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -25,7 +25,7 @@
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      id="pref-navigator"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
@@ -24,7 +24,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % offlineDTD SYSTEM "chrome://communicator/locale/pref/pref-offline.dtd" >
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % policiesDTD SYSTEM "chrome://communicator/locale/pref/pref-policies.dtd" >
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@@ -25,7 +25,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');"
      headertitle="&lHeader;">
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-scripts.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-scripts.xul
@@ -38,7 +38,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>

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

 <page id="scriptsAndWindowPanel" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-scripts.xul');"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul
@@ -22,7 +22,7 @@
  -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-search.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-search.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()"
      headertitle="&lHeader;">
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-security.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-security.xul
@@ -22,7 +22,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-security.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-security.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-security.xul');"
      headertitle="&lHeader;">
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul
@@ -22,7 +22,7 @@
     Joe Hewitt <hewitt@netscape.com>
  -->

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-smart_browsing.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref-smart_browsing.dtd" >

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -26,7 +26,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefSmartBrowsingDTD SYSTEM "chrome://communicator/locale/pref/pref-smart_browsing.dtd" >
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-smartupdate.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-smartupdate.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-smartupdate.xul'); initUpdateNotifications();"
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-tabs.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-tabs.xul
@@ -23,7 +23,7 @@

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

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

 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
      onload="parent.initPanel('chrome://communicator/content/pref/pref-tabs.xul');
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
@@ -24,7 +24,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % themesDTD SYSTEM "chrome://communicator/locale/pref/pref-themes.dtd" >
 %themesDTD;
 <!ENTITY % regionDTD SYSTEM "chrome://global-region/locale/region.dtd" >
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
@@ -25,7 +25,7 @@

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

-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % platformDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref.xul
@@ -3,7 +3,7 @@

 <?xul-overlay href="chrome://communicator/content/pref/preftree.xul"?>

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


 <!-- This dialog has a fixed size and is not resizable. 
--- a/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -25,7 +25,7 @@

 <?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/preftree.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/preftree.dtd" >

 <overlay id="prefTreeOverlay"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mozilla/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul
@@ -23,7 +23,7 @@
     Ben Goodger <ben@netscape.com>
  -->

-<!DOCTYPE window SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">  
+<!DOCTYPE overlay SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">  
  
 <overlay id="platformPreferencesOverlay"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mozilla/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul
@@ -24,7 +24,7 @@
     Bill Law    <law@netscape.com>
  -->

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % platformPrefOverlayDTD SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">  
--- a/mozilla/xpfe/components/search/resources/internetresults.xul
+++ b/mozilla/xpfe/components/search/resources/internetresults.xul
@@ -3,7 +3,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/search/internetresults.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/search/internetresults.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/search/internetresults.dtd">

 <page onload="onLoadInternetResults();"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mozilla/xpfe/components/search/resources/search-editor.xul
+++ b/mozilla/xpfe/components/search/resources/search-editor.xul
@@ -29,7 +29,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/search/search-editor.css" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/search/search-editor.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/search/search-editor.dtd">

 <dialog title="&window.title.label;" id="search-editor-window"
        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mozilla/xpfe/components/sidebar/resources/PageNotFound.xul
+++ b/mozilla/xpfe/components/sidebar/resources/PageNotFound.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>

-<!DOCTYPE window SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd">

 <page xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
  <description class="header">&sidebar.pagenotfound.label;</description>
--- a/mozilla/xpfe/components/sidebar/resources/customize.xul
+++ b/mozilla/xpfe/components/sidebar/resources/customize.xul
@@ -23,7 +23,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/sidebar/customize.css"
  type="text/css"?>

-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % customizeDTD SYSTEM "chrome://communicator/locale/sidebar/customize.dtd" >
 %customizeDTD;
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
--- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
@@ -22,7 +22,7 @@
 <?xml-stylesheet href="chrome://communicator/content/sidebar/sidebarOverlay.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/skin/button.css" type="text/css"?> 

-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % sidebarOverlayDTD SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd" >
 %sidebarOverlayDTD;
 ]>
--- a/mozilla/xpfe/components/timebomb/resources/content/expireText.xul
+++ b/mozilla/xpfe/components/timebomb/resources/content/expireText.xul
@@ -23,7 +23,7 @@ Contributor(s):

 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % commRegionDTD SYSTEM "chrome://communicator-region/locale/region.dtd" >
 %commRegionDTD;
 <!ENTITY % timebombDTD SYSTEM "chrome://communicator/locale/timebomb/timebomb.dtd">
--- a/mozilla/xpfe/components/timebomb/resources/content/warn.xul
+++ b/mozilla/xpfe/components/timebomb/resources/content/warn.xul
@@ -23,7 +23,7 @@ Contributor(s):

 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % commRegionDTD SYSTEM "chrome://communicator-region/locale/region.dtd" >
 %commRegionDTD;
 <!ENTITY % timebombDTD SYSTEM "chrome://communicator/locale/timebomb/timebomb.dtd">
--- a/mozilla/xpfe/global/resources/content/charsetDetectorsOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/charsetDetectorsOverlay.xul
@@ -20,7 +20,7 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->


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

 <overlay id="charsetDetectorsOverlay"
     xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
--- a/mozilla/xpfe/global/resources/content/dialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/dialogOverlay.xul
@@ -2,7 +2,7 @@

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

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

 <overlay id="dialogOverlay"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
@@ -21,7 +21,7 @@
   -->
 <!-- mac version of platformDialogOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">

 <overlay id="platformDialogOverlay"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
@@ -22,7 +22,7 @@

 <!-- os2 version of platformDialogOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">

 <overlay id="platformDialogOverlay"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mozilla/xpfe/global/resources/content/printPageSetup.xul
+++ b/mozilla/xpfe/global/resources/content/printPageSetup.xul
@@ -31,7 +31,7 @@ Contributor(s):

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/printing.css" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/printPageSetup.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/printPageSetup.dtd">

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  onload="onLoad();"
--- a/mozilla/xpfe/global/resources/content/printdialog.xul
+++ b/mozilla/xpfe/global/resources/content/printdialog.xul
@@ -29,7 +29,7 @@ Contributor(s):
 -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://global/locale/printdialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://global/locale/printdialog.dtd">

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  onload="onLoad();"
--- a/mozilla/xpfe/global/resources/content/selectDialog.xul
+++ b/mozilla/xpfe/global/resources/content/selectDialog.xul
@@ -21,7 +21,7 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->

 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-<!DOCTYPE window SYSTEM "chrome://global/locale/commonDialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
      onload="selectDialogOnLoad()"
--- a/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
@@ -21,7 +21,7 @@
   -->
 <!-- unix version of platformDialogOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">

 <overlay id="platformDialogOverlay"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul
+++ b/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul
@@ -28,7 +28,7 @@ Contributor(s):
 -->

 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/printjoboptions.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://global-platform/locale/printjoboptions.dtd">

 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  onload="onLoad();"
--- a/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
@@ -22,7 +22,7 @@

 <!-- win version of platformDialogOverlay.xul -->

-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">

 <overlay id="platformDialogOverlay"
             xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mozilla/xpfe/global/resources/content/wizardOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/wizardOverlay.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> 

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

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