Fix #434: Remove duplicate data, context-sensitive help

https://github.com/BestImageViewer/geeqie/issues/434

Remove data duplicated in the README and Help files
Include context-sensitive help in all preferences windows
Minor addition to README file

diff --git a/doc/docbook/GuideOptionsAdditional.xml b/doc/docbook/GuideOptionsAdditional.xml
new file mode 100644 (file)
index 0000000..08383e0
--- /dev/null
+++ b/doc/docbook/GuideOptionsAdditional.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<chapter id="GuideOptionsAdditional">\r
+  <title id="titleGuideOptionsAdditional">Additional Preferences</title>\r
+  <para>There are two sets of preferences in Geeqie: those set via the main Preferences tabbed dialogue, and those set either via a menu entry or by editing a configuration file.</para>\r
+\r
+    <para>\r
+      This chapter explains in detail the Geeqie preferences that are set via a menu entry or by editing a configuration file.\r
+    </para>\r
+\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsLayout.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideEditorsConfig.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsHidden.xml" />\r
+    <para />\r
+\r
+</chapter>\r

diff --git a/doc/docbook/GuideOptionsMain.xml b/doc/docbook/GuideOptionsMain.xml
new file mode 100644 (file)
index 0000000..15b6ed7
--- /dev/null
+++ b/doc/docbook/GuideOptionsMain.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<chapter id="GuideOptionsMain">\r
+  <title id="titleGuideOptionsMain">Preferences</title>\r
+  <para>There are two sets of preferences in Geeqie: those set via the main Preferences tabbed dialogue, and those set either via a menu entry or by editing a configuration file.</para>\r
+\r
+    <para>\r
+      This chapter explains in detail the main Geeqie preferences dialog, which is accessed via\r
+      <menuchoice>\r
+        <shortcut>\r
+          <keycombo>\r
+            <keycap>Ctrl</keycap>\r
+            <keycap>O</keycap>\r
+          </keycombo>\r
+        </shortcut>\r
+        <guimenu>Edit</guimenu>\r
+        <guimenuitem>Preferences</guimenuitem>\r
+        <guimenuitem>Preferences</guimenuitem>\r
+      </menuchoice>\r
+      or\r
+      <guiicon>\r
+        <inlinegraphic fileref="preferences-desktop.png" />\r
+      </guiicon>\r
+      on the Toolbar.\r
+    </para>\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsGeneral.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsImage.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsWindow.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsKeyboard.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsFiltering.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsMetadata.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsColor.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsStereo.xml" />\r
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="GuideOptionsBehavior.xml" />\r
+    <para />\r
+\r
+</chapter>\r