From 10484cc5cc8c3867fb16a2f55cc8a1bb3df3d60d Mon Sep 17 00:00:00 2001
From: "heikki%netscape.com"
 <heikki%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 31 Jan 2002 22:12:36 +0000
Subject: [PATCH] Bug 106053, remove unused XHTML namespace declarations, and
 fix incorrect namespace usages. r=harishd, sr=hewitt.

git-svn-id: svn://10.0.0.236/trunk@113369 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/xml/tests/toc/toc.js             |  2 +-
 .../ui/composer/content/TextEditorAppShell.xul   |  2 +-
 .../editor/ui/composer/content/pref-publish.xul  |  6 +++---
 .../editor/ui/composer/content/sb-file-panel.xul |  1 -
 .../editor/ui/dialogs/content/EdButtonProps.xul  |  1 -
 .../ui/dialogs/content/EdFieldSetProps.xul       |  1 -
 .../editor/ui/dialogs/content/EdFormProps.xul    |  1 -
 .../editor/ui/dialogs/content/EdImageOverlay.xul |  1 -
 .../editor/ui/dialogs/content/EdInputImage.xul   |  1 -
 .../editor/ui/dialogs/content/EdInputProps.xul   |  1 -
 .../editor/ui/dialogs/content/EdLabelProps.xul   |  1 -
 .../editor/ui/dialogs/content/EdSelectProps.xul  |  1 -
 .../ui/dialogs/content/EdTextAreaProps.xul       |  1 -
 .../ui/dialogs/content/EditorPublishOverlay.xul  |  1 -
 .../browser/chrome/content/mini-nav.xul          |  2 +-
 .../browser/chrome/content/simple-shell.xul      |  2 +-
 .../components/ui/progressDlg/nsProgressDlg.xul  |  2 +-
 .../viewers/computedStyle/computedStyle.xul      |  1 -
 .../p3p/resources/content/privacyOverlay.xul     |  1 -
 .../transformiix/resources/buster/buster.xul     |  1 -
 .../extensions/xmlterm/ui/content/xmlterm.xul    |  2 +-
 .../extensions/xmlterm/ui/content/xmlterm2.xul   |  8 ++++----
 .../xmlterm/ui/content/xmltermOverlay.xul        |  1 -
 .../base/src/grid/examples/borderedcolumns.xul   |  1 -
 .../src/grid/examples/borderedrowscolumns.xul    |  1 -
 .../src/grid/examples/borderedrowscolumns2.xul   |  1 -
 .../src/grid/examples/borderedrowscolumns3.xul   |  1 -
 .../src/grid/examples/bordermargincolumns1.xul   |  1 -
 .../xul/base/src/grid/examples/collapsetest.xul  |  1 -
 .../xul/base/src/grid/examples/divcolumngrid.xul |  1 -
 .../xul/base/src/grid/examples/divrowgrid.xul    |  1 -
 .../xul/base/src/grid/examples/dynamicgrid.xul   |  1 -
 .../xul/base/src/grid/examples/flexgroupgrid.xul |  1 -
 .../base/src/grid/examples/javascriptappend.xul  |  1 -
 .../xul/base/src/grid/examples/jumpygrid.xul     |  1 -
 .../xul/base/src/grid/examples/nestedrows.xul    |  1 -
 .../xul/base/src/grid/examples/rowspan.xul       |  1 -
 .../base/src/grid/examples/scrollingcolumns.xul  |  1 -
 .../xul/base/src/grid/examples/scrollingrows.xul |  1 -
 .../xul/base/src/grid/examples/splitter.xul      |  1 -
 .../smime/resources/content/am-smime.xul         |  1 -
 .../netwerk/resources/content/redirect_loop.xul  |  2 +-
 .../resources/content/securityOverlay.xul        |  1 -
 .../pki/resources/content/crlImportDialog.xul    |  1 -
 .../pki/resources/content/pref-crlupdate.xul     |  1 -
 .../tests/viewer/samples/scrollbarTest2.xul      |  1 -
 .../tests/viewer/samples/sliderTest1.xul         |  1 -
 .../webshell/tests/viewer/samples/treeTest1.xul  | 16 ++++++++--------
 .../xpfe/browser/resources/content/fastnav.xul   |  2 +-
 .../xpfe/browser/resources/content/pageInfo.xul  |  2 +-
 mozilla/xpfe/browser/samples/dexopenchrome.xul   |  1 -
 mozilla/xpfe/browser/samples/widgets.xul         |  1 -
 .../autocomplete/test/autocomplete_test.xul      |  1 -
 .../prefwindow/resources/content/preftree.xul    |  1 -
 .../search/resources/internetresults.xul         |  1 -
 .../components/search/resources/search-panel.xul |  1 -
 .../ucth/resources/helperAppDldProgress.xul      |  2 +-
 .../content/mac/platformDialogOverlay.xul        |  1 -
 .../content/os2/platformDialogOverlay.xul        |  1 -
 .../content/unix/platformDialogOverlay.xul       |  1 -
 .../content/win/platformDialogOverlay.xul        |  1 -
 mozilla/xpfe/test/winopen.xul                    |  1 -
 .../xpinstall/res/content/updateNotification.xul |  1 -
 63 files changed, 25 insertions(+), 75 deletions(-)

