diff --git a/ChangeLog b/ChangeLog
index b36238b9e..98fe57e27 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,18 @@
 2003-12-02  Alex Roitman  <shura@alex.neuro.umn.edu>
 	* src/gramps.desktop: Add russian strings. Set encoding line to UTF-8.
+	* src/gramps_main.py (on_faq_activate): Switch Help->FAQ function 
+        to displaying the manual's appendix in yelp.
+	* src/gramps.glade: Remove FAQ window. 
+	* doc/gramps-manual/C/cmdline.xml,
+	doc/gramps-manual/C/gramps-manual.xml,
+	doc/gramps-manual/C/custom.xml,
+	doc/gramps-manual/C/keybind.xml,
+	doc/gramps-manual/C/faq.xml,   
+	doc/gramps-manual/C/legal.xml,
+	doc/gramps-manual/C/filtref.xml,
+	doc/gramps-manual/C/mainwin.xml,
+	doc/gramps-manual/C/getstart.xml, 
+	doc/gramps-manual/C/usage.xml: Add copyright info to header.
 
 2003-12-02  Tim Waugh  <twaugh@redhat.com>
 	* gramps.spec.in: Add more docs.
diff --git a/doc/gramps-manual/C/cmdline.xml b/doc/gramps-manual/C/cmdline.xml
index 3e581b93e..7ae0c00d5 100644
--- a/doc/gramps-manual/C/cmdline.xml
+++ b/doc/gramps-manual/C/cmdline.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	  User Manual for Gramps - a GTK+/GNOME based genealogy program
+
+	  Copyright (C) 2003  Alexander Roitman
+
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts. 
+          A copy of the license is included in the file COPYING-DOCS 
+          distributed with this manual.
+-->
+
+<!-- $Id$ -->
+
       <!-- =============== Appendices Subsection ================ -->
   <sect2 id="append-cmdline">
   <title>Command line reference</title>
diff --git a/doc/gramps-manual/C/custom.xml b/doc/gramps-manual/C/custom.xml
index 896b1be2d..d0510ffd2 100644
--- a/doc/gramps-manual/C/custom.xml
+++ b/doc/gramps-manual/C/custom.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+	  User Manual for Gramps - a GTK+/GNOME based genealogy program
+
+	  Copyright (C) 2003  Alexander Roitman
+
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts. 
+          A copy of the license is included in the file COPYING-DOCS 
+          distributed with this manual.
+-->
+
 <!-- $Id$ -->
 
 <!-- ================ Customization ================================ -->
diff --git a/doc/gramps-manual/C/faq.xml b/doc/gramps-manual/C/faq.xml
index af1e6a6d8..37853cc96 100644
--- a/doc/gramps-manual/C/faq.xml
+++ b/doc/gramps-manual/C/faq.xml
@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+	  User Manual for Gramps - a GTK+/GNOME based genealogy program
+
+	  Copyright (C) 2003  Alexander Roitman
+
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts. 
+          A copy of the license is included in the file COPYING-DOCS 
+          distributed with this manual.
+-->
 
 <!-- $Id$ -->
 
@@ -250,22 +263,24 @@ bug</guimenuitem></menuchoice> from gramps main menu). </para>
 <itemizedlist>
 
 <listitem><para>   
-1. Version of gramps you were using when you encountered the bug 
+Version of gramps you were using when you encountered the bug 
 (available through <menuchoice><guisubmenu>Help</guisubmenu>
 <guimenuitem>About</guimenuitem></menuchoice> menu item).
 </para></listitem>
 
 <listitem><para>
-2. Language under which gramps was run
-(available by executing <command>echo $LANG</command> in your terminal).
+Language under which gramps was run
+(available by executing </para>
+   <para><command>echo $LANG</command></para>
+<para>in your terminal).
 </para></listitem>
 
 <listitem><para>
-3. Symptoms indicating that this is indeed a bug.
+Symptoms indicating that this is indeed a bug.
 </para></listitem>
 
 <listitem><para>
