Imported Upstream version 2.8.1

6 files changed, 341 insertions, 206 deletions

diff --git a/docs/handbook/en/docbook/hdbk-config.docbook b/docs/handbook/en/docbook/hdbk-config.docbook
index abd562d..3073ba2 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" width="600" depth="472" scale="75" format="PNG" />
+          <imagedata fileref="ss_configfonts.png" width="100%" contentdepth="100%" scalefit="1" format="PNG" />
         </imageobject>
         <textobject>
           <phrase>Options Dialog - fonts</phrase>
@@ -154,7 +154,7 @@
               </row>
               <row>
                 <entry>
-                  <ulink url="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS">
+                  <ulink url="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS/">
                   Crosswire's font directory</ulink>
                 </entry>
 
@@ -163,7 +163,7 @@
               </row>
               <row>
                 <entry>
-                  <ulink url="ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/">
+                  <ulink url="http://aol-4.vo.llnwd.net/pub/communicator/extras/fonts/windows/">
                   Bitstream CyberBit</ulink>
                 </entry>
                 <entry>Covers almost the entire range of Unicode, but
@@ -212,10 +212,10 @@
 	functions that you need the most.</para>
 
       <imageobject>
-	<imagedata fileref="ss_shortcuts.png" width="600" depth="441" scale="75" format="PNG" />
+	<imagedata fileref="ss_shortcuts.png" width="100%" contentdepth="100%" scalefit="1" format="PNG" />
       </imageobject>
 
-      <para>In the preceding example, F2, Bible Study Howto has a
+      <para>In the preceding example, F2, Bible Study HowTo has a
 	 secondary shortcut defined, CTRL+2.</para>
     </sect2>
   </sect1>
diff --git a/docs/handbook/en/docbook/hdbk-intro.docbook b/docs/handbook/en/docbook/hdbk-intro.docbook
index 3cb1b99..16255db 100644
--- a/docs/handbook/en/docbook/hdbk-intro.docbook
+++ b/docs/handbook/en/docbook/hdbk-intro.docbook
@@ -6,7 +6,7 @@
     <para>&bibletime; is a Bible study tool with support for
       different types of texts and languages. Even large amounts of works
       modules are easy to install and manage. It is built on the
-      <ulink url="http://www.crosswire.org/sword">&sword;</ulink> library,
+      <ulink url="http://www.crosswire.org/sword/">&sword;</ulink> library,
       which provides the back-end functionality for &bibletime;, such
       as viewing Bible text, searching etc. &sword; is the flagship product
       of the <ulink url="http://www.crosswire.org">&cbs;</ulink>.</para>
@@ -61,20 +61,22 @@
             Daily Path, and the Losungen.</para>
           </listitem>
         </varlistentry>
+
         <varlistentry>
           <term>Lexicons/Dictionaries</term>
           <listitem>
             <para>Lexicons available include: Robinson's Morphological
-            Analysis Codes, Brown-Driver-Briggs Hebrew Lexicon and the
-            International Standard Bible Encyclopaedia. Dictionaries
-            available include Strong's Hebrew Bible Dictionary,
-            Strong's Greek Bible Dictionary, Webster's Revised
-            Unabridged Dictionary of the English Language 1913, Nave's
-            Topical Bible.</para>
+	      Analysis Codes, and the
+	      International Standard Bible Encyclopaedia. Dictionaries
+	      available include Strong's Hebrew Bible Dictionary,
+	      Strong's Greek Bible Dictionary, Webster's Revised
+	      Unabridged Dictionary of the English Language 1913, Nave's
+	      Topical Bible.</para>
           </listitem>
         </varlistentry>
       </variablelist></para>
     </sect2>
+
     <sect2 id="hdbk-intro-motivation">
       <title>Motivation</title>
       <para>Our desire is to serve God, and to do our part to help
diff --git a/docs/handbook/en/docbook/hdbk-operation.docbook b/docs/handbook/en/docbook/hdbk-operation.docbook
index adb1223..e4107bb 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" width="600" depth="466" scale="75" format="PNG" />
+        <imagedata fileref="ss_mainterms.png" width="100%" contentdepth="100%" scalefit="1" format="PNG" />
       </imageobject>
       <textobject>
         <phrase>The &bibletime; application window</phrase>
