From 0e44cb8c2afa66bc481ce2aff26e00995e9a8626 Mon Sep 17 00:00:00 2001
From: Laurent Monin <geeqie@norz.org>
Date: Sat, 25 Oct 2008 07:47:47 +0000
Subject: [PATCH] Get rid off of chapters numbers in html documentation
 filenames. It will ease re-ordering.

---
 doc/{6_collections.html => collections.html}  | 12 +--
 doc/{12_credits.html => credits.html}         |  4 +-
 doc/faq.html                                  |  2 +-
 ..._management.html => image_management.html} | 16 ++--
 ...e.html => image_management_copy_move.html} |  8 +-
 ...lete.html => image_management_delete.html} | 18 ++--
 ...=> image_management_external_editing.html} | 14 +--
 ...name.html => image_management_rename.html} |  8 +-
 ...sentation.html => image_presentation.html} | 12 +--
 ...tml => image_presentation_fullscreen.html} | 12 +--
 ...html => image_presentation_slideshow.html} | 16 ++--
 ...{5_image_search.html => image_search.html} | 12 +--
 ...l => image_search_finding_duplicates.html} | 12 +--
 ...1_search.html => image_search_search.html} | 12 +--
 doc/index.html                                | 90 +++++++++----------
 ...{1_introduction.html => introduction.html} |  4 +-
 doc/{2_main_window.html => main_window.html}  | 22 ++---
 ...e_pane.html => main_window_file_pane.html} | 12 +--
 ...pane.html => main_window_folder_pane.html} | 22 ++---
 ..._pane.html => main_window_image_pane.html} | 16 ++--
 ..._3_layout.html => main_window_layout.html} | 18 ++--
 ...{2_2_menus.html => main_window_menus.html} | 16 ++--
 ...ation.html => main_window_navigation.html} |  8 +-
 ...s_bar.html => main_window_status_bar.html} |  8 +-
 doc/{10_options.html => options.html}         | 22 ++---
 ..._6_advanced.html => options_advanced.html} |  8 +-
 ...ands.html => options_editor_commands.html} |  8 +-
 ..._filtering.html => options_filtering.html} |  8 +-
 ...10_1_general.html => options_general.html} | 10 +--
 doc/{10_7_hidden.html => options_hidden.html} |  8 +-
 doc/{10_2_image.html => options_image.html}   |  8 +-
 doc/{10_3_window.html => options_window.html} |  8 +-
 ..._other_windows.html => other_windows.html} | 12 +--
 ...ml => other_windows_image_properties.html} | 12 +--
 ...w.html => other_windows_image_window.html} | 10 +--
 doc/{9_printing.html => printing.html}        |  8 +-
 doc/{11_reference.html => reference.html}     | 14 +--
 ..._line.html => reference_command_line.html} |  8 +-
 ...html => reference_keyboard_shortcuts.html} | 10 +--
 ...agement.html => reference_management.html} | 16 ++--
 ...mbnails.html => reference_thumbnails.html} | 10 +--
 doc/{7_sidebars.html => sidebars.html}        | 12 +--
 doc/{7_1_exif.html => sidebars_exif.html}     |  8 +-
 ...3_keywords.html => sidebars_keywords.html} | 10 +--
 ...anager.html => sidebars_sort_manager.html} |  8 +-
 45 files changed, 296 insertions(+), 296 deletions(-)
 rename doc/{6_collections.html => collections.html} (95%)
 rename doc/{12_credits.html => credits.html} (97%)
 rename doc/{4_image_management.html => image_management.html} (77%)
 rename doc/{4_1_copy_move.html => image_management_copy_move.html} (96%)
 rename doc/{4_3_delete.html => image_management_delete.html} (80%)
 rename doc/{4_4_external_editing.html => image_management_external_editing.html} (86%)
 rename doc/{4_2_rename.html => image_management_rename.html} (95%)
 rename doc/{8_image_presentation.html => image_presentation.html} (83%)
 rename doc/{8_2_fullscreen.html => image_presentation_fullscreen.html} (96%)
 rename doc/{8_1_slideshow.html => image_presentation_slideshow.html} (84%)
 rename doc/{5_image_search.html => image_search.html} (82%)
 rename doc/{5_2_finding_duplicates.html => image_search_finding_duplicates.html} (96%)
 rename doc/{5_1_search.html => image_search_search.html} (96%)
 rename doc/{1_introduction.html => introduction.html} (97%)
 rename doc/{2_main_window.html => main_window.html} (74%)
 rename doc/{2_4_file_pane.html => main_window_file_pane.html} (93%)
 rename doc/{2_5_folder_pane.html => main_window_folder_pane.html} (88%)
 rename doc/{2_6_image_pane.html => main_window_image_pane.html} (91%)
 rename doc/{2_3_layout.html => main_window_layout.html} (69%)
 rename doc/{2_2_menus.html => main_window_menus.html} (95%)
 rename doc/{2_1_navigation.html => main_window_navigation.html} (94%)
 rename doc/{2_7_status_bar.html => main_window_status_bar.html} (95%)
 rename doc/{10_options.html => options.html} (75%)
 rename doc/{10_6_advanced.html => options_advanced.html} (96%)
 rename doc/{10_5_editor_commands.html => options_editor_commands.html} (95%)
 rename doc/{10_4_filtering.html => options_filtering.html} (93%)
 rename doc/{10_1_general.html => options_general.html} (94%)
 rename doc/{10_7_hidden.html => options_hidden.html} (94%)
 rename doc/{10_2_image.html => options_image.html} (96%)
 rename doc/{10_3_window.html => options_window.html} (93%)
 rename doc/{3_other_windows.html => other_windows.html} (83%)
 rename doc/{3_2_image_properties.html => other_windows_image_properties.html} (90%)
 rename doc/{3_1_image_window.html => other_windows_image_window.html} (86%)
 rename doc/{9_printing.html => printing.html} (96%)
 rename doc/{11_reference.html => reference.html} (80%)
 rename doc/{11_1_command_line.html => reference_command_line.html} (97%)
 rename doc/{11_2_keyboard_shortcuts.html => reference_keyboard_shortcuts.html} (98%)
 rename doc/{11_4_management.html => reference_management.html} (92%)
 rename doc/{11_3_thumbnails.html => reference_thumbnails.html} (88%)
 rename doc/{7_sidebars.html => sidebars.html} (85%)
 rename doc/{7_1_exif.html => sidebars_exif.html} (94%)
 rename doc/{7_3_keywords.html => sidebars_keywords.html} (94%)
 rename doc/{7_2_sort_manager.html => sidebars_sort_manager.html} (96%)

diff --git a/doc/6_collections.html b/doc/collections.html
similarity index 95%
rename from doc/6_collections.html
rename to doc/collections.html
index a259e84d..756efa78 100644
--- a/doc/6_collections.html
+++ b/doc/collections.html
@@ -32,7 +32,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="5_2_finding_duplicates.html">Previous</a>
+            <p><a href="image_search_finding_duplicates.html">Previous</a>
             </p>
           </td>
 
@@ -41,7 +41,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-collections-2"><a href="7_sidebars.html">Next</a>
+            <p class="gq-collections-2"><a href="sidebars.html">Next</a>
             </p>
           </td>
         </tr>
@@ -75,7 +75,7 @@
 
   <p class="gq-collections-7">The icon pane displays images contained in the collection as thumbnails in a grid, by default the file names also appear below each thumbnail.</p>
 
-  <p class="gq-collections-7">The Icon pane works exactly like the Icon view mode of the <a href="2_4_file_pane.html">file pane</a> in a main window. But with the addition that the contents of the collection can be organized with drag and drop.</p>
+  <p class="gq-collections-7">The Icon pane works exactly like the Icon view mode of the <a href="main_window_file_pane.html">file pane</a> in a main window. But with the addition that the contents of the collection can be organized with drag and drop.</p>
 
   <p class="gq-collections-7">A <b>context menu</b> is available for the icon pane by right clicking the mouse or pressing the Menu key.</p>
 
@@ -447,7 +447,7 @@
   <br />
   </p>
 
-  <p class="gq-collections-7">The <b>selection</b> can be changed using the keyboard and mouse the same as in a <a href="2_4_file_pane.html">file pane</a> of the main window.</p>
+  <p class="gq-collections-7">The <b>selection</b> can be changed using the keyboard and mouse the same as in a <a href="main_window_file_pane.html">file pane</a> of the main window.</p>
 
   <p><br />
   <br />
@@ -492,7 +492,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="5_2_finding_duplicates.html">Previous</a>
+            <p><a href="image_search_finding_duplicates.html">Previous</a>
             </p>
           </td>
 
@@ -502,7 +502,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-collections-2"><a href="7_sidebars.html">Next</a>
+            <p class="gq-collections-2"><a href="sidebars.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/12_credits.html b/doc/credits.html
similarity index 97%
rename from doc/12_credits.html
rename to doc/credits.html
index 894c43db..5f19d4bb 100644
--- a/doc/12_credits.html
+++ b/doc/credits.html
@@ -32,7 +32,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_4_management.html">Previous</a>
+            <p><a href="reference_management.html">Previous</a>
             </p>
           </td>
 
@@ -104,7 +104,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_4_management.html">Previous</a>
+            <p><a href="reference_management.html">Previous</a>
             </p>
           </td>
 
diff --git a/doc/faq.html b/doc/faq.html
index c764c929..0ff9a1df 100644
--- a/doc/faq.html
+++ b/doc/faq.html
@@ -44,7 +44,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-faq-2"><a href="1_introduction.html">Next</a>
+            <p class="gq-faq-2"><a href="introduction.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/4_image_management.html b/doc/image_management.html
similarity index 77%
rename from doc/4_image_management.html
rename to doc/image_management.html
index 7fe67505..ede4840e 100644
--- a/doc/4_image_management.html
+++ b/doc/image_management.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="3_2_image_properties.html">Previous</a>
+            <p><a href="other_windows_image_properties.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-management-2"><a href="4_1_copy_move.html">Next</a>
+            <p class="gq-image-management-2"><a href="image_management_copy_move.html">Next</a>
             </p>
           </td>
         </tr>
@@ -54,13 +54,13 @@
 
   <p>Geeqie includes a set of utilities to copy, move, rename, and delete images.</p>
 
-  <p class="gq-image-management-5">4.1 <a href="4_1_copy_move.html">Copy and Move</a></p>
+  <p class="gq-image-management-5">4.1 <a href="image_management_copy_move.html">Copy and Move</a></p>
 
-  <p class="gq-image-management-5">4.2 <a href="4_2_rename.html">Rename</a></p>
+  <p class="gq-image-management-5">4.2 <a href="image_management_rename.html">Rename</a></p>
 
-  <p class="gq-image-management-5">4.3 <a href="4_3_delete.html">Delete</a></p>
+  <p class="gq-image-management-5">4.3 <a href="image_management_delete.html">Delete</a></p>
 
-  <p class="gq-image-management-5">4.4 <a href="4_4_external_editing.html">External Editing</a></p>
+  <p class="gq-image-management-5">4.4 <a href="image_management_external_editing.html">External Editing</a></p>
 
   <p><br />
   <br />
@@ -85,7 +85,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="3_2_image_properties.html">Previous</a>
+            <p><a href="other_windows_image_properties.html">Previous</a>
             </p>
           </td>
 
@@ -95,7 +95,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-management-2"><a href="4_1_copy_move.html">Next</a>
+            <p class="gq-image-management-2"><a href="image_management_copy_move.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/4_1_copy_move.html b/doc/image_management_copy_move.html
similarity index 96%
rename from doc/4_1_copy_move.html
rename to doc/image_management_copy_move.html
index 0a9368c4..0ce60722 100644
--- a/doc/4_1_copy_move.html
+++ b/doc/image_management_copy_move.html
@@ -32,7 +32,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_image_management.html">Previous</a>
+            <p><a href="image_management.html">Previous</a>
             </p>
           </td>
 
@@ -41,7 +41,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-copy-move-2"><a href="4_2_rename.html">Next</a>
+            <p class="gq-copy-move-2"><a href="image_management_rename.html">Next</a>
             </p>
           </td>
         </tr>
@@ -145,7 +145,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_image_management.html">Previous</a>
+            <p><a href="image_management.html">Previous</a>
             </p>
           </td>
 
