Index: evolution/shell/e-shell-window-commands.c
===================================================================
--- evolution/shell/e-shell-window-commands.c	(Revision 34542)
+++ evolution/shell/e-shell-window-commands.c	(Arbeitskopie)
@@ -124,24 +124,15 @@
 }
 
 static void
-command_submit_bug (BonoboUIComponent *uih,
+command_open_faq (BonoboUIComponent *uih,
 		    EShellWindow *window,
 		    const char *path)
 {
-	gchar *command_line;
 	GError *error = NULL;
-
-        command_line = "bug-buddy --sm-disable --package=Evolution";
-
-	g_debug ("Spawning: %s", command_line);
-
-	if (!g_spawn_command_line_async (command_line, &error)) {
-		if (error->code == G_SPAWN_ERROR_NOENT)
-			e_notice (NULL, GTK_MESSAGE_ERROR,
-				_("Bug buddy is not installed."));
-		else
-			e_notice (NULL, GTK_MESSAGE_ERROR,
-				_("Bug buddy could not be run."));
+	gnome_url_show ("http://www.go-evolution.org/FAQ", &error);
+	if (error != NULL) {
+		e_notice (NULL, GTK_MESSAGE_ERROR,
+				_("Error opening the FAQ webpage."));
 		g_error_free (error);
 	}
 }
@@ -679,20 +670,7 @@
 		NULL);
 }
 
-#if 0
-/* Unused */
 static void
-command_help_faq (BonoboUIComponent *uih,
-		  EShellWindow *window,
-		  const char *path)
-{
-	/* FIXME Show when we have a faq */
-	/* FIXME use the error */
-	gnome_url_show ("http://gnome.org/projects/evolution/faq.shtml", NULL);
-}
-#endif
-
-static void
 command_quick_reference (BonoboUIComponent *uih,
 			 EShellWindow *window,
 			 const char *path)
@@ -837,7 +815,7 @@
 
 static BonoboUIVerb help_verbs [] = {
 	BONOBO_UI_VERB ("QuickReference", (BonoboUIVerbFn) command_quick_reference),
-	BONOBO_UI_VERB ("HelpSubmitBug", (BonoboUIVerbFn) command_submit_bug),
+	BONOBO_UI_VERB ("HelpOpenFAQ", (BonoboUIVerbFn) command_open_faq),
 	BONOBO_UI_VERB ("HelpAbout", (BonoboUIVerbFn) command_about),
 
 	BONOBO_UI_VERB_END
Index: evolution/ui/evolution.xml
===================================================================
--- evolution/ui/evolution.xml	(Revision 34542)
+++ evolution/ui/evolution.xml	(Arbeitskopie)
@@ -36,8 +36,7 @@
     <cmd name="ViewSideBar" _label="Show Side _Bar" type="toggle"
       _tip="View/Hide the Side Bar" state="1"/>
 
-    <cmd name="HelpSubmitBug" _label="Submit Bug Report"
-      _tip="Submit a bug report using Bug Buddy"/>
+    <cmd name="HelpOpenFAQ" _label="Evolution _FAQ" _tip="Open the Frequently Asked Questions webpage"/>
 
     <cmd name="SendReceive"
      _tip="Send queued items and retrieve new items"
@@ -159,14 +158,9 @@
 
       <separator f="" name="eshell2"/>
 
-      <!-- <menuitem name="HelpFAQ" verb=""
+      <menuitem name="HelpOpenFAQ" verb=""
 	_label="Evolution _FAQ"/> 
 
-      <separator/> -->
-
-      <menuitem name="HelpSubmitBug" verb=""
-	_label="Submit _Bug Report"/>
-
       <separator f="" name="eshell4"/>
 
       <menuitem name="HelpAbout" verb=""
Index: evolution/shell/ChangeLog
===================================================================
--- evolution/shell/ChangeLog	(Revision 34542)
+++ evolution/shell/ChangeLog	(Arbeitskopie)
@@ -1,3 +1,11 @@
+2007-11-18  Andre Klapper  <a9016009@gmx.de>
+
+	** Fixes bug #497810
+
+	* e-shell-window-commands.c:
+	add "Evolution FAQ" help menu item,
+	remove "Submit Bug Report" menu item
+
 2007-11-02  Damien Carbery  <damien.carbery@sun.com>
 
 	** Fixes bug #492058
Index: evolution/ui/ChangeLog
===================================================================
--- evolution/ui/ChangeLog	(Revision 34542)
+++ evolution/ui/ChangeLog	(Arbeitskopie)
@@ -1,3 +1,11 @@
+2007-11-18  Andre Klapper  <a9016009@gmx.de>
+
+	** Fixes bug #497810
+
+	* evolution.xml:
+	add "Evolution FAQ" help menu item,
+	remove "Submit Bug Report" menu item
+
 2007-11-10  Michael Monreal  <mmonreal@svn.gnome.org>
 
 	** Fix for bug #209425
