Imported Upstream version 2.8.1

6 files changed, 701 insertions, 853 deletions

diff --git a/docs/handbook/nl/docbook/hdbk-config.docbook b/docs/handbook/nl/docbook/hdbk-config.docbook
index adbdacb..e1ffbd4 100644
--- a/docs/handbook/nl/docbook/hdbk-config.docbook
+++ b/docs/handbook/nl/docbook/hdbk-config.docbook
@@ -1,27 +1,27 @@
 <chapter id="hdbk-config">
   <title>&bibletime; configureren</title>
-  <para>In this section you find an overview to configure &bibletime;, which can be 
+  <para>In this section you find an overview to configure &bibletime;, which can be
 found under <guimenu>Settings</guimenu> in the main menu.</para>
   <sect1 id="hdbk-config-bt">
     <title>Configure &bibletime; Dialog</title>
-    <para>The &bibletime; user interface can be customized in many ways depending on 
-your needs. You can access the configuration dialog by selecting 
-<menuchoice> <guimenu>Settings</guimenu> </menuchoice> 
+    <para>The &bibletime; user interface can be customized in many ways depending on
+your needs. You can access the configuration dialog by selecting
+<menuchoice> <guimenu>Settings</guimenu> </menuchoice>
 <guimenuitem>Configure &bibletime;</guimenuitem>.</para>
 
     <sect2 id="hdbk-config-bt-display">
       <title>
         <guimenu>Display</guimenu>
       </title>
-      <para>Het gedrag bij het opstarten kan aangepast worden aan de gebruiker. Maak een 
+      <para>Het gedrag bij het opstarten kan aangepast worden aan de gebruiker. Maak een
 keuze uit de volgende opties: 
       <itemizedlist>
         <listitem>
           <para>Toon opstartlogo</para>
         </listitem>
       </itemizedlist></para>
-      <para>Display templates define the rendering of text (colors, size etc.). Various 
-built-in templates are available. If you select one, you will see a preview 
+      <para>Display templates define the rendering of text (colors, size etc.). Various
+built-in templates are available. If you select one, you will see a preview
 on the right pane.</para>
     </sect2>
 
@@ -29,13 +29,13 @@ on the right pane.</para>
       <title>
         <guimenu>Desk</guimenu>
       </title>
-      <para>Many features provided by the &sword; backend can now be customized in 
-&bibletime;.  These features are documented right in the dialog.  You also 
-have the possibility to specify standard works that should be used when no 
-specific work is specified in a reference.  An example: The standard Bible 
-is used to display the content of cross references in the Bible.  When you 
-hover over them, the Mag will show the content of the verses referred to, 
-according to the standard Bible you specified.  With the use of text 
+      <para>Many features provided by the &sword; backend can now be customized in
+&bibletime;.  These features are documented right in the dialog.  You also
+have the possibility to specify standard works that should be used when no
+specific work is specified in a reference.  An example: The standard Bible
+is used to display the content of cross references in the Bible.  When you
+hover over them, the Mag will show the content of the verses referred to,
+according to the standard Bible you specified.  With the use of text
 filters, you can control the appearance of the text.</para>
     </sect2>
 
@@ -43,18 +43,17 @@ filters, you can control the appearance of the text.</para>
       <title>
         <guimenu>Languages</guimenu>
       </title>
-      <para>Hier kunt u specificeren welke talen gebruikt moeten worden voor de 
-bijbelboeknamen. Stel dit op uw moedertaal als deze beschikbaar is en u 
+      <para>Hier kunt u specificeren welke talen gebruikt moeten worden voor de
+bijbelboeknamen. Stel dit op uw moedertaal als deze beschikbaar is en u
 voelt zich helemaal thuis.</para>
 
-      <para>By default, &bibletime; uses the default system display font. You can 
-override this font if necessary. Some languages require special fonts to be 
-displayed correctly, and this dialog allows you to specify a custom font for 
+      <para>By default, &bibletime; uses the default system display font. You can
+override this font if necessary. Some languages require special fonts to be
+displayed correctly, and this dialog allows 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" />
-        </imageobject>
+        <imageobject> <imagedata fileref="ss_configfonts.png" width="100%"
+contentdepth="100%" scalefit="1" format="PNG" /> </imageobject>
         <textobject>
           <phrase>Options Dialog - fonts</phrase>
         </textobject>
@@ -62,26 +61,26 @@ each language.</para>
           <para>De Opties dialoog - Lettertypen</para>
         </caption>
       </mediaobject>
-      <para>&bibletime; can now use all supported fonts.  As long as the works you are 
-interested in display correctly nothing needs to be done here. If a work 
-only displays as a series of question marks (??????) or empty boxes, then 
-you know that the standard display font does not contain the characters used 
+      <para>&bibletime; can now use all supported fonts.  As long as the works you are
+interested in display correctly nothing needs to be done here. If a work
+only displays as a series of question marks (??????) or empty boxes, then
+you know that the standard display font does not contain the characters used
 in this work.</para>
 
-      <para>To correct this, choose this work's language from the drop down menu. Select 
-the use custom font checkbox. Now select a font. For example, a font that 
-supports many languages is Code2000. If no installed font can display the 
-work you are interested in, try installing the localization package for that 
+      <para>To correct this, choose this work's language from the drop down menu. Select
+the use custom font checkbox. Now select a font. For example, a font that
+supports many languages is Code2000. If no installed font can display the
+work you are interested in, try installing the localization package for that
 language.</para>
       <sect3 id="hdbk-config-bt-addfont">
         <title>Lettertypen installeren</title>
-        <para>Detailed font installation instructions are outside the scope of this 
-handbook. For further information you might want to refer to the <ulink 
-url="http://www.linux.org/docs/ldp/howto/Unicode-HOWTO-2.html"> Unicode 
+        <para>Detailed font installation instructions are outside the scope of this
+handbook. For further information you might want to refer to the <ulink
+url="http://www.linux.org/docs/ldp/howto/Unicode-HOWTO-2.html"> Unicode
 HOWTO</ulink>.</para>
         <tip>
-          <para>If you use a small font like Clearlyu (about 22kb), &bibletime; will run 
-faster than with a large font like <trademark class="registered">Bitstream 
+          <para>If you use a small font like Clearlyu (about 22kb), &bibletime; will run
+faster than with a large font like <trademark class="registered">Bitstream
 Cyberbit</trademark>(about 12Mb).</para>
         </tip>
       </sect3>
@@ -96,7 +95,7 @@ Cyberbit</trademark>(about 12Mb).</para>
             <para>De lokalisatiepakketten (localization packages) in uw distributie.</para>
           </listitem>
           <listitem>
-            <para>An existing <trademark class="registered">Microsoft Windows</trademark> 
+            <para>An existing <trademark class="registered">Microsoft Windows</trademark>
 installation on the same computer.</para>
           </listitem>
           <listitem>
@@ -106,9 +105,9 @@ installation on the same computer.</para>
             <para>Online verzamelingen van lettertypen.</para>
           </listitem>
         </itemizedlist>
-        <para>Unicode fonts support more characters than other fonts, and some of these 
-fonts are available at no charge. None of available fonts includes all 
-characters defined in the Unicode standard, so you may want to use different 
+        <para>Unicode fonts support more characters than other fonts, and some of these
+fonts are available at no charge. None of available fonts includes all
+characters defined in the Unicode standard, so you may want to use different
 fonts for different languages.</para>
         <table id="hdbk-config-unicode-fonts-table">
           <title>Unicode lettertypen</title>
@@ -116,62 +115,62 @@ fonts for different languages.</para>
             <tbody>
               <row>
                 <entry>
-                  <ulink url="http://code2000.net/CODE2000.ZIP">
-                  Code2000</ulink>
+                  <ulink url="http://code2000.net/CODE2000.ZIP"> Code2000</ulink>
                 </entry>
-                <entry>Misschien het beste gratis Unicode lettertype, welke een groot aantal 
+                <entry>Misschien het beste gratis Unicode lettertype, welke een groot aantal
 karakters ondersteunt.</entry>
               </row>
               <row>
                 <entry>
-                  <ulink url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;cat_id=FontDownloads">
-                  SIL unicode fonts</ulink>
+                  <ulink
+url="http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&amp;cat_id=FontDownloads">
+SIL unicode fonts</ulink>
                 </entry>
                 <entry>Excellent Unicode fonts from the Summer Institute of Linguistics.</entry>
               </row>
               <row>
                 <entry>
-                  <ulink url="http://www.nongnu.org/freefont/">
-                  FreeFont</ulink>
+                  <ulink url="http://www.nongnu.org/freefont/"> FreeFont</ulink>
                 </entry>
                 <entry>A new free Unicode font initiative.</entry>
               </row>
               <row>
                 <entry>
-                  <ulink url="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS">
-                  Crosswire's font directory</ulink>
+                  <ulink url="ftp://ftp.crosswire.org/pub/sword/iso/latest/FONTS/">
+Crosswire's font directory</ulink>
                 </entry>
 
                 <entry>Several fonts available from the &cbs; FTP site.</entry>
               </row>
               <row>
                 <entry>
-                  <ulink url="ftp://ftp.netscape.com/pub/communicator/extras/fonts/windows/">
-                  Bitstream CyberBit</ulink>
+                  <ulink
+url="http://aol-4.vo.llnwd.net/pub/communicator/extras/fonts/windows/">
+Bitstream CyberBit</ulink>
                 </entry>