@@ -155,7 +155,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-copy-move-2"><a href="4_2_rename.html">Next</a>
+            <p class="gq-copy-move-2"><a href="image_management_rename.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/4_3_delete.html b/doc/image_management_delete.html
similarity index 80%
rename from doc/4_3_delete.html
rename to doc/image_management_delete.html
index 5f762081..5360eb36 100644
--- a/doc/4_3_delete.html
+++ b/doc/image_management_delete.html
@@ -35,7 +35,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_2_rename.html">Previous</a>
+            <p><a href="image_management_rename.html">Previous</a>
             </p>
           </td>
 
@@ -44,7 +44,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-delete-2"><a href="4_4_external_editing.html">Next</a>
+            <p class="gq-delete-2"><a href="image_management_external_editing.html">Next</a>
             </p>
           </td>
         </tr>
@@ -56,9 +56,9 @@
 
   <h1>4.3 Delete</h1>
 
-  <p>To delete a file in Geeqie press Control + D, or select Delete from the file menu. Delete is also available in the context menu of all images and files. If <a href="10_6_advanced.html">Enable delete key</a> is enabled in Options, pressing the Delete key can also be used to delete files.</p>
+  <p>To delete a file in Geeqie press Control + D, or select Delete from the file menu. Delete is also available in the context menu of all images and files. If <a href="options_advanced.html">Enable delete key</a> is enabled in Options, pressing the Delete key can also be used to delete files.</p>
 
-  <p>The behavior when starting a delete operation depends on the <a href="10_6_advanced.html">Confirm file delete</a> option in Options. If the option is enabled a dialog will appear to confirm the operation, if it is not enabled the files will be deleted without further interaction. In all cases if the file is unable to be deleted you will be notified by a dialog.</p>
+  <p>The behavior when starting a delete operation depends on the <a href="options_advanced.html">Confirm file delete</a> option in Options. If the option is enabled a dialog will appear to confirm the operation, if it is not enabled the files will be deleted without further interaction. In all cases if the file is unable to be deleted you will be notified by a dialog.</p>
 
   <p><br />
   <br />
@@ -71,7 +71,7 @@
 
   <p class="gq-delete-5">When deleting multiple files, the dialog will include two arrow buttons to step the image preview through the list of files to be deleted. Initially the preview will be blank, activate the right arrow to display the first file.</p>
 
-  <p class="gq-delete-5">The dialog will also display the status of the <a href="10_6_advanced.html">Safe Delete</a> feature. Use this to determine if a file to be Deleted will be immediately lost, or if the file can possibly be recovered from the Safe Delete folder.</p>
+  <p class="gq-delete-5">The dialog will also display the status of the <a href="options_advanced.html">Safe Delete</a> feature. Use this to determine if a file to be Deleted will be immediately lost, or if the file can possibly be recovered from the Safe Delete folder.</p>
 
   <p class="gq-delete-5">If a file is unable to be deleted, a dialog will appear to notify you. If multiple files were selected and any remain, the dialog will include a Continue button, activating this button or pressing Enter will delete the remaining files. Pressing Escape or activating the Cancel button will close the dialog and the remaining files will not be deleted.</p>
 
@@ -82,7 +82,7 @@
   <p><u>Safe Delete</u>
   </p>
 
-  <p class="gq-delete-5">Geeqie includes a feature to temporarily store deleted files in a selected folder, to use this feature enable <a href="10_6_advanced.html">Safe Delete</a> on the advanced tab of the preferences dialog. Safe Delete includes these options:</p>
+  <p class="gq-delete-5">Geeqie includes a feature to temporarily store deleted files in a selected folder, to use this feature enable <a href="options_advanced.html">Safe Delete</a> on the advanced tab of the preferences dialog. Safe Delete includes these options:</p>
 
   <p class="gq-delete-6"><b>Folder:</b> The folder to use for temporarily retaining deleted files.</p>
 
@@ -94,7 +94,7 @@
 
   <p class="gq-delete-9">This is used to distinguish which files to remove first when clearing space for new files. The digit counter increments with each deleted file.</p>
 
-  <p class="gq-delete-9">To clear the contents of the Safe Delete folder, activate the Clear button provided for this purpose on the <a href="10_6_advanced.html">Advanced tab</a> in Options.</p>
+  <p class="gq-delete-9">To clear the contents of the Safe Delete folder, activate the Clear button provided for this purpose on the <a href="options_advanced.html">Advanced tab</a> in Options.</p>
 
   <p><br />
   <br />
@@ -119,7 +119,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_2_rename.html">Previous</a>
+            <p><a href="image_management_rename.html">Previous</a>
             </p>
           </td>
 
@@ -129,7 +129,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-delete-2"><a href="4_4_external_editing.html">Next</a>
+            <p class="gq-delete-2"><a href="image_management_external_editing.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/4_4_external_editing.html b/doc/image_management_external_editing.html
similarity index 86%
rename from doc/4_4_external_editing.html
rename to doc/image_management_external_editing.html
index 4714c501..b2d227a0 100644
--- a/doc/4_4_external_editing.html
+++ b/doc/image_management_external_editing.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_3_delete.html">Previous</a>
+            <p><a href="image_management_delete.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-external-editing-2"><a href="5_image_search.html">Next</a>
+            <p class="gq-external-editing-2"><a href="image_search.html">Next</a>
             </p>
           </td>
         </tr>
@@ -54,9 +54,9 @@
 
   <p>Geeqie provides the ability to execute commands, such as running an image editor, on a selected image. In Geeqie these are called the external editing commands.</p>
 
-  <p>These commands are executed by pressing Control and a number key, from the Edit menu, or from the context menu available to all images and files. The keyboards shortcuts are Control + 1 through Control + 9, and Control + 0, they correspond respectively to commands 1 through 10 on the <a href="10_5_editor_commands.html">Editors tab</a> in Options.</p>
+  <p>These commands are executed by pressing Control and a number key, from the Edit menu, or from the context menu available to all images and files. The keyboards shortcuts are Control + 1 through Control + 9, and Control + 0, they correspond respectively to commands 1 through 10 on the <a href="options_editor_commands.html">Editors tab</a> in Options.</p>
 
-  <p>To edit the command list refer to section 10.5 <a href="10_5_editor_commands.html">Editor Commands</a>.</p>
+  <p>To edit the command list refer to section 10.5 <a href="options_editor_commands.html">Editor Commands</a>.</p>
 
   <p><br />
   <br />
@@ -67,7 +67,7 @@
 
   <p class="gq-external-editing-5">Commands that are set to display the command's output in a window will show a dialog when the command is executed.</p>
 
-  <p class="gq-external-editing-5">To specify a command to show a dialog begin the command with the %V or %v macros, details for these an all macros are listed on the <a href="10_5_editor_commands.html">Editors tab</a> in Options.</p>
+  <p class="gq-external-editing-5">To specify a command to show a dialog begin the command with the %V or %v macros, details for these an all macros are listed on the <a href="options_editor_commands.html">Editors tab</a> in Options.</p>
 
   <p class="gq-external-editing-5">The result dialog will display the command's text output. If the editor command will result in multiple runs of the same command for each file, the Stop button will be enabled, activate it to stop Geeqie from executing the command for remaining files.</p>
 
@@ -92,7 +92,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_3_delete.html">Previous</a>
+            <p><a href="image_management_delete.html">Previous</a>
             </p>
           </td>
 
@@ -102,7 +102,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-external-editing-2"><a href="5_image_search.html">Next</a>
+            <p class="gq-external-editing-2"><a href="image_search.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/4_2_rename.html b/doc/image_management_rename.html
similarity index 95%
rename from doc/4_2_rename.html
rename to doc/image_management_rename.html
index 3c1fe5eb..1286c080 100644
--- a/doc/4_2_rename.html
+++ b/doc/image_management_rename.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_1_copy_move.html">Previous</a>
+            <p><a href="image_management_copy_move.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-rename-2"><a href="4_3_delete.html">Next</a>
+            <p class="gq-rename-2"><a href="image_management_delete.html">Next</a>
             </p>
           </td>
         </tr>
@@ -113,7 +113,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_1_copy_move.html">Previous</a>
+            <p><a href="image_management_copy_move.html">Previous</a>
             </p>
           </td>
 
@@ -123,7 +123,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-rename-2"><a href="4_3_delete.html">Next</a>
+            <p class="gq-rename-2"><a href="image_management_delete.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/8_image_presentation.html b/doc/image_presentation.html
similarity index 83%
rename from doc/8_image_presentation.html
rename to doc/image_presentation.html
index e5ca78f6..fb2e51d8 100644
--- a/doc/8_image_presentation.html
+++ b/doc/image_presentation.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="7_3_keywords.html">Previous</a>
+            <p><a href="sidebars_keywords.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-presentation-2"><a href="8_1_slideshow.html">Next</a>
+            <p class="gq-image-presentation-2"><a href="image_presentation_slideshow.html">Next</a>
             </p>
           </td>
         </tr>
@@ -54,9 +54,9 @@
 
   <p>Geeqie can be used to display a set of images, showing each image for a period of time before changing to the next image. Images can also be set to fill the entire screen.</p>
 
-  <p class="gq-image-presentation-5">8.1 <a href="8_1_slideshow.html">Slide show</a></p>
+  <p class="gq-image-presentation-5">8.1 <a href="image_presentation_slideshow.html">Slide show</a></p>
 
-  <p class="gq-image-presentation-5">8.2 <a href="8_2_fullscreen.html">Full screen</a></p>
+  <p class="gq-image-presentation-5">8.2 <a href="image_presentation_fullscreen.html">Full screen</a></p>
 
   <p><br />
   <br />
@@ -77,7 +77,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="7_3_keywords.html">Previous</a>
+            <p><a href="sidebars_keywords.html">Previous</a>
             </p>
           </td>
 
@@ -87,7 +87,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-presentation-2"><a href="8_1_slideshow.html">Next</a>
+            <p class="gq-image-presentation-2"><a href="image_presentation_slideshow.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/8_2_fullscreen.html b/doc/image_presentation_fullscreen.html
similarity index 96%
rename from doc/8_2_fullscreen.html
rename to doc/image_presentation_fullscreen.html
index 5622e2a2..1e67e429 100644
--- a/doc/8_2_fullscreen.html
+++ b/doc/image_presentation_fullscreen.html
@@ -35,7 +35,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="8_1_slideshow.html">Previous</a>
+            <p><a href="image_presentation_slideshow.html">Previous</a>
             </p>
           </td>
 
@@ -44,7 +44,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-fullscreen-2"><a href="9_printing.html">Next</a>
+            <p class="gq-fullscreen-2"><a href="printing.html">Next</a>
             </p>
           </td>
         </tr>
@@ -111,7 +111,7 @@
   <p class="gq-fullscreen-5"><u>Configuring full screen</u>
   </p>
 
-  <p>Full screen behavior and location can be adjusted on the <a href="10_6_advanced.html">Advanced tab</a> of the preferences dialog.</p>
+  <p>Full screen behavior and location can be adjusted on the <a href="options_advanced.html">Advanced tab</a> of the preferences dialog.</p>
 
   <p class="gq-fullscreen-6"><b>Size and location</b>: This can be changed using <b>Full screen size</b> option, this can be used to select the monitor to use in a multiple monitor configuration.</p>
 
@@ -345,7 +345,7 @@
     </table>
   </div>
 
-  <p class="gq-fullscreen-6">(*) Default Mouse wheel functions, can be altered by changing <span class="gq-fullscreen-10">the <a href="10_6_advanced.html">Mouse wheel scrolls image</a> option.</span></p>
+  <p class="gq-fullscreen-6">(*) Default Mouse wheel functions, can be altered by changing <span class="gq-fullscreen-10">the <a href="options_advanced.html">Mouse wheel scrolls image</a> option.</span></p>
 
   <p class="gq-fullscreen-5">Several other standard controls are also available through the keyboard and context menu:</p>
 
@@ -500,7 +500,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="8_1_slideshow.html">Previous</a>
+            <p><a href="image_presentation_slideshow.html">Previous</a>
             </p>
           </td>
 
@@ -510,7 +510,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-fullscreen-2"><a href="9_printing.html">Next</a>
+            <p class="gq-fullscreen-2"><a href="printing.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/8_1_slideshow.html b/doc/image_presentation_slideshow.html
similarity index 84%
rename from doc/8_1_slideshow.html
rename to doc/image_presentation_slideshow.html
index 1ba43be2..18af0ab0 100644
--- a/doc/8_1_slideshow.html
+++ b/doc/image_presentation_slideshow.html
@@ -35,7 +35,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="8_image_presentation.html">Previous</a>
+            <p><a href="image_presentation.html">Previous</a>
             </p>
           </td>
 
