diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index fa07f571b..b5542207d 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-21  Alex Roitman  <shura@alex.neuro.umn.edu>
+	* src/plugins/book.glade: Minor improvements to the dialogs. 
+	* doc/gramps-manual/C/gramps-manual.xml: Update manual.
+
 2003-09-21  Don Allingham  <dallingham@users.sourceforge.net>
 	* src/AddrEdit.py: Fixed OK button callback
 
diff --git a/gramps2/doc/gramps-manual/C/gramps-manual.xml b/gramps2/doc/gramps-manual/C/gramps-manual.xml
index a660efeb6..c7de61a1c 100644
--- a/gramps2/doc/gramps-manual/C/gramps-manual.xml
+++ b/gramps2/doc/gramps-manual/C/gramps-manual.xml
@@ -2,9 +2,9 @@
 <!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">
-  <!ENTITY appversion "0.9.3">
-  <!ENTITY manrevision "2.2">
-  <!ENTITY date "July 2003">
+  <!ENTITY appversion "0.9.4">
+  <!ENTITY manrevision "2.3">
+  <!ENTITY date "September 2003">
   <!ENTITY app "<application>GRAMPS</application>">
   <!-- Information about the entities
        The legal.xml file contains legal information, there is no need to edit the file. 
@@ -98,6 +98,15 @@
       <revision> 
 		<revnumber>GRAMPS Manual V&manrevision;</revnumber> 
 		<date>&date;</date> 
+		<revdescription> 
+	  		<para role="author">Alex Roitman
+	    	<email>shura@alex.neuro.umn.edu</email>
+	  		</para>
+		</revdescription> 
+      </revision> 
+      <revision> 
+		<revnumber>GRAMPS Manual V2.2</revnumber> 
+		<date>July 2003</date> 
 		<revdescription> 
 	  		<para role="author">Alex Roitman
 	    	<email>shura@alex.neuro.umn.edu</email>
@@ -942,11 +951,22 @@
       <para>Exporting allows you to share any portion of your &app; database 
       with other researchers as well as to make your database completely 
       portable to another computer. Currently, &app; 
-      can export data  to three different formats: GEDCOM, &app; package, 
-      and CD. All of these are available as items of
+      can export data  to three different formats: CD, GEDCOM, &app; package, 
+      and Web Family Tree. All of these are available as items of
       <menuchoice><guimenu>File</guimenu>  
       <guisubmenu>Export</guisubmenu></menuchoice> submenu.</para>
 
+      <para>Exporting to CD will prepare you database directory with all its
+      contents to be recorded to the CD. This is done through the 
+      <guilabel>burn:///</guilabel> location in Nautilus. After exporting to 
+      CD, go to the <guilabel>burn:///</guilabel> location by  
+      selecting <menuchoice><guimenu>Go</guimenu>  
+      <guisubmenu>CD Creator</guisubmenu></menuchoice> in Nautilus menu. Your
+      database directory will show up. To record it onto the CD, click the CD
+      icon on the Nautilus toolbar, or select <menuchoice><guimenu>File</guimenu>  
+      <guisubmenu>Write to CD</guisubmenu></menuchoice> in Nautilus menu.
+      </para>
+
       <para>Exporting to GEDCOM will create a GEDCOM file, according to the
       settings set in the following dialog:</para>
       
@@ -962,17 +982,20 @@
 
       <para>Type the desired GEDCOM filename into the text entry box or
       click the <guibutton>Browse...</guibutton> button to evoke the  
-      <guilabel>Save File</guilabel> dialog. Use the <guilabel>Filter</guilabel>
-      pop-up menu to limit the scope of the export according to the stated rule. 
+      <guilabel>Save File</guilabel> dialog. 
       Choose the desired <guilabel>Encoding</guilabel> of the exported file. 