-                <entry>Dekt bijna het gehele bereik van Unicode, maar kan &bibletime; vertragen 
+                <entry>Dekt bijna het gehele bereik van Unicode, maar kan &bibletime; vertragen
 door zijn omvang.</entry>
               </row>
               <row>
                 <entry>Clearlyu</entry>
-                <entry>Is inbegrepen in sommige distributies. Bevat Europese, Griekse, Hebreeuwse 
+                <entry>Is inbegrepen in sommige distributies. Bevat Europese, Griekse, Hebreeuwse
 en Thaise karakters.</entry>
               </row>
               <row>
                 <entry>
-                  <ulink url="http://fontforge.sourceforge.net/sfds/">
-                  Caslon, Monospace, Cupola, Caliban</ulink>
+                  <ulink url="http://fontforge.sourceforge.net/sfds/"> Caslon, Monospace,
+Cupola, Caliban</ulink>
                 </entry>
-                <entry>Gedeeltelijk bereik van de Unicode standaard, zie voor meer informatie op de 
+                <entry>Gedeeltelijk bereik van de Unicode standaard, zie voor meer informatie op de
 bijbehorende website.</entry>
               </row>
             </tbody>
           </tgroup>
         </table>
-        <para>There are good Unicode font lists on the net, as the one by Christoph Singer 
-( <ulink url="http://www.slovo.info/unifonts.htm">Multilingual Unicode 
-TrueType Fonts in the Internet</ulink>), or the one by Alan Wood ( <ulink 
-url="http://www.alanwood.net/unicode/fontsbyrange.html"> Unicode character 
+        <para>There are good Unicode font lists on the net, as the one by Christoph Singer
+( <ulink url="http://www.slovo.info/unifonts.htm">Multilingual Unicode
+TrueType Fonts in the Internet</ulink>), or the one by Alan Wood ( <ulink
+url="http://www.alanwood.net/unicode/fontsbyrange.html"> Unicode character
 ranges and the Unicode fonts that support them</ulink>).</para>
       </sect3>
     </sect2>
@@ -181,18 +180,18 @@ ranges and the Unicode fonts that support them</ulink>).</para>
         <guimenu>Shortcuts</guimenu>
       </title>
 
-      <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 the <link 
-linkend="hdbk-reference-shortcuts">Shortcuts section</link> for a complete 
-listing). Most of &bibletime;'s commands can be assigned Shortcuts.  This is 
+      <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 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" 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 secondary shortcut 
+      <para>In the preceding example, F2, Bible Study HowTo has a secondary shortcut
 defined, CTRL+2.</para>
     </sect2>
   </sect1>
diff --git a/docs/handbook/nl/docbook/hdbk-intro.docbook b/docs/handbook/nl/docbook/hdbk-intro.docbook
index 6c567a7..8781e2a 100644
--- a/docs/handbook/nl/docbook/hdbk-intro.docbook
+++ b/docs/handbook/nl/docbook/hdbk-intro.docbook
@@ -3,82 +3,83 @@
   <sect1 id="hdbk-intro-about">
     <title>About &bibletime;</title>
 
-    <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, which provides 
-the back-end functionality for &bibletime;, such as viewing Bible text, 
-searching etc. &sword; is the flagship product of the <ulink 
+    <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, 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>
 
-    <para>&bibletime; is designed to be used with works encoded in one of the formats 
-supported by the &sword; project. Complete information on the supported 
-document formats can be found in the <ulink 
-url="http://www.crosswire.org/sword/develop/index.jsp"> developers 
+    <para>&bibletime; is designed to be used with works encoded in one of the formats
+supported by the &sword; project. Complete information on the supported
+document formats can be found in the <ulink
+url="http://www.crosswire.org/sword/develop/index.jsp"> developers
 section</ulink> of the &sword; Project, &cbs;.</para>
 
     <sect2 id="hdbk-intro-works">
       <title>Beschikbare modules</title>
-      <para>Over 200 documents in 50 languages are available from the <ulink 
-url="http://www.crosswire.org">&cbs;</ulink>.  These include:
-      <variablelist>
+      <para>Over 200 documents in 50 languages are available from the <ulink
+url="http://www.crosswire.org">&cbs;</ulink>.  These include: <variablelist>
         <varlistentry>
           <term>Bijbels</term>
           <listitem>
-            <para>The full Bible text, with optional things like Strong's Numbers, headings 
-and/or footnotes in the text.  Bibles are available in many languages, and 
-include not only modern versions, but also ancient texts like the Codex 
-Leningradensis ("WLC", Hebrew), and the Septuagint ("LXX", Greek). This is 
+            <para>The full Bible text, with optional things like Strong's Numbers, headings
+and/or footnotes in the text.  Bibles are available in many languages, and
+include not only modern versions, but also ancient texts like the Codex
+Leningradensis ("WLC", Hebrew), and the Septuagint ("LXX", Greek). This is
 the most advanced section in the library of the &sword; project.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>Boeken</term>
           <listitem>
-            <para>Books available include "Imitation of Christ", "Enuma Elish", and "Josephus: 
+            <para>Books available include "Imitation of Christ", "Enuma Elish", and "Josephus:
 The Complete Works"</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>Bijbelcommentaren</term>
           <listitem>
-            <para>Commentaries available include classics like John Wesley's "Notes on the 
-Bible", Matthew Henry's commentary and Luther's "Commentary on Galatians." 
-With the <emphasis>Personal</emphasis> commentary you can <link 
-linkend="hdbk-op-parts-desk-write"> record your own personal notes</link> to 
+            <para>Commentaries available include classics like John Wesley's "Notes on the
+Bible", Matthew Henry's commentary and Luther's "Commentary on Galatians."
+With the <emphasis>Personal</emphasis> commentary you can <link
+linkend="hdbk-op-parts-desk-write"> record your own personal notes</link> to
 sections of the Bible.</para>
           </listitem>
         </varlistentry>
         <varlistentry>
           <term>Dagelijkse overdenkingen</term>
           <listitem>