@@ -44,7 +44,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-slideshow-2"><a href="8_2_fullscreen.html">Next</a>
+            <p class="gq-slideshow-2"><a href="image_presentation_fullscreen.html">Next</a>
             </p>
           </td>
         </tr>
@@ -88,7 +88,7 @@
   <p><u>Stopping a slide show</u>
   </p>
 
-  <p>An active slide show can be stopped by using the same functions available to start one, as they work like a toggle switch. If slide show repeat is not enabled in the <a href="10_1_general.html">options dialog</a>, the slide show will stop when the last image in the sequence is displayed.</p>
+  <p>An active slide show can be stopped by using the same functions available to start one, as they work like a toggle switch. If slide show repeat is not enabled in the <a href="options_general.html">options dialog</a>, the slide show will stop when the last image in the sequence is displayed.</p>
 
   <p>Any action that changes the image pane to a new image will stop the active slide show, with the exception of the methods discussed in <a href="#navigation">Slide show sequence navigation</a>.</p>
 
@@ -99,7 +99,7 @@
   <p><u>Slide show status</u>
   </p>
 
-  <p>The main window <a href="2_7_status_bar.html">status bar</a> can be used to determine when a slide show is active, <b>Slide show</b> will be displayed next to the file count field. An individual <a href="3_1_image_window.html">Image Window</a> can also display a slide show, however the status will not be immediately visible. To determine the slide show status in an image window, open a context menu by right clicking or using the menu key, the slide show menu item will reflect the slide show status; if <b>Start slide show</b> is displayed, no slide show is active, conversely if <b>Stop slide show</b> is displayed a slide show is active.</p>
+  <p>The main window <a href="main_window_status_bar.html">status bar</a> can be used to determine when a slide show is active, <b>Slide show</b> will be displayed next to the file count field. An individual <a href="other_windows_image_window.html">Image Window</a> can also display a slide show, however the status will not be immediately visible. To determine the slide show status in an image window, open a context menu by right clicking or using the menu key, the slide show menu item will reflect the slide show status; if <b>Start slide show</b> is displayed, no slide show is active, conversely if <b>Stop slide show</b> is displayed a slide show is active.</p>
 
   <p>When a Slide show is paused, the main window status bar will display <b>Paused</b> instead of <b>Slide show</b>. Likewise, the image context menu will display <b>Pause slide show</b> or <b>Continue slide show</b>, depending on the current state.</p>
 
@@ -135,7 +135,7 @@
 
   <p class="gq-slideshow-5">An image collection can be used as the list of images, to do this drag an image from a collection window onto the image pane. Starting a slide show will then include the images from that collection.</p>
 
-  <p>So far, the methods described are for slide shows in a main window, in an <a href="3_1_image_window.html">Image Window</a>, the slide show will use all images referenced by that window.</p>
+  <p>So far, the methods described are for slide shows in a main window, in an <a href="other_windows_image_window.html">Image Window</a>, the slide show will use all images referenced by that window.</p>
 
   <p><br />
   <br />
@@ -172,7 +172,7 @@
   <p class="gq-slideshow-5"><u>Configuring a slide show</u>
   </p>
 
-  <p>The options that control the behavior of slide shows are located on the <a href="10_1_general.html">General tab</a> of the options dialog.</p>
+  <p>The options that control the behavior of slide shows are located on the <a href="options_general.html">General tab</a> of the options dialog.</p>
 
   <p class="gq-slideshow-7"><b>Display time</b>: The delay between each image in the slide show can be adjusted with the <span class="gq-slideshow-6"><b>Delay before image change</b> option.</span></p>
 
@@ -199,7 +199,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="8_image_presentation.html">Previous</a>
+            <p><a href="image_presentation.html">Previous</a>
             </p>
           </td>
 
@@ -209,7 +209,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-slideshow-2"><a href="8_2_fullscreen.html">Next</a>
+            <p class="gq-slideshow-2"><a href="image_presentation_fullscreen.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/5_image_search.html b/doc/image_search.html
similarity index 82%
rename from doc/5_image_search.html
rename to doc/image_search.html
index 2f0754b0..4a99c5af 100644
--- a/doc/5_image_search.html
+++ b/doc/image_search.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_4_external_editing.html">Previous</a>
+            <p><a href="image_management_external_editing.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-search-2"><a href="5_1_search.html">Next</a>
+            <p class="gq-image-search-2"><a href="image_search_search.html">Next</a>
             </p>
           </td>
         </tr>
@@ -54,9 +54,9 @@
 
   <p>Geeqie provides methods to find an image, and the ability to find duplicate images.</p>
 
-  <p class="gq-image-search-5">5.1 <a href="5_1_search.html">Search Window</a></p>
+  <p class="gq-image-search-5">5.1 <a href="image_search_search.html">Search Window</a></p>
 
-  <p class="gq-image-search-5">5.2 <a href="5_2_finding_duplicates.html">Finding Duplicates</a></p>
+  <p class="gq-image-search-5">5.2 <a href="image_search_finding_duplicates.html">Finding Duplicates</a></p>
 
   <p><br />
   <br />
@@ -81,7 +81,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="4_4_external_editing.html">Previous</a>
+            <p><a href="image_management_external_editing.html">Previous</a>
             </p>
           </td>
 
@@ -91,7 +91,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-search-2"><a href="5_1_search.html">Next</a>
+            <p class="gq-image-search-2"><a href="image_search_search.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/5_2_finding_duplicates.html b/doc/image_search_finding_duplicates.html
similarity index 96%
rename from doc/5_2_finding_duplicates.html
rename to doc/image_search_finding_duplicates.html
index 9106a5e5..ba7519f3 100644
--- a/doc/5_2_finding_duplicates.html
+++ b/doc/image_search_finding_duplicates.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="5_1_search.html">Previous</a>
+            <p><a href="image_search_search.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-finding-duplicates-2"><a href="6_collections.html">Next</a>
+            <p class="gq-finding-duplicates-2"><a href="collections.html">Next</a>
             </p>
           </td>
         </tr>
@@ -98,7 +98,7 @@
 
   <p class="gq-finding-duplicates-5"><b>Similarity (low):</b> Slightly similar image content.</p>
 
-  <p class="gq-finding-duplicates-5"><b>Similarity (custom):</b> Similar image content, the value to use to consider two images a match is configured in the <a href="10_6_advanced.html">Advanced tab</a> of the preferences dialog by setting the &#8220;Custom similarity threshold&#8221;.</p>
+  <p class="gq-finding-duplicates-5"><b>Similarity (custom):</b> Similar image content, the value to use to consider two images a match is configured in the <a href="options_advanced.html">Advanced tab</a> of the preferences dialog by setting the &#8220;Custom similarity threshold&#8221;.</p>
 
   <p><br />
   <br />
@@ -412,7 +412,7 @@
   <br />
   </p>
 
-  <p class="gq-finding-duplicates-5">The <b>selection</b> can be changed using the keyboard and mouse the same as in a <a href="2_4_file_pane.html">file pane</a> of the main window.</p>
+  <p class="gq-finding-duplicates-5">The <b>selection</b> can be changed using the keyboard and mouse the same as in a <a href="main_window_file_pane.html">file pane</a> of the main window.</p>
 
   <p class="gq-finding-duplicates-5">The image Dimensions column of the result list will only contain dimension information when comparing by dimensions, or when the data is easily available from memory or has been read from the cache.</p>
 
@@ -483,7 +483,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="5_1_search.html">Previous</a>
+            <p><a href="image_search_search.html">Previous</a>
             </p>
           </td>
 
@@ -493,7 +493,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-finding-duplicates-2"><a href="6_collections.html">Next</a>
+            <p class="gq-finding-duplicates-2"><a href="collections.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/5_1_search.html b/doc/image_search_search.html
similarity index 96%
rename from doc/5_1_search.html
rename to doc/image_search_search.html
index 0d1aa5ac..05d2c5b5 100644
--- a/doc/5_1_search.html
+++ b/doc/image_search_search.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="5_image_search.html">Previous</a>
+            <p><a href="image_search.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-search-2"><a href="5_2_finding_duplicates.html">Next</a>
+            <p class="gq-search-2"><a href="image_search_finding_duplicates.html">Next</a>
             </p>
           </td>
         </tr>
@@ -104,7 +104,7 @@
 
   <p class="gq-search-5">The image dimensions test is simple, both width and height must be within the allowed values for a match.</p>
 
-  <p class="gq-search-5"><b>Image content:</b> The search will match if the image contents are similar within the percentage value, inclusive. This uses the same test and data that is used to determine image similarity when <a href="5_2_finding_duplicates.html">Finding Duplicates</a>. The entry is for entering the path for the image to use in this test.</p>
+  <p class="gq-search-5"><b>Image content:</b> The search will match if the image contents are similar within the percentage value, inclusive. This uses the same test and data that is used to determine image similarity when <a href="image_search_finding_duplicates.html">Finding Duplicates</a>. The entry is for entering the path for the image to use in this test.</p>
 
   <p class="gq-search-5"><b>Keywords:</b> The search will match if the file's associated keywords match all, match any, or exclude the entered keywords, depending on the method selected from the drop down menu. Keywords can be separated with a space, comma, or tab character.</p>
 
@@ -390,7 +390,7 @@
   <br />
   </p>
 
-  <p class="gq-search-5">The <b>selection</b> can be changed using the keyboard and mouse the same as in a <a href="2_4_file_pane.html">file pane</a> of the main window.</p>
+  <p class="gq-search-5">The <b>selection</b> can be changed using the keyboard and mouse the same as in a <a href="main_window_file_pane.html">file pane</a> of the main window.</p>
 
   <p class="gq-search-5">The image Dimensions column of the result list will only contain dimension information when dimensions are included in the search parameters.</p>
 
@@ -441,7 +441,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="5_image_search.html">Previous</a>
+            <p><a href="image_search.html">Previous</a>
             </p>
           </td>
 
@@ -451,7 +451,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-search-2"><a href="5_2_finding_duplicates.html">Next</a>
+            <p class="gq-search-2"><a href="image_search_finding_duplicates.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/index.html b/doc/index.html
index baca5b42..9297991d 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -48,7 +48,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-index-2"><a href="1_introduction.html">Next</a>
+            <p class="gq-index-2"><a href="introduction.html">Next</a>
             </p>
           </td>
         </tr>
@@ -62,91 +62,91 @@
 
   <p class="gq-index-6">If you are having trouble finding a solution in the manual, try looking in the <a href="faq.html">FAQ</a>.</p>
 
-  <p>1. <a href="1_introduction.html">Introduction</a></p>
+  <p>1. <a href="introduction.html">Introduction</a></p>
 
-  <p>2. <a href="2_main_window.html">Main Window</a></p>
+  <p>2. <a href="main_window.html">Main Window</a></p>
 
-  <p class="gq-index-6">2.1 <a href="2_1_navigation.html">Navigation</a></p>
+  <p class="gq-index-6">2.1 <a href="main_window_navigation.html">Navigation</a></p>
 
-  <p class="gq-index-6">2.2 <a href="2_2_menus.html">Menus</a></p>
+  <p class="gq-index-6">2.2 <a href="main_window_menus.html">Menus</a></p>
 
-  <p class="gq-index-6">2.3 <a href="2_3_layout.html">Layout</a></p>
+  <p class="gq-index-6">2.3 <a href="main_window_layout.html">Layout</a></p>
 
-  <p class="gq-index-6">2.4 <a href="2_4_file_pane.html">File Pane</a></p>
+  <p class="gq-index-6">2.4 <a href="main_window_file_pane.html">File Pane</a></p>
 
-  <p class="gq-index-6">2.5 <a href="2_5_folder_pane.html">Folder Pane</a></p>
+  <p class="gq-index-6">2.5 <a href="main_window_folder_pane.html">Folder Pane</a></p>
 
-  <p class="gq-index-6">2.6 <a href="2_6_image_pane.html">Image Pane</a></p>
+  <p class="gq-index-6">2.6 <a href="main_window_image_pane.html">Image Pane</a></p>
 
-  <p class="gq-index-6">2.7 <a href="2_7_status_bar.html">Status Bar</a></p>
+  <p class="gq-index-6">2.7 <a href="main_window_status_bar.html">Status Bar</a></p>
 
