Imported Upstream version 2.5

5 files changed, 199 insertions, 119 deletions

diff --git a/docs/handbook/en/docbook/hdbk-config.docbook b/docs/handbook/en/docbook/hdbk-config.docbook
index a829ace..abd562d 100644
--- a/docs/handbook/en/docbook/hdbk-config.docbook
+++ b/docs/handbook/en/docbook/hdbk-config.docbook
@@ -60,7 +60,7 @@
       you to specify a custom font for each language.</para>
       <mediaobject>
         <imageobject>
-          <imagedata fileref="ss_configfonts.png" format="PNG" />
+          <imagedata fileref="ss_configfonts.png" width="600" depth="472" scale="75" format="PNG" />
         </imageobject>
         <textobject>
           <phrase>Options Dialog - fonts</phrase>
@@ -205,14 +205,14 @@
       <para>Shortcuts (previously known as HotKeys) are special key
 	commands that can be used in the
         place of the menu items and icons. A number of &bibletime;'s
-	commands have predefined Shortcuts (see 
-	<link linkend="hdbk-reference-shortcuts">this section</link> for a
+	commands have predefined Shortcuts (see the
+	<link linkend="hdbk-reference-shortcuts">Shortcuts section</link> for a
 	complete listing). Most of &bibletime;'s commands can be
 	assigned Shortcuts.  This is very helpful to quickly access the
 	functions that you need the most.</para>
 
       <imageobject>
-	<imagedata fileref="ss_shortcuts.png" format="PNG" />
+	<imagedata fileref="ss_shortcuts.png" width="600" depth="441" scale="75" format="PNG" />
       </imageobject>
 
       <para>In the preceding example, F2, Bible Study Howto has a
diff --git a/docs/handbook/en/docbook/hdbk-operation.docbook b/docs/handbook/en/docbook/hdbk-operation.docbook
index 7ab4ec9..adb1223 100644
--- a/docs/handbook/en/docbook/hdbk-operation.docbook
+++ b/docs/handbook/en/docbook/hdbk-operation.docbook
@@ -5,7 +5,7 @@
     <para>This is what a typical &bibletime; session looks like: 
     <mediaobject>
       <imageobject>
-        <imagedata fileref="ss_mainterms.png" format="PNG" />
+        <imagedata fileref="ss_mainterms.png" width="600" depth="466" scale="75" format="PNG" />
       </imageobject>
       <textobject>
         <phrase>The &bibletime; application window</phrase>
@@ -60,33 +60,34 @@
 
       <sect3 id="hdbk-op-parts-bookshelf-metainfo">
         <title>Additional information about works</title>
+
         <para>If you click with the 
-        <mousebutton>right</mousebutton> mouse button on the symbol of a
-        work, you will see a menu with additional entries that are
-        relevant for this work. 
-        <guimenuitem>"About this work"</guimenuitem> opens a window with
-        lots of interesting information about the selected work. 
-        <guimenuitem>"Unlock this work"</guimenuitem> opens a small
-        dialog for encrypted documents, where you can enter the unlock
-        key to access the work. For additional information on locked
-        works, please see 
-        <ulink url="http://www.crosswire.org/sword/modules/aboutlocked.jsp">
-        this page</ulink> on the &cbs; web
-        site.</para>
+	  <mousebutton>right</mousebutton> mouse button on the symbol of a
+	  work, you will see a menu with additional entries that are
+	  relevant for this work. 
+	  <guimenuitem>"About this work"</guimenuitem> opens a window with
+	  lots of interesting information about the selected work. 
+	  <guimenuitem>"Unlock this work"</guimenuitem> opens a small
+	  dialog for encrypted documents, where you can enter the unlock
+	  key to access the work. For additional information on locked
+	  works, please see the
+	  <ulink url="http://www.crosswire.org/sword/modules/aboutlocked.jsp">
+	  Locked Modules</ulink> page on the &cbs; web site.</para>
       </sect3>
 
       <sect3 id="hdbk-op-parts-bookshelf-search">
         <title>Searching in works</title>
+
         <para>You can search in a work by clicking with the 
-        <mousebutton>right</mousebutton> mouse button on its symbol and
-        selecting 
-        <guimenuitem>"Search in work(s)"</guimenuitem>. By pressing
-        &Shift; and clicking on other works you can select more
-        than one. Then follow the same procedure to open the search
-        dialog. You will be searching in all of these documents. A
-        complete description of the operation of the search features
-        can be found 
-        <link linkend="hdbk-op-search">here</link>.</para>
+	  <mousebutton>right</mousebutton> mouse button on its symbol and
+	  selecting 
+	  <guimenuitem>"Search in work(s)"</guimenuitem>. By pressing
+	  &Shift; and clicking on other works you can select more
+	  than one. Then follow the same procedure to open the search
+	  dialog. You will be searching in all of these documents. A
+	  complete description of the operation of the search features
+	  can be found on the 
+	  <link linkend="hdbk-op-search">Searching in Works section</link>.</para>
       </sect3>
 
       <sect3 id="hdbk-op-parts-bookshelf-bookmarks">
@@ -245,7 +246,7 @@
         <screeninfo>Search Text Dialog Options Tab</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="ss_searchopts.png" format="PNG" />
+            <imagedata fileref="ss_searchopts.png" width="600" depth="463" scale="75" format="PNG" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -373,25 +374,32 @@
           <screeninfo>Search Analysis Dialog Box</screeninfo>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="ss_searchanal.png" format="PNG" />
+              <imagedata fileref="ss_searchanal.png" width="600" depth="470" scale="75" format="PNG" />
             </imageobject>
           </mediaobject>
         </screenshot>
       </sect3>
     </sect2>
   </sect1>
+
   <sect1 id="hdbk-op-bookshelfmanager">
-    <title>The 
-    <guimenuitem>Bookshelf Manager</guimenuitem></title>
-    <para>The 
-    <guimenuitem>Bookshelf Manager</guimenuitem> is a tool to manage
-    your Bookshelf. You can install new works to your Bookshelf, and
-    update or remove existing works from your Bookshelf. Access it by
-    clicking 
-    <menuchoice>
-      <guimenu>Settings</guimenu>
-      <guimenuitem>Bookshelf Manager</guimenuitem>
-    </menuchoice> in the main menu.</para>
+    <title>The <guimenuitem>Bookshelf Manager</guimenuitem></title>
+
+    <para>The <guimenuitem>Bookshelf Manager</guimenuitem> is a tool to manage
+      your Bookshelf. You can install new works to your Bookshelf, and
+      update or remove existing works from your Bookshelf. Access it by
+      clicking 
+      <menuchoice>
+	<guimenu>Settings</guimenu>
+	<guimenuitem>Bookshelf Manager</guimenuitem>
+      </menuchoice> in the main menu.</para>
+
+      <tip>
+	<para>If this is the first time you are starting &bibletime;,
+	  click on the Refresh button to see a list of works provided by
+	  the &cbs;.</para>
+      </tip>
+
     <sect2 id="hdbk-op-bookshelfmanager-path">
       <title>Bookshelf path(s) setup</title>
       <para>Here you can specify where &bibletime; may store your
diff --git a/docs/handbook/en/docbook/hdbk-reference.docbook b/docs/handbook/en/docbook/hdbk-reference.docbook
index 111fba9..360c22a 100644
--- a/docs/handbook/en/docbook/hdbk-reference.docbook
+++ b/docs/handbook/en/docbook/hdbk-reference.docbook
@@ -2,13 +2,14 @@
   <title>Reference</title>
   <sect1 id="hdbk-reference-menus">
     <title>Main menu reference</title>
+
     <para>In this section you can find detailed descriptions of all
-    entries in the main menu of &bibletime;. They are ordered in
-    just the way they appear in &bibletime;, with all the sub-items
-    listed under the major menu item they belong to. You can also see
-    the shortcut of each item;a complete listing of all shortcuts can be
-    found in 
-    <link linkend="hdbk-reference-shortcuts">this section</link>.</para>
+      entries in the main menu of &bibletime;. They are ordered in
+      just the way they appear in &bibletime;, with all the sub-items
+      listed under the major menu item they belong to. You can also see
+      the shortcut of each item;a complete listing of all shortcuts can be
+      found in the <link linkend="hdbk-reference-shortcuts">shortcuts section</link>.</para>
+
     <sect2 id="hdbk-reference-menus-file">
       <title>
         <guimenu>File</guimenu>
@@ -25,7 +26,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_exit.png" format="PNG" />
+                    <imagedata fileref="i_exit.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject>File</guimenu>
                 <guimenuitem>Quit</guimenuitem>
@@ -58,7 +59,7 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_window_fullscreen.png" format="PNG" />
+                  <imagedata fileref="i_window_fullscreen.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>View</guimenu>
               <guimenuitem>Fullscreen mode</guimenuitem>
@@ -153,20 +154,22 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_find.png" format="PNG" />
+                  <imagedata fileref="i_find.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Search</guimenu>
               <guimenuitem>Search in standard bible</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
-            <para>
-            <action>Opens the Search Dialog to search in the standard
-            Bible only</action>. More works can be added in the Search
-            Dialog. A more detailed search description can be found 
-	    <link linkend="hdbk-op-search">here</link>.</para>
+            <para><action>Opens the Search Dialog to search in the standard
+	      Bible only</action>. More works can be added in the Search
+	      Dialog. A more detailed search description can be found in
+	      the <link linkend="hdbk-op-search">Searching in works</link>
+	      section.</para>
           </listitem>
         </varlistentry>
+
         <varlistentry id="hdbk-reference-menus-search-openworks">
           <term>
             <menuchoice>
@@ -177,19 +180,21 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_find.png" format="PNG" />
+                  <imagedata fileref="i_find.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Search</guimenu>
               <guimenuitem>Search in open work(s)</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
-            <para>
-            <action>Opens the Search Dialog to search in all open
-            works</action>. Works can be added or removed in the Search
-            Dialog. A more detailed search description can be found 
-	    <link linkend="hdbk-op-search">here</link>.</para>
+            <para><action>Opens the Search Dialog to search in all open
+	      works</action>. Works can be added or removed in the Search
+	      Dialog. A more detailed search description can be found
+	      in the 
+	      <link linkend="hdbk-op-search">Searching in works</link> section.</para>
           </listitem>
+
         </varlistentry>
       </variablelist>
     </sect2>
@@ -299,7 +304,7 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_cascade.png" format="PNG" />
+                  <imagedata fileref="i_cascade.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Window</guimenu>
               <guimenuitem>Cascade</guimenuitem>
@@ -313,6 +318,30 @@
           </listitem>
         </varlistentry>
 
+        <varlistentry id="hdbk-reference-menus-window-tile">
+          <term>
+            <menuchoice>
+              <shortcut>
+                <keycombo action="simul">
+                <keycap>&Ctrl;I</keycap></keycombo>
+              </shortcut>
+              <guimenu>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="i_tile.png" width="32" depth="32" format="PNG" />
+                </imageobject>
+              </inlinemediaobject>Window</guimenu>
+              <guimenuitem>Tile</guimenuitem>
+            </menuchoice>
+          </term>
+
+          <listitem>
+            <para>
+	      <action>Tiles all open windows</action>.
+	    </para>
+          </listitem>
+        </varlistentry>
+
         <varlistentry id="hdbk-reference-menus-window-tilevertically">
           <term>
             <menuchoice>
@@ -323,7 +352,7 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_tile_vert.png" format="PNG" />
+                  <imagedata fileref="i_tile_vert.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Window</guimenu>
               <guimenuitem>Tile vertically</guimenuitem>
@@ -347,7 +376,7 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_tile_horiz.png" format="PNG" />
+                  <imagedata fileref="i_tile_horiz.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Window</guimenu>
               <guimenuitem>Tile horizontally</guimenuitem>
@@ -372,7 +401,7 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_fileclose.png" format="PNG" />
+                  <imagedata fileref="i_fileclose.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Window</guimenu>
               <guimenuitem>Close all</guimenuitem>
@@ -398,22 +427,23 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_configure.png" format="PNG" />
+                  <imagedata fileref="i_configure.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Settings</guimenu>
               <guimenuitem>Configure &bibletime;</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
-            <para>
-            <action>Opens &bibletime;'s main configuration
-            dialog</action>. You can configure all kinds of nice
-            settings there to adapt &bibletime; to your needs.
-            Please see 
-            <link linkend="hdbk-config-bt">this section</link> for
-            details.</para>
+            <para> <action>Opens &bibletime;'s main configuration
+	      dialog</action>. You can configure all kinds of nice
+	      settings there to adapt &bibletime; to your needs.
+	      Please see the
+	      <link linkend="hdbk-config-bt">Configuring &bibletime; section</link> for
+	      details.</para>
           </listitem>
         </varlistentry>
+
         <varlistentry id="hdbk-reference-menus-settings-bookshelf_manager">
 
           <term>
@@ -426,19 +456,18 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_configuresword.png"
-                  format="PNG" />
+                  <imagedata fileref="i_configuresword.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Settings</guimenu>
               <guimenuitem>Bookshelf Manager</guimenuitem>
             </menuchoice>
           </term>
+
           <listitem>
-            <para>
-            <action>Opens a dialog where you can change your &sword;
-            configuration and manage your bookshelf</action>. Please
-            see <link linkend="hdbk-op-bookshelfmanager">this
-            section</link> for details.</para>
+            <para><action>Opens a dialog where you can change your &sword;
+	      configuration and manage your bookshelf</action>. Please
+	      see the <link linkend="hdbk-op-bookshelfmanager">Bookshelf
+	      Manager section</link> for details.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -460,7 +489,7 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_contents2.png" format="PNG" />
+                  <imagedata fileref="i_contents2.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Help</guimenu>
               <guimenuitem>Handbook</guimenuitem>
@@ -484,8 +513,7 @@
               <guimenu>
               <inlinemediaobject>
                 <imageobject>
-                  <imagedata fileref="i_contents2.png"
-                  format="PNG" />
+                  <imagedata fileref="i_contents2.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Help</guimenu>
               <guimenuitem>Bible Study Howto</guimenuitem>
@@ -541,7 +569,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_forward.png" format="PNG" />
+                    <imagedata fileref="i_forward.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -564,7 +592,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_back.png" format="PNG" />
+                    <imagedata fileref="i_back.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -587,7 +615,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_bible.png" format="PNG" />
+                    <imagedata fileref="i_bible.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -610,7 +638,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_bible_add.png" format="PNG" />
+                    <imagedata fileref="i_bible_add.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -633,7 +661,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_find.png" format="PNG" />
+                    <imagedata fileref="i_find.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -656,7 +684,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_displayconfig.png" format="PNG" />
+                    <imagedata fileref="i_displayconfig.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -679,7 +707,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_commentary.png" format="PNG" />
+                    <imagedata fileref="i_commentary.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -702,7 +730,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_commentary_add.png" format="PNG" />
+                    <imagedata fileref="i_commentary_add.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -725,7 +753,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_sync.png" format="PNG" />
+                    <imagedata fileref="i_sync.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -748,7 +776,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_book.png" format="PNG" />
+                    <imagedata fileref="i_book.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -771,7 +799,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_lexicon.png" format="PNG" />
+                    <imagedata fileref="i_lexicon.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -794,7 +822,7 @@
                 <guimenu>
                 <inlinemediaobject>
                   <imageobject>
-                    <imagedata fileref="i_lexicon_add.png" format="PNG" />
+                    <imagedata fileref="i_lexicon_add.png" width="32" depth="32" format="PNG" />
                   </imageobject>
                 </inlinemediaobject></guimenu>
               </menuchoice>
@@ -813,13 +841,14 @@
 
   <sect1 id="hdbk-reference-shortcuts">
     <title>Shortcuts index</title>
-    <para>This is index of all shortcuts and their corresponding
-    description in the handbook. The shortcuts are sorted (roughly)
-    alphabetical. If you want to directly find out which shortcuts a
-    certain menu item has, you can either look at the entry itself in
-    &bibletime; (as it always shows the shortcut), or you can look it
-    up in 
-    <link linkend="hdbk-reference-menus">this section</link>.</para>
+
+    <para>This is an index of all shortcuts and their corresponding
+      description in the handbook. The shortcuts are sorted (roughly)
+      alphabetical. If you want to directly find out which shortcuts a
+      certain menu item has, you can either look at the entry itself in
+      &bibletime; (as it always shows the shortcut), or you can look it
+      in the <link linkend="hdbk-reference-menus">Main Menu reference</link>.</para>
+
     <informaltable>
       <tgroup cols="2">
         <colspec colname="shortcut" />
@@ -889,6 +918,22 @@
             </menuchoice> equivalent; toggle automatic window
             tiling.</entry>
           </row>
+
+          <row>
+            <entry>
+              <keycombo action="simul">
+              <keycap>&Ctrl;&Alt;I</keycap></keycombo>
+            </entry>
+
+            <entry>
+	      <menuchoice>
+	       <guimenu>Window</guimenu>
+	       <guimenuitem>Arrangement mode</guimenuitem>
+	       <guimenuitem>Auto-tile</guimenuitem>
+	      </menuchoice> equivalent; toggle automatic window
+	      tiling.</entry>
+          </row>
+
           <row>
             <entry>
               <keycombo action="simul">
@@ -902,6 +947,7 @@
             </menuchoice> equivalent; toggle automatic window
             cascading.</entry>
           </row>
+
           <row>
             <entry>
               <keycombo action="simul">
@@ -1019,6 +1065,22 @@
           <row>
             <entry>
               <keycombo action="simul">
+              <keycap>&Ctrl;I</keycap></keycombo>
+            </entry>
+
+            <entry>
+	      <link linkend="hdbk-reference-menus-window-tile">
+		<menuchoice>
+		  <guimenu>Window</guimenu>
+		  <guimenuitem>Tile</guimenuitem>
+		</menuchoice>
+	      </link> windows equivalent.
+            </entry>
+          </row>
+
+          <row>
+            <entry>
+              <keycombo action="simul">
               <keycap>&Ctrl;J</keycap></keycombo>
             </entry>
 
diff --git a/docs/handbook/en/docbook/hdbk-start.docbook b/docs/handbook/en/docbook/hdbk-start.docbook
index 77cc67d..db41237 100644
--- a/docs/handbook/en/docbook/hdbk-start.docbook
+++ b/docs/handbook/en/docbook/hdbk-start.docbook
@@ -4,14 +4,14 @@
   <sect1 id="hdbk-start">
     <title>How to start &bibletime;</title>
 
-    <sect2 id="hdbk-start">
+    <sect2 id="hdbk-start-starting">
       <title>Starting &bibletime;</title>
       <para>&bibletime; is an executable file that is integrated
       with the desktop. You can launch &bibletime; from
       the Start Menu with this icon: 
       <mediaobject>
         <imageobject>
-          <imagedata fileref="i_bibletime.png" format="PNG" />
+          <imagedata fileref="i_bibletime.png" width="32" depth="32" format="PNG" />
         </imageobject>
         <textobject>
           <phrase>&bibletime; start icon</phrase>
@@ -37,26 +37,30 @@
 
   <sect1 id="hdbk-startsequence">
     <title>Startup sequence</title>
+
     <para>As &bibletime; launches you may see the following screens
-    before the main &bibletime; window opens:</para>
+      before the main &bibletime; window opens:</para>
+
     <variablelist>
       <varlistentry>
         <term>
           <interface>Bookshelf Manager</interface>
         </term>
         <listitem>
-          <para>
-          <action>Modifies your Bookshelf.</action> This dialog lets you
-          modify your Bookshelf, add or delete works from your system.
-          It will only be shown if no default Bookshelf can be found.
-          Please see 
-          <link linkend="hdbk-op-bookshelfmanager"> this
-          section</link> for further details. If you start off with an
-          empty Bookshelf, it will be helpful to install at least one
-          Bible, Commentary, Lexicon and one Book to get to know
-          &bibletime;'s basic features quickly.</para>
+          <para><action>Modifies your Bookshelf</action>.  This dialog lets
+	    you modify your Bookshelf, add or delete works from your system.
+	    It will only be shown if no default Bookshelf can be found.
+	    Please see <link linkend="hdbk-op-bookshelfmanager">The
+	    Bookshelf Manager section</link> for further details. If you
+	    start off with an empty Bookshelf, it will be helpful to install
+	    at least one Bible, Commentary, Lexicon and one Book to get to
+	    know &bibletime;'s basic features quickly.  You can do
+	    this by clicking on the Refresh button.  You will be
+	    presented with a list of works that are available from the
+	    &cbs;</para>
         </listitem>
       </varlistentry>
+
       <varlistentry>
         <term>
           <interface>Configure &bibletime; dialog</interface>
diff --git a/docs/handbook/en/docbook/index.docbook b/docs/handbook/en/docbook/index.docbook
index 5eb8415..a0d2dc9 100644
--- a/docs/handbook/en/docbook/index.docbook
+++ b/docs/handbook/en/docbook/index.docbook
@@ -20,7 +20,8 @@
 ]>
 <book>
 <bookinfo>
-  <title>The &bibletime; handbook</title>
+  <title>The &bibletime; Handbook</title>
+
   <authorgroup>
     <author>
       <firstname>Fred</firstname>
@@ -42,18 +43,23 @@
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
   <copyright>
     <year>1999-2009</year>
-    <holder>the &bibletime; team</holder>
+    <holder>The &bibletime; Team</holder>
   </copyright>
+
   <legalnotice>
-    <para>The &bibletime; handbook is part of
-    &bibletime;.</para>
+    <para>The &bibletime; Handbook is part of the
+      &bibletime; study aid.</para>
   </legalnotice>
-  <date>2009-10</date>
-  <releaseinfo>2.4</releaseinfo>
+
+  <date>$LastChangedDate: 2009-11-18 19:30:32 +0100 (Mi, 18 Nov 2009) $</date>
+
+  <releaseinfo>2.5</releaseinfo>
+
   <abstract>
     <para>&bibletime; is a Bible study tool based on the &sword;
       framework.</para>
   </abstract>
+
   <keywordset>
     <keyword>Qt4</keyword>
     <keyword>bibletime</keyword>