@@ -35,27 +35,24 @@
 
       <sect3 id="hdbk-op-parts-bookshelf-open">
         <title>Reading works</title>
+
         <para>To open a work from the bookshelf for reading, simply
-        click with the 
-        <mousebutton>left mouse button</mousebutton> on the desired
-        category (Bibles, Commentaries, Lexicons, Books, Devotionals or
-        Glossaries) to display its contents. Then just click on one of
-        the works to open it for reading. A read window will appear in
-        the Desk area.</para>
+	  click with the <mousebutton>left mouse button</mousebutton> on
+	  the desired category (Bibles, Commentaries, Lexicons, Books,
 
-        <tip>
-          <para>Drag &amp; Drop Works Here</para>
-        </tip>
+	  Devotionals or Glossaries) to display its contents. Then just
+	  click on one of the works to open it for reading. A read window
+	  will appear in the Desk area.</para>
 
         <para>If you are reading a certain work, and want to open
-        another work at the passage you are reading, you can use a
-        shortcut. Simply click with the 
-        <mousebutton>left mouse button</mousebutton> on the
-        verse/passage reference (pointer changes to hand) and drag it
-        to the Bookshelf. Drop it on the work you want to open, and it
-        will be opened for reading at the specified location. You can
-        also drag a verse reference into an existing read window, then
-        it will jump to the specified location.</para>
+	  another work at the passage you are reading, you can use a
+	  shortcut. Simply click with the 
+	  <mousebutton>left mouse button</mousebutton> on the
+	  verse/passage reference (pointer changes to hand) and drag it
+	  to the Bookshelf. Drop it on the work you want to open, and it
+	  will be opened for reading at the specified location. You can
+	  also drag a verse reference into an existing read window, then
+	  it will jump to the specified location.</para>
       </sect3>
 
       <sect3 id="hdbk-op-parts-bookshelf-metainfo">
@@ -246,7 +243,7 @@
         <screeninfo>Search Text Dialog Options Tab</screeninfo>
         <mediaobject>
           <imageobject>
-            <imagedata fileref="ss_searchopts.png" width="600" depth="463" scale="75" format="PNG" />
+            <imagedata fileref="ss_searchopts.png" width="100%" contentdepth="100%" scalefit="1" format="PNG" />
           </imageobject>
         </mediaobject>
       </screenshot>
@@ -295,6 +292,8 @@
           <tgroup cols="3">
             <thead>
               <row>
+		<?dbhtml bgcolor="#EEEEEE" ?>
+		<?dbfo bgcolor="#EEEEEE" ?>
                 <entry>Prefix</entry>
                 <entry>Meaning</entry>
 		<entry>Example</entry>
@@ -374,7 +373,7 @@
           <screeninfo>Search Analysis Dialog Box</screeninfo>
           <mediaobject>
             <imageobject>
-              <imagedata fileref="ss_searchanal.png" width="600" depth="470" scale="75" format="PNG" />
+              <imagedata fileref="ss_searchanal.png" width="100%" contentdepth="100%" scalefit="1" format="PNG" />
             </imageobject>
           </mediaobject>
         </screenshot>
@@ -402,9 +401,13 @@
 
     <sect2 id="hdbk-op-bookshelfmanager-path">
       <title>Bookshelf path(s) setup</title>
+
       <para>Here you can specify where &bibletime; may store your
-      Bookshelf on the hard drive. You can even store it in multiple
-      directories. Default is "~/.sword/".</para>
+	Bookshelf on the hard drive.  You can even store it in multiple
+	directories. The default is "~/.sword/" on *nix and 
+	"C:\Documents and Settings\All Users\Application Data\Sword"
+	for Windows.</para>
+
       <tip>
         <para>If you have a sword CD, but do not want to install all
         the works on the hard disk, but use them directly from the CD,
@@ -413,16 +416,21 @@
         on the CD if it is present.</para>
       </tip>
     </sect2>
+
     <sect2 id="hdbk-op-bookshelfmanager-installupdate">
       <title>Install/update work(s)</title>
+
       <para>With this facility, you can connect to a repository of