-4. Any Traceback messages, error messages, warnings, etc, 
+Any Traceback messages, error messages, warnings, etc, 
 that showed up in your terminal or a in separate traceback window.
 </para></listitem>
 
diff --git a/doc/gramps-manual/C/filtref.xml b/doc/gramps-manual/C/filtref.xml
index 0581d9d6b..a4f91847e 100644
--- a/doc/gramps-manual/C/filtref.xml
+++ b/doc/gramps-manual/C/filtref.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+	  User Manual for Gramps - a GTK+/GNOME based genealogy program
+
+	  Copyright (C) 2003  Alexander Roitman
+
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts. 
+          A copy of the license is included in the file COPYING-DOCS 
+          distributed with this manual.
+-->
+
 <!-- $Id$ -->
 
       <!-- =============== Appendices Subsection ================ -->
diff --git a/doc/gramps-manual/C/getstart.xml b/doc/gramps-manual/C/getstart.xml
index df6672df0..d204d8403 100644
--- a/doc/gramps-manual/C/getstart.xml
+++ b/doc/gramps-manual/C/getstart.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	  User Manual for Gramps - a GTK+/GNOME based genealogy program
+
+	  Copyright (C) 2003  Alexander Roitman
+
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts. 
+          A copy of the license is included in the file COPYING-DOCS 
+          distributed with this manual.
+-->
+
 <!-- =========== Getting Started ============================== -->
 
   <sect1 id="gramps-getting-started"> 
diff --git a/doc/gramps-manual/C/gramps-manual.xml b/doc/gramps-manual/C/gramps-manual.xml
index 944d54824..fb7a34d95 100644
--- a/doc/gramps-manual/C/gramps-manual.xml
+++ b/doc/gramps-manual/C/gramps-manual.xml
@@ -1,5 +1,21 @@
 <?xml version="1.0"?>
+
+<!--
+	  User Manual for Gramps - a GTK+/GNOME based genealogy program
+
+	  Copyright (C) 2003  Alexander Roitman
+
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts. 
+          A copy of the license is included in the file COPYING-DOCS 
+          distributed with this manual.
+-->
+
 <!-- $Id$ -->
+
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
   <!ENTITY legal SYSTEM "legal.xml">
diff --git a/doc/gramps-manual/C/keybind.xml b/doc/gramps-manual/C/keybind.xml
index 864ca0fe7..9fc28a059 100644
--- a/doc/gramps-manual/C/keybind.xml
+++ b/doc/gramps-manual/C/keybind.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+	  User Manual for Gramps - a GTK+/GNOME based genealogy program
+
+	  Copyright (C) 2003  Alexander Roitman
+
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts. 
+          A copy of the license is included in the file COPYING-DOCS 
+          distributed with this manual.
+-->
+
 <!-- $Id$ -->
 
       <!-- =============== Appendices Subsection ================ -->
diff --git a/doc/gramps-manual/C/mainwin.xml b/doc/gramps-manual/C/mainwin.xml
index baf5b2f2d..272d50cf4 100644
--- a/doc/gramps-manual/C/mainwin.xml
+++ b/doc/gramps-manual/C/mainwin.xml
@@ -1,4 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+	  User Manual for Gramps - a GTK+/GNOME based genealogy program
+
+	  Copyright (C) 2003  Alexander Roitman
+
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts. 
+          A copy of the license is included in the file COPYING-DOCS 
+          distributed with this manual.
+-->
+
 <!-- $Id$ -->
 
 <!-- ================ Main Window ================================ -->
diff --git a/doc/gramps-manual/C/usage.xml b/doc/gramps-manual/C/usage.xml
index 86736932a..5d487187d 100644
--- a/doc/gramps-manual/C/usage.xml
+++ b/doc/gramps-manual/C/usage.xml
@@ -1,5 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!--
+	  User Manual for Gramps - a GTK+/GNOME based genealogy program
+
+	  Copyright (C) 2003  Alexander Roitman
+
+	  Permission is granted to copy, distribute and/or modify this
+	  document under the terms of the GNU Free Documentation
+	  License (GFDL), Version 1.1 or any later version published
+	  by the Free Software Foundation with no Invariant Sections,
+	  no Front-Cover Texts, and no Back-Cover Texts. 
+          A copy of the license is included in the file COPYING-DOCS 
+          distributed with this manual.
+-->
+
 <!-- $Id$ -->
 
 <!-- ================ Usage ================================ -->