-  <p>3. <a href="3_other_windows.html">Other Windows</a></p>
+  <p>3. <a href="other_windows.html">Other Windows</a></p>
 
-  <p class="gq-index-6">3.1 <a href="3_1_image_window.html">Image Window</a></p>
+  <p class="gq-index-6">3.1 <a href="other_windows_image_window.html">Image Window</a></p>
 
-  <p class="gq-index-6">3.2 <a href="3_2_image_properties.html">Image Properties</a> Window</p>
+  <p class="gq-index-6">3.2 <a href="other_windows_image_properties.html">Image Properties</a> Window</p>
 
-  <p>4. <a href="4_image_management.html">Image Management</a></p>
+  <p>4. <a href="image_management.html">Image Management</a></p>
 
-  <p class="gq-index-6">4.1 <a href="4_1_copy_move.html">Copy and Move</a></p>
+  <p class="gq-index-6">4.1 <a href="image_management_copy_move.html">Copy and Move</a></p>
 
-  <p class="gq-index-6">4.2 <a href="4_2_rename.html">Rename</a></p>
+  <p class="gq-index-6">4.2 <a href="image_management_rename.html">Rename</a></p>
 
-  <p class="gq-index-6">4.3 <a href="4_3_delete.html">Delete</a></p>
+  <p class="gq-index-6">4.3 <a href="image_management_delete.html">Delete</a></p>
 
-  <p class="gq-index-6">4.4 <a href="4_4_external_editing.html">External Editing</a> Commands</p>
+  <p class="gq-index-6">4.4 <a href="image_management_external_editing.html">External Editing</a> Commands</p>
 
-  <p>5. <a href="5_image_search.html">Image Search</a></p>
+  <p>5. <a href="image_search.html">Image Search</a></p>
 
-  <p class="gq-index-6">5.1 <a href="5_1_search.html">Search Window</a></p>
+  <p class="gq-index-6">5.1 <a href="image_search_search.html">Search Window</a></p>
 
-  <p class="gq-index-6">5.2 <a href="5_2_finding_duplicates.html">Finding Duplicate</a> Images</p>
+  <p class="gq-index-6">5.2 <a href="image_search_finding_duplicates.html">Finding Duplicate</a> Images</p>
 
-  <p>6. <a href="6_collections.html">Collections</a></p>
+  <p>6. <a href="collections.html">Collections</a></p>
 
-  <p>7. <a href="7_sidebars.html">Sidebars</a></p>
+  <p>7. <a href="sidebars.html">Sidebars</a></p>
 
-  <p class="gq-index-6">7.1 <a href="7_1_exif.html">EXIF</a></p>
+  <p class="gq-index-6">7.1 <a href="sidebars_exif.html">EXIF</a></p>
 
-  <p class="gq-index-6">7.2 <a href="7_2_sort_manager.html">Sort Manager</a></p>
+  <p class="gq-index-6">7.2 <a href="sidebars_sort_manager.html">Sort Manager</a></p>
 
-  <p class="gq-index-6">7.3 <a href="7_3_keywords.html">Keywords</a></p>
+  <p class="gq-index-6">7.3 <a href="sidebars_keywords.html">Keywords</a></p>
 
-  <p>8. <a href="8_image_presentation.html">Image Presentation</a></p>
+  <p>8. <a href="image_presentation.html">Image Presentation</a></p>
 
-  <p class="gq-index-6">8.1 <a href="8_1_slideshow.html">Slide show</a></p>
+  <p class="gq-index-6">8.1 <a href="image_presentation_slideshow.html">Slide show</a></p>
 
-  <p class="gq-index-6">8.2 <a href="8_2_fullscreen.html">Full screen</a></p>
+  <p class="gq-index-6">8.2 <a href="image_presentation_fullscreen.html">Full screen</a></p>
 
-  <p>9. <a href="9_printing.html">Printing</a></p>
+  <p>9. <a href="printing.html">Printing</a></p>
 
-  <p>10. <a href="10_options.html">Options</a> Explained</p>
+  <p>10. <a href="options.html">Options</a> Explained</p>
 
-  <p class="gq-index-6">10.1 <a href="10_1_general.html">General Options</a></p>
+  <p class="gq-index-6">10.1 <a href="options_general.html">General Options</a></p>
 
-  <p class="gq-index-6">10.2 <a href="10_2_image.html">Image Options</a></p>
+  <p class="gq-index-6">10.2 <a href="options_image.html">Image Options</a></p>
 
-  <p class="gq-index-6">10.3 <a href="10_3_window.html">Window Options</a></p>
+  <p class="gq-index-6">10.3 <a href="options_window.html">Window Options</a></p>
 
-  <p class="gq-index-6">10.4 <a href="10_4_filtering.html">Filtering Options</a></p>
+  <p class="gq-index-6">10.4 <a href="options_filtering.html">Filtering Options</a></p>
 
-  <p class="gq-index-6">10.5 <a href="10_5_editor_commands.html">Editor Commands</a></p>
+  <p class="gq-index-6">10.5 <a href="options_editor_commands.html">Editor Commands</a></p>
 
-  <p class="gq-index-6">10.6 <a href="10_6_advanced.html">Advanced Options</a></p>
+  <p class="gq-index-6">10.6 <a href="options_advanced.html">Advanced Options</a></p>
 
-  <p class="gq-index-6">10.7 <a href="10_7_hidden.html">Hidden Options</a></p>
+  <p class="gq-index-6">10.7 <a href="options_hidden.html">Hidden Options</a></p>
 
-  <p>11. <a href="11_reference.html">Reference</a></p>
+  <p>11. <a href="reference.html">Reference</a></p>
 
-  <p class="gq-index-6">11.1 <a href="11_1_command_line.html">Command Line</a> Options</p>
+  <p class="gq-index-6">11.1 <a href="reference_command_line.html">Command Line</a> Options</p>
 
-  <p class="gq-index-6">11.2 <a href="11_2_keyboard_shortcuts.html">Keyboard Shortcuts</a></p>
+  <p class="gq-index-6">11.2 <a href="reference_keyboard_shortcuts.html">Keyboard Shortcuts</a></p>
 
-  <p class="gq-index-6">11.3 <a href="11_3_thumbnails.html">Thumbnails</a></p>
+  <p class="gq-index-6">11.3 <a href="reference_thumbnails.html">Thumbnails</a></p>
 
-  <p class="gq-index-6">11.4 <a href="11_4_management.html">Cache and Data Management</a></p>
+  <p class="gq-index-6">11.4 <a href="reference_management.html">Cache and Data Management</a></p>
 
-  <p>12. <a href="12_credits.html">Credits</a></p>
+  <p>12. <a href="credits.html">Credits</a></p>
 
   <p>13. <a href="gnu_fdl.txt">GNU Free Documentation License</a></p>
 
@@ -175,7 +175,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-index-2"><a href="1_introduction.html">Next</a>
+            <p class="gq-index-2"><a href="introduction.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/1_introduction.html b/doc/introduction.html
similarity index 97%
rename from doc/1_introduction.html
rename to doc/introduction.html
index e574e432..8506f0ed 100644
--- a/doc/1_introduction.html
+++ b/doc/introduction.html
@@ -42,7 +42,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-introduction-2"><a href="2_main_window.html">Next</a>
+            <p class="gq-introduction-2"><a href="main_window.html">Next</a>
             </p>
           </td>
         </tr>
@@ -170,7 +170,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-introduction-2"><a href="2_main_window.html">Next</a>
+            <p class="gq-introduction-2"><a href="main_window.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/2_main_window.html b/doc/main_window.html
similarity index 74%
rename from doc/2_main_window.html
rename to doc/main_window.html
index 1b481b4f..ce9f21df 100644
--- a/doc/2_main_window.html
+++ b/doc/main_window.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="1_introduction.html">Previous</a>
+            <p><a href="introduction.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-main-window-2"><a href="2_1_navigation.html">Next</a>
+            <p class="gq-main-window-2"><a href="main_window_navigation.html">Next</a>
             </p>
           </td>
         </tr>
@@ -58,19 +58,19 @@
   <br />
   </p>
 
-  <p class="gq-main-window-5">2.1 <a href="2_1_navigation.html">Navigation</a></p>
+  <p class="gq-main-window-5">2.1 <a href="main_window_navigation.html">Navigation</a></p>
 
-  <p class="gq-main-window-5">2.2 <a href="2_2_menus.html">Menus</a></p>
+  <p class="gq-main-window-5">2.2 <a href="main_window_menus.html">Menus</a></p>
 
-  <p class="gq-main-window-5">2.3 <a href="2_3_layout.html">Layout</a></p>
+  <p class="gq-main-window-5">2.3 <a href="main_window_layout.html">Layout</a></p>
 
-  <p class="gq-main-window-5">2.4 <a href="2_4_file_pane.html">File Pane</a></p>
+  <p class="gq-main-window-5">2.4 <a href="main_window_file_pane.html">File Pane</a></p>
 
-  <p class="gq-main-window-5">2.5 <a href="2_5_folder_pane.html">Folder Pane</a></p>
+  <p class="gq-main-window-5">2.5 <a href="main_window_folder_pane.html">Folder Pane</a></p>
 
-  <p class="gq-main-window-5">2.6 <a href="2_6_image_pane.html">Image Pane</a></p>
+  <p class="gq-main-window-5">2.6 <a href="main_window_image_pane.html">Image Pane</a></p>
 
-  <p class="gq-main-window-5">2.7 <a href="2_7_status_bar.html">Status Bar</a></p>
+  <p class="gq-main-window-5">2.7 <a href="main_window_status_bar.html">Status Bar</a></p>
 
   <p><br />
   <br />
@@ -91,7 +91,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="1_introduction.html">Previous</a>
+            <p><a href="introduction.html">Previous</a>
             </p>
           </td>
 
@@ -101,7 +101,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-main-window-2"><a href="2_1_navigation.html">Next</a>
+            <p class="gq-main-window-2"><a href="main_window_navigation.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/2_4_file_pane.html b/doc/main_window_file_pane.html
similarity index 93%
rename from doc/2_4_file_pane.html
rename to doc/main_window_file_pane.html
index 2ccae1e4..c6a2c24c 100644
--- a/doc/2_4_file_pane.html
+++ b/doc/main_window_file_pane.html
@@ -33,7 +33,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_3_layout.html">Previous</a>
+            <p><a href="main_window_layout.html">Previous</a>
             </p>
           </td>
 
@@ -42,7 +42,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-file-pane-2"><a href="2_5_folder_pane.html">Next</a>
+            <p class="gq-file-pane-2"><a href="main_window_folder_pane.html">Next</a>
             </p>
           </td>
         </tr>
@@ -135,7 +135,7 @@
 
   <p class="gq-file-pane-5">To select all files press Control + A, or to unselect all image press Control + Shift + A. These operations are also available from the Edit menu as &ldquo;Select all&rdquo; and &ldquo;Select none&rdquo;.</p>
 
-  <p class="gq-file-pane-5">The current number of selected images and their total size will be indicated in the File list section of the <a href="2_7_status_bar.html">status bar</a>.</p>
+  <p class="gq-file-pane-5">The current number of selected images and their total size will be indicated in the File list section of the <a href="main_window_status_bar.html">status bar</a>.</p>
 
   <p><br />
   <br />
@@ -155,7 +155,7 @@
   <p><u>Context menu</u>
   </p>
 
-  <p>Right clicking the mouse or pressing the menu key while the file pane has focus will display a menu. The menu functions will perform the same as those that match the window's <a href="2_2_menus.html">menu bar</a>, however a few functions are unique to the context menu:</p>
+  <p>Right clicking the mouse or pressing the menu key while the file pane has focus will display a menu. The menu functions will perform the same as those that match the window's <a href="main_window_menus.html">menu bar</a>, however a few functions are unique to the context menu:</p>
 
   <p class="gq-file-pane-5"><b>View in new window:</b> Opens a new window containing a list of the currently selected images.</p>
 
@@ -195,7 +195,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_3_layout.html">Previous</a>
+            <p><a href="main_window_layout.html">Previous</a>
             </p>
           </td>
 