diff --git a/mozilla/content/xml/tests/toc/toc.js b/mozilla/content/xml/tests/toc/toc.js
index 17c94923427..758d8c7b0a4 100644
--- a/mozilla/content/xml/tests/toc/toc.js
+++ b/mozilla/content/xml/tests/toc/toc.js
@@ -67,7 +67,7 @@ function addToToc(root, tocFrame)
 
       // Create the image and toggling container in the table of contents
       if (i < searchTags.length-1) {
-        var img = document.createElementNS("http://www.w3.org/1999/xhtml","html:img");
+        var img = document.createElementNS("http://www.w3.org/1999/xhtml","img");
         img.src = "minus.gif";
         newTocElement.insertBefore(img,newTocLink);
  
diff --git a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
index f4a6649b422..c612a6e321d 100644
--- a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
@@ -38,7 +38,7 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/editor.dtd"> 
 
 <!-- NOTE: If we don't have "title" set, text editor doesn't work! -->
-<window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml"
+<window id="main-window"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="TextEditorOnLoad()"
         onunload="EditorShutdown()"
diff --git a/mozilla/editor/ui/composer/content/pref-publish.xul b/mozilla/editor/ui/composer/content/pref-publish.xul
index ec5de95f18b..7c0fb5225bc 100644
--- a/mozilla/editor/ui/composer/content/pref-publish.xul
+++ b/mozilla/editor/ui/composer/content/pref-publish.xul
@@ -26,9 +26,9 @@
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/pref-publish.dtd" >
 <page xmlns:html="http://www.w3.org/1999/xhtml"
-    		xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        title="&window.title;"
-  		  onload="if( parent.handle ) parent.handle.onpageload( 'pref-publish' ); else parent.queuedTag = 'pref-publish';">
+      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+      title="&window.title;"
+      onload="if( parent.handle ) parent.handle.onpageload( 'pref-publish' ); else parent.queuedTag = 'pref-publish';">
 
 <html:div flex="100%">
 <html:div id="top">
diff --git a/mozilla/editor/ui/composer/content/sb-file-panel.xul b/mozilla/editor/ui/composer/content/sb-file-panel.xul
index f9d49d0f3f1..69e634e3c49 100644
--- a/mozilla/editor/ui/composer/content/sb-file-panel.xul
+++ b/mozilla/editor/ui/composer/content/sb-file-panel.xul
@@ -27,7 +27,6 @@
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
 
 <window
-  xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/mozilla/editor/ui/dialogs/content/EdButtonProps.xul b/mozilla/editor/ui/dialogs/content/EdButtonProps.xul
index e9f1115f440..d313d6e6b30 100644
--- a/mozilla/editor/ui/dialogs/content/EdButtonProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdButtonProps.xul
@@ -43,7 +43,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorButtonProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
diff --git a/mozilla/editor/ui/dialogs/content/EdFieldSetProps.xul b/mozilla/editor/ui/dialogs/content/EdFieldSetProps.xul
index eb573f3f657..4c2053cbc16 100644
--- a/mozilla/editor/ui/dialogs/content/EdFieldSetProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdFieldSetProps.xul
@@ -43,7 +43,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorFieldSetProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
diff --git a/mozilla/editor/ui/dialogs/content/EdFormProps.xul b/mozilla/editor/ui/dialogs/content/EdFormProps.xul
index e86a57a7ce3..2820769cfc6 100644
--- a/mozilla/editor/ui/dialogs/content/EdFormProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdFormProps.xul
@@ -43,7 +43,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorFormProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
diff --git a/mozilla/editor/ui/dialogs/content/EdImageOverlay.xul b/mozilla/editor/ui/dialogs/content/EdImageOverlay.xul
index b09cfe95ca7..dc6d358310e 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageOverlay.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageOverlay.xul
@@ -26,7 +26,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorImageProperties.dtd">
 
 <overlay id="EdImageOverlay"
-     xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/x-javascript" src="chrome://editor/content/EdImageOverlay.js"/>
diff --git a/mozilla/editor/ui/dialogs/content/EdInputImage.xul b/mozilla/editor/ui/dialogs/content/EdInputImage.xul
index 8918d0b6cb7..e64f76d64a8 100644
--- a/mozilla/editor/ui/dialogs/content/EdInputImage.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInputImage.xul
@@ -44,7 +44,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorInputProperties.dtd">
 <dialog title="&windowTitleImage.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
diff --git a/mozilla/editor/ui/dialogs/content/EdInputProps.xul b/mozilla/editor/ui/dialogs/content/EdInputProps.xul
index c263ae5b65e..a8fa2b04b95 100644
--- a/mozilla/editor/ui/dialogs/content/EdInputProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInputProps.xul
@@ -43,7 +43,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorInputProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
diff --git a/mozilla/editor/ui/dialogs/content/EdLabelProps.xul b/mozilla/editor/ui/dialogs/content/EdLabelProps.xul
index 92a993b4cf2..5f62eb5b0b0 100644
--- a/mozilla/editor/ui/dialogs/content/EdLabelProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLabelProps.xul
@@ -43,7 +43,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorLabelProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
diff --git a/mozilla/editor/ui/dialogs/content/EdSelectProps.xul b/mozilla/editor/ui/dialogs/content/EdSelectProps.xul
index 8f28409fdb7..41129dcefa7 100644
--- a/mozilla/editor/ui/dialogs/content/EdSelectProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdSelectProps.xul
@@ -43,7 +43,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorSelectProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
diff --git a/mozilla/editor/ui/dialogs/content/EdTextAreaProps.xul b/mozilla/editor/ui/dialogs/content/EdTextAreaProps.xul
index 8f6beece2bc..16fe4fb787a 100644
--- a/mozilla/editor/ui/dialogs/content/EdTextAreaProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdTextAreaProps.xul
@@ -43,7 +43,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorTextAreaProperties.dtd">
 <dialog title="&windowTitle.label;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         onload="Startup();"
         buttons="accept,cancel"
         ondialogaccept="return onAccept();"
diff --git a/mozilla/editor/ui/dialogs/content/EditorPublishOverlay.xul b/mozilla/editor/ui/dialogs/content/EditorPublishOverlay.xul
index d4f2fd6ac50..90aa279af28 100644
--- a/mozilla/editor/ui/dialogs/content/EditorPublishOverlay.xul
+++ b/mozilla/editor/ui/dialogs/content/EditorPublishOverlay.xul
@@ -28,7 +28,6 @@
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorPublish.dtd">
 
 <overlay id="EditorPublishOverlay"
-     xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <vbox id="PublishSettingsInputs">
diff --git a/mozilla/embedding/browser/chrome/content/mini-nav.xul b/mozilla/embedding/browser/chrome/content/mini-nav.xul
index 898b472ca7d..d76d9927c0c 100644
--- a/mozilla/embedding/browser/chrome/content/mini-nav.xul
+++ b/mozilla/embedding/browser/chrome/content/mini-nav.xul
@@ -31,7 +31,7 @@ Contributor(s): ______________________________________. -->
 %embeddingDTD;
 ]>
 