-      works (called "library"), and transfer one or more works to your
-      local Bookshelf. These libraries may be local (e.g. a &sword; CD),
-      or remote (e.g. Crosswire's online repository of &sword; modules,
-      or another site offering &sword; modules). You can manage your
-      libraries with 
-      <guibutton>Add library</guibutton> and 
-      <guibutton>Delete library</guibutton>.</para>
+	works (called "library"), and transfer one or more works to your
+	local Bookshelf. These libraries may be local (e.g. a &sword; CD),
+	or remote (e.g. Crosswire's online repository of &sword; modules,
+	or another site offering &sword; modules).  You can install
+	other sources by clicking on <guibutton>Get list...</guibutton>
+	when you have <guibutton>New Installation Source</guibutton>
+	dialog open.  You can manage your libraries with 
+	<guibutton>Add library</guibutton> and 
+	<guibutton>Delete library</guibutton>.</para>
+
       <para>To begin the installation or update process, select a
       library you want to connect to and a local Bookshelf path to
       install the work(s) to. Then click on 
@@ -435,6 +443,7 @@
       <guibutton>Install works</guibutton>. They will then be
       transferred to your Bookshelf.</para>
     </sect2>
+
     <sect2 id="hdbk-op-bookshelfmanager-remove">
       <title>Remove work(s)</title>
       <para>This facility allows you to delete one or more of the works
diff --git a/docs/handbook/en/docbook/hdbk-reference.docbook b/docs/handbook/en/docbook/hdbk-reference.docbook
index 360c22a..6fe498e 100644
--- a/docs/handbook/en/docbook/hdbk-reference.docbook
+++ b/docs/handbook/en/docbook/hdbk-reference.docbook
@@ -21,7 +21,7 @@
               <menuchoice>
                 <shortcut>
                   <keycombo action="simul">
-                  <keycap>&Ctrl;Q</keycap></keycombo>
+                  <keycap>&Ctrl;+Q</keycap></keycombo>
                 </shortcut>
                 <guimenu>
                 <inlinemediaobject>
@@ -72,25 +72,6 @@
           </listitem>
         </varlistentry>
 
-        <varlistentry id="hdbk-reference-menus-view-showtoolbar">
-          <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                  <keycap>F6</keycap>
-                </keycombo>
-              </shortcut>
-              <guimenu>View</guimenu>
-              <guimenuitem>Show toolbar</guimenuitem>
-            </menuchoice>
-          </term>
-          <listitem>
-            <para>
-            <action>Toggles Toolbar display.</action> Toggle this
-            setting to turn the main toolbar on or off.</para>
-          </listitem>
-        </varlistentry>
-
         <varlistentry id="hdbk-reference-menus-view-showbookshelf">
           <term>
             <menuchoice>
@@ -137,6 +118,102 @@
             left pane on or off.</para>
           </listitem>
         </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-view-toolbars-showmain">
+          <term>
+            <menuchoice>
+              <shortcut>
+                <keycombo action="simul">
+                  <keycap>F6</keycap>
+                </keycombo>
+              </shortcut>
+              <guimenu>View</guimenu>
+              <guimenuitem>Toolbars</guimenuitem>
+	      <guimenuitem>Show main</guimenuitem>
+            </menuchoice>
+          </term>
+          <listitem>
+            <para><action>Toggles Main Toolbar display.</action> Toggle this
+	      setting to turn the main toolbar on or off.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-view-toolbars-shownavigation">
+          <term>
+            <menuchoice>
+              <guimenu>View</guimenu>
+              <guimenuitem>Toolbars</guimenuitem>
+	      <guimenuitem>Show navigation</guimenuitem>
+            </menuchoice>
+          </term>
+          <listitem>
+            <para><action>Toggles Navigation in works.</action> Toggle this
+	      setting to add or remove the navigation combo box in works.
+	      This can be handy to view the full toolbar in the open
+	      works</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-view-toolbars-showworks">
+          <term>
+            <menuchoice>
+              <guimenu>View</guimenu>
+              <guimenuitem>Toolbars</guimenuitem>
+	      <guimenuitem>Show works</guimenuitem>
+            </menuchoice>
+          </term>
+          <listitem>
+            <para><action>Toggles Toolbars in works.</action> Toggle this
+	      setting to add or remove the works icons in the open
+	      works.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-view-toolbars-showtools">
+          <term>
+            <menuchoice>
+              <guimenu>View</guimenu>
+              <guimenuitem>Toolbars</guimenuitem>
+	      <guimenuitem>Show tools</guimenuitem>
+            </menuchoice>
+          </term>
+          <listitem>
+            <para><action>Toggles tools in works.</action> Toggle this
+	      setting to add or remove the tools icons in the open
+	      works.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-view-toolbars-showformat">
+          <term>
+            <menuchoice>
+              <guimenu>View</guimenu>
+              <guimenuitem>Toolbars</guimenuitem>
+	      <guimenuitem>Show format</guimenuitem>
+            </menuchoice>
+          </term>
+          <listitem>
+            <para><action>Toggles format.</action> Toggle this setting
+	      when editing HTML in Personal Commentaries. It will add or
+	      remove the formatting toolbar.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry
+	id="hdbk-reference-menus-view-toolbars-showtoolbarsintextwindows">
+          <term>
+            <menuchoice>
+              <guimenu>View</guimenu>
+              <guimenuitem>Toolbars</guimenuitem>
+	      <guimenuitem>Show toolbars in text windows</guimenuitem>
+            </menuchoice>
+          </term>
+          <listitem>
+            <para><action>Toggles toolbars in works.</action> Toggle
+	      this setting to add or remove the complete toolbar in open
+	      works.</para>
+          </listitem>
+        </varlistentry>
       </variablelist>
     </sect2>
     <sect2 id="hdbk-reference-menus-search">
