SF.net SVN: geany:[4865] trunk

[ntrel at users.sourceforge.net]

Revision: 4865
          http://geany.svn.sourceforge.net/geany/?rev=4865&view=rev
Author:   ntrel
Date:     2010-04-28 12:49:09 +0000 (Wed, 28 Apr 2010)

Log Message:
-----------
Add Folding section link to filetypes.common custom settings.

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

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-04-27 15:09:34 UTC (rev 4864)
+++ trunk/ChangeLog	2010-04-28 12:49:09 UTC (rev 4865)
@@ -1,3 +1,9 @@
+2010-04-28  Nick Treleaven  <nick(dot)treleaven(at)btinternet(dot)com>
+
+ * doc/geany.txt, doc/geany.html:
+   Add Folding section link to filetypes.common custom settings.
+
+
 2010-04-27  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
 
  * src/callbacks.c:

Modified: trunk/doc/geany.html
===================================================================
--- trunk/doc/geany.html	2010-04-27 15:09:34 UTC (rev 4864)
+++ trunk/doc/geany.html	2010-04-28 12:49:09 UTC (rev 4865)
@@ -1144,6 +1144,11 @@
 marked by vertical lines within this margin. For many filetypes nested
 folding is supported, so there may be several fold points within other
 fold points.</p>
+<div class="note">
+<p class="first admonition-title">Note</p>
+<p class="last">You can customize the folding icon and line styles - see the
+filetypes.common <a class="reference" href="#folding-settings">Folding Settings</a>.</p>
+</div>
 <p>If you don't like it or don't need it at all, you can simply disable
 folding support completely in the preferences dialog.</p>
 <p>The folding behaviour can be changed with the "Fold/Unfold all children of
@@ -4439,6 +4444,8 @@
 The fourth argument defines whether to use the background color.</p>
 <p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">white_space=0xc0c0c0;0xffffff;true;true</span></tt></p>
 </dd>
+</dl>
+<dl class="docutils" id="folding-settings">
 <dt>folding_style</dt>
 <dd><p class="first">The style of folding icons. Only first and second arguments are
 used.</p>
@@ -4455,8 +4462,8 @@
 <li>1 -- for straight lines</li>
 <li>2 -- for curved lines</li>
 </ul>
-<p><em>Example:</em> <tt class="docutils literal"><span class="pre">folding_style=1;1;</span></tt></p>
-<p class="last"><em>Example:</em> <tt class="docutils literal"><span class="pre">folding_style=3;0;</span></tt></p>
+<p><em>Default:</em> <tt class="docutils literal"><span class="pre">folding_style=1;1;</span></tt></p>
+<p class="last"><em>Arrows:</em> <tt class="docutils literal"><span class="pre">folding_style=3;0;</span></tt></p>
 </dd>
 <dt>folding_horiz_line</dt>
 <dd><p class="first">Draw a thin horizontal line at the line where text is folded. Only
@@ -6005,7 +6012,7 @@
 <div class="footer">
 <hr class="footer" />
 <a class="reference" href="geany.txt">View document source</a>.
-Generated on: 2010-04-22 16:49 UTC.
+Generated on: 2010-04-28 12:47 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	2010-04-27 15:09:34 UTC (rev 4864)
+++ trunk/doc/geany.txt	2010-04-28 12:49:09 UTC (rev 4865)
@@ -714,6 +714,10 @@
 folding is supported, so there may be several fold points within other
 fold points.
 
+.. note::
+    You can customize the folding icon and line styles - see the
+    filetypes.common `Folding Settings`_.
+
 If you don't like it or don't need it at all, you can simply disable
 folding support completely in the preferences dialog.
 
@@ -3799,6 +3803,8 @@
 
     *Example:* ``white_space=0xc0c0c0;0xffffff;true;true``
 
+.. _Folding Settings:
+
 folding_style
     The style of folding icons. Only first and second arguments are
     used.
@@ -3816,9 +3822,9 @@
     * 1 -- for straight lines
     * 2 -- for curved lines
 
-    *Example:* ``folding_style=1;1;``
+    *Default:* ``folding_style=1;1;``
 
-    *Example:* ``folding_style=3;0;``
+    *Arrows:* ``folding_style=3;0;``
 
 folding_horiz_line
     Draw a thin horizontal line at the line where text is folded. Only


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