-      Use the <guilabel>Target</guilabel> to select the desired GEDCOM 
+      Use the <guilabel>Filter</guilabel>
+      pop-up menu to limit the scope of the export according to the stated rule. 
+      Use the <guilabel>Target</guilabel> menu to select the desired GEDCOM 
       dialect. Select your copyright statement from the 
       <guilabel>Copyright</guilabel> menu. Check <guilabel>Do not include
       records marked private</guilabel> to disable the output of private
       records. Check <guilabel>Restrict data on living people</guilabel>
       to limit living people's data to family ties. With this option, 
       information concerning birth, death, addresses, various events, 
-      etc. will be omitted in the exported GEDCOM file.
+      etc. will be omitted in the exported GEDCOM file. If this option is selected, 
+      you can further choose whether to use the word "Living" as first name, exclude
+      notes, and exclude sources for the living people. 
       </para>
 
       <para>Upon starting the export, &app; will 
@@ -997,15 +1020,11 @@
       by &app;.
       </para>
       
-      <para>Exporting to CD will prepare you database directory with all its
-      contents to be recorded to the CD. This is done through the 
-      <guilabel>burn:///</guilabel> location in Nautilus. After exporting to 
-      CD, go to the <guilabel>burn:///</guilabel> location by  
-      selecting <menuchoice><guimenu>Go</guimenu>  
-      <guisubmenu>CD Creator</guisubmenu></menuchoice> in Nautilus menu. Your
-      database directory will show up. To record it onto the CD, click the CD
-      icon on the Nautilus toolbar, or select <menuchoice><guimenu>File</guimenu>  
-      <guisubmenu>Write to CD</guisubmenu></menuchoice> in Nautilus menu.
+      <para>Exporting to Web Family Tree will create the text file suitable 
+      as an input for the WFT program. Use the <guilabel>Filter</guilabel>
+      pop-up menu to limit the scope of the export according to the stated rule.
+      Check <guilabel>Restrict data on living people</guilabel> to limit living 
+      people's data to family ties.
       </para>
 
       <para>If a media file is not found during export, the following dialog
@@ -2936,9 +2955,8 @@
 
 	<para> The Book Report creates a single document (i.e. a Book) 
         containing a collection of graphical and textual reports.
-        However, as of version &appversion; the Text reports are available 
-        for inclusion in books. Nevertheless, this allows for a very rich set 
-        of documents that &app; can produce. 
+        Consequently, this allows for a very rich set of documents 
+        that &app; can produce. 
         </para>
 
 	<para> When Book Report is selected, the following book configuration
@@ -2956,8 +2974,8 @@
 
 	<para> The <guilabel>Book name</guilabel> text entry field is used to
         save the book (a set of configured selections) for future use.
-        The pane on the left side lists the items available for inclusion in the 
-        book. The pane on the right side lists the currently selected items in
+        The pane on the left-hand side lists the items available for inclusion in the 
+        book. The pane on the right-hand side lists the currently selected items in
         the order they will appear in the book. </para>
         
 	<para> The top set of buttons between the panes operates on the 
@@ -2989,6 +3007,33 @@
         ancestors as separate chapters). By default, the center person is set to
         the active person. </para> 
 
+	<para>Almost all items available for inclusion in the book are textual 
+        or graphical reports, and are therefore available in the form of standalone 
+        reports. The exception is the following items which are only available as 
+        book items:</para>
+
+	<variablelist>
+
+	<varlistentry><term>Title Page</term>
+	<listitem><para>This item produces a customized Title page. You can 
+        configure the text of title, subtitle, and the footer of the page. 
+        An image can be optionally placed between the subtitle and the footer. 
+        Because of its configurability, this item can be used to create 
+        title pages for the whole book, its chapter, or even a single item. 
+        </para>
+        </listitem>
+	</varlistentry>
+
+ 	<varlistentry><term>Custom Text</term>
+	<listitem><para>This item produces a page with three paragraphs, each 
+        containing custom text. The appearance of the text can be adjusted by 
+        using custom styles. This item was meant to be used for epigraphs, 
+        dedications, explanations, notes, and so forth. 
+        </para></listitem>
+	</varlistentry>
+
+	</variablelist>
+
       </sect3>
 
       <!-- =============== Usage Sub-subsection ================ -->
