SF.net SVN: geany:[2995] trunk

[ntrel at users.sourceforge.net]

Revision: 2995
          http://geany.svn.sourceforge.net/geany/?rev=2995&view=rev
Author:   ntrel
Date:     2008-09-25 11:38:58 +0000 (Thu, 25 Sep 2008)

Log Message:
-----------
Minor formatting changes - make the using a Makefile paragraph a
note.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/doc/geany.html
    trunk/doc/geany.txt

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-09-25 11:30:44 UTC (rev 2994)
+++ trunk/ChangeLog	2008-09-25 11:38:58 UTC (rev 2995)
@@ -8,6 +8,9 @@
    Detect which error regex match contains the line number, and use the
    other match for the filename.
    Update 'Build system' docs for custom error regexes.
+ * doc/geany.txt, doc/geany.html:
+   Minor formatting changes - make the using a Makefile paragraph a
+   note.
 
 
 2008-09-24  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2008-09-25 11:30:44 UTC (rev 2994)
+++ trunk/doc/geany.html	2008-09-25 11:38:58 UTC (rev 2995)
@@ -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="2008-09-23" />
+<meta name="date" content="2008-09-25" />
 <style type="text/css">
 
 /*
@@ -139,7 +139,7 @@
 <br />Nick Treleaven
 <br />Frank Lanitz</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2008-09-23</td></tr>
+<td>2008-09-25</td></tr>
 <tr><th class="docinfo-name">Version:</th>
 <td>0.15</td></tr>
 </tbody>
@@ -2150,9 +2150,9 @@
 <ul class="simple">
 <li>Compile</li>
 <li>Build</li>
-<li>Make all</li>
-<li>Make custom target</li>
-<li>Make object</li>
+<li>Make All</li>
+<li>Make Custom Target</li>
+<li>Make Object</li>
 <li>Execute</li>
 <li>Set Includes and Arguments</li>
 </ul>
@@ -2232,6 +2232,13 @@
 Set Includes and Arguments you can add any include paths and compile
 flags for the compiler, any library names and paths for the linker,
 and any arguments you want to use when running Execute.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">If you need complex settings for your build system, or several
+different settings, then writing a Makefile and using the Make
+commands is recommended; this will also make it easier for users to
+build your software.</p>
+</div>
 <p>These settings are saved automatically when Geany is shut down.</p>
 <p>The following variables can be used:</p>
 <ul class="simple">
@@ -2239,9 +2246,6 @@
 <li>%e -- filename without path and without extension</li>
 </ul>
 <p>See <a class="reference" href="#build-settings-section">[build_settings] Section</a> for details.</p>
-<p>If you need complex settings for your build system, or several
-different settings, then writing a Makefile and using the Make commands
-is recommended.</p>
 <div class="section">
 <h4><a class="toc-backref" href="#id122" id="one-step-compilation" name="one-step-compilation">One step compilation</a></h4>
 <p>If you are using the Build command to compile and link in one step,
@@ -4269,7 +4273,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2008-09-25 11:28 UTC.
+Generated on: 2008-09-25 11:36 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>

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2008-09-25 11:30:44 UTC (rev 2994)
+++ trunk/doc/geany.txt	2008-09-25 11:38:58 UTC (rev 2995)
@@ -1979,9 +1979,9 @@
 
 * Compile
 * Build
-* Make all
-* Make custom target
-* Make object
+* Make All
+* Make Custom Target
+* Make Object
 * Execute
 * Set Includes and Arguments
 
@@ -2084,6 +2084,12 @@
 flags for the compiler, any library names and paths for the linker,
 and any arguments you want to use when running Execute.
 
+.. note::
+    If you need complex settings for your build system, or several
+    different settings, then writing a Makefile and using the Make
+    commands is recommended; this will also make it easier for users to
+    build your software.
+
 These settings are saved automatically when Geany is shut down.
 
 The following variables can be used:
@@ -2093,9 +2099,6 @@
 
 See `[build_settings] Section`_ for details.
 
-If you need complex settings for your build system, or several
-different settings, then writing a Makefile and using the Make commands
-is recommended.
 
 
 One step compilation


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.