From 98452edcc9e2ee542ba722f816fc6f0deeabc6f7 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Thu, 26 Jul 2012 15:33:10 +0100
Subject: [PATCH] Update manual for search pref changes; add some links

---
 doc/geany.html | 14 ++++++++------
 doc/geany.txt  | 14 +++++++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/doc/geany.html b/doc/geany.html
index 59589bb5e..5aa0576e0 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -756,7 +756,7 @@ Return:</p>
 <li>An optional message window which can show the following tabs:<ul>
 <li>Status - A list of status messages.</li>
 <li>Compiler - The output of compiling or building programs.</li>
-<li>Messages - Results of 'Find Usage', 'Find Usage' 'Find in Files' and other actions</li>
+<li>Messages - Results of 'Find Usage', 'Find in Files' and other actions</li>
 <li>Scribble - A text scratchpad for any use.</li>
 <li>Terminal - An optional terminal window.</li>
 </ul>
@@ -1585,6 +1585,7 @@ and the editor window's popup menu:</p>
 <li>Go to tag declaration</li>
 <li>Go to line</li>
 </ul>
+<p>See also <a class="reference internal" href="#search">Search</a> preferences.</p>
 <div class="section" id="toolbar-entries">
 <h3><a class="toc-backref" href="#id59">Toolbar entries</a></h3>
 <p>There are also two toolbar entries:</p>
@@ -2208,15 +2209,16 @@ goto line fields and the VTE.</dd>
 <div class="section" id="search">
 <h4><a class="toc-backref" href="#id94">Search</a></h4>
 <dl class="docutils">
-<dt>Always wrap search and hide the Find dialog</dt>
-<dd>Always wrap search around the document and hide the Find dialog after clicking
-Find Next/Previous.</dd>
+<dt>Always wrap search</dt>
+<dd>Always wrap search around the document when finding a match.</dd>
+<dt>Hide the Find dialog</dt>
+<dd>Hide the <a class="reference internal" href="#find">Find</a> dialog after clicking Find Next/Previous.</dd>
 <dt>Use the current word under the cursor for Find dialogs</dt>
 <dd>Use current word under the cursor when opening the Find, Find in Files or Replace dialog and
 there is no selection. When this option is disabled, the search term last used in the
 appropriate Find dialog is used.</dd>
 <dt>Use the current file's directory for Find in Files</dt>
-<dd>When opening the Find in Files dialog, set the directory to search to the directory of the current
+<dd>When opening the <a class="reference internal" href="#find-in-files">Find in Files</a> dialog, set the directory to search to the directory of the current
 active file. When this option is disabled, the directory of the last use of the Find in Files
 dialog is used.</dd>
 </dl>
@@ -6795,7 +6797,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2012-06-25 13:30 UTC.
+Generated on: 2012-07-26 14:29 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
diff --git a/doc/geany.txt b/doc/geany.txt
index 807b74532..e60dc17c9 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -293,7 +293,7 @@ The workspace has the following parts:
 
   * Status - A list of status messages.
   * Compiler - The output of compiling or building programs.
-  * Messages - Results of 'Find Usage', 'Find Usage' 'Find in Files' and other actions
+  * Messages - Results of 'Find Usage', 'Find in Files' and other actions
   * Scribble - A text scratchpad for any use.
   * Terminal - An optional terminal window.
 
@@ -1153,6 +1153,8 @@ and the editor window's popup menu:
 * Go to tag declaration
 * Go to line
 
+See also `Search`_ preferences.
+
 Toolbar entries
 ^^^^^^^^^^^^^^^
 There are also two toolbar entries:
@@ -1815,9 +1817,11 @@ Auto-focus widgets (focus follows mouse)
 Search
 ``````
 
-Always wrap search and hide the Find dialog
-    Always wrap search around the document and hide the Find dialog after clicking
-    Find Next/Previous.
+Always wrap search
+    Always wrap search around the document when finding a match.
+
+Hide the Find dialog
+    Hide the `Find`_ dialog after clicking Find Next/Previous.
 
 Use the current word under the cursor for Find dialogs
     Use current word under the cursor when opening the Find, Find in Files or Replace dialog and
@@ -1825,7 +1829,7 @@ Use the current word under the cursor for Find dialogs
     appropriate Find dialog is used.
 
 Use the current file's directory for Find in Files
-    When opening the Find in Files dialog, set the directory to search to the directory of the current
+    When opening the `Find in Files`_ dialog, set the directory to search to the directory of the current
     active file. When this option is disabled, the directory of the last use of the Find in Files
     dialog is used.