@@ -3022,11 +3067,12 @@
 	individual (active person) or a set of individuals. The options 
 	for this report are broken down into contents, privacy, and advanced 
 	options. The contents options include the filter (determine the 
-	scope of the database to consider), number of generations to consider, 
-	destination directory for the images, and a link to the index page.
+	scope of the database to consider), 
+	destination directory for the images, an optional short ancestor tree, 
+        and a link to the index page.
 	Privacy options allow you to omit private records, restrict 
-	information on living people, to skip images (either all or only 
-        those of living people), and to omit comments and text in source 
+	information on living people, skip images (either all or only 
+        those of living people), and omit comments and text in source 
         information. Finally, the advanced options allow you to include 
         the optional &app; ID, create a GENDEX index, and specify the 
         extension of the resulting files. </para>
diff --git a/gramps2/src/plugins/book.glade b/gramps2/src/plugins/book.glade
index 81e5f6ccb..f3d35f98f 100644
--- a/gramps2/src/plugins/book.glade
+++ b/gramps2/src/plugins/book.glade
@@ -5,9 +5,9 @@
 <requires lib="gnome"/>
 
 <widget class="GtkWindow" id="top">
-  <property name="width_request">800</property>
+  <property name="width_request">860</property>
   <property name="visible">True</property>
-  <property name="title" translatable="no">Book</property>
+  <property name="title" translatable="yes">Book</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -23,7 +23,7 @@
       <child>
 	<widget class="GtkLabel" id="title">
 	  <property name="visible">True</property>
-	  <property name="label" translatable="no">title</property>
+	  <property name="label" translatable="yes">title</property>
 	  <property name="use_underline">False</property>
 	  <property name="use_markup">False</property>
 	  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -88,7 +88,7 @@
 		  <property name="activates_default">False</property>
 		</widget>
 		<packing>
-		  <property name="padding">0</property>
+		  <property name="padding">6</property>
 		  <property name="expand">True</property>
 		  <property name="fill">True</property>
 		</packing>
@@ -121,10 +121,34 @@
 	  <property name="row_spacing">0</property>
 	  <property name="column_spacing">0</property>
 
+	  <child>
+	    <widget class="GtkLabel" id="book_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">book_label</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">True</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">False</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0</property>
+	      <property name="xpad">12</property>
+	      <property name="ypad">6</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">2</property>
+	      <property name="right_attach">3</property>
+	      <property name="top_attach">0</property>
+	      <property name="bottom_attach">1</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
 	  <child>
 	    <widget class="GtkLabel" id="avail_label">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="no">avail_label</property>
+	      <property name="label" translatable="yes">avail_label</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">True</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -145,94 +169,6 @@
 	    </packing>
 	  </child>
 
-	  <child>
-	    <widget class="GtkLabel" id="book_label">
-	      <property name="visible">True</property>
-	      <property name="label" translatable="no">book_label</property>
-	      <property name="use_underline">True</property>
-	      <property name="use_markup">True</property>
-	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-	      <property name="wrap">False</property>
-	      <property name="selectable">False</property>
-	      <property name="xalign">0</property>
-	      <property name="yalign">0</property>
-	      <property name="xpad">12</property>
-	      <property name="ypad">6</property>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">0</property>
-	      <property name="bottom_attach">1</property>
-	      <property name="x_options">fill</property>
-	      <property name="y_options"></property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="a_scrolledwindow">
-	      <property name="width_request">41</property>
-	      <property name="height_request">60</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="GtkTreeView" id="avail_tree">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">True</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">0</property>
-	      <property name="right_attach">1</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">24</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
-	  <child>
-	    <widget class="GtkScrolledWindow" id="b_scrolledwindow">
-	      <property name="width_request">41</property>
-	      <property name="height_request">60</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_ETCHED_IN</property>
-	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-	      <child>
-		<widget class="GtkTreeView" id="book_tree">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="headers_visible">True</property>
-		  <property name="rules_hint">False</property>
-		  <property name="reorderable">False</property>
-		  <property name="enable_search">True</property>
-		</widget>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="left_attach">2</property>
-	      <property name="right_attach">3</property>
-	      <property name="top_attach">1</property>
-	      <property name="bottom_attach">2</property>
-	      <property name="x_padding">24</property>
-	      <property name="y_options">fill</property>
-	    </packing>
-	  </child>
-
 	  <child>
 	    <widget class="GtkVButtonBox" id="mid_vbuttonbox">
 	      <property name="visible">True</property>
