Index: evolution/ui/evolution.xml
===================================================================
--- evolution/ui/evolution.xml	(Revision 34557)
+++ evolution/ui/evolution.xml	(Arbeitskopie)
@@ -39,6 +39,9 @@
     <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"
      pixtype="pixbuf"/>
@@ -159,11 +162,9 @@
 
       <separator f="" name="eshell2"/>
 
-      <!-- <menuitem name="HelpFAQ" verb=""
+      <menuitem name="HelpFAQ" verb=""
 	_label="Evolution _FAQ"/> 
 
-      <separator/> -->
-
       <menuitem name="HelpSubmitBug" verb=""
 	_label="Submit _Bug Report"/>
 
Index: evolution/shell/e-shell-window-commands.c
===================================================================
--- evolution/shell/e-shell-window-commands.c	(Revision 34557)
+++ evolution/shell/e-shell-window-commands.c	(Arbeitskopie)
@@ -679,19 +679,21 @@
 		NULL);
 }
 
-#if 0
-/* Unused */
 static void
-command_help_faq (BonoboUIComponent *uih,
+command_open_faq (BonoboUIComponent *uih,
 		  EShellWindow *window,
-		  const char *path)
+ 		  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
+ 	GError *error = NULL;
 
+	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);
+ 	}
+ }
+
 static void
 command_quick_reference (BonoboUIComponent *uih,
 			 EShellWindow *window,
@@ -837,6 +839,7 @@
 
 static BonoboUIVerb help_verbs [] = {
 	BONOBO_UI_VERB ("QuickReference", (BonoboUIVerbFn) command_quick_reference),
+	BONOBO_UI_VERB ("HelpOpenFAQ", (BonoboUIVerbFn) command_open_faq),
 	BONOBO_UI_VERB ("HelpSubmitBug", (BonoboUIVerbFn) command_submit_bug),
 	BONOBO_UI_VERB ("HelpAbout", (BonoboUIVerbFn) command_about),
 
Index: evolution/ui/ChangeLog
===================================================================
--- evolution/ui/ChangeLog	(Revision 34557)
+++ evolution/ui/ChangeLog	(Arbeitskopie)
@@ -1,3 +1,10 @@
+2007-11-20  Andre Klapper  <a9016009@gmx.de>
+
+	** Fixes bug #497810
+
+	* evolution.xml:
+	add "Evolution FAQ" help menu item
+
 2007-11-10  Michael Monreal  <mmonreal@svn.gnome.org>
 
 	** Fix for bug #209425
Index: evolution/shell/ChangeLog
===================================================================
--- evolution/shell/ChangeLog	(Revision 34557)
+++ evolution/shell/ChangeLog	(Arbeitskopie)
@@ -1,3 +1,10 @@
+2007-11-20  Andre Klapper  <a9016009@gmx.de>
+
+	** Fixes bug #497810
+
+	* e-shell-window-commands.c:
+	add "Evolution FAQ" help menu item
+
 2007-11-02  Damien Carbery  <damien.carbery@sun.com>
 
 	** Fixes bug #492058