-<window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml"
+<window id="main-window"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   orient="vertical"
diff --git a/mozilla/embedding/browser/chrome/content/simple-shell.xul b/mozilla/embedding/browser/chrome/content/simple-shell.xul
index 0b60b8c339c..28d24cae240 100644
--- a/mozilla/embedding/browser/chrome/content/simple-shell.xul
+++ b/mozilla/embedding/browser/chrome/content/simple-shell.xul
@@ -22,7 +22,7 @@ Contributor(s): ______________________________________. -->
 
 <?xml-stylesheet href="chrome://embed/content/simple-shell.css" type="text/css"?> 
 
-<window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml"
+<window id="main-window"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   orient="vertical"
diff --git a/mozilla/embedding/components/ui/progressDlg/nsProgressDlg.xul b/mozilla/embedding/components/ui/progressDlg/nsProgressDlg.xul
index c119196c0a4..e3193008975 100644
--- a/mozilla/embedding/components/ui/progressDlg/nsProgressDlg.xul
+++ b/mozilla/embedding/components/ui/progressDlg/nsProgressDlg.xul
@@ -31,7 +31,7 @@ Contributor(s):
 
 <!DOCTYPE window SYSTEM "chrome://global/locale/downloadProgress.dtd">
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
+<window 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
         title="&downloadWindow.title;"
diff --git a/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul b/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul
index 407af927328..0c0e4d3a87b 100644
--- a/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul
+++ b/mozilla/extensions/inspector/resources/content/viewers/computedStyle/computedStyle.xul
@@ -9,7 +9,6 @@
 
 <page id="winComputedStyle"
       orient="vertical"
-      xmlns:html="http://www.w3.org/1999/xhtml"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   
   <script type="application/x-javascript" src="chrome://inspector/content/jsutil/xul/inBaseOutlinerView.js"/>
diff --git a/mozilla/extensions/p3p/resources/content/privacyOverlay.xul b/mozilla/extensions/p3p/resources/content/privacyOverlay.xul
index 4afbdd2b1bf..7f1710ffccb 100644
--- a/mozilla/extensions/p3p/resources/content/privacyOverlay.xul
+++ b/mozilla/extensions/p3p/resources/content/privacyOverlay.xul
@@ -26,7 +26,6 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/P3PPrivacyInfo.dtd" >
 
 <overlay id="NavPrivacyOverlay"
-         xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/x-javascript" src="chrome://communicator/content/privacyUI.js" />
diff --git a/mozilla/extensions/transformiix/resources/buster/buster.xul b/mozilla/extensions/transformiix/resources/buster/buster.xul
index 9acb633c3bb..4133b92b220 100644
--- a/mozilla/extensions/transformiix/resources/buster/buster.xul
+++ b/mozilla/extensions/transformiix/resources/buster/buster.xul
@@ -24,7 +24,6 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="txTools.css" type="text/css"?> 
 <window id="XalanBuster"