@@ -149,7 +226,7 @@
             <menuchoice>
               <shortcut>
                 <keycombo action="simul">
-                <keycap>&Ctrl;&Alt;F</keycap></keycombo>
+                <keycap>&Ctrl;+&Alt;+F</keycap></keycombo>
               </shortcut>
               <guimenu>
               <inlinemediaobject>
@@ -175,7 +252,7 @@
             <menuchoice>
               <shortcut>
                 <keycombo action="simul">
-                <keycap>&Ctrl;O</keycap></keycombo>
+                <keycap>&Ctrl;+O</keycap></keycombo>
               </shortcut>
               <guimenu>
               <inlinemediaobject>
@@ -205,101 +282,58 @@
       </title>
 
       <variablelist>
-        <varlistentry id="hdbk-reference-menus-window-savesession">
-          <term>
-            <menuchoice>
-              <guimenu> Window</guimenu>
-              <guimenuitem>Save session</guimenuitem>
-            </menuchoice>
-          </term>
-
-          <listitem>
-            <para>
-            <action>Directly saves the current session</action>. This
-            will open a context menu where you can select an existing
-            session to save to. It will be overwritten with your
-            current session. See the next item on how to save to a new
-            session.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="hdbk-reference-menus-window-savenewsession">
+        <varlistentry id="hdbk-reference-menus-window-close">
           <term>
             <menuchoice>
               <shortcut>
                 <keycombo action="simul">
-                <keycap>&Ctrl;&Alt;S</keycap></keycombo>
+                <keycap>&Ctrl;+W</keycap></keycombo>
               </shortcut>
-              <guimenu>Window</guimenu>
-              <guimenuitem>Save as new session</guimenuitem>
-            </menuchoice>
-          </term>
-
-          <listitem>
-            <para>
-            <action>Saves the current session under a new
-            name</action>. This will ask for a new name to save the
-            session to.</para>
-          </listitem>
-        </varlistentry>
-
-        <varlistentry id="hdbk-reference-menus-window-loadsession">
-          <term>
-            <menuchoice>
-              <guimenu>Window</guimenu>
-              <guimenuitem>Load session</guimenuitem>
+              <guimenu>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="i_fileclose.png" width="32" depth="32" format="PNG" />
+                </imageobject>
+              </inlinemediaobject>Window</guimenu>
+              <guimenuitem>Close window</guimenuitem>
             </menuchoice>
           </term>
 
           <listitem>
             <para>
-            <action>Loads an existing session</action>. This will open
-            a context menu where you can select an existing session to
-            load.</para>
+            <action>Closes active window</action>.</para>
           </listitem>
         </varlistentry>
 
-        <varlistentry id="hdbk-reference-menus-window-deletesession">
+        <varlistentry id="hdbk-reference-menus-window-closeall">
           <term>
             <menuchoice>
