Index: gnome-panel//applet.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/applet.c,v
retrieving revision 1.166
diff -p -u -5 -r1.166 applet.c
--- gnome-panel//applet.c	21 May 2002 08:00:07 -0000	1.166
+++ gnome-panel//applet.c	25 May 2002 09:17:35 -0000
@@ -189,11 +189,11 @@ applet_callback_callback(GtkWidget *widg
 	switch(menu->info->type) {
 	case APPLET_LAUNCHER:
 		if (strcmp (menu->name, "properties") == 0) {
 			launcher_properties (menu->info->data);
 		} else if (strcmp (menu->name, "help") == 0) {
-			panel_show_help ("launchers", NULL);
+			panel_show_help ("wgospanel.xml", "gospanel-16");
 		} else if (strcmp (menu->name, "help_on_app") == 0) {
 			Launcher * launcher = menu->info->data;
 			if (launcher->ditem != NULL) {
 				GError *error = NULL;
 				const char *docpath =
@@ -212,11 +212,11 @@ applet_callback_callback(GtkWidget *widg
 		if (strcmp (menu->name, "properties")==0) {
 			Drawer *drawer = menu->info->data;
 			g_assert(drawer);
 			panel_config(drawer->drawer);
 		} else if (strcmp (menu->name, "help") == 0) {
-			panel_show_help ("drawers", NULL);
+			panel_show_help ("wgospanel.xml", "gospanel-18");
 		}
 		break;
 	case APPLET_MENU:
 		if(strcmp(menu->name,"properties")==0)
 			menu_properties(menu->info->data);
@@ -226,14 +226,11 @@ applet_callback_callback(GtkWidget *widg
 				tmp[1] = "applications:/";
 				gnome_execute_async (g_get_home_dir (), 2, tmp);
 				g_free (tmp[0]);
 			}
 		} else if (strcmp (menu->name, "help") == 0) {
-			Menu *menu2 = menu->info->data;
-			char *page;
-			page = menu2->main_menu ? "mainmenu" : "menus";
-			panel_show_help (page, NULL);
+			panel_show_help ("wgospanel.xml", "gospanel-37");
 		}
 		break;
 	case APPLET_LOCK: {
                 /*
 		  <jwz> Activate Screensaver
@@ -247,11 +244,11 @@ applet_callback_callback(GtkWidget *widg
 		  <jwz> and "xscreensaver-demo"
 		*/
 		char *command = NULL;
 		gboolean freeit = FALSE;
 		if (strcmp (menu->name, "help") == 0)
-			panel_show_help ("specialobjects", "LOCKBUTTON");
+			panel_show_help ("wgospanel.xml", "gospanel-21");
 		else if (strcmp (menu->name, "restart") == 0) {
 			command = "xscreensaver-command -exit ; xscreensaver &";
 		} else if (strcmp (menu->name, "prefs") == 0) {
 			command = "xscreensaver-demo";
 		} else {
@@ -265,11 +262,11 @@ applet_callback_callback(GtkWidget *widg
 			g_free (command);
 		break;
 	}
 	case APPLET_LOGOUT:
 		if (strcmp (menu->name, "help") == 0)
-			panel_show_help ("specialobjects", "LOGOUTBUTTON");
+			panel_show_help ("wgospanel.xml", "gospanel-20");
 		break;
 	case APPLET_BONOBO:
 		/*
 		 * Applet's menu's are handled differently
 		 */
Index: gnome-panel//gnome-run.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/gnome-run.c,v
retrieving revision 1.103
diff -p -u -5 -r1.103 gnome-run.c
--- gnome-panel//gnome-run.c	23 May 2002 14:33:05 -0000	1.103
+++ gnome-panel//gnome-run.c	25 May 2002 09:17:37 -0000
@@ -276,11 +276,11 @@ run_dialog_response (GtkWidget *w, int r
 	char **envv = NULL;
 	int envc;
 	GError *error = NULL;
 
 	if (response == GTK_RESPONSE_HELP) {
-		panel_show_help ("specialobjects", "RUNBUTTON");
+		panel_show_help ("wgoseditmainmenu.xml", "gospanel-23");
 		/* just return as we don't want to close */
 		return;
 	} else if (response != PANEL_RESPONSE_RUN) {
 		goto return_and_close;
 	}
Index: gnome-panel//launcher.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/launcher.c,v
retrieving revision 1.201
diff -p -u -5 -r1.201 launcher.c
--- gnome-panel//launcher.c	23 May 2002 14:33:05 -0000	1.201
+++ gnome-panel//launcher.c	25 May 2002 09:17:37 -0000
@@ -529,11 +529,11 @@ static void
 window_response (GtkWidget *w, int response, gpointer data)
 {
 	Launcher *launcher = data;
 
 	if (response == GTK_RESPONSE_HELP) {
-		panel_show_help ("launchers", NULL);
+		panel_show_help ("wgospanel.xml", "gospanel-52");
 	} else if (response == REVERT_BUTTON) { /* revert */
 		if (launcher->ditem != NULL)
 			gnome_desktop_item_unref (launcher->ditem);
 		launcher->ditem = gnome_desktop_item_copy (launcher->revert_ditem);
 
@@ -742,11 +742,11 @@ really_add_launcher (GtkWidget *dialog, 
 		if (launcher != NULL)
 			launcher_hoard (launcher);
 
 		panel_config_sync_schedule ();
 	} else if (response == GTK_RESPONSE_HELP) {
-		panel_show_help ("launchers", "LAUNCHERS");
+		panel_show_help ("wgospanel.xml", "gospanel-52");
 		/* just return as we don't want to close */
 		return;
 	}
 
 	gtk_widget_destroy (dialog);
Index: gnome-panel//menu-ditem.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/menu-ditem.c,v
retrieving revision 1.10
diff -p -u -5 -r1.10 menu-ditem.c
--- gnome-panel//menu-ditem.c	22 May 2002 17:24:43 -0000	1.10
+++ gnome-panel//menu-ditem.c	25 May 2002 09:17:37 -0000
@@ -24,11 +24,11 @@ ditem_properties_clicked (GtkWidget *w, 
 {
 	GnomeDItemEdit *dee = g_object_get_data (G_OBJECT (w), "GnomeDItemEdit");
 	GnomeDesktopItem *ditem = data;
 
 	if (response == GTK_RESPONSE_HELP) {
-		panel_show_help ("launchers", NULL);
+		panel_show_help ("wgospanel.xml", "gospanel-16");
 	} else if (response == REVERT_BUTTON) {
 		if (ditem != NULL)
 			gnome_ditem_edit_set_ditem (dee, ditem);
 		else
 			gnome_ditem_edit_clear (dee);
Index: gnome-panel//menu-properties.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/menu-properties.c,v
retrieving revision 1.59
diff -p -u -5 -r1.59 menu-properties.c
--- gnome-panel//menu-properties.c	12 Mar 2002 12:41:42 -0000	1.59
+++ gnome-panel//menu-properties.c	25 May 2002 09:17:38 -0000
@@ -343,14 +343,11 @@ dialog_response (GtkWidget *dialog, int 
 	Menu *menu = data;
 
 	if (response == GTK_RESPONSE_CLOSE) {
 		gtk_widget_destroy (dialog);
 	} else if (response == GTK_RESPONSE_HELP) {
-		if (GTK_TOGGLE_BUTTON (menu->dialog_info->main_menu)->active)
-			panel_show_help ("mainmenu", "MAINMENUCONFIG");
-		else
-			panel_show_help ("menus", NULL);
+			panel_show_help ("wgospanel.xml", "gospanel-37");
 	}
 }
 
 static GtkWidget *
 create_properties_dialog (Menu *menu)
Index: gnome-panel//menu.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/menu.c,v
retrieving revision 1.579
diff -p -u -5 -r1.579 menu.c
--- gnome-panel//menu.c	23 May 2002 14:33:05 -0000	1.579
+++ gnome-panel//menu.c	25 May 2002 09:17:41 -0000
@@ -3244,11 +3244,11 @@ setup_remove_this_panel(GtkWidget *menu,
 }
 
 static void
 show_panel_help (GtkWidget *w, gpointer data)
 {
-	panel_show_help ("panel", NULL);
+	panel_show_help ("wgospanel.xml", "gospanel-5");
 }
 
 static void
 make_panel_submenu (GtkWidget *menu, gboolean fake_submenus, gboolean is_basep)
 {
Index: gnome-panel//panel-config.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-config.c,v
retrieving revision 1.154
diff -p -u -5 -r1.154 panel-config.c
--- gnome-panel//panel-config.c	12 Apr 2002 22:13:51 -0000	1.154
+++ gnome-panel//panel-config.c	25 May 2002 09:17:42 -0000
@@ -1521,11 +1521,11 @@ window_response (GtkWidget *w, int respo
 		int tab;
 
 		tab = gtk_notebook_get_current_page (GTK_NOTEBOOK (notebook));
 
 		if (tab == 1)
-			panel_show_help ("panelproperties", "PANELBACKTAB");
+			panel_show_help ("wgospanel.xml", "gospanel-28");
 		else
 			panel_show_help (help_path, help_linkid);
 	} else {
 		gtk_widget_destroy (w);
 	}
@@ -1600,45 +1600,45 @@ panel_config (GtkWidget *panel)
 	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (ppc->config_window)->vbox),
 			    prop_nbook, TRUE, TRUE, 0);
 
 	if(EDGE_IS_WIDGET(panel)) {
 		/* edge notebook page */
-		help_path = "panelproperties";
-		help_linkid = "EDGETAB";
+		help_path = "wgospanel.xml";
+		help_linkid = "gospanel-28";
 		page = edge_notebook_page(ppc);
 		ppc->type_tab = gtk_event_box_new();
 		gtk_container_add(GTK_CONTAINER(ppc->type_tab), page);
 		ppc->type_tab_label = gtk_label_new (_("Edge panel"));
 		gtk_notebook_append_page(GTK_NOTEBOOK(prop_nbook),
 					 ppc->type_tab,
 					 ppc->type_tab_label);
 	} else if(ALIGNED_IS_WIDGET(panel)) {
 		/* aligned notebook page */
-		help_path = "panelproperties";
-		help_linkid = "EDGETAB";
+		help_path = "wgospanel.xml";
+		help_linkid = "gospanel-28";
 		page = aligned_notebook_page(ppc);
 		ppc->type_tab = gtk_event_box_new();
 		gtk_container_add(GTK_CONTAINER(ppc->type_tab), page);
 		ppc->type_tab_label = gtk_label_new (_("Corner panel"));
 		gtk_notebook_append_page(GTK_NOTEBOOK(prop_nbook),
 					 ppc->type_tab,
 					 ppc->type_tab_label);
 	} else if(SLIDING_IS_WIDGET(panel)) {
 		/* sliding notebook page */
-		help_path = "panelproperties";
-		help_linkid = "EDGETAB";
+		help_path = "wgospanel.xml";
+		help_linkid = "gospanel-28";
 		page = sliding_notebook_page(ppc);
 		ppc->type_tab = gtk_event_box_new();
 		gtk_container_add(GTK_CONTAINER(ppc->type_tab), page);
 		ppc->type_tab_label = gtk_label_new (_("Sliding panel"));
 		gtk_notebook_append_page(GTK_NOTEBOOK (prop_nbook),
 					 ppc->type_tab,
 					 ppc->type_tab_label);
 	} else if(FLOATING_IS_WIDGET(panel)) {
 		/* floating notebook page */
-		help_path = "panelproperties";
-		help_linkid = "EDGETAB";
+		help_path = "wgospanel.xml";
+		help_linkid = "gospanel-28";
 		page = floating_notebook_page(ppc);
 		ppc->type_tab = gtk_event_box_new();
 		gtk_container_add(GTK_CONTAINER(ppc->type_tab), page);
 		ppc->type_tab_label = gtk_label_new (_("Floating panel"));
 		gtk_notebook_append_page(GTK_NOTEBOOK (prop_nbook),
@@ -1648,12 +1648,12 @@ panel_config (GtkWidget *panel)
 		BasePWidget *basep = BASEP_WIDGET(panel);
 		GtkWidget *applet = PANEL_WIDGET(basep->panel)->master_widget;
 		AppletInfo *info =
 			g_object_get_data (G_OBJECT (applet), "applet_info");
 		add_drawer_properties_page(ppc, GTK_NOTEBOOK (prop_nbook), info->data);
-		help_path = "drawers";
-		help_linkid = NULL;
+		help_path = "wgospanel.xml";
+		help_linkid = "gospanel-550";
 		/* we can't change to/from drawers anyhow */
 		ppc->type_tab = NULL;
  	}
 
 	/* Backing configuration */
Index: gnome-panel//panel-util.c
===================================================================
RCS file: /cvs/gnome/gnome-panel/gnome-panel/panel-util.c,v
retrieving revision 1.109
diff -p -u -5 -r1.109 panel-util.c
--- gnome-panel//panel-util.c	21 May 2002 00:02:28 -0000	1.109
+++ gnome-panel//panel-util.c	25 May 2002 09:17:43 -0000
@@ -42,11 +42,11 @@ extern GSList *applets;
 void
 panel_show_help (const char *doc_name, const char *linkid)
 {
 	GError *error = NULL;
 
-	if (!gnome_help_display_desktop (NULL, "panel", doc_name, linkid, &error)) {
+	if (!gnome_help_display_desktop (NULL, "user-guide", doc_name, linkid, &error)) {
 		panel_error_dialog ("cannot_show_help",
 				    _("<b>Cannot display help document</b>\n\n"
 				      "Details: %s"), error != NULL ? error->message : "");
 		g_clear_error (&error);
 	}