-        xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="loaderstuff()"
         orient="vertical">
diff --git a/mozilla/extensions/xmlterm/ui/content/xmlterm.xul b/mozilla/extensions/xmlterm/ui/content/xmlterm.xul
index 1e2db930a7c..5e4f7d67afd 100644
--- a/mozilla/extensions/xmlterm/ui/content/xmlterm.xul
+++ b/mozilla/extensions/xmlterm/ui/content/xmlterm.xul
@@ -30,7 +30,7 @@ NOTE: Put all the skin stuff in the content directory for the moment
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
 <!DOCTYPE window>
-<window id="xmlterm-window" xmlns:html="http://www.w3.org/1999/xhtml"
+<window id="xmlterm-window"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="StartupXMLTerm();"
         title="xmlterm" orient="vertical" width="586" height="412">
diff --git a/mozilla/extensions/xmlterm/ui/content/xmlterm2.xul b/mozilla/extensions/xmlterm/ui/content/xmlterm2.xul
index a9719ac67b7..ea7610a1e9b 100644
--- a/mozilla/extensions/xmlterm/ui/content/xmlterm2.xul
+++ b/mozilla/extensions/xmlterm/ui/content/xmlterm2.xul
@@ -33,10 +33,10 @@
   
   <script type="application/x-javascript" src="chrome://xmlterm/content/XMLTermChrome.js"/>
 
-  <html:iframe id="content-frame2" type="content" html:name="content2"
-               html:src="about:blank" flex="100%"/>
+  <html:iframe id="content-frame2" type="content" name="content2"
+               src="about:blank" flex="100%"/>
 
-  <html:iframe id="content-frame" type="content" html:name="content"
-               html:src="chrome://xmlterm/content/xmlterm.html" flex="100%"/>
+  <html:iframe id="content-frame" type="content" name="content"
+               src="chrome://xmlterm/content/xmlterm.html" flex="100%"/>
 
 </window>
diff --git a/mozilla/extensions/xmlterm/ui/content/xmltermOverlay.xul b/mozilla/extensions/xmlterm/ui/content/xmltermOverlay.xul
index 85f02b56cf5..4278ee222c8 100644
--- a/mozilla/extensions/xmlterm/ui/content/xmltermOverlay.xul
+++ b/mozilla/extensions/xmlterm/ui/content/xmltermOverlay.xul
@@ -5,7 +5,6 @@
 <!-- This is the overlay that adds "XMLterm" to the (global) task menu. -->
 
 <overlay id="XMLtermTaskMenuID"
-     xmlns:html="http://www.w3.org/1999/xhtml"
      xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/x-javascript" src="chrome://xmlterm/content/xmltermOverlay.js"/>
diff --git a/mozilla/layout/xul/base/src/grid/examples/borderedcolumns.xul b/mozilla/layout/xul/base/src/grid/examples/borderedcolumns.xul
index 71f71cd2a1f..1e0473d534d 100644
--- a/mozilla/layout/xul/base/src/grid/examples/borderedcolumns.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/borderedcolumns.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox>
diff --git a/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns.xul b/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns.xul
index b2eb1843596..d3c3c8a01d6 100644
--- a/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox>
diff --git a/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns2.xul b/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns2.xul
index 2ba316ad069..9cf978296cd 100644
--- a/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns2.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns2.xul
@@ -7,7 +7,6 @@
 
 
 <window orient="vertical"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox>
diff --git a/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns3.xul b/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns3.xul
index 1c9387ba793..0468e29717c 100644
--- a/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns3.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/borderedrowscolumns3.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox>
diff --git a/mozilla/layout/xul/base/src/grid/examples/bordermargincolumns1.xul b/mozilla/layout/xul/base/src/grid/examples/bordermargincolumns1.xul
index 1326f4eabd2..bf8038b2af2 100644
--- a/mozilla/layout/xul/base/src/grid/examples/bordermargincolumns1.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/bordermargincolumns1.xul
@@ -7,7 +7,6 @@
 
 
 <window orient="vertical"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox>
diff --git a/mozilla/layout/xul/base/src/grid/examples/collapsetest.xul b/mozilla/layout/xul/base/src/grid/examples/collapsetest.xul
index a419ec8d207..c27b790c322 100644
--- a/mozilla/layout/xul/base/src/grid/examples/collapsetest.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/collapsetest.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical" style="border: 2px solid green"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
 <script>
diff --git a/mozilla/layout/xul/base/src/grid/examples/divcolumngrid.xul b/mozilla/layout/xul/base/src/grid/examples/divcolumngrid.xul
index 71aa63f061b..384c2d6f7f9 100644
--- a/mozilla/layout/xul/base/src/grid/examples/divcolumngrid.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/divcolumngrid.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical" style="border: 2px solid green"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
   <hbox>
     <grid style="border: 2px solid red;">
