From d4b23f9f3e214b8e8735f18de99453df2e3f67c4 Mon Sep 17 00:00:00 2001
From: Nick Treleaven <nick.treleaven@btinternet.com>
Date: Wed, 17 Nov 2010 17:42:16 +0000
Subject: [PATCH] Use 'Filetype build commands' and 'Independent build
 commands'. Fix saying project *independent* execute can only be set by hand.

git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5412 ea778897-0a13-0410-b9d1-a72fbfd435f5
---
 ChangeLog      |  3 +++
 doc/geany.html | 35 ++++++++++++++++++-----------------
 doc/geany.txt  | 30 +++++++++++++++---------------
 3 files changed, 36 insertions(+), 32 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1b91314f7..9b8cafb7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
  * src/build.c, doc/geany.txt, doc/geany.html:
    Change 'Non-Filetype Commands' to 'Independent Commands' in the Set
    Build Commands dialog.
+ * doc/geany.txt, doc/geany.html:
+   Use 'Filetype build commands' and 'Independent build commands'.
+   Fix saying project *independent* execute can only be set by hand.
 
 
 2010-11-16  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
diff --git a/doc/geany.html b/doc/geany.html
index 470a9cee4..2f74d8a10 100644
--- a/doc/geany.html
+++ b/doc/geany.html
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.4: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz" />
-<meta name="date" content="2010-11-15" />
+<meta name="date" content="2010-11-17" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@ Stylesheet for Geany's documentation based on a version of John Gabriele.
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2010-11-15</td></tr>
+<td>2010-11-17</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.20</td></tr>
 </tbody>
@@ -2896,16 +2896,16 @@ you can also change the label to match.</p>
 <p>The build menu is divided into four groups of items each with different
 behaviors:</p>
 <ul class="simple">
-<li>Filetype items - are configurable and depend on the filetype of the current
-document; they capture output in the compiler tab and parse it for
+<li>Filetype build commands - are configurable and depend on the filetype of the
+current document; they capture output in the compiler tab and parse it for
 errors.</li>
-<li>Filetype-independent items - are configurable and mostly don't depend on the
+<li>Independent build commands - are configurable and mostly don't depend on the
 filetype of the current document; they also capture output in the
 compiler tab and parse it for errors.</li>
-<li>Execute items - are configurable and intended for executing your
+<li>Execute commands - are configurable and intended for executing your
 program or other long running programs.  The output is not parsed for errors
 and is directed to the terminal selected in preferences.</li>
-<li>Fixed items - these perform built-in actions:<ul>
+<li>Fixed commands - these perform built-in actions:<ul>
 <li>Go to the next error.</li>
 <li>Go to the previous error.</li>
 <li>Show the build menu commands dialog.</li>
@@ -3017,9 +3017,10 @@ filetype.xxx file in
 filetype.xxx in
 Geany install</p>
 <p class="last">Saves To: as user
-preferences left</p>
+preferences left.</p>
 </td>
-<td>Label: _Execute Command: ./%e</td>
+<td>Label: _Execute
+Command: ./%e</td>
 </tr>
 </tbody>
 </table>
@@ -3037,9 +3038,10 @@ a whole directory.</li>
 <li>(Filetype-Independent, System Filetype) - although conceptually strange, defining
 filetype-independent commands in a filetype file, this provides the ability to
 define filetype dependent default menu items.</li>
-<li>(Execute, Project File) and (Execute, Preferences) - the project filetype-based
-execute and preferences independent execute can only be set by hand editing the
-appropriate file, see <a class="reference" href="#preferences-file-format">Preferences File Format</a> and <a class="reference" href="#project-file-format">Project File Format</a>.</li>
+<li>(Execute, Project File) and (Execute, Preferences) - the project independent
+execute and preferences independent execute commands can only be set by hand
+editing the appropriate file, see <a class="reference" href="#preferences-file-format">Preferences File Format</a> and <a class="reference" href="#project-file-format">Project File
+Format</a>.</li>
 </ul>
 </div>
 <div class="section">
@@ -3052,10 +3054,9 @@ dialog.  Both use the same form shown below.</p>
 <img alt="./images/build_menu_commands_dialog.png" src="./images/build_menu_commands_dialog.png" />
 <p>The dialog is divided into three sections:</p>
 <ul class="simple">