-              <guimenu>Window</guimenu>
-              <guimenuitem>Delete session</guimenuitem>
+              <shortcut>
+                <keycombo action="simul">
+                <keycap>&Ctrl;+&Alt;+W</keycap></keycombo>
+              </shortcut>
+              <guimenu>
+              <inlinemediaobject>
+                <imageobject>
+                  <imagedata fileref="i_fileclose.png" width="32" depth="32" format="PNG" />
+                </imageobject>
+              </inlinemediaobject>Window</guimenu>
+              <guimenuitem>Close all</guimenuitem>
             </menuchoice>
           </term>
 
           <listitem>
             <para>
-            <action>Deletes an existing session</action>. This will
-            open a context menu where you can select an existing
-            session that should be deleted.</para>
+            <action>Closes all open windows</action>.</para>
           </listitem>
         </varlistentry>
 
-        <varlistentry id="hdbk-reference-menus-window-arrangement_mode">
-          <term>
-            <menuchoice>
-              <guimenu>Window</guimenu>
-              <guimenuitem>Arrangement mode</guimenuitem>
-            </menuchoice>
-          </term>
-
-          <listitem>
-            <para>
-            <action>Controls the basic window arrangement
-            behaviour</action>. In the opening context menu, you can
-            either specify that you want to take care of the window
-            arrangement yourself (Manual mode) or have &bibletime;
-            handle it for you (Automatic modes, just try them
-            out!).</para>
-          </listitem>
-        </varlistentry>
-<!--- TODO add submen items here -->
         <varlistentry id="hdbk-reference-menus-window-cascade">
           <term>
             <menuchoice>
               <shortcut>
                 <keycombo action="simul">
-                <keycap>&Ctrl;J</keycap></keycombo>
+                <keycap>&Ctrl;+J</keycap></keycombo>
               </shortcut>
               <guimenu>
               <inlinemediaobject>
@@ -323,7 +357,7 @@
             <menuchoice>
               <shortcut>
                 <keycombo action="simul">
-                <keycap>&Ctrl;I</keycap></keycombo>
+                <keycap>&Ctrl;+I</keycap></keycombo>
               </shortcut>
               <guimenu>
               <inlinemediaobject>
@@ -347,7 +381,7 @@
             <menuchoice>
               <shortcut>
                 <keycombo action="simul">
-                <keycap>&Ctrl;G</keycap></keycombo>
+                <keycap>&Ctrl;+G</keycap></keycombo>
               </shortcut>
               <guimenu>
               <inlinemediaobject>
@@ -371,7 +405,7 @@
             <menuchoice>
               <shortcut>
                 <keycombo action="simul">
-                <keycap>&Ctrl;H</keycap></keycombo>
+                <keycap>&Ctrl;+H</keycap></keycombo>
               </shortcut>
               <guimenu>
               <inlinemediaobject>
@@ -391,26 +425,91 @@
           </listitem>
         </varlistentry>
 
-        <varlistentry id="hdbk-reference-menus-window-closeall">
+        <varlistentry id="hdbk-reference-menus-window-arrangement_mode">
+          <term>
+            <menuchoice>
+              <guimenu>Window</guimenu>
+              <guimenuitem>Arrangement mode</guimenuitem>
+            </menuchoice>
+          </term>
+
+          <listitem>
+            <para><action>Controls the basic window arrangement
+	      behaviour</action>. In the opening context menu, you can
+	      either specify that you want to take care of the window
+	      arrangement yourself (Manual mode), Tabbed, Auto-tile
+	      vertically, Auto-tile horizontally, Auto-tile or
+	      Auto-cascade.  Just try them out!</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-window-savesession">
+          <term>
+            <menuchoice>
+              <guimenu> Window</guimenu>
+              <guimenuitem>Save session</guimenuitem>
+            </menuchoice>
+          </term>
+
+          <listitem>
+            <para>
+            <action>Directly saves the current session</action>. This
+            will open a context menu where you can select an existing
+            session to save to. It will be overwritten with your
+            current session. See the next item on how to save to a new
+            session.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-window-savenewsession">
           <term>
             <menuchoice>
               <shortcut>
                 <keycombo action="simul">
-                <keycap>&Ctrl;&Alt;W</keycap></keycombo>
+                <keycap>&Ctrl;+&Alt;+S</keycap></keycombo>
               </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_fileclose.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Window</guimenu>