diff --git a/mozilla/layout/xul/base/src/grid/examples/divrowgrid.xul b/mozilla/layout/xul/base/src/grid/examples/divrowgrid.xul
index fb03fa38a99..4712843e497 100644
--- a/mozilla/layout/xul/base/src/grid/examples/divrowgrid.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/divrowgrid.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical" style="border: 2px solid green"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox>
diff --git a/mozilla/layout/xul/base/src/grid/examples/dynamicgrid.xul b/mozilla/layout/xul/base/src/grid/examples/dynamicgrid.xul
index b3c8b4f54cf..84687f0c8ed 100644
--- a/mozilla/layout/xul/base/src/grid/examples/dynamicgrid.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/dynamicgrid.xul
@@ -7,7 +7,6 @@
 
 
 <window orient="vertical" 
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 		onload="start()"> 
 
diff --git a/mozilla/layout/xul/base/src/grid/examples/flexgroupgrid.xul b/mozilla/layout/xul/base/src/grid/examples/flexgroupgrid.xul
index 8740eb558b4..5ee03e70d5f 100644
--- a/mozilla/layout/xul/base/src/grid/examples/flexgroupgrid.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/flexgroupgrid.xul
@@ -7,7 +7,6 @@
 
 
 <window orient="vertical"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
    <hbox>
diff --git a/mozilla/layout/xul/base/src/grid/examples/javascriptappend.xul b/mozilla/layout/xul/base/src/grid/examples/javascriptappend.xul
index 98135c178c0..647065d4d79 100644
--- a/mozilla/layout/xul/base/src/grid/examples/javascriptappend.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/javascriptappend.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical" style="border: 2px solid green"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <script>
diff --git a/mozilla/layout/xul/base/src/grid/examples/jumpygrid.xul b/mozilla/layout/xul/base/src/grid/examples/jumpygrid.xul
index 3b68f0e95e0..72df9c65870 100644
--- a/mozilla/layout/xul/base/src/grid/examples/jumpygrid.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/jumpygrid.xul
@@ -7,7 +7,6 @@
 
 
 <window orient="vertical" style="border: 2px solid green"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
     <script>
diff --git a/mozilla/layout/xul/base/src/grid/examples/nestedrows.xul b/mozilla/layout/xul/base/src/grid/examples/nestedrows.xul
index 078356faac2..ac469f0fc66 100644
--- a/mozilla/layout/xul/base/src/grid/examples/nestedrows.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/nestedrows.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox flex="1">
diff --git a/mozilla/layout/xul/base/src/grid/examples/rowspan.xul b/mozilla/layout/xul/base/src/grid/examples/rowspan.xul
index 517e6288370..f057339beb4 100644
--- a/mozilla/layout/xul/base/src/grid/examples/rowspan.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/rowspan.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical" style="border: 2px solid green"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox>
diff --git a/mozilla/layout/xul/base/src/grid/examples/scrollingcolumns.xul b/mozilla/layout/xul/base/src/grid/examples/scrollingcolumns.xul
index a57a33d8537..fe2bbaa5903 100644
--- a/mozilla/layout/xul/base/src/grid/examples/scrollingcolumns.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/scrollingcolumns.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox flex="1">
diff --git a/mozilla/layout/xul/base/src/grid/examples/scrollingrows.xul b/mozilla/layout/xul/base/src/grid/examples/scrollingrows.xul
index af207dc40b5..8bf1864c517 100644
--- a/mozilla/layout/xul/base/src/grid/examples/scrollingrows.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/scrollingrows.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox flex="1">
diff --git a/mozilla/layout/xul/base/src/grid/examples/splitter.xul b/mozilla/layout/xul/base/src/grid/examples/splitter.xul
index cec71ee708e..79ab99e0a03 100644
--- a/mozilla/layout/xul/base/src/grid/examples/splitter.xul
+++ b/mozilla/layout/xul/base/src/grid/examples/splitter.xul
@@ -6,7 +6,6 @@
 
 
 <window orient="vertical" style="border: 2px solid green"
-xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
   <hbox>
diff --git a/mozilla/mailnews/extensions/smime/resources/content/am-smime.xul b/mozilla/mailnews/extensions/smime/resources/content/am-smime.xul
index 0df78282db8..dfb3364e6a8 100644
--- a/mozilla/mailnews/extensions/smime/resources/content/am-smime.xul
+++ b/mozilla/mailnews/extensions/smime/resources/content/am-smime.xul
@@ -28,7 +28,6 @@ Contributors:
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-smime.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         class="color-dialog"
         onload="parent.onPanelLoaded('am-smime.xul');"
         orient="vertical">
diff --git a/mozilla/netwerk/resources/content/redirect_loop.xul b/mozilla/netwerk/resources/content/redirect_loop.xul
index 3322ce2fe63..81248358671 100644
--- a/mozilla/netwerk/resources/content/redirect_loop.xul
+++ b/mozilla/netwerk/resources/content/redirect_loop.xul
@@ -2,7 +2,7 @@
 
 <!DOCTYPE window SYSTEM "chrome://necko/locale/redirect_loop.dtd">
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
+<window 
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
 		xmlns:NC="http://home.netscape.com/NC-rdf#"	
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mozilla/netwerk/resources/content/securityOverlay.xul b/mozilla/netwerk/resources/content/securityOverlay.xul
index 5fa4d8b28c2..c520b7f7bb1 100644
--- a/mozilla/netwerk/resources/content/securityOverlay.xul
+++ b/mozilla/netwerk/resources/content/securityOverlay.xul
@@ -4,7 +4,6 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/securityOverlay.dtd">
 
 <overlay id="NavSecurityOverlay"