@@ -485,14 +421,76 @@
 	      <property name="right_attach">2</property>
 	      <property name="top_attach">1</property>
 	      <property name="bottom_attach">2</property>
-	      <property name="x_options"></property>
+	      <property name="x_options">shrink</property>
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkScrolledWindow" id="a_scrolledwindow">
+	      <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="GtkTreeView" id="avail_tree">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="headers_visible">True</property>
+		  <property name="rules_hint">False</property>
+		  <property name="reorderable">False</property>
+		  <property name="enable_search">True</property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">1</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_padding">24</property>
+	      <property name="x_options">expand|shrink|fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkScrolledWindow" id="b_scrolledwindow">
+	      <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_ETCHED_IN</property>
+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+	      <child>
+		<widget class="GtkTreeView" id="book_tree">
+		  <property name="visible">True</property>
+		  <property name="can_focus">True</property>
+		  <property name="headers_visible">True</property>
+		  <property name="rules_hint">False</property>
+		  <property name="reorderable">False</property>
+		  <property name="enable_search">True</property>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">2</property>
+	      <property name="right_attach">3</property>
+	      <property name="top_attach">1</property>
+	      <property name="bottom_attach">2</property>
+	      <property name="x_padding">24</property>
+	      <property name="x_options">expand|shrink|fill</property>
+	      <property name="y_options">fill</property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
-	  <property name="padding">0</property>
-	  <property name="expand">False</property>
+	  <property name="padding">6</property>
+	  <property name="expand">True</property>
 	  <property name="fill">True</property>
 	</packing>
       </child>
@@ -539,10 +537,9 @@
 </widget>
 
 <widget class="GtkDialog" id="booklist">
-  <property name="width_request">300</property>
-  <property name="height_request">400</property>
+  <property name="height_request">300</property>
   <property name="visible">True</property>
-  <property name="title" translatable="no">dialog1</property>
+  <property name="title" translatable="yes">dialog1</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_NONE</property>
   <property name="modal">False</property>
@@ -582,7 +579,7 @@
 	      <property name="label">gtk-close</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
+	      <property name="response_id">-7</property>
 	      <signal name="clicked" handler="on_booklist_cancel_clicked" object="top" last_modification_time="Tue, 10 Jun 2003 22:54:51 GMT"/>
 	    </widget>
 	  </child>
@@ -595,7 +592,7 @@
 	      <property name="label">gtk-ok</property>
 	      <property name="use_stock">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-	      <property name="response_id">0</property>
+	      <property name="response_id">-5</property>
 	      <signal name="clicked" handler="on_booklist_ok_clicked" object="top" last_modification_time="Tue, 10 Jun 2003 22:30:39 GMT"/>
 	    </widget>
 	  </child>
@@ -617,7 +614,7 @@
 	  <child>
 	    <widget class="GtkLabel" id="title">
 	      <property name="visible">True</property>
-	      <property name="label" translatable="no">label6</property>
+	      <property name="label" translatable="yes">label6</property>
 	      <property name="use_underline">False</property>
 	      <property name="use_markup">False</property>
 	      <property name="justify">GTK_JUSTIFY_LEFT</property>