-              <guimenuitem>Close all</guimenuitem>
+              <guimenu>Window</guimenu>
+              <guimenuitem>Save as new session</guimenuitem>
             </menuchoice>
           </term>
 
           <listitem>
             <para>
-            <action>Closes all open windows</action>.</para>
+            <action>Saves the current session under a new
+            name</action>. This will ask for a new name to save the
+            session to.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-window-loadsession">
+          <term>
+            <menuchoice>
+              <guimenu>Window</guimenu>
+              <guimenuitem>Load session</guimenuitem>
+            </menuchoice>
+          </term>
+
+          <listitem>
+            <para>
+            <action>Loads an existing session</action>. This will open
+            a context menu where you can select an existing session to
+            load.</para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry id="hdbk-reference-menus-window-deletesession">
+          <term>
+            <menuchoice>
+              <guimenu>Window</guimenu>
+              <guimenuitem>Delete session</guimenuitem>
+            </menuchoice>
+          </term>
+
+          <listitem>
+            <para>
+            <action>Deletes an existing session</action>. This will
+            open a context menu where you can select an existing
+            session that should be deleted.</para>
           </listitem>
         </varlistentry>
       </variablelist>
@@ -516,7 +615,7 @@
                   <imagedata fileref="i_contents2.png" width="32" depth="32" format="PNG" />
                 </imageobject>
               </inlinemediaobject>Help</guimenu>
-              <guimenuitem>Bible Study Howto</guimenuitem>
+              <guimenuitem>Bible Study HowTo</guimenuitem>
             </menuchoice>
           </term>
           <listitem>
@@ -855,6 +954,8 @@
         <colspec colname="desc" />
         <thead>
           <row>
+	    <?dbhtml bgcolor="#EEEEEE" ?>
+	    <?dbfo bgcolor="#EEEEEE" ?>
             <entry>Shortcut</entry>
             <entry>Description</entry>
           </row>
@@ -863,14 +964,14 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Alt;Left</keycap></keycombo>
+              <keycap>&Alt;+Left</keycap></keycombo>
             </entry>
             <entry>Moves back in the history of read windows.</entry>
           </row>
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Alt;Right</keycap></keycombo>
+              <keycap>&Alt;+Right</keycap></keycombo>
             </entry>
             <entry>Moves forward in the history of read
             windows.</entry>
@@ -878,7 +979,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;F</keycap></keycombo>
+              <keycap>&Ctrl;+&Alt;+F</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-search-defaultbible">
@@ -893,7 +994,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;G</keycap></keycombo>
+              <keycap>&Ctrl;+&Alt;+G</keycap></keycombo>
             </entry>
 
             <entry>
@@ -908,7 +1009,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;H</keycap></keycombo>
+              <keycap>&Ctrl;+&Alt;+H</keycap></keycombo>
             </entry>
             <entry>
             <menuchoice>
@@ -922,7 +1023,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;I</keycap></keycombo>
+              <keycap>&Ctrl;+&Alt;+I</keycap></keycombo>
             </entry>
 
             <entry>
@@ -937,7 +1038,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;J</keycap></keycombo>
+              <keycap>&Ctrl;+&Alt;+J</keycap></keycombo>
             </entry>
             <entry>
             <menuchoice>
@@ -951,20 +1052,36 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;M</keycap></keycombo>
+              <keycap>&Ctrl;+&Alt;+M</keycap></keycombo>
             </entry>
+
             <entry>
-            <menuchoice>
-              <guimenu>Window</guimenu>
-              <guimenuitem>Arrangement mode</guimenuitem>
-              <guimenuitem>Manual mode</guimenuitem>
-            </menuchoice> equivalent; toggle manual window
+	      <menuchoice>
+		<guimenu>Window</guimenu>
+		<guimenuitem>Arrangement mode</guimenuitem>
+		<guimenuitem>Manual mode</guimenuitem>
+	      </menuchoice> equivalent; toggle manual window
             placement.</entry>
           </row>