diff --git a/src/gramps.glade b/src/gramps.glade
index 7156583f6..b196e42d2 100644
--- a/src/gramps.glade
+++ b/src/gramps.glade
@@ -8005,85 +8005,4 @@
   </child>
 </widget>
 
-<widget class="GtkWindow" id="faq">
-  <property name="width_request">650</property>
-  <property name="height_request">400</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">FAQ - GRAMPS</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon">gramps.xpm</property>
-
-  <child>
-    <widget class="GtkVBox" id="vbox78">
-      <property name="visible">True</property>
-      <property name="homogeneous">False</property>
-      <property name="spacing">0</property>
-
-      <child>
-	<widget class="GtkScrolledWindow" id="scrolledwindow77">
-	  <property name="border_width">6</property>
-	  <property name="visible">True</property>
-	  <property name="can_focus">True</property>
-	  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-	  <property name="shadow_type">GTK_SHADOW_IN</property>
-	  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	  <child>
-	    <widget class="GtkTextView" id="faq_view">
-	      <property name="visible">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="editable">False</property>
-	      <property name="justification">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap_mode">GTK_WRAP_NONE</property>
-	      <property name="cursor_visible">True</property>
-	      <property name="pixels_above_lines">0</property>
-	      <property name="pixels_below_lines">0</property>
-	      <property name="pixels_inside_wrap">0</property>
-	      <property name="left_margin">0</property>
-	      <property name="right_margin">0</property>
-	      <property name="indent">0</property>
-	      <property name="text" translatable="yes"></property>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">True</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-
-      <child>
-	<widget class="GtkHButtonBox" id="hbuttonbox33">
-	  <property name="visible">True</property>
-	  <property name="layout_style">GTK_BUTTONBOX_END</property>
-	  <property name="spacing">0</property>
-
-	  <child>
-	    <widget class="GtkButton" id="button168">
-	      <property name="visible">True</property>
-	      <property name="can_default">True</property>
-	      <property name="can_focus">True</property>
-	      <property name="label">gtk-close</property>
-	      <property name="use_stock">True</property>
-	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <signal name="clicked" handler="on_faq_close_clicked" object="faq" last_modification_time="Wed, 26 Nov 2003 18:10:30 GMT"/>
-	    </widget>
-	  </child>
-	</widget>
-	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
-	  <property name="fill">True</property>
-	</packing>
-      </child>
-    </widget>
-  </child>
-</widget>
-
 </glade-interface>
diff --git a/src/gramps_main.py b/src/gramps_main.py
index 5ef09cb30..1317aa3be 100755
--- a/src/gramps_main.py
+++ b/src/gramps_main.py
@@ -842,19 +842,7 @@ class Gramps:
 
     def on_faq_activate(self,obj):
         """Display FAQ"""
-        faqtop = gtk.glade.XML(const.gladeFile, "faq", "faq")
-        faqWindow = faqtop.get_widget("faq")
-	faqView = faqtop.get_widget("faq_view")
-        faqtop.signal_autoconnect({
-            "on_faq_close_clicked" : Utils.destroy_passed_object
-	})
-	# FIXME: filename is bogus, waiting for install policy decision
-	faq_file = open('/home/shura/gramps2/FAQ')
-	faq_text = faq_file.read()
-	faq_file.close()
-	faq_buffer = faqView.get_buffer()
-        faq_buffer.set_text(faq_text)
-	faqWindow.show()
+        gnome.help_display('gramps-manual','faq')
 
     def on_new_clicked(self,obj):
         """Prompt for permission to close the current database"""