From 8c0427fe8cf0d8893d9d89fb638c9fdc4100e979 Mon Sep 17 00:00:00 2001
From: "matt%netscape.com"
 <matt%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 8 Sep 1999 00:07:42 +0000
Subject: [PATCH] Fixing help menu

git-svn-id: svn://10.0.0.236/trunk@46263 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../global/resources/content/globalOverlay.xul | 18 ++++++++++++++++++
 .../global/resources/locale/globalOverlay.dtd  | 14 ++++++++++++++
 2 files changed, 32 insertions(+)

diff --git a/mozilla/xpfe/global/resources/content/globalOverlay.xul b/mozilla/xpfe/global/resources/content/globalOverlay.xul
index e2e127c6ae7..26205883a37 100644
--- a/mozilla/xpfe/global/resources/content/globalOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/globalOverlay.xul
@@ -20,7 +20,25 @@
 	<!-- Help Menu -->
 	<menu id="helpMenu" value="&helpMenu.label;">
 	  <menupopup>
+		<menu value="&helpContentCmd.label;">
+			<menupopup>
+			  <menuitem value="&webBrowsingCmd.label;" oncommand="window.content.location.href='http://www.mozilla.org/projects/user-docs/local/browserhelp/navtop.html'"/>
+			  <menuitem value="&emailCmd.label;" oncommand="window.content.location.href='http://www.mozilla.org/projects/user-docs/local/mailhelp/mailtop.html'"/>
+			  <menuitem value="&internetShopCmd.label;" oncommand="window.content.location.href='http://www.mozilla.org/projects/user-docs/served/shophelp/shoptop.html'"/>
+			  <menuitem value="&customCmd.label;" oncommand="window.content.location.href='http://www.mozilla.org/projects/user-docs/served/custhelp/custtop.html'"/>
+			  <menuseparator/>
+			  <menuitem value="&softUpdatesCmd.label;" oncommand="window.content.location.href='http://www.mozilla.org/projects/user-docs/served/updatehelp/updatetop.html'"/>
+			  <menuitem value="&connProbCmd.label;" oncommand="window.content.location.href='http://www.mozilla.org/projects/user-docs/local/troubleshoot/troubletop.html'"/>
+			  <menuitem value="&secPrivCmd.label;" oncommand="window.content.location.href='http://home.netscape.com/security/basics/index.html'"/>
+			 </menupopup>
+		</menu>
 		<menuseparator/>
+		<menuitem value="&whatNewCmd.label;" oncommand="window.content.location.href='http://www.mozilla.org/projects/user-docs/served/whatsnew/newtop.html'"/>
+			  <menuitem value="&newTutorCmd.label;" oncommand="window.content.location.href='http://home.netscape.com/netcenter/newnet/index.html'"/>
+			  <menuitem value="&supportChannelCmd.label;" oncommand="window.content.location.href='http://home.netscape.com/support/index.html'"/>
+		<menuseparator/>
+			<menuitem value="&interUsersCmd.label;" oncommand="window.content.location.href='http://home.netscape.com/menu/intl/'"/>
+			  <menuitem value="&aboutCommCmd.label;" oncommand="window.content.location.href='about:'"/>
 			   
 
 
diff --git a/mozilla/xpfe/global/resources/locale/globalOverlay.dtd b/mozilla/xpfe/global/resources/locale/globalOverlay.dtd
index 187f4da7426..17e0f3565ac 100644
--- a/mozilla/xpfe/global/resources/locale/globalOverlay.dtd
+++ b/mozilla/xpfe/global/resources/locale/globalOverlay.dtd
@@ -18,3 +18,17 @@
 <!ENTITY aboutPluginsCmd.label				".About Plug-ins">  
 <!ENTITY aboutFontCmd.label					".About Font Displayers">  
 <!ENTITY aboutCmd.label						".About Communicator...">  
+
+
+<!ENTITY webBrowsingCmd.label			        "Web Browsing">  
+<!ENTITY emailCmd.label					"Email">  
+<!ENTITY internetShopCmd.label				"Internet Shopping">  
+<!ENTITY customCmd.label				"Customization">  
+<!ENTITY softUpdatesCmd.label				"Software Updates"> 
+<!ENTITY connProbCmd.label				"Connection Problems">  
+<!ENTITY secPrivCmd.label				"Security and Privacy">  
+<!ENTITY whatNewCmd.label				"What's New in 5.0">  
+<!ENTITY newTutorCmd.label				"New to Netscape Tutorial">  
+<!ENTITY supportChannelCmd.label			"Support Channel"> 
+<!ENTITY interUsersCmd.label				"International Users">  
+<!ENTITY aboutCommCmd.label				"About Communicator">