@@ -205,7 +205,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-file-pane-2"><a href="2_5_folder_pane.html">Next</a>
+            <p class="gq-file-pane-2"><a href="main_window_folder_pane.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/2_5_folder_pane.html b/doc/main_window_folder_pane.html
similarity index 88%
rename from doc/2_5_folder_pane.html
rename to doc/main_window_folder_pane.html
index d00312aa..ea10335e 100644
--- a/doc/2_5_folder_pane.html
+++ b/doc/main_window_folder_pane.html
@@ -37,7 +37,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_4_file_pane.html">Previous</a>
+            <p><a href="main_window_file_pane.html">Previous</a>
             </p>
           </td>
 
@@ -46,7 +46,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-folder-pane-2"><a href="2_6_image_pane.html">Next</a>
+            <p class="gq-folder-pane-2"><a href="main_window_image_pane.html">Next</a>
             </p>
           </td>
         </tr>
@@ -67,7 +67,7 @@
   <p class="gq-folder-pane-6"><span class="gq-folder-pane-5">Menu bar</span>
   </p>
 
-  <p class="gq-folder-pane-7">The main menu of the window. The functions available from the main menu are described in the <a href="2_2_menus.html">Menus</a> chapter.</p>
+  <p class="gq-folder-pane-7">The main menu of the window. The functions available from the main menu are described in the <a href="main_window_menus.html">Menus</a> chapter.</p>
 
   <p><br />
   <br />
@@ -94,7 +94,7 @@
 
   <p class="gq-folder-pane-7"><b>Set zoom 1:1:</b> Restore zoom to the image's original size.</p>
 
-  <p class="gq-folder-pane-7"><b>Configure options:</b> Displays the <a href="10_options.html">Options window</a>.</p>
+  <p class="gq-folder-pane-7"><b>Configure options:</b> Displays the <a href="options.html">Options window</a>.</p>
 
   <p class="gq-folder-pane-7"><b>Float controls:</b> Toggle the folder pane, file pane, and status bar between the main window and a secondary window.</p>
 
@@ -146,17 +146,17 @@
   <p><u>Context menu</u>
   </p>
 
-  <p>Right clicking the mouse or pressing the menu key while the folder pane has focus will display a menu. The menu functions will perform the same as those that match the window's <a href="2_2_menus.html">menu bar</a>, however a few functions are unique to the context menu:</p>
+  <p>Right clicking the mouse or pressing the menu key while the folder pane has focus will display a menu. The menu functions will perform the same as those that match the window's <a href="main_window_menus.html">menu bar</a>, however a few functions are unique to the context menu:</p>
 
   <p class="gq-folder-pane-7"><b>Up to parent:</b> This will change the window to display the contents of the parent folder.</p>
 
-  <p class="gq-folder-pane-7"><b>Slide show:</b> Start a <a href="8_1_slideshow.html">slide show</a> that contains all images in the selected folder.</p>
+  <p class="gq-folder-pane-7"><b>Slide show:</b> Start a <a href="image_presentation_slideshow.html">slide show</a> that contains all images in the selected folder.</p>
 
-  <p class="gq-folder-pane-7"><b>Slide show recursive:</b> Start a <a href="8_1_slideshow.html">slide show</a> that contains all images in the selected folder, and all images in the sub folders of that folder.</p>
+  <p class="gq-folder-pane-7"><b>Slide show recursive:</b> Start a <a href="image_presentation_slideshow.html">slide show</a> that contains all images in the selected folder, and all images in the sub folders of that folder.</p>
 
-  <p class="gq-folder-pane-7"><b>Find duplicates:</b> This will open a new <a href="5_2_finding_duplicates.html">find duplicates</a> window containing all images in the selected folder.</p>
+  <p class="gq-folder-pane-7"><b>Find duplicates:</b> This will open a new <a href="image_search_finding_duplicates.html">find duplicates</a> window containing all images in the selected folder.</p>
 
-  <p class="gq-folder-pane-7"><b>Find duplicates recursive:</b> This will open a new <a href="5_2_finding_duplicates.html">find duplicates</a> window containing all image in the selected folder, and all images in the sub folders of that folder.</p>
+  <p class="gq-folder-pane-7"><b>Find duplicates recursive:</b> This will open a new <a href="image_search_finding_duplicates.html">find duplicates</a> window containing all image in the selected folder, and all images in the sub folders of that folder.</p>
 
   <p class="gq-folder-pane-10"><b>New folder:</b> Creates a new folder that is a sub folder of the selected folder.</p>
 
@@ -192,7 +192,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_4_file_pane.html">Previous</a>
+            <p><a href="main_window_file_pane.html">Previous</a>
             </p>
           </td>
 
@@ -202,7 +202,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-folder-pane-2"><a href="2_6_image_pane.html">Next</a>
+            <p class="gq-folder-pane-2"><a href="main_window_image_pane.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/2_6_image_pane.html b/doc/main_window_image_pane.html
similarity index 91%
rename from doc/2_6_image_pane.html
rename to doc/main_window_image_pane.html
index 258d4877..e5b319b2 100644
--- a/doc/2_6_image_pane.html
+++ b/doc/main_window_image_pane.html
@@ -35,7 +35,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_5_folder_pane.html">Previous</a>
+            <p><a href="main_window_folder_pane.html">Previous</a>
             </p>
           </td>
 
@@ -44,7 +44,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-pane-2"><a href="2_7_status_bar.html">Next</a>
+            <p class="gq-image-pane-2"><a href="main_window_status_bar.html">Next</a>
             </p>
           </td>
         </tr>
@@ -67,9 +67,9 @@
 
   <p>The image is drawn to the screen as it is decoded from disk. The image can be panned and zoomed while it is still loading. Image adjustment operations for rotation, mirror, and flip will delay until the image is completed. The adjustment queue will remember one operation and will retain the most recently requested function, which will be performed once the image has finished loading.</p>
 
-  <p>The quality of the image, especially when using the zoom feature, is dependent on the settings that are available on the <a href="10_2_image.html">Image tab</a> of the preferences dialog.</p>
+  <p>The quality of the image, especially when using the zoom feature, is dependent on the settings that are available on the <a href="options_image.html">Image tab</a> of the preferences dialog.</p>
 
-  <p>To increase the speed of loading the next image when navigating the image list in sequence, enable the <a href="10_2_image.html">Preload next image</a> option.</p>
+  <p>To increase the speed of loading the next image when navigating the image list in sequence, enable the <a href="options_image.html">Preload next image</a> option.</p>
 
   <p><br />
   <br />
@@ -114,7 +114,7 @@
   <p><u>Context menu</u>
   </p>
 
-  <p>Right clicking the mouse or pressing the menu key while the image has the focus will display a menu. The menu functions will perform the same as those that match the window's <a href="2_2_menus.html">menu bar</a>, however a few functions are unique to the context menu:</p>
+  <p>Right clicking the mouse or pressing the menu key while the image has the focus will display a menu. The menu functions will perform the same as those that match the window's <a href="main_window_menus.html">menu bar</a>, however a few functions are unique to the context menu:</p>
 
   <p class="gq-image-pane-7"><b>View in new window:</b> Opens a new window containing a second copy of the current image.</p>
 
@@ -139,7 +139,7 @@
   <br />
   </p>
 
-  <p>(*) Note: The mouse wheel behavior for scrolling and image step can be swapped with the <u>Mouse wheel scrolls image</u> option located on the <a href="10_6_advanced.html">Advanced tab</a> of the preferences dialog.</p>
+  <p>(*) Note: The mouse wheel behavior for scrolling and image step can be swapped with the <u>Mouse wheel scrolls image</u> option located on the <a href="options_advanced.html">Advanced tab</a> of the preferences dialog.</p>
 
   <p><br />
   <br />
@@ -156,7 +156,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_5_folder_pane.html">Previous</a>
+            <p><a href="main_window_folder_pane.html">Previous</a>
             </p>
           </td>
 
@@ -166,7 +166,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-pane-2"><a href="2_7_status_bar.html">Next</a>
+            <p class="gq-image-pane-2"><a href="main_window_status_bar.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/2_3_layout.html b/doc/main_window_layout.html
similarity index 69%
rename from doc/2_3_layout.html
rename to doc/main_window_layout.html
index 84ec7525..386f0ed0 100644
--- a/doc/2_3_layout.html
+++ b/doc/main_window_layout.html
@@ -33,7 +33,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_2_menus.html">Previous</a>
+            <p><a href="main_window_menus.html">Previous</a>
             </p>
           </td>
 
@@ -42,7 +42,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-layout-2"><a href="2_4_file_pane.html">Next</a>
+            <p class="gq-layout-2"><a href="main_window_file_pane.html">Next</a>
             </p>
           </td>
         </tr>
@@ -54,12 +54,12 @@
 
   <h1>2.3 Layout</h1>
 
-  <p>The main window consists of four areas, the <a href="2_5_folder_pane.html">folder pane</a>, <a href="2_4_file_pane.html">file pane</a>, <a href="2_6_image_pane.html">image pane</a>, and the <a href="2_7_status_bar.html">status bar</a>. The status bar is always at the bottom of the window. The three remaining areas, or panes, can be arranged and sized by the user.</p>
+  <p>The main window consists of four areas, the <a href="main_window_folder_pane.html">folder pane</a>, <a href="main_window_file_pane.html">file pane</a>, <a href="main_window_image_pane.html">image pane</a>, and the <a href="main_window_status_bar.html">status bar</a>. The status bar is always at the bottom of the window. The three remaining areas, or panes, can be arranged and sized by the user.</p>
 
   <p><u>Selecting the location of each pane</u>
   </p>
 
-  <p class="gq-layout-5">The arrangement of the folder, file, and image pane is selected on the <a href="10_3_window.html">Windows tab</a> of the Options window. There are four choices for the layout, the difference is that each has the larger pane in a different location: right, bottom, left, and top.</p>
+  <p class="gq-layout-5">The arrangement of the folder, file, and image pane is selected on the <a href="options_window.html">Windows tab</a> of the Options window. There are four choices for the layout, the difference is that each has the larger pane in a different location: right, bottom, left, and top.</p>
 
   <p class="gq-layout-5">The order in which the panes are filled is determined by the three row list located below the layout selection. The three numbered rows correspond to the three numbered regions of the selected layout, to change the order of the list drag a row to the desired location within the list. To drag a row move the mouse over the selected row, press and hold the primary mouse button, then drag the row to the desired location and release the button.</p>
 
@@ -72,15 +72,15 @@
 
   <p class="gq-layout-7">Folder pane</p>
 
-  <p class="gq-layout-5">The <a href="2_5_folder_pane.html">folder pane</a> contains the menu bar, tool bar, path entry, and folder list. The list can be set to display the sub folders of the active folder or a tree that starts with the root folder and contains all folders in the file system.</p>
+  <p class="gq-layout-5">The <a href="main_window_folder_pane.html">folder pane</a> contains the menu bar, tool bar, path entry, and folder list. The list can be set to display the sub folders of the active folder or a tree that starts with the root folder and contains all folders in the file system.</p>
 
   <p class="gq-layout-7">File pane</p>
 
-  <p class="gq-layout-5">The <a href="2_4_file_pane.html">file pane</a> lists the images contained in the active folder. The file pane can be set to display as a vertical list or an icon view.</p>
+  <p class="gq-layout-5">The <a href="main_window_file_pane.html">file pane</a> lists the images contained in the active folder. The file pane can be set to display as a vertical list or an icon view.</p>
 
   <p class="gq-layout-7">Image pane</p>
 
-  <p class="gq-layout-5">The <a href="2_6_image_pane.html">image pane</a> is where the active image is displayed.</p>
+  <p class="gq-layout-5">The <a href="main_window_image_pane.html">image pane</a> is where the active image is displayed.</p>
 
   <p><br />
   <br />
@@ -101,7 +101,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_2_menus.html">Previous</a>
+            <p><a href="main_window_menus.html">Previous</a>
             </p>
           </td>
 
@@ -111,7 +111,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-layout-2"><a href="2_4_file_pane.html">Next</a>
+            <p class="gq-layout-2"><a href="main_window_file_pane.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/2_2_menus.html b/doc/main_window_menus.html
similarity index 95%
rename from doc/2_2_menus.html
rename to doc/main_window_menus.html
index ad04df3e..c1009559 100644
--- a/doc/2_2_menus.html
+++ b/doc/main_window_menus.html
@@ -36,7 +36,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_1_navigation.html">Previous</a>
+            <p><a href="main_window_navigation.html">Previous</a>
             </p>
           </td>
 
@@ -45,7 +45,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-menus-2"><a href="2_3_layout.html">Next</a>
+            <p class="gq-menus-2"><a href="main_window_layout.html">Next</a>
             </p>
           </td>
         </tr>