-         xmlns:html="http://www.w3.org/1999/xhtml"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <script type="application/x-javascript" src="chrome://communicator/content/securityUI.js" />
diff --git a/mozilla/security/manager/pki/resources/content/crlImportDialog.xul b/mozilla/security/manager/pki/resources/content/crlImportDialog.xul
index 43600aa0804..6c785b1fad3 100644
--- a/mozilla/security/manager/pki/resources/content/crlImportDialog.xul
+++ b/mozilla/security/manager/pki/resources/content/crlImportDialog.xul
@@ -27,7 +27,6 @@
 
 <dialog id="crlImportSuccess" 
   title="&crl.import.status.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
   onload="onLoad();"
   buttons="accept,cancel,help"
diff --git a/mozilla/security/manager/pki/resources/content/pref-crlupdate.xul b/mozilla/security/manager/pki/resources/content/pref-crlupdate.xul
index 76d8da69a7a..e54aad2dd35 100644
--- a/mozilla/security/manager/pki/resources/content/pref-crlupdate.xul
+++ b/mozilla/security/manager/pki/resources/content/pref-crlupdate.xul
@@ -27,7 +27,6 @@
 
 <dialog id="crlUpdatePref" 
   title="&validation.crl.autoupdate.title;"
-  xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
   onload="onLoad();"
   buttons="accept,cancel,help"
diff --git a/mozilla/webshell/tests/viewer/samples/scrollbarTest2.xul b/mozilla/webshell/tests/viewer/samples/scrollbarTest2.xul
index b3cec65f08e..dbe10686b8a 100644
--- a/mozilla/webshell/tests/viewer/samples/scrollbarTest2.xul
+++ b/mozilla/webshell/tests/viewer/samples/scrollbarTest2.xul
@@ -4,7 +4,6 @@
 <!DOCTYPE window> 
 
 <window style="height: 100%; width: 100%;" 
-xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 <hbox style="width: 100%; height: 100%">
    <scrollbar orient="vertical"/>
diff --git a/mozilla/webshell/tests/viewer/samples/sliderTest1.xul b/mozilla/webshell/tests/viewer/samples/sliderTest1.xul
index 0d39e2202a4..671bf1d3a58 100644
--- a/mozilla/webshell/tests/viewer/samples/sliderTest1.xul
+++ b/mozilla/webshell/tests/viewer/samples/sliderTest1.xul
@@ -4,7 +4,6 @@
 <!DOCTYPE window> 
 
 <window style="height: 100%; width: 100%;" 
-xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"> 
 
 <slider orient="vertical" curpos="50">
diff --git a/mozilla/webshell/tests/viewer/samples/treeTest1.xul b/mozilla/webshell/tests/viewer/samples/treeTest1.xul
index ce49d612f50..b928aa8f742 100644
--- a/mozilla/webshell/tests/viewer/samples/treeTest1.xul
+++ b/mozilla/webshell/tests/viewer/samples/treeTest1.xul
@@ -41,25 +41,25 @@ A simple static tree view with things that can expand and collapse. Nothing fanc
 			<treechildren>
 				<treeitem>
 					<treerow>
-						<treecell><treeindentation/><html:img html:hspace="2" html:style="vertical-align: bottom" html:src="http://rava/~hyatt/PageRead.gif"/>Tinderbox</treecell>
+						<treecell><treeindentation/><html:img hspace="2" style="vertical-align: bottom" src="http://rava/~hyatt/PageRead.gif"/>Tinderbox</treecell>
 						<treecell><html:div>http://tinderbox.mozilla.org</html:div></treecell>  
 					</treerow>
 				</treeitem>
 				<treeitem>
 					<treerow>
-						<treecell><treeindentation/><html:img html:hspace="2" html:style="vertical-align: bottom" html:src="http://rava/~hyatt/PageRead.gif"/>Bonsai</treecell>
+						<treecell><treeindentation/><html:img hspace="2" style="vertical-align: bottom" src="http://rava/~hyatt/PageRead.gif"/>Bonsai</treecell>
 						<treecell><html:div>http://bonsai.mozilla.org</html:div></treecell>  
 					</treerow>
 				</treeitem>
 				<treeitem>
 					<treerow>
-						<treecell><treeindentation/><html:img html:hspace="2" html:style="vertical-align: bottom" html:src="http://rava/~hyatt/PageRead.gif"/>Mozilla.org</treecell>
+						<treecell><treeindentation/><html:img hspace="2" style="vertical-align: bottom" src="http://rava/~hyatt/PageRead.gif"/>Mozilla.org</treecell>
 						<treecell><html:div>http://www.mozilla.org</html:div></treecell>  
 					</treerow>
 				</treeitem>
 				<treeitem>
 					<treerow>
