From ae3ed65d262a5cd647073eb4cac831c789fd2be2 Mon Sep 17 00:00:00 2001
From: "ben%netscape.com" <ben%netscape.com>
Date: Sun, 30 Apr 2000 08:03:24 +0000
Subject: [PATCH] remove need for dup navigator.dtd files in mozilla/commercial
 trees

---
 xpfe/browser/resources/content/navigator.xul        | 7 ++++++-
 xpfe/browser/resources/content/navigatorOverlay.xul | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/xpfe/browser/resources/content/navigator.xul b/xpfe/browser/resources/content/navigator.xul
index 8e8b68fd9ad..48eaaa16451 100644
--- a/xpfe/browser/resources/content/navigator.xul
+++ b/xpfe/browser/resources/content/navigator.xul
@@ -29,7 +29,12 @@ Contributor(s): ______________________________________. -->
 <?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/NavSecurityOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://navigator/locale/navigator.dtd" >
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
+%navigatorDTD;
+]>
 
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/xpfe/browser/resources/content/navigatorOverlay.xul b/xpfe/browser/resources/content/navigatorOverlay.xul
index fefad87d7e2..54730c7e174 100644
--- a/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -22,7 +22,12 @@ Contributor(s): ______________________________________. -->
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://navigator/locale/navigator.dtd" >
+<!DOCTYPE window [
+<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
+%brandDTD;
+<!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
+%navigatorDTD;
+]>
 
 <overlay id="navigatorOverlay"
          xmlns:html="http://www.w3.org/TR/REC-html40"