@@ -97,7 +97,7 @@
   <p><u>Edit menu</u>
   </p>
 
-  <p class="gq-menus-5"><b>in &lt;command name&gt;...</b>: This will execute the external command associated with &lt;command name&gt;, these can be changed edited on the <a href="10_5_editor_commands.html">Editors tab</a> of the Option dialog.</p>
+  <p class="gq-menus-5"><b>in &lt;command name&gt;...</b>: This will execute the external command associated with &lt;command name&gt;, these can be changed edited on the <a href="options_editor_commands.html">Editors tab</a> of the Option dialog.</p>
 
   <p class="gq-menus-5"><b>Adjust</b> sub menu:</p>
 
@@ -117,7 +117,7 @@
 
   <p class="gq-menus-5"><b>Select none</b>: Clears the current file selection.</p>
 
-  <p class="gq-menus-5"><b>Preferences...</b>: Opens the <a href="10_options.html">Preferences Dialog</a> for changing of user preferences.</p>
+  <p class="gq-menus-5"><b>Preferences...</b>: Opens the <a href="options.html">Preferences Dialog</a> for changing of user preferences.</p>
 
   <p class="gq-menus-5"><b>Thumbnail maintenance</b>: Opens a dialog with utilities to manage cached thumbnails and keywords data.</p>
 
@@ -132,7 +132,7 @@
 
   <p class="gq-menus-5"><b>Zoom 1:1</b>: Resets the zoom to the original size of the image.</p>
 
-  <p class="gq-menus-5"><b>Zoom to fit</b>: Automatically adjusts the zoom so that the image will fit within the display pane. The effect on images with an original size smaller than the display pane can be changed with the <u>Allow enlargement of image for zoom to fit</u> <span class="gq-menus-8">option located on the <a href="10_2_image.html">Image tab</a> of the preferences dialog</span>.</p>
+  <p class="gq-menus-5"><b>Zoom to fit</b>: Automatically adjusts the zoom so that the image will fit within the display pane. The effect on images with an original size smaller than the display pane can be changed with the <u>Allow enlargement of image for zoom to fit</u> <span class="gq-menus-8">option located on the <a href="options_image.html">Image tab</a> of the preferences dialog</span>.</p>
 
   <p class="gq-menus-5"><b>Thumbnails</b>: Toggles the display of image thumbnails in the file list, this item is not available when the file list is in icon view mode. A check appears next to this item when thumbnails are enabled.</p>
 
@@ -187,7 +187,7 @@
   <p><u>Keyboard shortcuts</u>
   </p>
 
-  <p>The keyboard sequence associated to each menu entry is listed within the main window menu bar. For reference, the complete list of default keyboard shortcuts can be found in section <a href="11_2_keyboard_shortcuts.html">11.2 Keyboard Shortcuts</a>.</p>
+  <p>The keyboard sequence associated to each menu entry is listed within the main window menu bar. For reference, the complete list of default keyboard shortcuts can be found in section <a href="reference_keyboard_shortcuts.html">11.2 Keyboard Shortcuts</a>.</p>
 
   <p><br />
   <br />
@@ -291,7 +291,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_1_navigation.html">Previous</a>
+            <p><a href="main_window_navigation.html">Previous</a>
             </p>
           </td>
 
@@ -301,7 +301,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-menus-2"><a href="2_3_layout.html">Next</a>
+            <p class="gq-menus-2"><a href="main_window_layout.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/2_1_navigation.html b/doc/main_window_navigation.html
similarity index 94%
rename from doc/2_1_navigation.html
rename to doc/main_window_navigation.html
index 2d432dea..5a434850 100644
--- a/doc/2_1_navigation.html
+++ b/doc/main_window_navigation.html
@@ -32,7 +32,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_main_window.html">Previous</a>
+            <p><a href="main_window.html">Previous</a>
             </p>
           </td>
 
@@ -41,7 +41,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-navigation-2"><a href="2_2_menus.html">Next</a>
+            <p class="gq-navigation-2"><a href="main_window_menus.html">Next</a>
             </p>
           </td>
         </tr>
@@ -100,7 +100,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_main_window.html">Previous</a>
+            <p><a href="main_window.html">Previous</a>
             </p>
           </td>
 
@@ -110,7 +110,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-navigation-2"><a href="2_2_menus.html">Next</a>
+            <p class="gq-navigation-2"><a href="main_window_menus.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/2_7_status_bar.html b/doc/main_window_status_bar.html
similarity index 95%
rename from doc/2_7_status_bar.html
rename to doc/main_window_status_bar.html
index 094a3f74..69b0efdd 100644
--- a/doc/2_7_status_bar.html
+++ b/doc/main_window_status_bar.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_6_image_pane.html">Previous</a>
+            <p><a href="main_window_image_pane.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-status-bar-2"><a href="3_other_windows.html">Next</a>
+            <p class="gq-status-bar-2"><a href="other_windows.html">Next</a>
             </p>
           </td>
         </tr>
@@ -108,7 +108,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_6_image_pane.html">Previous</a>
+            <p><a href="main_window_image_pane.html">Previous</a>
             </p>
           </td>
 
@@ -118,7 +118,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-status-bar-2"><a href="3_other_windows.html">Next</a>
+            <p class="gq-status-bar-2"><a href="other_windows.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/10_options.html b/doc/options.html
similarity index 75%
rename from doc/10_options.html
rename to doc/options.html
index 99d1a17f..f14ddbdc 100644
--- a/doc/10_options.html
+++ b/doc/options.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="9_printing.html">Previous</a>
+            <p><a href="printing.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-options-2"><a href="10_1_general.html">Next</a>
+            <p class="gq-options-2"><a href="options_general.html">Next</a>
             </p>
           </td>
         </tr>
@@ -58,19 +58,19 @@
   <br />
   </p>
 
-  <p class="gq-options-5">10.1 <a href="10_1_general.html">General Options</a></p>
+  <p class="gq-options-5">10.1 <a href="options_general.html">General Options</a></p>
 
-  <p class="gq-options-5">10.2 <a href="10_2_image.html">Image Options</a></p>
+  <p class="gq-options-5">10.2 <a href="options_image.html">Image Options</a></p>
 
-  <p class="gq-options-5">10.3 <a href="10_3_window.html">Window Options</a></p>
+  <p class="gq-options-5">10.3 <a href="options_window.html">Window Options</a></p>
 
-  <p class="gq-options-5">10.4 <a href="10_4_filtering.html">Filtering Options</a></p>
+  <p class="gq-options-5">10.4 <a href="options_filtering.html">Filtering Options</a></p>
 
-  <p class="gq-options-5">10.5 <a href="10_5_editor_commands.html">Editor Commands</a></p>
+  <p class="gq-options-5">10.5 <a href="options_editor_commands.html">Editor Commands</a></p>
 
-  <p class="gq-options-5">10.6 <a href="10_6_advanced.html">Advanced Options</a></p>
+  <p class="gq-options-5">10.6 <a href="options_advanced.html">Advanced Options</a></p>
 
-  <p class="gq-options-5">10.7 <a href="10_7_hidden.html">Hidden Options</a></p>
+  <p class="gq-options-5">10.7 <a href="options_hidden.html">Hidden Options</a></p>
 
   <p><br />
   <br />
@@ -91,7 +91,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="9_printing.html">Previous</a>
+            <p><a href="printing.html">Previous</a>
             </p>
           </td>
 
@@ -101,7 +101,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-options-2"><a href="10_1_general.html">Next</a>
+            <p class="gq-options-2"><a href="options_general.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/10_6_advanced.html b/doc/options_advanced.html
similarity index 96%
rename from doc/10_6_advanced.html
rename to doc/options_advanced.html
index c25393ce..eb079764 100644
--- a/doc/10_6_advanced.html
+++ b/doc/options_advanced.html
@@ -39,7 +39,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_5_editor_commands.html">Previous</a>
+            <p><a href="options_editor_commands.html">Previous</a>
             </p>
           </td>
 
@@ -48,7 +48,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-advanced-2"><a href="10_7_hidden.html">Next</a>
+            <p class="gq-advanced-2"><a href="options_hidden.html">Next</a>
             </p>
           </td>
         </tr>
@@ -164,7 +164,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_5_editor_commands.html">Previous</a>
+            <p><a href="options_editor_commands.html">Previous</a>
             </p>
           </td>
 
@@ -174,7 +174,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-advanced-2"><a href="10_7_hidden.html">Next</a>
+            <p class="gq-advanced-2"><a href="options_hidden.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/10_5_editor_commands.html b/doc/options_editor_commands.html
similarity index 95%
rename from doc/10_5_editor_commands.html
rename to doc/options_editor_commands.html
index 3959eec0..c4df5c18 100644
--- a/doc/10_5_editor_commands.html
+++ b/doc/options_editor_commands.html
@@ -32,7 +32,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_4_filtering.html">Previous</a>
+            <p><a href="options_filtering.html">Previous</a>
             </p>
           </td>
 
@@ -41,7 +41,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-editor-commands-2"><a href="10_6_advanced.html">Next</a>
+            <p class="gq-editor-commands-2"><a href="options_advanced.html">Next</a>
             </p>
           </td>
         </tr>
@@ -169,7 +169,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_4_filtering.html">Previous</a>
+            <p><a href="options_filtering.html">Previous</a>
             </p>
           </td>
 
@@ -179,7 +179,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-editor-commands-2"><a href="10_6_advanced.html">Next</a>
+            <p class="gq-editor-commands-2"><a href="options_advanced.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/10_4_filtering.html b/doc/options_filtering.html
similarity index 93%
rename from doc/10_4_filtering.html
rename to doc/options_filtering.html
index 414678ab..a7d592bf 100644
--- a/doc/10_4_filtering.html
+++ b/doc/options_filtering.html
@@ -32,7 +32,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_3_window.html">Previous</a>
+            <p><a href="options_window.html">Previous</a>
             </p>
           </td>
 
@@ -41,7 +41,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-filtering-2"><a href="10_5_editor_commands.html">Next</a>
+            <p class="gq-filtering-2"><a href="options_editor_commands.html">Next</a>
             </p>
           </td>
         </tr>
@@ -107,7 +107,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_3_window.html">Previous</a>
+            <p><a href="options_window.html">Previous</a>
             </p>
           </td>
 
@@ -117,7 +117,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-filtering-2"><a href="10_5_editor_commands.html">Next</a>
+            <p class="gq-filtering-2"><a href="options_editor_commands.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/10_1_general.html b/doc/options_general.html
similarity index 94%
rename from doc/10_1_general.html
rename to doc/options_general.html
index 146eb205..835b9595 100644
--- a/doc/10_1_general.html
+++ b/doc/options_general.html
@@ -36,7 +36,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_options.html">Previous</a>
+            <p><a href="options.html">Previous</a>
             </p>
           </td>
 
@@ -45,7 +45,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-general-2"><a href="10_2_image.html">Next</a>
+            <p class="gq-general-2"><a href="options_image.html">Next</a>
             </p>
           </td>
         </tr>
@@ -97,7 +97,7 @@
   <dl>
     <dd>
       <dl>
-        <dd class="gq-general-9"><b>Cache thumbnails</b>: Enable this to save thumbnails to disk, subsequent requests for a thumbnail will be faster. Thumbnails are cached into ($HOME)/.geeqie/thumbnails. Refer to <a href="11_3_thumbnails.html">11.3 thumbnails</a> for details.</dd>
+        <dd class="gq-general-9"><b>Cache thumbnails</b>: Enable this to save thumbnails to disk, subsequent requests for a thumbnail will be faster. Thumbnails are cached into ($HOME)/.geeqie/thumbnails. Refer to <a href="reference_thumbnails.html">11.3 thumbnails</a> for details.</dd>
 
         <dd class="gq-general-9"><b>Use shared thumbnail cache:</b> This will use a thumbnail caching method that is compatible with applications that use the standard thumbnail specification. When this option is enabled thumbnails will be stored in ($HOME)/.thumbnails</dd>
 
@@ -166,7 +166,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_options.html">Previous</a>
+            <p><a href="options.html">Previous</a>
             </p>
           </td>
 