-						<treecell><treeindentation/><html:img html:hspace="2" html:style="vertical-align: bottom" html:src="http://rava/~hyatt/PageRead.gif"/>Bugzilla</treecell>
+						<treecell><treeindentation/><html:img hspace="2" style="vertical-align: bottom" src="http://rava/~hyatt/PageRead.gif"/>Bugzilla</treecell>
 						<treecell><html:div>http://bugzilla.mozilla.org</html:div></treecell>  
 					</treerow>
 				</treeitem>
@@ -75,25 +75,25 @@ A simple static tree view with things that can expand and collapse. Nothing fanc
 			<treechildren>
 				<treeitem>
 					<treerow>
-						<treecell><treeindentation/><html:img html:hspace="2" html:style="vertical-align: bottom" html:src="http://rava/~hyatt/PageRead.gif"/>Tinderbox</treecell>
+						<treecell><treeindentation/><html:img hspace="2" style="vertical-align: bottom" src="http://rava/~hyatt/PageRead.gif"/>Tinderbox</treecell>
 						<treecell><html:div>http://tinderbox.mozilla.org</html:div></treecell>  
 					</treerow>
 				</treeitem>
 				<treeitem>
 					<treerow>
-						<treecell><treeindentation/><html:img html:hspace="2" html:style="vertical-align: bottom" html:src="http://rava/~hyatt/PageRead.gif"/>Bonsai</treecell>
+						<treecell><treeindentation/><html:img hspace="2" style="vertical-align: bottom" src="http://rava/~hyatt/PageRead.gif"/>Bonsai</treecell>
 						<treecell><html:div>http://bonsai.mozilla.org</html:div></treecell>  
 					</treerow>
 				</treeitem>
 				<treeitem>
 					<treerow>
-						<treecell><treeindentation/><html:img html:hspace="2" html:style="vertical-align: bottom" html:src="http://rava/~hyatt/PageRead.gif"/>Mozilla.org</treecell>
+						<treecell><treeindentation/><html:img hspace="2" style="vertical-align: bottom" src="http://rava/~hyatt/PageRead.gif"/>Mozilla.org</treecell>
 						<treecell><html:div>http://www.mozilla.org</html:div></treecell>  
 					</treerow>
 				</treeitem>
 				<treeitem>
 					<treerow>
-						<treecell><treeindentation/><html:img html:hspace="2" html:style="vertical-align: bottom" html:src="http://rava/~hyatt/PageRead.gif"/>Bugzilla</treecell>
+						<treecell><treeindentation/><html:img hspace="2" style="vertical-align: bottom" src="http://rava/~hyatt/PageRead.gif"/>Bugzilla</treecell>
 						<treecell><html:div>http://bugzilla.mozilla.org</html:div></treecell>  
 					</treerow>
 				</treeitem>
diff --git a/mozilla/xpfe/browser/resources/content/fastnav.xul b/mozilla/xpfe/browser/resources/content/fastnav.xul
index de64781f060..d8f43a827c7 100644
--- a/mozilla/xpfe/browser/resources/content/fastnav.xul
+++ b/mozilla/xpfe/browser/resources/content/fastnav.xul
@@ -32,7 +32,7 @@ Contributor(s): ______________________________________. -->
 %navigatorDTD;
 ]>
 
-<window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml"
+<window id="main-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         onload="Startup()" onunload="Shutdown()"
diff --git a/mozilla/xpfe/browser/resources/content/pageInfo.xul b/mozilla/xpfe/browser/resources/content/pageInfo.xul
index d21fbb09ac3..b0f54c2aa15 100644
--- a/mozilla/xpfe/browser/resources/content/pageInfo.xul
+++ b/mozilla/xpfe/browser/resources/content/pageInfo.xul
@@ -37,7 +37,7 @@
   %pageInfoDTD;
 ]>
 
-<window id="main-window" xmlns:html="http://www.w3.org/1999/xhtml"
+<window id="main-window"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   windowtype="Browser:page-info"
   onload="onLoadPageInfo()"
diff --git a/mozilla/xpfe/browser/samples/dexopenchrome.xul b/mozilla/xpfe/browser/samples/dexopenchrome.xul
index a2ffcc036be..0f1ccc2fdf2 100644
--- a/mozilla/xpfe/browser/samples/dexopenchrome.xul
+++ b/mozilla/xpfe/browser/samples/dexopenchrome.xul
@@ -4,7 +4,6 @@
 <!-- DO NOT LOCALIZE: this file is source documentation; not part of the build -->
 <!-- Sample interface for bringing up and passing parameters to a dialog -->
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         orient="horizontal"
         title = "Chrome Features Test">
 
diff --git a/mozilla/xpfe/browser/samples/widgets.xul b/mozilla/xpfe/browser/samples/widgets.xul
index dee1fad016d..3b9e38761f8 100644
--- a/mozilla/xpfe/browser/samples/widgets.xul
+++ b/mozilla/xpfe/browser/samples/widgets.xul
@@ -27,7 +27,6 @@
 <?xml-stylesheet href="chrome://navigator/skin/navigator.css" type="text/css"?> 
 
 <window id="openLocation"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
         style="width: 250px;"