-<li>Filetype menu items which will be selected based on the filetype of the
-currently open document.</li>
-<li>Filetype-independent menu items.</li>
-<li>Execute menu items.</li>
+<li>Filetype build commands (selected based on the current document's filetype).</li>
+<li>Independent build commands (available regardless of filetype).</li>
+<li>Filetype execute commands.</li>
 </ul>
 <p>The filetype and independent sections also each contain a field for the regular
 expression used for parsing command output for error and warning messages.</p>
@@ -6353,7 +6354,7 @@ USE OR PERFORMANCE OF THIS SOFTWARE.</p>
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-11-17 15:28 UTC.
+Generated on: 2010-11-17 17:38 UTC.
 Generated by <a class="reference" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>
diff --git a/doc/geany.txt b/doc/geany.txt
index a17fc528e..7536bdcee 100644
--- a/doc/geany.txt
+++ b/doc/geany.txt
@@ -2663,16 +2663,16 @@ These settings are saved automatically when Geany is shut down.
 The build menu is divided into four groups of items each with different
 behaviors:
 
-* Filetype items - are configurable and depend on the filetype of the current
-  document; they capture output in the compiler tab and parse it for
+* Filetype build commands - are configurable and depend on the filetype of the
+  current document; they capture output in the compiler tab and parse it for
   errors.
-* Filetype-independent items - are configurable and mostly don't depend on the
+* Independent build commands - are configurable and mostly don't depend on the
   filetype of the current document; they also capture output in the
   compiler tab and parse it for errors.
-* Execute items - are configurable and intended for executing your
+* Execute commands - are configurable and intended for executing your
   program or other long running programs.  The output is not parsed for errors
   and is directed to the terminal selected in preferences.
-* Fixed items - these perform built-in actions:
+* Fixed commands - these perform built-in actions:
 
   * Go to the next error.
   * Go to the previous error.
@@ -2717,12 +2717,12 @@ is shown in the following table.
 |              |                     |                          |                   |    Label: Make _Object        |
 |              |                     |                          |                   |    Command: make %e.o         |
 +--------------+---------------------+--------------------------+-------------------+-------------------------------+
-| Execute      | Loads From: project | Loads From:              | Loads From:       | Label: _Execute Command: ./%e |
-|              | file or else        | geany.conf file in       | filetype.xxx in   |                               |
+| Execute      | Loads From: project | Loads From:              | Loads From:       | Label: _Execute               |
+|              | file or else        | geany.conf file in       | filetype.xxx in   | Command: ./%e                 |
 |              | filetype defined in | ~/.config/geany or else  | Geany install     |                               |
 |              | project file        | filetype.xxx file in     |                   |                               |
 |              |                     | ~/.config/geany/filedefs | Saves To: as user |                               |
-|              | Saves To:           |                          | preferences left  |                               |
+|              | Saves To:           |                          | preferences left. |                               |
 |              | project file        | Saves To:                |                   |                               |
 |              |                     | filetype.xxx file in     |                   |                               |
 |              |                     | ~/.config/geany/filedefs |                   |                               |
@@ -2746,9 +2746,10 @@ The following notes on the table reference cells by coordinate as (group,source)
   filetype-independent commands in a filetype file, this provides the ability to
   define filetype dependent default menu items.
 
-* (Execute, Project File) and (Execute, Preferences) - the project filetype-based
-  execute and preferences independent execute can only be set by hand editing the
-  appropriate file, see `Preferences File Format`_ and `Project File Format`_.
+* (Execute, Project File) and (Execute, Preferences) - the project independent
+  execute and preferences independent execute commands can only be set by hand
+  editing the appropriate file, see `Preferences File Format`_ and `Project File
+  Format`_.
 
 Build Menu Commands Dialog
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -2763,10 +2764,9 @@ dialog.  Both use the same form shown below.
 
 The dialog is divided into three sections:
 
-* Filetype menu items which will be selected based on the filetype of the
-  currently open document.
-* Filetype-independent menu items.
-* Execute menu items.
+* Filetype build commands (selected based on the current document's filetype).
+* Independent build commands (available regardless of filetype).
+* Filetype execute commands.
 
 The filetype and independent sections also each contain a field for the regular
 expression used for parsing command output for error and warning messages.