@@ -176,7 +176,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-general-2"><a href="10_2_image.html">Next</a>
+            <p class="gq-general-2"><a href="options_image.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/10_7_hidden.html b/doc/options_hidden.html
similarity index 94%
rename from doc/10_7_hidden.html
rename to doc/options_hidden.html
index e2844fa4..452a0baa 100644
--- a/doc/10_7_hidden.html
+++ b/doc/options_hidden.html
@@ -35,7 +35,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_6_advanced.html">Previous</a>
+            <p><a href="options_advanced.html">Previous</a>
             </p>
           </td>
 
@@ -44,7 +44,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-hidden-2"><a href="11_reference.html">Next</a>
+            <p class="gq-hidden-2"><a href="reference.html">Next</a>
             </p>
           </td>
         </tr>
@@ -113,7 +113,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_6_advanced.html">Previous</a>
+            <p><a href="options_advanced.html">Previous</a>
             </p>
           </td>
 
@@ -123,7 +123,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-hidden-2"><a href="11_reference.html">Next</a>
+            <p class="gq-hidden-2"><a href="reference.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/10_2_image.html b/doc/options_image.html
similarity index 96%
rename from doc/10_2_image.html
rename to doc/options_image.html
index 531d1258..48aac7f6 100644
--- a/doc/10_2_image.html
+++ b/doc/options_image.html
@@ -40,7 +40,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_1_general.html">Previous</a>
+            <p><a href="options_general.html">Previous</a>
             </p>
           </td>
 
@@ -49,7 +49,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-2"><a href="10_3_window.html">Next</a>
+            <p class="gq-image-2"><a href="options_window.html">Next</a>
             </p>
           </td>
         </tr>
@@ -155,7 +155,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_1_general.html">Previous</a>
+            <p><a href="options_general.html">Previous</a>
             </p>
           </td>
 
@@ -165,7 +165,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-2"><a href="10_3_window.html">Next</a>
+            <p class="gq-image-2"><a href="options_window.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/10_3_window.html b/doc/options_window.html
similarity index 93%
rename from doc/10_3_window.html
rename to doc/options_window.html
index c07f2dd7..dad9071b 100644
--- a/doc/10_3_window.html
+++ b/doc/options_window.html
@@ -32,7 +32,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_2_image.html">Previous</a>
+            <p><a href="options_image.html">Previous</a>
             </p>
           </td>
 
@@ -41,7 +41,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-window-2"><a href="10_4_filtering.html">Next</a>
+            <p class="gq-window-2"><a href="options_filtering.html">Next</a>
             </p>
           </td>
         </tr>
@@ -105,7 +105,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_2_image.html">Previous</a>
+            <p><a href="options_image.html">Previous</a>
             </p>
           </td>
 
@@ -115,7 +115,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-window-2"><a href="10_4_filtering.html">Next</a>
+            <p class="gq-window-2"><a href="options_filtering.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/3_other_windows.html b/doc/other_windows.html
similarity index 83%
rename from doc/3_other_windows.html
rename to doc/other_windows.html
index 7fb6088e..565b5d00 100644
--- a/doc/3_other_windows.html
+++ b/doc/other_windows.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_7_status_bar.html">Previous</a>
+            <p><a href="main_window_status_bar.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-other-windows-2"><a href="3_1_image_window.html">Next</a>
+            <p class="gq-other-windows-2"><a href="other_windows_image_window.html">Next</a>
             </p>
           </td>
         </tr>
@@ -54,9 +54,9 @@
 
   <p>This section describes the windows available in Geeqie that can be thought of as general purpose, they are not designed for a specific purpose.</p>
 
-  <p class="gq-other-windows-5">3.1 <a href="3_1_image_window.html">Image Window</a></p>
+  <p class="gq-other-windows-5">3.1 <a href="other_windows_image_window.html">Image Window</a></p>
 
-  <p class="gq-other-windows-5">3.2 <a href="3_2_image_properties.html">Image Properties</a> Window</p>
+  <p class="gq-other-windows-5">3.2 <a href="other_windows_image_properties.html">Image Properties</a> Window</p>
 
   <p><br />
   <br />
@@ -81,7 +81,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="2_7_status_bar.html">Previous</a>
+            <p><a href="main_window_status_bar.html">Previous</a>
             </p>
           </td>
 
@@ -91,7 +91,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-other-windows-2"><a href="3_1_image_window.html">Next</a>
+            <p class="gq-other-windows-2"><a href="other_windows_image_window.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/3_2_image_properties.html b/doc/other_windows_image_properties.html
similarity index 90%
rename from doc/3_2_image_properties.html
rename to doc/other_windows_image_properties.html
index 75d3519e..6d7c60e3 100644
--- a/doc/3_2_image_properties.html
+++ b/doc/other_windows_image_properties.html
@@ -32,7 +32,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="3_1_image_window.html">Previous</a>
+            <p><a href="other_windows_image_window.html">Previous</a>
             </p>
           </td>
 
@@ -41,7 +41,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-properties-2"><a href="4_image_management.html">Next</a>
+            <p class="gq-image-properties-2"><a href="image_management.html">Next</a>
             </p>
           </td>
         </tr>
@@ -94,7 +94,7 @@
   <p><u>Keywords tab</u>
   </p>
 
-  <p class="gq-image-properties-5">The keywords tab contains the same information that is in the Keywords sidebar, please refer to the <a href="7_3_keywords.html">Keywords Sidebar</a> page for details.</p>
+  <p class="gq-image-properties-5">The keywords tab contains the same information that is in the Keywords sidebar, please refer to the <a href="sidebars_keywords.html">Keywords Sidebar</a> page for details.</p>
 
   <p><br />
   <br />
@@ -103,7 +103,7 @@
   <p><u>EXIF tab</u>
   </p>
 
-  <p class="gq-image-properties-5">The EXIF tab contains the same information that is in the EXIF sidebar, please refer to the <a href="7_1_exif.html">EXIF Sidebar</a> page for details.</p>
+  <p class="gq-image-properties-5">The EXIF tab contains the same information that is in the EXIF sidebar, please refer to the <a href="sidebars_exif.html">EXIF Sidebar</a> page for details.</p>
 
   <p><br />
   <br />
@@ -128,7 +128,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="3_1_image_window.html">Previous</a>
+            <p><a href="other_windows_image_window.html">Previous</a>
             </p>
           </td>
 
@@ -138,7 +138,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-properties-2"><a href="4_image_management.html">Next</a>
+            <p class="gq-image-properties-2"><a href="image_management.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/3_1_image_window.html b/doc/other_windows_image_window.html
similarity index 86%
rename from doc/3_1_image_window.html
rename to doc/other_windows_image_window.html
index e67a1ffa..88800f4c 100644
--- a/doc/3_1_image_window.html
+++ b/doc/other_windows_image_window.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="3_other_windows.html">Previous</a>
+            <p><a href="other_windows.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-window-2"><a href="3_2_image_properties.html">Next</a>
+            <p class="gq-image-window-2"><a href="other_windows_image_properties.html">Next</a>
             </p>
           </td>
         </tr>
@@ -60,7 +60,7 @@
   <br />
   </p>
 
-  <p>The image pane contained in an image window behaves and operates similar to the image pane of a <a href="2_6_image_pane.html">Main Window</a>. The keyboard shortcuts are the same, and the context menu is the same except &ldquo;Hide file list&rdquo; is replaced by &ldquo;Close window&rdquo;. The <a href="8_1_slideshow.html">slide show</a> and <a href="8_2_fillscreen.html">full screen</a> functions are also available.</p>
+  <p>The image pane contained in an image window behaves and operates similar to the image pane of a <a href="main_window_image_pane.html">Main Window</a>. The keyboard shortcuts are the same, and the context menu is the same except &ldquo;Hide file list&rdquo; is replaced by &ldquo;Close window&rdquo;. The <a href="image_presentation_slideshow.html">slide show</a> and <a href="8_2_fillscreen.html">full screen</a> functions are also available.</p>
 
   <p><br />
   <br />
@@ -69,7 +69,7 @@
   <p><u>Navigation</u>
   </p>
 
-  <p>When the image window contains a list of images or is linked to a collection, the displayed image can be changed forward or backward in the list with the respective PageDown and PageUp keys. In addition, all navigation methods for the mouse and keyboard are similar to that of the image pane of a <a href="2_6_image_pane.html">Main Window</a>.</p>
+  <p>When the image window contains a list of images or is linked to a collection, the displayed image can be changed forward or backward in the list with the respective PageDown and PageUp keys. In addition, all navigation methods for the mouse and keyboard are similar to that of the image pane of a <a href="main_window_image_pane.html">Main Window</a>.</p>
 
   <p><br />
   <br />
@@ -128,7 +128,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-image-window-2"><a href="3_2_image_properties.html">Next</a>
+            <p class="gq-image-window-2"><a href="other_windows_image_properties.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/9_printing.html b/doc/printing.html
similarity index 96%
rename from doc/9_printing.html
rename to doc/printing.html
index 007829ea..618d5d5b 100644
--- a/doc/9_printing.html
+++ b/doc/printing.html
@@ -37,7 +37,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="8_2_fullscreen.html">Previous</a>
+            <p><a href="image_presentation_fullscreen.html">Previous</a>
             </p>
           </td>
 
@@ -46,7 +46,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-printing-2"><a href="10_options.html">Next</a>
+            <p class="gq-printing-2"><a href="options.html">Next</a>
             </p>
           </td>
         </tr>
@@ -207,7 +207,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="8_2_fullscreen.html">Previous</a>
+            <p><a href="image_presentation_fullscreen.html">Previous</a>
             </p>
           </td>
 
@@ -217,7 +217,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-printing-2"><a href="10_options.html">Next</a>
+            <p class="gq-printing-2"><a href="options.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/11_reference.html b/doc/reference.html
similarity index 80%
rename from doc/11_reference.html
rename to doc/reference.html
index de3ad9d8..d8edc816 100644
--- a/doc/11_reference.html
+++ b/doc/reference.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_7_hidden.html">Previous</a>
+            <p><a href="options_hidden.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-reference-2"><a href="11_1_command_line.html">Next</a>
+            <p class="gq-reference-2"><a href="reference_command_line.html">Next</a>
             </p>
           </td>
         </tr>
@@ -56,11 +56,11 @@
   <br />
   </p>
 
-  <p class="gq-reference-5">11.1 <a href="11_1_command_line.html">Command Line</a> Options</p>
+  <p class="gq-reference-5">11.1 <a href="reference_command_line.html">Command Line</a> Options</p>
 
-  <p class="gq-reference-5">11.2 <a href="11_2_keyboard_shortcuts.html">Keyboard Shortcuts</a></p>
+  <p class="gq-reference-5">11.2 <a href="reference_keyboard_shortcuts.html">Keyboard Shortcuts</a></p>
 
-  <p class="gq-reference-5">11.3 <a href="11_3_thumbnails.html">Thumbnails</a></p>
+  <p class="gq-reference-5">11.3 <a href="reference_thumbnails.html">Thumbnails</a></p>
 
   <p><br />
   <br />
@@ -81,7 +81,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="10_7_hidden.html">Previous</a>
+            <p><a href="options_hidden.html">Previous</a>
             </p>
           </td>
 
@@ -91,7 +91,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-reference-2"><a href="11_1_command_line.html">Next</a>
+            <p class="gq-reference-2"><a href="reference_command_line.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/11_1_command_line.html b/doc/reference_command_line.html
similarity index 97%
rename from doc/11_1_command_line.html
rename to doc/reference_command_line.html
index 156cffc0..3405f1eb 100644
--- a/doc/11_1_command_line.html
+++ b/doc/reference_command_line.html
@@ -30,7 +30,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_reference.html">Previous</a>
+            <p><a href="reference.html">Previous</a>
             </p>
           </td>
 
@@ -39,7 +39,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-command-line-2"><a href="11_2_keyboard_shortcuts.html">Next</a>
+            <p class="gq-command-line-2"><a href="reference_keyboard_shortcuts.html">Next</a>
             </p>
           </td>
         </tr>
@@ -518,7 +518,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_reference.html">Previous</a>
+            <p><a href="reference.html">Previous</a>
             </p>
           </td>
 
@@ -528,7 +528,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-command-line-2"><a href="11_2_keyboard_shortcuts.html">Next</a>
+            <p class="gq-command-line-2"><a href="reference_keyboard_shortcuts.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/11_2_keyboard_shortcuts.html b/doc/reference_keyboard_shortcuts.html
similarity index 98%
rename from doc/11_2_keyboard_shortcuts.html
rename to doc/reference_keyboard_shortcuts.html
index 9d52525f..c6925139 100644
--- a/doc/11_2_keyboard_shortcuts.html
+++ b/doc/reference_keyboard_shortcuts.html
@@ -35,7 +35,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_1_command_line.html">Previous</a>
+            <p><a href="reference_command_line.html">Previous</a>
             </p>
           </td>
 