diff --git a/mozilla/xpfe/components/autocomplete/test/autocomplete_test.xul b/mozilla/xpfe/components/autocomplete/test/autocomplete_test.xul
index e8042ce391c..d64319e767f 100644
--- a/mozilla/xpfe/components/autocomplete/test/autocomplete_test.xul
+++ b/mozilla/xpfe/components/autocomplete/test/autocomplete_test.xul
@@ -6,7 +6,6 @@
                    
 <window id="actest"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml"
         xmlns:nc="http://home.netscape.com/NC-rdf#"
     		orient="vertical"
         width="750"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul b/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
index 912333874d9..e36b61c452d 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -28,7 +28,6 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/preftree.dtd" >
 
 <overlay id="prefTreeOverlay"
-  xmlns:html="http://www.w3.org/1999/xhtml"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script>
diff --git a/mozilla/xpfe/components/search/resources/internetresults.xul b/mozilla/xpfe/components/search/resources/internetresults.xul
index 4a7a83c2a11..adb45e32bf3 100644
--- a/mozilla/xpfe/components/search/resources/internetresults.xul
+++ b/mozilla/xpfe/components/search/resources/internetresults.xul
@@ -7,7 +7,6 @@
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/search/internetresults.dtd">
 
 <page onload="onLoadInternetResults();"
-      xmlns:html="http://www.w3.org/1999/xhtml"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       title="&internetresults.title;"
diff --git a/mozilla/xpfe/components/search/resources/search-panel.xul b/mozilla/xpfe/components/search/resources/search-panel.xul
index fcc554f7199..6c8d5f53b5e 100644
--- a/mozilla/xpfe/components/search/resources/search-panel.xul
+++ b/mozilla/xpfe/components/search/resources/search-panel.xul
@@ -27,7 +27,6 @@
 
 <!DOCTYPE window SYSTEM "chrome://communicator/locale/search/search-panel.dtd" >
 <page id="searchPanel"
-      xmlns:html="http://www.w3.org/1999/xhtml"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       orient="vertical" onload="SearchPanelStartup();"
diff --git a/mozilla/xpfe/components/ucth/resources/helperAppDldProgress.xul b/mozilla/xpfe/components/ucth/resources/helperAppDldProgress.xul
index df5ddee166d..5b422cce283 100644
--- a/mozilla/xpfe/components/ucth/resources/helperAppDldProgress.xul
+++ b/mozilla/xpfe/components/ucth/resources/helperAppDldProgress.xul
@@ -31,7 +31,7 @@ Contributor(s):
 
 <!DOCTYPE window SYSTEM "chrome://global/locale/downloadProgress.dtd">
 
-<window xmlns:html="http://www.w3.org/1999/xhtml"
+<window 
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         class="dialog"
         title="&downloadWindow.title;"
diff --git a/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
index bee173d0594..dcf2e7093d7 100644
--- a/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
@@ -24,7 +24,6 @@
 <!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
 
 <overlay id="platformDialogOverlay"
-             xmlns:html="http://www.w3.org/1999/xhtml"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <hbox id="okCancelButtons">
diff --git a/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
index d88819d0476..bc02bca034d 100644
--- a/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
@@ -25,7 +25,6 @@
 <!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
 
 <overlay id="platformDialogOverlay"
-             xmlns:html="http://www.w3.org/1999/xhtml"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <hbox id="okCancelButtons">
diff --git a/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
index 35b09b2ecee..2e1751a1073 100644
--- a/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
@@ -24,7 +24,6 @@
 <!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
 
 <overlay id="platformDialogOverlay"
-             xmlns:html="http://www.w3.org/1999/xhtml"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <hbox id="okCancelButtons">
diff --git a/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
index 38648a0062b..7fd065e6076 100644
--- a/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
@@ -25,7 +25,6 @@
 <!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
 
 <overlay id="platformDialogOverlay"
-             xmlns:html="http://www.w3.org/1999/xhtml"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
   <hbox id="okCancelButtons">
diff --git a/mozilla/xpfe/test/winopen.xul b/mozilla/xpfe/test/winopen.xul
index f8df3f47e17..2b852cc6e83 100644
--- a/mozilla/xpfe/test/winopen.xul
+++ b/mozilla/xpfe/test/winopen.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?> <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <window 
-    xmlns:html="http://www.w3.org/1999/xhtml"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
 orient="vertical"
     height="300"
diff --git a/mozilla/xpinstall/res/content/updateNotification.xul b/mozilla/xpinstall/res/content/updateNotification.xul
index 04db465d06b..b6d31a32ad7 100644
--- a/mozilla/xpinstall/res/content/updateNotification.xul
+++ b/mozilla/xpinstall/res/content/updateNotification.xul
@@ -3,7 +3,6 @@
 <!DOCTYPE window SYSTEM "chrome://global/locale/updateNotification.dtd" >
 
 <overlay id="updateNotificationMenuID"
-xmlns:html="http://www.w3.org/1999/xhtml"
 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
 <script type="application/x-javascript">