-            <para>Veel mensen waarderen deze dagelijkse porties van Gods Woord. Onder de 
-beschikbare modules bevinden zich Daily Light on the Daily Path (Dagelijks 
+            <para>Veel mensen waarderen deze dagelijkse porties van Gods Woord. Onder de
+beschikbare modules bevinden zich Daily Light on the Daily Path (Dagelijks
 Licht op het Dagelijkse Pad) en de Losungen.</para>
           </listitem>
         </varlistentry>
+
         <varlistentry>
           <term>Lexicons/Woordenboeken</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>
+            <para>Lexicons available include: Robinson's Morphological 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>Motivatie</title>
-      <para>Our desire is to serve God, and to do our part to help others grow in their 
-relationship with Him. We have striven to make this a powerful, quality 
-program, and still make it simple and intuitive to operate. It is our desire 
+      <para>Our desire is to serve God, and to do our part to help others grow in their
+relationship with Him. We have striven to make this a powerful, quality
+program, and still make it simple and intuitive to operate. It is our desire
 that God be praised, as He is the source of all good things.</para>
       <blockquote>
         <attribution>Jakobus 1:17, NBG51</attribution>
-        <para>Iedere gave, die goed, en elk geschenk, dat volmaakt is, daalt van boven 
-neder, van de Vader der lichten, bij wie geen verandering is of zweem van 
+        <para>Iedere gave, die goed, en elk geschenk, dat volmaakt is, daalt van boven
+neder, van de Vader der lichten, bij wie geen verandering is of zweem van
 ommekeer.</para>
       </blockquote>
       <para>God zegene u wanneer u dit programma gebruikt.</para>
diff --git a/docs/handbook/nl/docbook/hdbk-operation.docbook b/docs/handbook/nl/docbook/hdbk-operation.docbook
index 26c961c..2e0f1fc 100644
--- a/docs/handbook/nl/docbook/hdbk-operation.docbook
+++ b/docs/handbook/nl/docbook/hdbk-operation.docbook
@@ -2,81 +2,75 @@
   <title>Werking van het programma</title>
   <sect1 id="hdbk-op-overview">
     <title>Programma overzicht</title>
-    <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" />
-      </imageobject>
+    <para>This is what a typical &bibletime; session looks like: <mediaobject>
+      <imageobject> <imagedata fileref="ss_mainterms.png" width="100%"
+contentdepth="100%" scalefit="1" format="PNG" /> </imageobject>
       <textobject>
         <phrase>The &bibletime; application window</phrase>
       </textobject>
-    </mediaobject>
-    You can easily see the different parts of the application. The top left 
-window is used to open installed works in the Bookshelf tab, and with the 
-Bookmarks tab you can manage your bookmarks. The little "Mag" window below 
-the Bookshelf is used to display extra information that is embedded in 
-documents. When you move your mouse over a footnote marker, for example, 
-then the Mag will display the actual content of the footnote. The toolbar 
-gives you quick access to important functions, and the Desk on the right 
-side is where you do your real work.</para>
-
-    <para>Laten we nu doorgaan en &eacute;&eacute;n voor &eacute;&eacute;n de 
+    </mediaobject> You can easily see the different parts of the
+application. The top left window is used to open installed works in the
+Bookshelf tab, and with the Bookmarks tab you can manage your bookmarks. The
+little "Mag" window below the Bookshelf is used to display extra information
+that is embedded in documents. When you move your mouse over a footnote
+marker, for example, then the Mag will display the actual content of the
+footnote. The toolbar gives you quick access to important functions, and the
+Desk on the right side is where you do your real work.</para>
+
+    <para>Laten we nu doorgaan en &eacute;&eacute;n voor &eacute;&eacute;n de
 verschillende onderdelen van de toepassing bekijken.</para>
   </sect1>
   <sect1 id="hdbk-op-parts">
     <title>Onderdelen van het &bibletime; toepassingsvenster</title>
     <sect2 id="hdbk-op-parts-bookshelf">
       <title>De Boekenplank</title>
-      <para>De Boekenplank laat alle ge&iuml;nstalleerde modules zien, gesorteerd per 
-categorie en taal. Het heeft ook een categorie genaamd "Bladwijzers". Dit is 
+      <para>De Boekenplank laat alle ge&iuml;nstalleerde modules zien, gesorteerd per
+categorie en taal. Het heeft ook een categorie genaamd "Bladwijzers". Dit is
 de plaats waar u uw eigen bladwijzers kunt opslaan en openen.</para>
 
       <sect3 id="hdbk-op-parts-bookshelf-open">
         <title>Modules lezen</title>
-        <para>Om een module uit de boekenplank te openen om te lezen, kunt u simpelweg met 
-de <mousebutton>linker muisknop</mousebutton> klikken op de gewenste 
-categorie (Bijbels, Bijbelcommentaren, Lexicons, Boeken, Overdenkingen of 
-Woordenlijsten) om de inhoud te laten zien. Klik dan op &eacute;&eacute;n 
-van de modules om die te openen. Er verschijnt dan een leesvenster in het 
-Bureaugebied.</para>
 
-        <tip>
-          <para>Drag &amp; Drop Werkt Hier</para>
-        </tip>
+        <para>Om een module uit de boekenplank te openen om te lezen, kunt u simpelweg met
+de <mousebutton>linker muisknop</mousebutton> klikken op de gewenste
+categorie (Bijbels, Bijbelcommentaren, Lexicons, Boeken, Overdenkingen of
+Woordenlijsten) om de inhoud te laten zien. Klik dan op &eacute;&eacute;n
+van de modules om die te openen. Er verschijnt dan een leesvenster in het
+Bureaugebied.</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, 
+        <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>
       </sect3>
 
       <sect3 id="hdbk-op-parts-bookshelf-metainfo">
         <title>Additionele informatie over modules</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 the <ulink 
-url="http://www.crosswire.org/sword/modules/aboutlocked.jsp"> Locked 
+        <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 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>Zoeken in modules</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 on the <link linkend="hdbk-op-search">Searching in Works 
+        <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 on the <link linkend="hdbk-op-search">Searching in Works
 section</link>.</para>
       </sect3>
 
@@ -88,19 +82,19 @@ section</link>.</para>
           <para>Drag &amp; Drop Werkt Hier</para>
         </tip>
 
-	Click with the <mousebutton>right</mousebutton> mouse button on the bookmark 
-category of the bookshelf and select <guimenuitem>"Create new 
-folder"</guimenuitem> to create a new bookmark subfolder. You can use normal 
-drag &amp; drop functions to drag verse references from read windows or 
-search results to the bookmark folder, and to rearrange bookmarks between 
+	Click with the <mousebutton>right</mousebutton> mouse button on the bookmark
+category of the bookshelf and select <guimenuitem>"Create new
+folder"</guimenuitem> to create a new bookmark subfolder. You can use normal
+drag &amp; drop functions to drag verse references from read windows or
+search results to the bookmark folder, and to rearrange bookmarks between
 folders.</para>
-        <para>You can also import bookmarks from other people or export bookmarks to share 
-them. To do this, open the <guimenu>context menu</guimenu> of the bookmark 
-folder as described above, and select <guimenuitem>"Export 
-bookmarks"</guimenuitem>. This will bring up a dialog box for you to save 
+        <para>You can also import bookmarks from other people or export bookmarks to share
+them. To do this, open the <guimenu>context menu</guimenu> of the bookmark
+folder as described above, and select <guimenuitem>"Export
+bookmarks"</guimenuitem>. This will bring up a dialog box for you to save
 the bookmark collection. You can import bookmarks in a similar way.</para>
 
-        <para>You can also click with the <mousebutton>right</mousebutton> on folders and 
+        <para>You can also click with the <mousebutton>right</mousebutton> on folders and
 bookmarks to change their names and descriptions.</para>
       </sect3>
     </sect2>
@@ -108,68 +102,68 @@ bookmarks to change their names and descriptions.</para>
     <sect2 id="hdbk-op-parts-mag">
       <title>Het Vergrootglas</title>
 
-      <para>Dit kleine venster in de linkeronderhoek van het &bibletime; venster is 
-volledig passief. Telkens wanneer uw muisaanwijzer over een stukje tekst met 
-extra informatie gaat (bijv. Strong-nummers), dan wordt deze extra 
-informatie weergegeven in het Vergrootglas en niet in de tekst zelf. Probeer 
+      <para>Dit kleine venster in de linkeronderhoek van het &bibletime; venster is
+volledig passief. Telkens wanneer uw muisaanwijzer over een stukje tekst met
+extra informatie gaat (bijv. Strong-nummers), dan wordt deze extra
+informatie weergegeven in het Vergrootglas en niet in de tekst zelf. Probeer
 het maar eens uit.</para>
     </sect2>
 
     <sect2 id="hdbk-op-parts-desk">
       <title>Het Bureau</title>
-      <para>The Desk is where the real work with &bibletime; takes place. Here you can 
-open works from the Bookshelf, read them, <link 
-linkend="hdbk-op-search">search</link> in them, and even save your 
-annotations in the personal commentary module (see <link 
+      <para>The Desk is where the real work with &bibletime; takes place. Here you can
+open works from the Bookshelf, read them, <link
+linkend="hdbk-op-search">search</link> in them, and even save your
+annotations in the personal commentary module (see <link
 linkend="hdbk-op-parts-desk-write">below</link>).</para>
 
       <sect3 id="hdbk-op-parts-desk-read">
         <title>Modules lezen</title>
-        <para>Zoals we al <link linkend="hdbk-op-parts-bookshelf-open">gezien</link> 
-hebben, kunt u de te lezen modules simpelweg openen door te klikken op hun 
-symbool in de Boekenplank. Een leesvenster zal worden geopend in het Bureau 
-gebied. Ieder leesvenster heeft een werkbalk. Hier kunt u gereedschappen 
-vinden om te navigeren in de module waarin dit leesvenster is verbonden, 
+        <para>Zoals we al <link linkend="hdbk-op-parts-bookshelf-open">gezien</link>
+hebben, kunt u de te lezen modules simpelweg openen door te klikken op hun
+symbool in de Boekenplank. Een leesvenster zal worden geopend in het Bureau
+gebied. Ieder leesvenster heeft een werkbalk. Hier kunt u gereedschappen
+vinden om te navigeren in de module waarin dit leesvenster is verbonden,
 alsmede history knoppen zoals u die kent vanuit uw internet browser.</para>
       </sect3>
 
       <sect3 id="hdbk-op-parts-desk-placement">
         <title>Plaatsing van leesvensters</title>
-        <para>Of course, you can open multiple works at the same time.  There are several 
-possibilities for arranging the read windows on the desk. Please have a look 
-at the entry <guimenu>Window</guimenu> in the main menu. There you can see 
-that you can either control the placement of the read windows completely 
-yourself, or have &bibletime; handle the placement automatically. To achieve 
-this, you have to select one of the automatic placement modes available at 
-<menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
+        <para>Of course, you can open multiple works at the same time.  There are several
+possibilities for arranging the read windows on the desk. Please have a look
+at the entry <guimenu>Window</guimenu> in the main menu. There you can see
+that you can either control the placement of the read windows completely
+yourself, or have &bibletime; handle the placement automatically. To achieve
+this, you have to select one of the automatic placement modes available at
+<menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement
 mode</guimenuitem> </menuchoice>. Just try it out, it's simple and works.</para>
       </sect3>
 
       <sect3 id="hdbk-op-parts-desk-write">
         <title>Uw eigen bijbelcommentaar bewerken</title>
 
-        <para>To be able to store your own comments about parts of the Bible, you have 
-install a certain work from the library of the <ulink 
-url="http://www.crosswire.org">&cbs;</ulink>.  This work is called "Personal 
+        <para>To be able to store your own comments about parts of the Bible, you have
+install a certain work from the library of the <ulink
+url="http://www.crosswire.org">&cbs;</ulink>.  This work is called "Personal
 commentary".</para>
 
-        <para>If you open the personal commentary by clicking on its symbol in the 
-Bookshelf with a <mousebutton>left</mousebutton> mouse button, it opens in 
-read mode. You will not be able to edit it in this mode. Should you wish to 
-write annotations into the personal commentary, you have to open it with the 
-<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit 
-this work</guimenu> and then either <guimenuitem>Plain 
-text</guimenuitem>(source code editor) or 
+        <para>If you open the personal commentary by clicking on its symbol in the
+Bookshelf with a <mousebutton>left</mousebutton> mouse button, it opens in
+read mode. You will not be able to edit it in this mode. Should you wish to
+write annotations into the personal commentary, you have to open it with the
+<mousebutton>right</mousebutton> mouse button and then select <guimenu>Edit
+this work</guimenu> and then either <guimenuitem>Plain
+text</guimenuitem>(source code editor) or
 <guimenuitem>HTML</guimenuitem>(basic gui wysiwyg editor).</para>
 
         <tip>
-          <para>If <menuchoice> <guimenu>Edit this work</guimenu> </menuchoice> is 
-deactivated, please check if you have write permission for the files of the 
+          <para>If <menuchoice> <guimenu>Edit this work</guimenu> </menuchoice> is
+deactivated, please check if you have write permission for the files of the
 personal commentary.</para>
         </tip>
 
         <tip>
-          <para>Drag &amp; drop works here. Drop a verse reference and the text of the verse 
+          <para>Drag &amp; drop works here. Drop a verse reference and the text of the verse
 will be inserted.</para>
         </tip>
       </sect3>
@@ -180,82 +174,79 @@ will be inserted.</para>
 
     <sect2 id="hdbk-op-search-intext">
       <title>Tekst zoeken in een geopend leesvenster</title>
-      <para>You can look for a word or phrase in the open read window (e.g. the chapter 
-of a bible that you're reading) just like you are used to from other 
-programs. This function can be reached either by clicking with the 
-<mousebutton>right</mousebutton> mouse button and selecting 
-<guimenuitem>Find...</guimenuitem>, or by using the shortcut <keycombo 
-action="simul"> <keycap>&Ctrl;F</keycap></keycombo>. Read on to learn how 
+      <para>You can look for a word or phrase in the open read window (e.g. the chapter
+of a bible that you're reading) just like you are used to from other
+programs. This function can be reached either by clicking with the
+<mousebutton>right</mousebutton> mouse button and selecting
+<guimenuitem>Find...</guimenuitem>, or by using the shortcut <keycombo
+action="simul"> <keycap>&Ctrl;F</keycap></keycombo>. Read on to learn how
 you can search in entire works.</para>
     </sect2>
 
     <sect2 id="hdbk-op-search-access">
       <title>De zoekdialoog benaderen</title>
-      <para>You can search in a work by clicking with the 
-<mousebutton>right</mousebutton> mouse button on its symbol in the 
-<guimenu>Bookshelf</guimenu> and selecting <guimenuitem>Search in 
-work(s)</guimenuitem>. By holding &Shift; or &Ctrl; and clicking on other 
-work's names you can select more than one. Then follow the same procedure to 
-open the search dialog. You will be searching in all of these works at the 
+      <para>You can search in a work by clicking with the
+<mousebutton>right</mousebutton> mouse button on its symbol in the
+<guimenu>Bookshelf</guimenu> and selecting <guimenuitem>Search in
+work(s)</guimenuitem>. By holding &Shift; or &Ctrl; and clicking on other
+work's names you can select more than one. Then follow the same procedure to
+open the search dialog. You will be searching in all of these works at the
 same time.</para>
 
-      <para>You can also access the search dialog by clicking on <menuchoice> 
-<guimenu>Search</guimenu> </menuchoice> from the main menu, and selecting 
+      <para>You can also access the search dialog by clicking on <menuchoice>
+<guimenu>Search</guimenu> </menuchoice> from the main menu, and selecting
 the appropriate entry.</para>
 
-      <para>Een derde mogelijkheid om zoekopdrachten te starten is door op het 
+      <para>Een derde mogelijkheid om zoekopdrachten te starten is door op het
 zoeksymbool in een geopend leesvenster te klikken.</para>
     </sect2>
 
     <sect2 id="hdbk-op-search-config">
       <title>Configuratie van de zoekopdracht</title>
       <screenshot>
-        <screeninfo>Het tabblad Opties in de dialoog Tekst Zoeken</screeninfo>
-        <mediaobject>
-          <imageobject>
-            <imagedata fileref="ss_searchopts.png" width="600" depth="463" scale="75" format="PNG" />
-          </imageobject>
-        </mediaobject>
-      </screenshot>
+<screeninfo>Het tabblad Opties in de dialoog Tekst Zoeken</screeninfo> <mediaobject>
+<imageobject> <imagedata fileref="ss_searchopts.png" width="100%"
+contentdepth="100%" scalefit="1" format="PNG" /> </imageobject></mediaobject></screenshot>
       <sect3 id="hdbk-op-search-config-works">
         <title>Modules selecteren</title>
-        <para>At the top of the options tab you will find 
-<guibutton>Choose</guibutton>(works). If you would like to search in 
-multiple works, click on this button and you will be offered a menu where 
+        <para>At the top of the options tab you will find
+<guibutton>Choose</guibutton>(works). If you would like to search in
+multiple works, click on this button and you will be offered a menu where
 you can select the works you want to search in.</para>
       </sect3>
       <sect3 id="hd-op-search-config-scope">
         <title>Zoekbereiken gebruiken</title>
-        <para>You can narrow the scope of your search to certain parts of the Bible by 
-selecting one of the predefined scopes from the list in <guimenu>Search 
-scope</guimenu>. You can define your own search ranges by clicking the 
+        <para>You can narrow the scope of your search to certain parts of the Bible by
+selecting one of the predefined scopes from the list in <guimenu>Search
+scope</guimenu>. You can define your own search ranges by clicking the
 <guibutton>Setup ranges</guibutton> button.</para>
       </sect3>
 
       <sect3 id="hd-op-search-config-syntax">
         <title>Introductie op de syntaxis van een eenvoudige zoekopdracht</title>
 
-        <para>Enter the search phrase separated by spaces.  By default the search function 
-will return results that match all the words.  If you want to find any of 
-the words entered, select the <guimenu>Some words</guimenu> button.  If you 
-want to perform a more complex search, select the <guimenu>Free</guimenu> 
-button.  You can see examples of searches by clicking on <guimenu>full 
+        <para>Enter the search phrase separated by spaces.  By default the search function
+will return results that match all the words.  If you want to find any of
+the words entered, select the <guimenu>Some words</guimenu> button.  If you
+want to perform a more complex search, select the <guimenu>Free</guimenu>
+button.  You can see examples of searches by clicking on <guimenu>full
 syntax</guimenu>.
 	  </para>
 
-        <para>You can use wildcards: '*' matches any number of characters, while '?' will 
-match any single character. The use of brackets allows you to group your 
+        <para>You can use wildcards: '*' matches any number of characters, while '?' will
+match any single character. The use of brackets allows you to group your
 search terms, e.g. '(Jesus OR spirit) AND God'.</para>
 
-        <para>To search text other than the main text, enter the text type followed by 
+        <para>To search text other than the main text, enter the text type followed by
 ':', and then the search term.  Refer to the table below for examples.</para>
 
-        <para>Beschikbare typen tekst: 
-        <table id="hd-op-search-config-syntax-table">
+        <para>Available text types: <table id="hd-op-search-config-syntax-table">
 	  <title>Search Types</title>
           <tgroup cols="3">
             <thead>
               <row>
+		<?dbhtml bgcolor="#EEEEEE" ?>
+		<?dbfo bgcolor="#EEEEEE" ?>
                 <entry>Voorvoegsel</entry>
                 <entry>Betekenis</entry>
 		<entry>Example</entry>
@@ -287,52 +278,48 @@ search terms, e.g. '(Jesus OR spirit) AND God'.</para>
         </table></para>
 
 	<tip>
-	  <para>You can right click on an installed work and select <guimenu>About</guimenu> 
-to find which of the above search criteria may work for you.  Not all works 
+	  <para>You can right click on an installed work and select <guimenu>About</guimenu>
+to find which of the above search criteria may work for you.  Not all works
 have the built in features for performing this type of search.</para>
 	</tip>
 
-        <para>&bibletime; uses the Lucene search engine to perform your searches. It has 
-many advanced features, and you can read more about it here: <ulink 
-url="http://lucene.apache.org/java/docs/index.html"> 
+        <para>&bibletime; uses the Lucene search engine to perform your searches. It has
+many advanced features, and you can read more about it here: <ulink
+url="http://lucene.apache.org/java/docs/index.html">
 http://lucene.apache.org/java/docs/index.html</ulink>.</para>
       </sect3>
     </sect2>
 
     <sect2 id="hdbk-op-search-results">
       <title>Zoekresultaten</title>
-      <para>Here you can see how many instances of the search string were found, sorted 
-by works. Clicking on a work with the <mousebutton>right</mousebutton> mouse 
-button allows you to copy, save, or print all verses that were found in a 
-certain work at once. This also works when you click on one or more of the 
-references to copy, save or print them. Clicking on a particular reference 
+      <para>Here you can see how many instances of the search string were found, sorted
+by works. Clicking on a work with the <mousebutton>right</mousebutton> mouse
+button allows you to copy, save, or print all verses that were found in a
+certain work at once. This also works when you click on one or more of the
+references to copy, save or print them. Clicking on a particular reference
 opens that verse up in context in the preview window below.</para>
       <tip>
-        <para>Sleep een bijbelverwijzing en laat die los op een symbool van een module op 
+        <para>Sleep een bijbelverwijzing en laat die los op een symbool van een module op
 de Boekenplank om de module op dat vers in een nieuw leesvenster te openen.</para>
       </tip>
       <tip>
-        <para>Sleep een bijbelverwijzing en laat die vallen op een geopend leesvenster en 
+        <para>Sleep een bijbelverwijzing en laat die vallen op een geopend leesvenster en
 die zal verspringen naar dat vers.</para>
       </tip>
       <tip>
-        <para>Selecteer bijbelverwijzingen en sleep ze naar de Boekenplank om bladwijzers 
+        <para>Selecteer bijbelverwijzingen en sleep ze naar de Boekenplank om bladwijzers
 te maken.</para>
       </tip>
       <sect3 id="hdbk-op-search-analysis">
         <title>Analyse van zoekresultaten</title>
-        <para>Click on <guibutton>Search analysis</guibutton> to open the search analysis 
-display. This gives a simple graphic analysis of the number of instances the 
-search string was found in each book of the Bible, and you can also save the 
+        <para>Click on <guibutton>Search analysis</guibutton> to open the search analysis
+display. This gives a simple graphic analysis of the number of instances the
+search string was found in each book of the Bible, and you can also save the
 analysis.</para>
         <screenshot>
-          <screeninfo>Zoekanalyse Dialoog</screeninfo>
-          <mediaobject>
-            <imageobject>
-              <imagedata fileref="ss_searchanal.png" width="600" depth="470" scale="75" format="PNG" />
-            </imageobject>
-          </mediaobject>
-        </screenshot>
+<screeninfo>Zoekanalyse Dialoog</screeninfo> <mediaobject>
+<imageobject> <imagedata fileref="ss_searchanal.png" width="100%"
+contentdepth="100%" scalefit="1" format="PNG" /> </imageobject></mediaobject></screenshot>
       </sect3>
     </sect2>
   </sect1>
@@ -340,58 +327,68 @@ analysis.</para>
   <sect1 id="hdbk-op-bookshelfmanager">
     <title>De <guimenuitem>Boekenplank 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> 
+    <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 
+	<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>Het instellen van Boekenplank bestandspad(en)</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>
+
+      <para>Here you can specify where &bibletime; may store your 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, then you can add the path to the CD 
-as one of your bookshelf paths. When you start &bibletime;, it will show all 
+        <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, then you can add the path to the CD
+as one of your bookshelf paths. When you start &bibletime;, it will show all
 works on the CD if it is present.</para>
       </tip>
     </sect2>
+
     <sect2 id="hdbk-op-bookshelfmanager-installupdate">
       <title>Modules installeren/bijwerken</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>
-      <para>Om het proces van installeren of bijwerken te starten kiest u een 
-bibliotheek waarmee u verbinding wilt zoeken en een lokaal bestandspad naar 
-een Boekenplank om de module(s) naar toe te installeren. Klik dan op 
-<guibutton>Verbinden met bibliotheek</guibutton>. &bibletime; zal de inhoud 
-van de bibliotheek scannen en een lijst presenteren van modules die u aan uw 
-Boekenplank kunt toevoegen of die reeds ge&iuml;nstalleerd zijn, maar 
-bijgewerkt kunnen worden omdat er een nieuwe versie beschikbaar is in de 
-bibliotheek. U kunt dan alle modules aanvinken die u wilt installeren of 
-bijwerken en dan klikken op <guibutton>Installeer modules</guibutton>. Ze 
+
+      <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 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>Om het proces van installeren of bijwerken te starten kiest u een
+bibliotheek waarmee u verbinding wilt zoeken en een lokaal bestandspad naar
+een Boekenplank om de module(s) naar toe te installeren. Klik dan op
+<guibutton>Verbinden met bibliotheek</guibutton>. &bibletime; zal de inhoud
+van de bibliotheek scannen en een lijst presenteren van modules die u aan uw
+Boekenplank kunt toevoegen of die reeds ge&iuml;nstalleerd zijn, maar
+bijgewerkt kunnen worden omdat er een nieuwe versie beschikbaar is in de
+bibliotheek. U kunt dan alle modules aanvinken die u wilt installeren of
+bijwerken en dan klikken op <guibutton>Installeer modules</guibutton>. Ze
 zullen dan overgeheveld worden naar uw Boekenplank.</para>
     </sect2>
+
     <sect2 id="hdbk-op-bookshelfmanager-remove">
       <title>Module(s) verwijderen</title>
-      <para>Deze voorziening stelt u in staat om &eacute;&eacute;n of meerdere modules 
-van uw Boekenplank te verwijderen om schijfruimte vrij te maken. Vink 
-simpelweg de items aan die u wilt verwijderen en klik op 
+      <para>Deze voorziening stelt u in staat om &eacute;&eacute;n of meerdere modules
+van uw Boekenplank te verwijderen om schijfruimte vrij te maken. Vink
+simpelweg de items aan die u wilt verwijderen en klik op
 <guibutton>Verwijder modules</guibutton>.</para>
     </sect2>
     <sect2 id="hdbk-op-bookshelfmanager-searchindexes">
       <title>Search Indexes</title>
-      <para>This option allows you to create new search indexes and cleanup orphaned 
+      <para>This option allows you to create new search indexes and cleanup orphaned
 index files for removed works.</para>
       <tip>
 	If you are having problems with your search function, visit
@@ -401,20 +398,20 @@ index files for removed works.</para>
   </sect1>
   <sect1 id="hdbk-op-output">
     <title>Exporteren en Printen</title>
-    <para>In many places, you can open a context menu by clicking with the 
-<mousebutton>right</mousebutton> mouse button. Depending on context, it will 
-allow you to <guimenuitem>Select</guimenuitem>, 
-<guimenuitem>Copy</guimenuitem> (to clipboard), 
-<guimenuitem>Save</guimenuitem> or <guimenuitem>Print</guimenuitem> 
-text. This works for example in the read windows, when you click on the 
-normal text or the verse reference, or in the search result page when you 
-click on a work or one or more verse references. It is pretty 
+    <para>In many places, you can open a context menu by clicking with the
+<mousebutton>right</mousebutton> mouse button. Depending on context, it will
+allow you to <guimenuitem>Select</guimenuitem>,
+<guimenuitem>Copy</guimenuitem> (to clipboard),
+<guimenuitem>Save</guimenuitem> or <guimenuitem>Print</guimenuitem>
+text. This works for example in the read windows, when you click on the
+normal text or the verse reference, or in the search result page when you
+click on a work or one or more verse references. It is pretty
 straightforward, so just try it out.</para>
 
-    <para>Afdrukken vanuit &bibletime; is redelijk elementair en is bedoelt als een 
-hulpfunctie. Als u een document of presentatie samenstelt die tekst bevat 
-uit &bibletime; modules, dan raden we u aan om een programma voor 
-presentaties of tekstbewerkingen te gebruiken om uw document op te maken en 
+    <para>Afdrukken vanuit &bibletime; is redelijk elementair en is bedoelt als een
+hulpfunctie. Als u een document of presentatie samenstelt die tekst bevat
+uit &bibletime; modules, dan raden we u aan om een programma voor
+presentaties of tekstbewerkingen te gebruiken om uw document op te maken en
 niet om direct vanuit &bibletime; af te drukken.</para>
   </sect1>
 </chapter>
diff --git a/docs/handbook/nl/docbook/hdbk-reference.docbook b/docs/handbook/nl/docbook/hdbk-reference.docbook
index 82ca6d2..4f2600a 100644
--- a/docs/handbook/nl/docbook/hdbk-reference.docbook
+++ b/docs/handbook/nl/docbook/hdbk-reference.docbook
@@ -3,11 +3,11 @@
   <sect1 id="hdbk-reference-menus">
     <title>Hoofdmenu verwijzing</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 the <link 
+    <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 the <link
 linkend="hdbk-reference-shortcuts">shortcuts section</link>.</para>
 
     <sect2 id="hdbk-reference-menus-file">
@@ -18,23 +18,15 @@ linkend="hdbk-reference-shortcuts">shortcuts section</link>.</para>
         <variablelist>
           <varlistentry id="hdbk-reference-menus-file-quit">
             <term>
-              <menuchoice>
-                <shortcut>
-                  <keycombo action="simul">
-                  <keycap>&Ctrl;Q</keycap></keycombo>
-                </shortcut>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_exit.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject>File</guimenu>
-                <guimenuitem>Quit</guimenuitem>
-              </menuchoice>
+              <menuchoice> <shortcut> <keycombo action="simul">
+<keycap>&Ctrl;+Q</keycap></keycombo> </shortcut> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_exit.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject>File</guimenu>
+<guimenuitem>Quit</guimenuitem> </menuchoice>
             </term>
             <listitem>
               <para>
-              <action>Closes &bibletime;.</action> &bibletime; will ask you if you want to 
+              <action>Closes &bibletime;.</action> &bibletime; will ask you if you want to
 write unsaved changes to disk.</para>
             </listitem>
           </varlistentry>
@@ -50,92 +42,128 @@ write unsaved changes to disk.</para>
       <variablelist>
         <varlistentry id="hdbk-reference-menus-view-fullscreenmode">
           <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                  <keycap>F5</keycap>
-                </keycombo>
-              </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_window_fullscreen.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>View</guimenu>
-              <guimenuitem>Fullscreen mode</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul"> <keycap>F5</keycap>
+</keycombo> </shortcut> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_window_fullscreen.png" width="32"
+depth="32" format="PNG" /> </imageobject></inlinemediaobject>View</guimenu> <guimenuitem>Fullscreen mode</guimenuitem>
+</menuchoice>
           </term>
           <listitem>
             <para>
-            <action>Toggles full screen display.</action> Toggle this setting to 
+            <action>Toggles full screen display.</action> Toggle this setting to
 maximize the &bibletime; window.</para>
           </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>Schakelt de weergave van de Werkbalk in/uit.</action> Schakel deze 
-instelling in/uit om de hoofdwerkbalk wel/niet weer te geven.</para>
-          </listitem>
-        </varlistentry>
-
         <varlistentry id="hdbk-reference-menus-view-showbookshelf">
           <term>
-            <menuchoice>
-              <guimenu>View</guimenu>
-              <guimenuitem>Show Bookshelf</guimenuitem>
-            </menuchoice>
+            <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show
+Bookshelf</guimenuitem> </menuchoice>
           </term>
           <listitem>
             <para>
-            <action>Schakelt de weergave van de Boekenplank in/uit.</action> Schakel 
-deze instelling in/uit om de Boekenplank in het linkerpaneel wel/niet weer 
-te geven. Dit kan handig zijn als u meer ruimte nodig heeft voor het 
+            <action>Schakelt de weergave van de Boekenplank in/uit.</action> Schakel
+deze instelling in/uit om de Boekenplank in het linkerpaneel wel/niet weer
+te geven. Dit kan handig zijn als u meer ruimte nodig heeft voor het
 vergrootglas.</para>
           </listitem>
         </varlistentry>
 
         <varlistentry id="hdbk-reference-menus-view-showbookmarks">
           <term>
-            <menuchoice>
-              <guimenu>View</guimenu>
-              <guimenuitem>Show Bookmarks</guimenuitem>
-            </menuchoice>
+            <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show
+Bookmarks</guimenuitem> </menuchoice>
           </term>
           <listitem>
             <para>
-            <action>Toggles display of the Bookmarks.</action> Toggle this setting to 
-turn the Bookmarks on the left pane on or off. This can be handy if you need 
+            <action>Toggles display of the Bookmarks.</action> Toggle this setting to
+turn the Bookmarks on the left pane on or off. This can be handy if you need
 more space for the Mag.</para>
           </listitem>
         </varlistentry>
 
         <varlistentry id="hdbk-reference-menus-view-showmag">
           <term>
-            <menuchoice>
-              <guimenu>View</guimenu>
-              <guimenuitem>Show Mag</guimenuitem>
-            </menuchoice>
+            <menuchoice> <guimenu>View</guimenu> <guimenuitem>Show Mag</guimenuitem>
+</menuchoice>
           </term>
           <listitem>
             <para>
-            <action>Schakelt de weergave van het Vergrootglas in/uit.</action> Schakel 
-deze instelling in/uit om het Vergrootglas in het linkerpaneel aan/uit te 
+            <action>Schakelt de weergave van het Vergrootglas in/uit.</action> Schakel
+deze instelling in/uit om het Vergrootglas in het linkerpaneel aan/uit te
 zetten.</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">
@@ -145,50 +173,35 @@ zetten.</para>
       <variablelist>
         <varlistentry id="hdbk-reference-menus-search-defaultbible">
           <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                <keycap>&Ctrl;&Alt;F</keycap></keycombo>
-              </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_find.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Search</guimenu>
-              <guimenuitem>Search in standard bible</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul">
+<keycap>&Ctrl;+&Alt;+F</keycap></keycombo> </shortcut> <guimenu>
+<inlinemediaobject>
+<imageobject> <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 in the <link 
+            <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>
-              <shortcut>
-                <keycombo action="simul">
-                <keycap>&Ctrl;O</keycap></keycombo>
-              </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_find.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Search</guimenu>
-              <guimenuitem>Search in open work(s)</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul">
+<keycap>&Ctrl;+O</keycap></keycombo> </shortcut> <guimenu> <inlinemediaobject>
+<imageobject> <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 in the <link linkend="hdbk-op-search">Searching in 
+            <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>
 
@@ -202,207 +215,169 @@ works</link> section.</para>
       </title>
 
       <variablelist>
-        <varlistentry id="hdbk-reference-menus-window-savesession">
+        <varlistentry id="hdbk-reference-menus-window-close">
           <term>
-            <menuchoice>
-              <guimenu> Window</guimenu>
-              <guimenuitem>Save session</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul">
+<keycap>&Ctrl;+W</keycap></keycombo> </shortcut> <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>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>
+            <action>Closes active window</action>.</para>
           </listitem>
         </varlistentry>
 
-        <varlistentry id="hdbk-reference-menus-window-savenewsession">
+        <varlistentry id="hdbk-reference-menus-window-closeall">
           <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                <keycap>&Ctrl;&Alt;S</keycap></keycombo>
-              </shortcut>
-              <guimenu>Window</guimenu>
-              <guimenuitem>Save as new session</guimenuitem>
-            </menuchoice>
+            <menuchoice> <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>Saves the current session under a new name</action>. This will ask 
-for a new name to save the session to.</para>
+            <action>Sluit alle geopende vensters</action></para>
           </listitem>
         </varlistentry>
 
-        <varlistentry id="hdbk-reference-menus-window-loadsession">
+        <varlistentry id="hdbk-reference-menus-window-cascade">
           <term>
-            <menuchoice>
-              <guimenu>Window</guimenu>
-              <guimenuitem>Load session</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul">
+<keycap>&Ctrl;+J</keycap></keycombo> </shortcut> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_cascade.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject>Window</guimenu>
+<guimenuitem>Cascade</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>Rangschikt alle geopende vensters trapsgewijs (achter
+elkaar)</action>
+	    </para>
           </listitem>
         </varlistentry>
 
-        <varlistentry id="hdbk-reference-menus-window-deletesession">
+        <varlistentry id="hdbk-reference-menus-window-tile">
           <term>
-            <menuchoice>
-              <guimenu>Window</guimenu>
-              <guimenuitem>Delete session</guimenuitem>
-            </menuchoice>
+            <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>Deletes an existing session</action>. This will open a context menu 
-where you can select an existing session that should be deleted.</para>
+	      <action>Tiles all open windows</action>.
+	    </para>
           </listitem>
         </varlistentry>
 
-        <varlistentry id="hdbk-reference-menus-window-arrangement_mode">
+        <varlistentry id="hdbk-reference-menus-window-tilevertically">
           <term>
-            <menuchoice>
-              <guimenu>Window</guimenu>
-              <guimenuitem>Arrangement mode</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul">
+<keycap>&Ctrl;+G</keycap></keycombo> </shortcut> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_tile_vert.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject>Window</guimenu> <guimenuitem>Tile
+vertically</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>
+	      <action>Automatically tiles all open windows vertically</action>.
+	    </para>
           </listitem>
         </varlistentry>
 
-        <!--- TODO add submen items here -->
-<varlistentry id="hdbk-reference-menus-window-cascade">
+        <varlistentry id="hdbk-reference-menus-window-tilehorizontally">
           <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                <keycap>&Ctrl;J</keycap></keycombo>
-              </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_cascade.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Window</guimenu>
-              <guimenuitem>Cascade</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul">
+<keycap>&Ctrl;+H</keycap></keycombo> </shortcut> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_tile_horiz.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject>Window</guimenu> <guimenuitem>Tile
+horizontally</guimenuitem> </menuchoice>
           </term>
 
           <listitem>
             <para>
-	      <action>Rangschikt alle geopende vensters trapsgewijs (achter 
-elkaar)</action>
+	      <action>Automatically tiles all open windows horizontally</action>.
 	    </para>
           </listitem>
         </varlistentry>
 
-        <varlistentry id="hdbk-reference-menus-window-tile">
+        <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>
-              <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>
+            <menuchoice> <guimenu> Window</guimenu> <guimenuitem>Save
+session</guimenuitem> </menuchoice>
           </term>
 
           <listitem>
             <para>
-	      <action>Tiles all open windows</action>.
-	    </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-tilevertically">
+        <varlistentry id="hdbk-reference-menus-window-savenewsession">
           <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                <keycap>&Ctrl;G</keycap></keycombo>
-              </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_tile_vert.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Window</guimenu>
-              <guimenuitem>Tile vertically</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul">
+<keycap>&Ctrl;+&Alt;+S</keycap></keycombo> </shortcut>
+<guimenu>Window</guimenu> <guimenuitem>Save as new session</guimenuitem>
+</menuchoice>
           </term>
 
           <listitem>
             <para>
-	      <action>Automatically tiles all open windows vertically</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-tilehorizontally">
+        <varlistentry id="hdbk-reference-menus-window-loadsession">
           <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                <keycap>&Ctrl;H</keycap></keycombo>
-              </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_tile_horiz.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Window</guimenu>
-              <guimenuitem>Tile horizontally</guimenuitem>
-            </menuchoice>
+            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Load
+session</guimenuitem> </menuchoice>
           </term>
 
           <listitem>
             <para>
-	      <action>Automatically tiles all open windows horizontally</action>.
-	    </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-closeall">
+        <varlistentry id="hdbk-reference-menus-window-deletesession">
           <term>
-            <menuchoice>
-              <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>
+            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Delete
+session</guimenuitem> </menuchoice>
           </term>
 
           <listitem>
             <para>
-            <action>Sluit alle geopende vensters</action></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>
@@ -415,21 +390,16 @@ elkaar)</action>
       <variablelist>
         <varlistentry id="hdbk-reference-menus-settings-bibletime">
           <term>
-            <menuchoice>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_configure.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Settings</guimenu>
-              <guimenuitem>Configure &bibletime;</guimenuitem>
-            </menuchoice>
+            <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <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 the <link linkend="hdbk-config-bt">Configuring 
+            <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>
@@ -437,26 +407,17 @@ needs.  Please see the <link linkend="hdbk-config-bt">Configuring
         <varlistentry id="hdbk-reference-menus-settings-bookshelf_manager">
 
           <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                  <keycap>F4</keycap>
-                </keycombo>
-              </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_configuresword.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Settings</guimenu>
-              <guimenuitem>Bookshelf Manager</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul"> <keycap>F4</keycap>
+</keycombo> </shortcut> <guimenu> <inlinemediaobject>
+<imageobject> <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 the <link 
-linkend="hdbk-op-bookshelfmanager">Bookshelf Manager section</link> for 
+            <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>
@@ -470,20 +431,10 @@ details.</para>
       <variablelist>
         <varlistentry id="hdbk-reference-menus-help-bibletime">
           <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                  <keycap>F1</keycap>
-                </keycombo>
-              </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_contents2.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Help</guimenu>
-              <guimenuitem>Handbook</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul"> <keycap>F1</keycap>
+</keycombo> </shortcut> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_contents2.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject>Help</guimenu> <guimenuitem>Handbook</guimenuitem> </menuchoice>
           </term>
           <listitem>
             <para>
@@ -493,45 +444,34 @@ details.</para>
 
         <varlistentry id="hdbk-reference-menus-help-bible_study_howto">
           <term>
-            <menuchoice>
-              <shortcut>
-                <keycombo action="simul">
-                  <keycap>F2</keycap>
-                </keycombo>
-              </shortcut>
-              <guimenu>
-              <inlinemediaobject>
-                <imageobject>
-                  <imagedata fileref="i_contents2.png" width="32" depth="32" format="PNG" />
-                </imageobject>
-              </inlinemediaobject>Help</guimenu>
-              <guimenuitem>Bible Study Howto</guimenuitem>
-            </menuchoice>
+            <menuchoice> <shortcut> <keycombo action="simul"> <keycap>F2</keycap>
+</keycombo> </shortcut> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_contents2.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject>Help</guimenu> <guimenuitem>Bible Study HowTo</guimenuitem>
+</menuchoice>
           </term>
           <listitem>
             <para>
-            <action>Opens a guide on how to study the Bible</action> It is the hope of 
-the &bibletime; team that this HowTo will provoke the readers to study the 
-scriptures to see what they say. This particular study guide has been chosen 
-as it takes care not to advocate any particular denominational doctrine. We 
-expect you to read and study the scriptures to understand what they say. If 
-you start with the attitude that you want to have the Lord sow his word in 
+            <action>Opens a guide on how to study the Bible</action> It is the hope of
+the &bibletime; team that this HowTo will provoke the readers to study the
+scriptures to see what they say. This particular study guide has been chosen
+as it takes care not to advocate any particular denominational doctrine. We
+expect you to read and study the scriptures to understand what they say. If
+you start with the attitude that you want to have the Lord sow his word in
 your heart He will not disappoint you.</para>
           </listitem>
         </varlistentry>
 
         <varlistentry id="hdbk-reference-menus-help-about">
           <term>
-            <menuchoice>
-	      <guimenu>Help</guimenu>
-	      <guimenuitem>About</guimenuitem>
-            </menuchoice>
+            <menuchoice> <guimenu>Help</guimenu> <guimenuitem>About</guimenuitem>
+</menuchoice>
           </term>
           <listitem>
             <para>
-            <action>Opens a window about &bibletime; project information</action> 
-contains information about &bibletime; software version, project 
-contributors, &sword; software version, &qt; software version and the 
+            <action>Opens a window about &bibletime; project information</action>
+contains information about &bibletime; software version, project
+contributors, &sword; software version, &qt; software version and the
 license agreement.</para>
           </listitem>
         </varlistentry>
@@ -542,7 +482,7 @@ license agreement.</para>
   <sect1 id="hdbk-reference-works">
     <title>Works reference</title>
     <para>
-      In this section you can find descriptions of the icons associated with open 
+      In this section you can find descriptions of the icons associated with open
 works.
     </para> 
 
@@ -551,14 +491,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-forward">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_forward.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_forward.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -574,14 +509,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-back">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_back.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_back.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -597,14 +527,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-selectbible">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_bible.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_bible.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -620,14 +545,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-selectbible-add">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_bible_add.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_bible_add.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -643,14 +563,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-search">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_find.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_find.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -666,14 +581,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-displayconfig">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_displayconfig.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_displayconfig.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -689,14 +599,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-selectcommentary">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_commentary.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_commentary.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -712,14 +617,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-selectcommentary-add">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_commentary_add.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_commentary_add.png" width="32"
+depth="32" format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -735,14 +635,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-synch">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_sync.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_sync.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -758,14 +653,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-book">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_book.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_book.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -781,14 +671,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-lexicon">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_lexicon.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_lexicon.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -804,14 +689,9 @@ works.
         <variablelist>
           <varlistentry id="hdbk-reference-works-list-lexicon-add">
             <term>
-              <menuchoice>
-                <guimenu>
-                <inlinemediaobject>
-                  <imageobject>
-                    <imagedata fileref="i_lexicon_add.png" width="32" depth="32" format="PNG" />
-                  </imageobject>
-                </inlinemediaobject></guimenu>
-              </menuchoice>
+              <menuchoice> <guimenu> <inlinemediaobject>
+<imageobject> <imagedata fileref="i_lexicon_add.png" width="32" depth="32"
+format="PNG" /> </imageobject></inlinemediaobject></guimenu> </menuchoice>
             </term>
 
             <listitem>
@@ -828,11 +708,11 @@ works.
   <sect1 id="hdbk-reference-shortcuts">
     <title>Shortcuts index</title>
 
-    <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 
+    <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>
@@ -841,6 +721,8 @@ reference</link>.</para>
         <colspec colname="desc" />
         <thead>
           <row>
+	    <?dbhtml bgcolor="#EEEEEE" ?>
+	    <?dbfo bgcolor="#EEEEEE" ?>
             <entry>Shortcut</entry>
             <entry>Beschrijving</entry>
           </row>
@@ -848,293 +730,271 @@ reference</link>.</para>
         <tbody>
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Alt;Left</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Alt;+Left</keycap></keycombo>
             </entry>
             <entry>Gaat terug in de history van leesvensters</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Alt;Right</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Alt;+Right</keycap></keycombo>
             </entry>
             <entry>Gaat vooruit in de history van leesvensters</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;F</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+&Alt;+F</keycap></keycombo>
             </entry>
             <entry>
-            <link linkend="hdbk-reference-menus-search-defaultbible"> <menuchoice> 
-<guimenu>Search</guimenu> <guimenuitem>Search in default bible</guimenuitem> 
-</menuchoice> </link> equivalent; opens the search dialog to search in the 
+            <link linkend="hdbk-reference-menus-search-defaultbible"> <menuchoice>
+<guimenu>Search</guimenu> <guimenuitem>Search in default bible</guimenuitem>
+</menuchoice> </link> equivalent; opens the search dialog to search in the
 default bible.</entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;G</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+&Alt;+G</keycap></keycombo>
             </entry>
 
             <entry>
-	      <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
-mode</guimenuitem> <guimenuitem>Auto-tile vertically</guimenuitem> 
+	      <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement
+mode</guimenuitem> <guimenuitem>Auto-tile vertically</guimenuitem>
 </menuchoice> equivalent; toggle automatic window tiling.
 	    </entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;H</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+&Alt;+H</keycap></keycombo>
             </entry>
             <entry>
-            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
-mode</guimenuitem> <guimenuitem>Auto-tile horizontally</guimenuitem> 
+            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement
+mode</guimenuitem> <guimenuitem>Auto-tile horizontally</guimenuitem>
 </menuchoice> equivalent; toggle automatic window tiling.</entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;I</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+&Alt;+I</keycap></keycombo>
             </entry>
 
             <entry>
-	      <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
-mode</guimenuitem> <guimenuitem>Auto-tile</guimenuitem> </menuchoice> 
+	      <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">
-              <keycap>&Ctrl;&Alt;J</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+&Alt;+J</keycap></keycombo>
             </entry>
             <entry>
-            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
-mode</guimenuitem> <guimenuitem>Auto-cascade</guimenuitem> </menuchoice> 
+            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement
+mode</guimenuitem> <guimenuitem>Auto-cascade</guimenuitem> </menuchoice>
 equivalent; toggle automatic window cascading.</entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;M</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+&Alt;+M</keycap></keycombo>
             </entry>
+
             <entry>
-            <menuchoice> <guimenu>Window</guimenu> <guimenuitem>Arrangement 
-mode</guimenuitem> <guimenuitem>Manual mode</guimenuitem> </menuchoice> 
+	      <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>
+              <keycombo action="simul"> <keycap>&Ctrl;+&Alt;+S</keycap></keycombo>
             </entry>
             <entry>
-            <link linkend="hdbk-reference-menus-window-savenewsession"> <menuchoice> 
-<guimenu>Window</guimenu> <guimenuitem>Save as new session</guimenuitem> 
+            <link linkend="hdbk-reference-menus-window-savenewsession"> <menuchoice>
+<guimenu>Window</guimenu> <guimenuitem>Save as new session</guimenuitem>
 </menuchoice> </link> equivalent; saves current layout as new session.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;&Alt;W</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+&Alt;+W</keycap></keycombo>
             </entry>
             <entry>
-            <link linkend="hdbk-reference-menus-window-closeall"> <menuchoice> 
-<guimenu>Window</guimenu> <guimenuitem>Close all</guimenuitem> </menuchoice> 
+            <link linkend="hdbk-reference-menus-window-closeall"> <menuchoice>
+<guimenu>Window</guimenu> <guimenuitem>Close all</guimenuitem> </menuchoice>
 </link> equivalent; closes all open windows.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;-</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+-</keycap></keycombo>
             </entry>
             <entry>Uitzoomen. Dit vermindert de lettergrootte van de leesvensters.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;+</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;++</keycap></keycombo>
             </entry>
             <entry>Inzoomen. Dit vergroot de lettergrootte van de leesvensters.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;A</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+A</keycap></keycombo>
             </entry>
             <entry>Selecteer alles. Dit selecteert alle tekst in de leesvensters.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;C</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+C</keycap></keycombo>
             </entry>
             <entry>Kopie&euml;ren. Dit kopieert de geselecteerde tekst naar het klembord.</entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;F</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+F</keycap></keycombo>
             </entry>
             <entry>Zoeken. Dit laat u zoeken binnen de tekst van een leesvenster.</entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;G</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+G</keycap></keycombo>
             </entry>
 
             <entry>
-	      <link linkend="hdbk-reference-menus-window-tilevertically"> <menuchoice> 
-<guimenu>Window</guimenu> <guimenuitem>Tile vertically</guimenuitem> 
+	      <link linkend="hdbk-reference-menus-window-tilevertically"> <menuchoice>
+<guimenu>Window</guimenu> <guimenuitem>Tile vertically</guimenuitem>
 </menuchoice> </link> equivalent.
             </entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;H</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+H</keycap></keycombo>
             </entry>
 
             <entry>
-	      <link linkend="hdbk-reference-menus-window-tilehorizontally"> <menuchoice> 
-<guimenu>Window</guimenu> <guimenuitem>Tile horizontally</guimenuitem> 
+	      <link linkend="hdbk-reference-menus-window-tilehorizontally"> <menuchoice>
+<guimenu>Window</guimenu> <guimenuitem>Tile horizontally</guimenuitem>
 </menuchoice> </link> equivalent.
             </entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;I</keycap></keycombo>
+              <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 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>
+              <keycombo action="simul"> <keycap>&Ctrl;+J</keycap></keycombo>
             </entry>
 
             <entry>
-	      <link linkend="hdbk-reference-menus-window-cascade"> <menuchoice> 
-<guimenu>Window</guimenu> <guimenuitem>Cascade</guimenuitem> </menuchoice> 
+	      <link linkend="hdbk-reference-menus-window-cascade"> <menuchoice>
+<guimenu>Window</guimenu> <guimenuitem>Cascade</guimenuitem> </menuchoice>
 </link> windows equivalent.
             </entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;L</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+L</keycap></keycombo>
             </entry>
             <entry>Change location. Changes focus to the toolbar field for the selected work.</entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;N</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+N</keycap></keycombo>
             </entry>
             <entry>Search with works of this window.</entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;O</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+O</keycap></keycombo>
             </entry>
             <entry>
-            <link linkend="hdbk-reference-menus-search-openworks"> <menuchoice> 
-<guimenu>Search</guimenu> <guimenuitem>Search in open work(s)</guimenuitem> 
-</menuchoice> </link> equivalent; opens the search dialog to search in all 
+            <link linkend="hdbk-reference-menus-search-openworks"> <menuchoice>
+<guimenu>Search</guimenu> <guimenuitem>Search in open work(s)</guimenuitem>
+</menuchoice> </link> equivalent; opens the search dialog to search in all
 currently opened works.</entry>
           </row>
 
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;Q</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+Q</keycap></keycombo>
             </entry>
             <entry>
-            <link linkend="hdbk-reference-menus-file-quit"> <menuchoice> 
-<guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice> 
+            <link linkend="hdbk-reference-menus-file-quit"> <menuchoice>
+<guimenu>File</guimenu> <guimenuitem>Quit</guimenuitem> </menuchoice>
 </link> equivalent; closes &bibletime;.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-              <keycap>&Ctrl;W</keycap></keycombo>
+              <keycombo action="simul"> <keycap>&Ctrl;+W</keycap></keycombo>
             </entry>
             <entry>Sluit het huidige venster.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-                <keycap>F1</keycap>
-              </keycombo>
+              <keycombo action="simul"> <keycap>F1</keycap> </keycombo>
             </entry>
             <entry>
-            <menuchoice> <guimenu>Help</guimenu> <guimenuitem>Handbook</guimenuitem> 
+            <menuchoice> <guimenu>Help</guimenu> <guimenuitem>Handbook</guimenuitem>
 </menuchoice> equivalent; opens the handbook.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-                <keycap>F2</keycap>
-              </keycombo>
+              <keycombo action="simul"> <keycap>F2</keycap> </keycombo>
             </entry>
             <entry>
-            <menuchoice> <guimenu>Help</guimenu> <guimenuitem>BibleStudy 
-Howto</guimenuitem> </menuchoice> equivalent; opens the BibleStudy Howto.</entry>
+            <menuchoice> <guimenu>Help</guimenu> <guimenuitem>BibleStudy
+HowTo</guimenuitem> </menuchoice> equivalent; opens the BibleStudy HowTo.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-                <keycap>F4</keycap>
-              </keycombo>
+              <keycombo action="simul"> <keycap>F4</keycap> </keycombo>
             </entry>
             <entry>
-            <link linkend="hdbk-reference-menus-settings-bookshelf_manager"> 
-<menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Bookshelf 
-Manager</guimenuitem> </menuchoice> </link> equivalent; opens the Bookshelf 
+            <link linkend="hdbk-reference-menus-settings-bookshelf_manager">
+<menuchoice> <guimenu>Settings</guimenu> <guimenuitem>Bookshelf
+Manager</guimenuitem> </menuchoice> </link> equivalent; opens the Bookshelf
 Manager.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-                <keycap>F8</keycap>
-              </keycombo>
+              <keycombo action="simul"> <keycap>F8</keycap> </keycombo>
             </entry>
             <entry>
-            <link linkend="hdbk-reference-menus-view-showbookshelf"> <menuchoice> 
-<guimenu>View</guimenu> <guimenuitem>Show Bookshelf</guimenuitem> 
+            <link linkend="hdbk-reference-menus-view-showbookshelf"> <menuchoice>
+<guimenu>View</guimenu> <guimenuitem>Show Bookshelf</guimenuitem>
 </menuchoice> </link> equivalent; toggles display of the Bookshelf.</entry>
           </row>
           <row>
             <entry>
-              <keycombo action="simul">
-                <keycap>F9</keycap>
-              </keycombo>
+              <keycombo action="simul"> <keycap>F9</keycap> </keycombo>
             </entry>
             <entry>
-            <link linkend="hdbk-reference-menus-view-showmag"> <menuchoice> 
-<guimenu>View</guimenu> <guimenuitem>Show mag</guimenuitem> </menuchoice> 
+            <link linkend="hdbk-reference-menus-view-showmag"> <menuchoice>
+<guimenu>View</guimenu> <guimenuitem>Show mag</guimenuitem> </menuchoice>
 </link> equivalent; toggles display of the mag(nifying glass).</entry>
           </row>
         </tbody>
diff --git a/docs/handbook/nl/docbook/hdbk-start.docbook b/docs/handbook/nl/docbook/hdbk-start.docbook
index c7d7539..2bae214 100644
--- a/docs/handbook/nl/docbook/hdbk-start.docbook
+++ b/docs/handbook/nl/docbook/hdbk-start.docbook
@@ -6,66 +6,62 @@
 
     <sect2 id="hdbk-start-starting">
       <title>&bibletime; opstarten</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" width="32" depth="32" format="PNG" />
-        </imageobject>
+      <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" width="32" depth="32"
+format="PNG" /> </imageobject>
         <textobject>
           <phrase>&bibletime; start icon</phrase>
         </textobject>
       </mediaobject></para>
 
-      <para>&bibletime; can also be launched from a terminal command prompt. To launch 
-&bibletime;, open a terminal window and type: 
-      <screen>bibletime</screen></para>
+      <para>&bibletime; can also be launched from a terminal command prompt. To launch
+&bibletime;, open a terminal window and type: <screen>bibletime</screen></para>
     </sect2>
 
     <sect2 id="hdbk-start-custom">
       <title>Aanpassing van het opstarten</title>
-      <para>From a terminal you can use &bibletime; to open a random verse in the 
-default bible:
-	<screen>bibletime --open-default-bible "&lt;random&gt;"</screen>
-	To open at a given passage like John 3:16, use:
-	<screen>bibletime --open-default-bible "John 3:16"</screen>
-	You can also use booknames in your current bookname language.</para>
+      <para>From a terminal you can use &bibletime; to open a random verse in the
+default bible: <screen>bibletime --open-default-bible "&lt;random&gt;"</screen> To open at a given
+passage like John 3:16, use: <screen>bibletime --open-default-bible "John 3:16"</screen> You can
+also use booknames in your current bookname language.</para>
     </sect2>
   </sect1>
 
-  <sect1 id="hdbk-startsequence">
-    <title>Volgorde van opstartschermen</title>
+  <sect1 id="hdbk-start-firstrun">
+    <title>Starting &bibletime; for the first time</title>
 
-    <para>Wanneer &bibletime; opstart kun je de volgende schermen zien, voordat het 
-hoofdvenster van &bibletime; opent:</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>Bookshelf Manager</interface>
+          <interface>Configure &bibletime; dialog</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">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>
+          <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>Configure &bibletime; dialog</interface>
+          <interface>Bookshelf Manager</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>
+          <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>
     </variablelist>
diff --git a/docs/handbook/nl/docbook/index.docbook b/docs/handbook/nl/docbook/index.docbook
index 9178e90..d8d9732 100644
--- a/docs/handbook/nl/docbook/index.docbook
+++ b/docs/handbook/nl/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,47 +42,42 @@
   </authorgroup>
   
   <!-- TRANS:ROLES_OF_TRANSLATORS -->
-<copyright>
-    <year>1999-2009</year>
-    <holder>The &bibletime; Team</holder>
-  </copyright>
+<copyright> <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 13:30:32 -0500 (Wed, 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
-
 sgml-minimize-attributes:nil
-
 sgml-general-insert-case:lower
-
 sgml-indent-step:0
-
 sgml-indent-data:nil
-
 End:
-
 -->