@@ -44,7 +44,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-keyboard-shortcuts-2"><a href="11_3_thumbnails.html">Next</a>
+            <p class="gq-keyboard-shortcuts-2"><a href="reference_thumbnails.html">Next</a>
             </p>
           </td>
         </tr>
@@ -1610,7 +1610,7 @@
   <br />
   </p>
 
-  <p class="gq-keyboard-shortcuts-11">(*) Default Mouse wheel functions, can be altered by changing <span class="gq-keyboard-shortcuts-10">the <a href="10_6_advanced.html">Mouse wheel scrolls image</a> option.</span></p>
+  <p class="gq-keyboard-shortcuts-11">(*) Default Mouse wheel functions, can be altered by changing <span class="gq-keyboard-shortcuts-10">the <a href="options_advanced.html">Mouse wheel scrolls image</a> option.</span></p>
 
   <p><br />
   <br />
@@ -1631,7 +1631,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_1_command_line.html">Previous</a>
+            <p><a href="reference_command_line.html">Previous</a>
             </p>
           </td>
 
@@ -1641,7 +1641,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-keyboard-shortcuts-2"><a href="11_3_thumbnails.html">Next</a>
+            <p class="gq-keyboard-shortcuts-2"><a href="reference_thumbnails.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/11_4_management.html b/doc/reference_management.html
similarity index 92%
rename from doc/11_4_management.html
rename to doc/reference_management.html
index 33714d96..d7b3f3dc 100644
--- a/doc/11_4_management.html
+++ b/doc/reference_management.html
@@ -33,7 +33,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_3_thumbnails.html">Previous</a>
+            <p><a href="reference_thumbnails.html">Previous</a>
             </p>
           </td>
 
@@ -42,7 +42,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-management-2"><a href="12_credits.html">Next</a>
+            <p class="gq-management-2"><a href="credits.html">Next</a>
             </p>
           </td>
         </tr>
@@ -63,7 +63,7 @@
   <p><u>Geeqie thumbnail cache</u>
   </p>
 
-  <p class="gq-management-5">The utilities listed here operate on the Geeqie caching mechanism. This also includes the data cached for the <a href="5_1_search.html">search</a> and <a href="5_2_finding_duplicates.html">find duplicates</a> utilities.</p>
+  <p class="gq-management-5">The utilities listed here operate on the Geeqie caching mechanism. This also includes the data cached for the <a href="image_search_search.html">search</a> and <a href="image_search_finding_duplicates.html">find duplicates</a> utilities.</p>
 
   <p class="gq-management-5"><b>Clean up</b>: Removes thumbnails and data for which the source image is no longer present, or has been modified since the thumbnail was generated.</p>
 
@@ -89,7 +89,7 @@
   <p><u>Create thumbnails</u>
   </p>
 
-  <p class="gq-management-5">This utility will render thumbnails using the current thumbnail caching mechanism, as determined in <a href="10_1_general.html">preferences</a>.</p>
+  <p class="gq-management-5">This utility will render thumbnails using the current thumbnail caching mechanism, as determined in <a href="options_general.html">preferences</a>.</p>
 
   <p class="gq-management-5"><b>Render:</b> Pre-render thumbnails for a specific folder, the utility has the following options:</p>
 
@@ -104,7 +104,7 @@
   <p><u>Metadata</u>
   </p>
 
-  <p class="gq-management-5">This utility operates on the data store for <a href="7_3_keywords.html">keywords and comments</a> located in the user's home folder: $HOME/.geeqie/metadata.</p>
+  <p class="gq-management-5">This utility operates on the data store for <a href="sidebars_keywords.html">keywords and comments</a> located in the user's home folder: $HOME/.geeqie/metadata.</p>
 
   <p class="gq-management-5"><b>Clean up:</b> Removes keywords and comments for which the source image is no longer present.</p>
 
@@ -207,7 +207,7 @@
         </td>
 
         <td width="50%">
-          <p>Default location for Geeqie collections, collections in this folder will appear in the <a href="7_2_sort_manager.html">sort manager</a> sidebar.</p>
+          <p>Default location for Geeqie collections, collections in this folder will appear in the <a href="sidebars_sort_manager.html">sort manager</a> sidebar.</p>
         </td>
       </tr>
 
@@ -303,7 +303,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_3_thumbnails.html">Previous</a>
+            <p><a href="reference_thumbnails.html">Previous</a>
             </p>
           </td>
 
@@ -313,7 +313,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-management-2"><a href="12_credits.html">Next</a>
+            <p class="gq-management-2"><a href="credits.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/11_3_thumbnails.html b/doc/reference_thumbnails.html
similarity index 88%
rename from doc/11_3_thumbnails.html
rename to doc/reference_thumbnails.html
index 03caba7d..ed816554 100644
--- a/doc/11_3_thumbnails.html
+++ b/doc/reference_thumbnails.html
@@ -33,7 +33,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_2_keyboard_shortcuts.html">Previous</a>
+            <p><a href="reference_keyboard_shortcuts.html">Previous</a>
             </p>
           </td>
 
@@ -42,7 +42,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-thumbnails-2"><a href="11_4_management.html">Next</a>
+            <p class="gq-thumbnails-2"><a href="reference_management.html">Next</a>
             </p>
           </td>
         </tr>
@@ -86,7 +86,7 @@
 
   <p class="gq-thumbnails-7">/path/to/.thumbnails/image.jpg.png</p>
 
-  <p class="gq-thumbnails-6">Local thumbnail caching is enabled with the option &ldquo;Cache thumbnails into .thumbnails&rdquo; on the <a href="10_1_general.html">General</a> tab of the options dialog. If it is not possible to store the thumbnail local to the source file (usually due to no write permissions), Geeqie will fall back to saving the thumbnail in the user's ($HOME)/.geeqie/thumbnails folder.</p>
+  <p class="gq-thumbnails-6">Local thumbnail caching is enabled with the option &ldquo;Cache thumbnails into .thumbnails&rdquo; on the <a href="options_general.html">General</a> tab of the options dialog. If it is not possible to store the thumbnail local to the source file (usually due to no write permissions), Geeqie will fall back to saving the thumbnail in the user's ($HOME)/.geeqie/thumbnails folder.</p>
 
   <p><br />
   <br />
@@ -126,7 +126,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="11_2_keyboard_shortcuts.html">Previous</a>
+            <p><a href="reference_keyboard_shortcuts.html">Previous</a>
             </p>
           </td>
 
@@ -136,7 +136,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-thumbnails-2"><a href="11_4_management.html">Next</a>
+            <p class="gq-thumbnails-2"><a href="reference_management.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/7_sidebars.html b/doc/sidebars.html
similarity index 85%
rename from doc/7_sidebars.html
rename to doc/sidebars.html
index ecda700c..c0e777de 100644
--- a/doc/7_sidebars.html
+++ b/doc/sidebars.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="6_collections.html">Previous</a>
+            <p><a href="collections.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-sidebars-2"><a href="7_1_exif.html">Next</a>
+            <p class="gq-sidebars-2"><a href="sidebars_exif.html">Next</a>
             </p>
           </td>
         </tr>
@@ -58,9 +58,9 @@
   <br />
   </p>
 
-  <p class="gq-sidebars-5">7.1 <a href="7_1_exif.html">EXIF sidebar</a></p>
+  <p class="gq-sidebars-5">7.1 <a href="sidebars_exif.html">EXIF sidebar</a></p>
 
-  <p class="gq-sidebars-5">7.2 <a href="7_2_sort_manager.html">Sort Manager sidebar</a></p>
+  <p class="gq-sidebars-5">7.2 <a href="sidebars_sort_manager.html">Sort Manager sidebar</a></p>
 
   <p class="gq-sidebars-5">7.3 <a href="7_3_keywords_sidebar.html">Keywords sidebar</a></p>
 
@@ -83,7 +83,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="6_collections.html">Previous</a>
+            <p><a href="collections.html">Previous</a>
             </p>
           </td>
 
@@ -93,7 +93,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-sidebars-2"><a href="7_1_exif.html">Next</a>
+            <p class="gq-sidebars-2"><a href="sidebars_exif.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/7_1_exif.html b/doc/sidebars_exif.html
similarity index 94%
rename from doc/7_1_exif.html
rename to doc/sidebars_exif.html
index 1dc60f14..f1810500 100644
--- a/doc/7_1_exif.html
+++ b/doc/sidebars_exif.html
@@ -31,7 +31,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="7_sidebars.html">Previous</a>
+            <p><a href="sidebars.html">Previous</a>
             </p>
           </td>
 
@@ -40,7 +40,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-exif-2"><a href="7_2_sort_manager.html">Next</a>
+            <p class="gq-exif-2"><a href="sidebars_sort_manager.html">Next</a>
             </p>
           </td>
         </tr>
@@ -108,7 +108,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="7_sidebars.html">Previous</a>
+            <p><a href="sidebars.html">Previous</a>
             </p>
           </td>
 
@@ -118,7 +118,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-exif-2"><a href="7_2_sort_manager.html">Next</a>
+            <p class="gq-exif-2"><a href="sidebars_sort_manager.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/7_3_keywords.html b/doc/sidebars_keywords.html
similarity index 94%
rename from doc/7_3_keywords.html
rename to doc/sidebars_keywords.html
index 2a6b8996..4aa85e8d 100644
--- a/doc/7_3_keywords.html
+++ b/doc/sidebars_keywords.html
@@ -33,7 +33,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="7_2_sort_manager.html">Previous</a>
+            <p><a href="sidebars_sort_manager.html">Previous</a>
             </p>
           </td>
 
@@ -42,7 +42,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-keywords-2"><a href="8_image_presentation.html">Next</a>
+            <p class="gq-keywords-2"><a href="image_presentation.html">Next</a>
             </p>
           </td>
         </tr>
@@ -62,7 +62,7 @@
   <br />
   </p>
 
-  <p><b>Keywords</b> <span class="gq-keywords-5">are single words that are associated to an image. They can be used to classify, group, or describe; the uses for keywords are only limited by your imagination.</span> Images associated to one or more keywords can be found using the <a href="5_1_search.html">Search window</a>.</p>
+  <p><b>Keywords</b> <span class="gq-keywords-5">are single words that are associated to an image. They can be used to classify, group, or describe; the uses for keywords are only limited by your imagination.</span> Images associated to one or more keywords can be found using the <a href="image_search_search.html">Search window</a>.</p>
 
   <p><b>Comments</b> is an area to associate a textual description to an image.</p>
 
@@ -130,7 +130,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="7_2_sort_manager.html">Previous</a>
+            <p><a href="sidebars_sort_manager.html">Previous</a>
             </p>
           </td>
 
@@ -140,7 +140,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-keywords-2"><a href="8_image_presentation.html">Next</a>
+            <p class="gq-keywords-2"><a href="image_presentation.html">Next</a>
             </p>
           </td>
         </tr>
diff --git a/doc/7_2_sort_manager.html b/doc/sidebars_sort_manager.html
similarity index 96%
rename from doc/7_2_sort_manager.html
rename to doc/sidebars_sort_manager.html
index 588ca216..2c519b41 100644
--- a/doc/7_2_sort_manager.html
+++ b/doc/sidebars_sort_manager.html
@@ -35,7 +35,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="7_1_exif.html">Previous</a>
+            <p><a href="sidebars_exif.html">Previous</a>
             </p>
           </td>
 
@@ -44,7 +44,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-sort-manager-2"><a href="7_3_keywords.html">Next</a>
+            <p class="gq-sort-manager-2"><a href="sidebars_keywords.html">Next</a>
             </p>
           </td>
         </tr>
@@ -164,7 +164,7 @@
       <thead>
         <tr valign="top">
           <td width="33%">
-            <p><a href="7_1_exif.html">Previous</a>
+            <p><a href="sidebars_exif.html">Previous</a>
             </p>
           </td>
 
@@ -174,7 +174,7 @@
           </td>
 
           <td width="33%">
-            <p class="gq-sort-manager-2"><a href="7_3_keywords.html">Next</a>
+            <p class="gq-sort-manager-2"><a href="sidebars_keywords.html">Next</a>
             </p>
           </td>
         </tr>
-- 
2.20.1