+
+          <row>
+            <entry>
+              <keycombo action="simul">
+              <keycap>&Ctrl;+&Alt;+T</keycap></keycombo>
+            </entry>
+            <entry>
+	      <menuchoice>
+		<guimenu>Window</guimenu>
+		<guimenuitem>Arrangement mode</guimenuitem>
+		<guimenuitem>Tabbed</guimenuitem>
+	      </menuchoice> equivalent; organizes windows with tabs
+	      across the top.</entry>
+          </row>
+
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;S</keycap></keycombo>
+              <keycap>&Ctrl;+&Alt;+S</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-window-savenewsession">
@@ -978,7 +1095,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;W</keycap></keycombo>
+              <keycap>&Ctrl;+&Alt;+W</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-window-closeall">
@@ -991,7 +1108,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;-</keycap></keycombo>
+              <keycap>&Ctrl;+-</keycap></keycombo>
             </entry>
             <entry>Zoom out. This decreases the font size of read
             windows.</entry>
@@ -999,7 +1116,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;+</keycap></keycombo>
+              <keycap>&Ctrl;++</keycap></keycombo>
             </entry>
             <entry>Zoom in. This increases the font size of read
             windows.</entry>
@@ -1007,7 +1124,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;A</keycap></keycombo>
+              <keycap>&Ctrl;+A</keycap></keycombo>
             </entry>
             <entry>Select all. This selects all text in read
             windows.</entry>
@@ -1015,7 +1132,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;C</keycap></keycombo>
+              <keycap>&Ctrl;+C</keycap></keycombo>
             </entry>
             <entry>Copy. This copies the selected text to the
             clipboard.</entry>
@@ -1024,7 +1141,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;F</keycap></keycombo>
+              <keycap>&Ctrl;+F</keycap></keycombo>
             </entry>
             <entry>Search. This lets you search within the text of a
             read window.</entry>
@@ -1033,7 +1150,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;G</keycap></keycombo>
+              <keycap>&Ctrl;+G</keycap></keycombo>
             </entry>
 
             <entry>
@@ -1049,7 +1166,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;H</keycap></keycombo>
+              <keycap>&Ctrl;+H</keycap></keycombo>
             </entry>
 
             <entry>
@@ -1065,7 +1182,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;I</keycap></keycombo>
+              <keycap>&Ctrl;+I</keycap></keycombo>
             </entry>
 
             <entry>
@@ -1081,7 +1198,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;J</keycap></keycombo>
+              <keycap>&Ctrl;+J</keycap></keycombo>
             </entry>
 
             <entry>
@@ -1097,7 +1214,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;L</keycap></keycombo>
+              <keycap>&Ctrl;+L</keycap></keycombo>
             </entry>
             <entry>Change location. Changes focus to the toolbar field for the
             	selected work.</entry>
@@ -1106,7 +1223,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;N</keycap></keycombo>
+              <keycap>&Ctrl;+N</keycap></keycombo>
             </entry>
             <entry>Search with works of this window.</entry>
           </row>
@@ -1114,7 +1231,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;O</keycap></keycombo>
+              <keycap>&Ctrl;+O</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-search-openworks">
@@ -1129,7 +1246,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;Q</keycap></keycombo>
+              <keycap>&Ctrl;+Q</keycap></keycombo>
             </entry>
             <entry>
             <link linkend="hdbk-reference-menus-file-quit">
@@ -1142,7 +1259,7 @@
           <row>
             <entry>
               <keycombo action="simul">
-              <keycap>&Ctrl;W</keycap></keycombo>
+              <keycap>&Ctrl;+W</keycap></keycombo>
             </entry>
             <entry>Closes the current window.</entry>
           </row>
@@ -1167,9 +1284,9 @@
             <entry>
             <menuchoice>
               <guimenu>Help</guimenu>
-              <guimenuitem>BibleStudy Howto</guimenuitem>
+              <guimenuitem>BibleStudy HowTo</guimenuitem>
             </menuchoice> equivalent; opens the BibleStudy
-            Howto.</entry>
+            HowTo.</entry>
           </row>
           <row>
             <entry>
diff --git a/docs/handbook/en/docbook/hdbk-start.docbook b/docs/handbook/en/docbook/hdbk-start.docbook
index db41237..887fd5e 100644
--- a/docs/handbook/en/docbook/hdbk-start.docbook
+++ b/docs/handbook/en/docbook/hdbk-start.docbook
@@ -35,15 +35,30 @@
     </sect2>
   </sect1>
 
-  <sect1 id="hdbk-startsequence">
-    <title>Startup sequence</title>
+  <sect1 id="hdbk-start-firstrun">
+    <title>Starting &bibletime; for the first time</title>
 
-    <para>As &bibletime; launches you may see the following screens
-      before the main &bibletime; window opens:</para>
+    <para>If you are starting &bibletime; for the first time, you will
+      want to configure the following options, available under the
+      <link linkend="hdbk-reference-menus-settings">Settings menu
+      bar</link>.</para>
 
     <variablelist>
       <varlistentry>
         <term>
+          <interface>Configure &bibletime; dialog</interface>
+        </term>
+        <listitem>
+          <para>
+          <action>Customizes &bibletime;.</action>This dialog lets
+          you adapt &bibletime; to your needs. Please see 
+          <link linkend="hdbk-config-bt">the detailed
+          description</link> of this dialog.</para>
+        </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term>
           <interface>Bookshelf Manager</interface>
         </term>
         <listitem>
@@ -60,19 +75,6 @@
 	    &cbs;</para>
         </listitem>
       </varlistentry>
-
-      <varlistentry>
-        <term>
-          <interface>Configure &bibletime; dialog</interface>
-        </term>
-        <listitem>
-          <para>
-          <action>Customizes &bibletime;.</action>This dialog lets
-          you adapt &bibletime; to your needs. Please see 
-          <link linkend="hdbk-config-bt">the detailed
-          description</link> of this dialog.</para>
-        </listitem>
-      </varlistentry>
     </variablelist>
   </sect1>
 </chapter>
diff --git a/docs/handbook/en/docbook/index.docbook b/docs/handbook/en/docbook/index.docbook
index a0d2dc9..4b7677e 100644
--- a/docs/handbook/en/docbook/index.docbook
+++ b/docs/handbook/en/docbook/index.docbook
@@ -3,7 +3,7 @@
  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"
 [
   <!ENTITY bibletime '<application>BibleTime</application>'>
-  <!ENTITY sword '<application>Sword</application>'>
+  <!ENTITY sword '<application>SWORD</application>'>
   <!ENTITY cbs '<application>Crosswire Bible Society</application>'>
   <!ENTITY kde '<application>KDE</application>'>
   <!ENTITY qt '<application>Qt</application>'>
@@ -42,33 +42,38 @@
   </authorgroup>
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
   <copyright>
-    <year>1999-2009</year>
+    <year>1999-2011</year>
     <holder>The &bibletime; Team</holder>
   </copyright>
 
   <legalnotice>
-    <para>The &bibletime; Handbook is part of the
-      &bibletime; study aid.</para>
+    <para>The &bibletime; Handbook is distributed with the
+      &bibletime; study program.</para>
   </legalnotice>
 
-  <date>$LastChangedDate: 2009-11-18 19:30:32 +0100 (Mi, 18 Nov 2009) $</date>
+  <date>August 2010</date>
 
-  <releaseinfo>2.5</releaseinfo>
+  <releaseinfo>2.8</releaseinfo>
 
   <abstract>
-    <para>&bibletime; is a Bible study tool based on the &sword;
-      framework.</para>
+    <para>&bibletime; is a completely free Bible study program. The
+      program's user interface is built with &qt; framework, which makes
+      it run on several operating systems including Linux, Windows,
+      FreeBSD and Mac OS X. The software uses the &sword; programming
+      library to work with over 200 free Bible texts, commentaries,
+      dictionaries and books provided by the &cbs;.</para>
   </abstract>
 
   <keywordset>
     <keyword>Qt4</keyword>
-    <keyword>bibletime</keyword>
-    <keyword>sword</keyword>
-    <keyword>crosswire</keyword>
-    <keyword>help dialog</keyword>
+    <keyword>BibleTime</keyword>
+    <keyword>SWORD</keyword>
+    <keyword>Crosswire</keyword>
+    <keyword>Help dialog</keyword>
   </keywordset>
-</bookinfo>&hdbkchap1; &hdbkchap2; &hdbkchap3;
-&hdbkchap4; &hdbkchap5;</book>
+</bookinfo>
+&hdbkchap1; &hdbkchap2; &hdbkchap3; &hdbkchap4; &hdbkchap5;
+</book>
 <!--
 Local Variables:
 mode: sgml