diff -Nru geany-plugins-0.20~svn1474/addons/ChangeLog geany-plugins-0.20~svn1515/addons/ChangeLog
--- geany-plugins-0.20~svn1474/addons/ChangeLog	2010-06-27 11:57:28.000000000 +0100
+++ geany-plugins-0.20~svn1515/addons/ChangeLog	2010-08-15 18:46:11.000000000 +0100
@@ -1,3 +1,9 @@
+2010-08-15  Enrico Tröger  <enrico(dot)troeger(at)uvena(dot)de>
+
+ * src/addons.c, src/ao_bookmarklist.c:
+   Fix line scrolling when jumping to bookmarks (part of #3043534).
+
+
 2010-06-27  Frank Lanitz  <frank(at)frank(dot)uvena(dot)de>
 
  * src/ao_xmltagging.c:
diff -Nru geany-plugins-0.20~svn1474/addons/src/addons.c geany-plugins-0.20~svn1515/addons/src/addons.c
--- geany-plugins-0.20~svn1474/addons/src/addons.c	2010-06-27 11:31:30.000000000 +0100
+++ geany-plugins-0.20~svn1515/addons/src/addons.c	2010-08-15 18:46:11.000000000 +0100
@@ -18,7 +18,7 @@
  *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  *      MA 02110-1301, USA.
  *
- * $Id: addons.c 1468 2010-06-27 10:31:30Z frlan $
+ * $Id: addons.c 1508 2010-08-15 17:46:11Z eht16 $
  */
 
 
@@ -40,7 +40,7 @@
 GeanyFunctions	*geany_functions;
 
 
-PLUGIN_VERSION_CHECK(188)
+PLUGIN_VERSION_CHECK(194)
 PLUGIN_SET_TRANSLATABLE_INFO(
 	LOCALEDIR,
 	GETTEXT_PACKAGE,
diff -Nru geany-plugins-0.20~svn1474/addons/src/ao_bookmarklist.c geany-plugins-0.20~svn1515/addons/src/ao_bookmarklist.c
--- geany-plugins-0.20~svn1474/addons/src/ao_bookmarklist.c	2010-01-01 22:24:34.000000000 +0000
+++ geany-plugins-0.20~svn1515/addons/src/ao_bookmarklist.c	2010-08-15 18:46:11.000000000 +0100
@@ -17,7 +17,7 @@
  *      along with this program; if not, write to the Free Software
  *      Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
- * $Id: ao_bookmarklist.c 1098 2010-01-01 22:24:34Z eht16 $
+ * $Id: ao_bookmarklist.c 1508 2010-08-15 17:46:11Z eht16 $
  */
 
 
@@ -201,9 +201,12 @@
 		GeanyDocument *doc = document_get_current();
 		if (DOC_VALID(doc))
 		{
+			gint pos;
+
 			gtk_tree_model_get(model, &iter, BMLIST_COL_LINE, &line, -1);
-			sci_goto_line(doc->editor->sci, line - 1, TRUE);
+			pos = sci_get_position_from_line(doc->editor->sci, line - 1);
 
+			editor_goto_pos(doc->editor, pos, FALSE);
 			gtk_widget_grab_focus(GTK_WIDGET(doc->editor->sci));
 		}
 	}
diff -Nru geany-plugins-0.20~svn1474/build/geanygendoc.m4 geany-plugins-0.20~svn1515/build/geanygendoc.m4
--- geany-plugins-0.20~svn1474/build/geanygendoc.m4	2010-05-29 10:05:27.000000000 +0100
+++ geany-plugins-0.20~svn1515/build/geanygendoc.m4	2010-08-17 01:35:20.000000000 +0100
@@ -50,7 +50,6 @@
     GP_STATUS_PLUGIN_ADD([GeanyGenDoc], [$enable_geanygendoc])
 
     AC_CONFIG_FILES([
-        geanygendoc/README
         geanygendoc/Makefile
         geanygendoc/src/Makefile
         geanygendoc/data/Makefile
diff -Nru geany-plugins-0.20~svn1474/configure geany-plugins-0.20~svn1515/configure
--- geany-plugins-0.20~svn1474/configure	2010-07-04 19:16:08.000000000 +0100
+++ geany-plugins-0.20~svn1515/configure	2010-08-19 01:10:09.000000000 +0100
@@ -13063,7 +13063,7 @@
 "
 
 
-    ac_config_files="$ac_config_files geanygendoc/README geanygendoc/Makefile geanygendoc/src/Makefile geanygendoc/data/Makefile geanygendoc/data/filetypes/Makefile geanygendoc/docs/Makefile"
+    ac_config_files="$ac_config_files geanygendoc/Makefile geanygendoc/src/Makefile geanygendoc/data/Makefile geanygendoc/data/filetypes/Makefile geanygendoc/docs/Makefile"
 
 
 
@@ -15184,7 +15184,6 @@
     "geanygdb/Makefile") CONFIG_FILES="$CONFIG_FILES geanygdb/Makefile" ;;
     "geanygdb/src/Makefile") CONFIG_FILES="$CONFIG_FILES geanygdb/src/Makefile" ;;
     "geanygdb/tests/Makefile") CONFIG_FILES="$CONFIG_FILES geanygdb/tests/Makefile" ;;
-    "geanygendoc/README") CONFIG_FILES="$CONFIG_FILES geanygendoc/README" ;;
     "geanygendoc/Makefile") CONFIG_FILES="$CONFIG_FILES geanygendoc/Makefile" ;;
     "geanygendoc/src/Makefile") CONFIG_FILES="$CONFIG_FILES geanygendoc/src/Makefile" ;;
     "geanygendoc/data/Makefile") CONFIG_FILES="$CONFIG_FILES geanygendoc/data/Makefile" ;;
diff -Nru geany-plugins-0.20~svn1474/debian/changelog geany-plugins-0.20~svn1515/debian/changelog
--- geany-plugins-0.20~svn1474/debian/changelog	2010-07-04 19:16:40.000000000 +0100
+++ geany-plugins-0.20~svn1515/debian/changelog	2010-08-19 01:10:33.000000000 +0100
@@ -1,3 +1,9 @@
+geany-plugins (0.20~svn1515-1~frasten0) lucid; urgency=low
+
+  * SVN snapshot of rev 1515 on 2010-08-17 02:35:20 +0200.
+
+ -- Andrea Piccinelli <frasten@gmail.com>  Thu, 19 Aug 2010 02:10:31 +0200
+
 geany-plugins (0.20~svn1474-1~frasten0) lucid; urgency=low
 
   * SVN snapshot of rev 1474 on 2010-06-27 14:01:15 +0200.
diff -Nru geany-plugins-0.20~svn1474/geanygendoc/ChangeLog geany-plugins-0.20~svn1515/geanygendoc/ChangeLog
--- geany-plugins-0.20~svn1474/geanygendoc/ChangeLog	2010-06-14 20:57:38.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanygendoc/ChangeLog	2010-08-17 01:35:20.000000000 +0100
@@ -1,3 +1,22 @@
+2010-08-17  Colomban Wendling  <ban(at)herbesfolles(dot)org>
+
+  * docs/manual.rst, docs/manual.html:
+    Add license information in the manual.
+  * docs/manual.css:
+    Add a style definition for blockquotes in the manual stylesheet.
+  * docs/manual.rst, docs/manual.html:
+    Move "User interface in Geany" part on the top of the manual. This part is
+    probably the first new users would look at, then move it to the top.
+  * docs/manual.rst, docs/manual.html:
+    Add a small sentence in the introduction to guide the user in her read.
+  * README.in, HACKING:
+    Update README.in, add HACKING.
+  * ../build/geanygendoc.m4, README.in -> README:
+    Don't pre-process README anymore. It isn't needed anymore since the version
+    number was removed, and this version number was wrong anyway since the the
+    plugin is part of Geany-plugins.
+
+
 2010-06-14  Colomban Wendling  <ban(at)herbesfolles(dot)org>
 
   * src/ggd-plugin.h:
diff -Nru geany-plugins-0.20~svn1474/geanygendoc/docs/manual.css geany-plugins-0.20~svn1515/geanygendoc/docs/manual.css
--- geany-plugins-0.20~svn1474/geanygendoc/docs/manual.css	2010-05-27 16:16:40.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanygendoc/docs/manual.css	2010-08-17 01:33:50.000000000 +0100
@@ -29,6 +29,12 @@
 	text-align: justify;
 }
 
+blockquote {
+	padding-left: 1em;
+	margin-left: 1em;
+	border-left: 3px solid #5c3566;
+}
+
 .literal-block,
 .literal {
 	background: #fff;
diff -Nru geany-plugins-0.20~svn1474/geanygendoc/docs/manual.html geany-plugins-0.20~svn1515/geanygendoc/docs/manual.html
--- geany-plugins-0.20~svn1474/geanygendoc/docs/manual.html	2010-05-27 16:16:40.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanygendoc/docs/manual.html	2010-08-17 01:34:33.000000000 +0100
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Docutils 0.6: http://docutils.sourceforge.net/" />
+<meta name="generator" content="Docutils 0.7: http://docutils.sourceforge.net/" />
 <title>GeanyGenDoc User Manual</title>
 <style type="text/css">
 
@@ -38,6 +38,12 @@
 	text-align: justify;
 }
 
+blockquote {
+	padding-left: 1em;
+	margin-left: 1em;
+	border-left: 3px solid #5c3566;
+}
+
 .literal-block,
 .literal {
 	background: #fff;
@@ -89,42 +95,45 @@
 plug-in for Geany as you might have noticed; but what is it meant to do?
 Basically, it generates and inserts text chunks, particularly from document's
 symbols. Its goal is to ease writing documentation for the good.</p>
+<p>If you are impatient, you will probably want to discover the <a class="reference internal" href="#user-interface-in-geany">user interface in
+Geany</a> first; but if you have the time to discover the tool, take a look at the
+<a class="reference internal" href="#design">design</a> and learn how GeanyGenDoc works and how you can take the most of it.</p>
 <div class="contents topic" id="contents">
 <p class="topic-title first">Contents</p>
 <ul class="simple">
 <li><a class="reference internal" href="#introduction" id="id4">Introduction</a></li>
-<li><a class="reference internal" href="#design" id="id5">Design</a></li>
-<li><a class="reference internal" href="#syntax" id="id6">Syntax</a><ul>
-<li><a class="reference internal" href="#key-value-pairs" id="id7">Key-Value pairs</a></li>
-<li><a class="reference internal" href="#naming" id="id8">Naming</a></li>
-<li><a class="reference internal" href="#comments" id="id9">Comments</a></li>
-<li><a class="reference internal" href="#value-types" id="id10">Value types</a></li>
+<li><a class="reference internal" href="#user-interface-in-geany" id="id5">User interface in Geany</a><ul>
+<li><a class="reference internal" href="#menus" id="id6">Menus</a><ul>
+<li><a class="reference internal" href="#editor-s-pop-up-menu" id="id7">Editor's pop-up menu</a></li>
+<li><a class="reference internal" href="#tools-menu" id="id8">Tools menu</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#file-types" id="id11">File types</a><ul>
-<li><a class="reference internal" href="#the-settings-group" id="id12">The <tt class="docutils literal">settings</tt> group</a></li>
-<li><a class="reference internal" href="#the-doctypes-group" id="id13">The <tt class="docutils literal">doctypes</tt> group</a></li>
+<li><a class="reference internal" href="#preferences-dialog" id="id9">Preferences dialog</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#documentation-types" id="id14">Documentation types</a><ul>
-<li><a class="reference internal" href="#short-example" id="id15">Short example</a></li>
+<li><a class="reference internal" href="#design" id="id10">Design</a></li>
+<li><a class="reference internal" href="#syntax" id="id11">Syntax</a><ul>
+<li><a class="reference internal" href="#key-value-pairs" id="id12">Key-Value pairs</a></li>
+<li><a class="reference internal" href="#naming" id="id13">Naming</a></li>
+<li><a class="reference internal" href="#comments" id="id14">Comments</a></li>
+<li><a class="reference internal" href="#value-types" id="id15">Value types</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#rules-the-cool-thing" id="id16">Rules: the cool thing</a><ul>
-<li><a class="reference internal" href="#type-hierarchy" id="id17">Type hierarchy</a><ul>
-<li><a class="reference internal" href="#known-types" id="id18">Known types</a></li>
+<li><a class="reference internal" href="#file-types" id="id16">File types</a><ul>
+<li><a class="reference internal" href="#the-settings-group" id="id17">The <tt class="docutils literal">settings</tt> group</a></li>
+<li><a class="reference internal" href="#the-doctypes-group" id="id18">The <tt class="docutils literal">doctypes</tt> group</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#rule-settings" id="id19">Rule settings</a></li>
+<li><a class="reference internal" href="#documentation-types" id="id19">Documentation types</a><ul>
+<li><a class="reference internal" href="#short-example" id="id20">Short example</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#user-interface-in-geany" id="id20">User interface in Geany</a><ul>
-<li><a class="reference internal" href="#menus" id="id21">Menus</a><ul>
-<li><a class="reference internal" href="#editor-s-pop-up-menu" id="id22">Editor's pop-up menu</a></li>
-<li><a class="reference internal" href="#tools-menu" id="id23">Tools menu</a></li>
+<li><a class="reference internal" href="#rules-the-cool-thing" id="id21">Rules: the cool thing</a><ul>
+<li><a class="reference internal" href="#type-hierarchy" id="id22">Type hierarchy</a><ul>
+<li><a class="reference internal" href="#known-types" id="id23">Known types</a></li>
 </ul>
 </li>
-<li><a class="reference internal" href="#preferences-dialog" id="id24">Preferences dialog</a></li>
+<li><a class="reference internal" href="#rule-settings" id="id24">Rule settings</a></li>
 </ul>
 </li>
 <li><a class="reference internal" href="#miscellaneous" id="id25">Miscellaneous</a><ul>
@@ -132,14 +141,89 @@
 </ul>
 </li>
 <li><a class="reference internal" href="#appendix" id="id27">Appendix</a><ul>
-<li><a class="reference internal" href="#configuration-syntax-summary" id="id28">Configuration syntax summary</a></li>
+<li><a class="reference internal" href="#license" id="id28">License</a></li>
+<li><a class="reference internal" href="#configuration-syntax-summary" id="id29">Configuration syntax summary</a></li>
 </ul>
 </li>
 </ul>
 </div>
 </div>
+<div class="section" id="user-interface-in-geany">
+<h1><a class="toc-backref" href="#id5">User interface in Geany</a></h1>
+<div class="section" id="menus">
+<h2><a class="toc-backref" href="#id6">Menus</a></h2>
+<p>GeanyGenDoc adds an item named <cite>Insert Documentation Comment</cite> in the editor's
+pop-up under the <cite>Insert Comments</cite> sub-menu; and a menu named
+<cite>Documentation Generator</cite> into the <cite>Tools</cite> menu.</p>
+<div class="section" id="editor-s-pop-up-menu">
+<h3><a class="toc-backref" href="#id7">Editor's pop-up menu</a></h3>
+<p>The item <cite>Editor's pop-up → Insert Comments → Insert Documentation Comment</cite>
+generates documentation for the current symbol. It has a keyboard shortcut
+that can be configured through Geany's keybinding configuration system, under
+<cite>GeanyGenDoc → Insert Documentation Comment</cite>.</p>
+</div>
+<div class="section" id="tools-menu">
+<h3><a class="toc-backref" href="#id8">Tools menu</a></h3>
+<p>The <cite>Documentation Generator</cite> menu under <cite>Tools</cite> contains the following items:</p>
+<dl class="docutils">
+<dt><cite>Document Current Symbol</cite></dt>
+<dd>This generates documentation for the current symbol. It is equivalent to the
+item <cite>Insert Documentation Comment</cite> that can be found in the editor's pop-up
+menu.</dd>
+<dt><cite>Document All Symbols</cite></dt>
+<dd>This generates documentation for all symbols in the document. This is
+equivalent to manually requesting documentation generation for each symbol in
+the document.</dd>
+<dt><cite>Reload Configuration Files</cite></dt>
+<dd>This force reloading of all the <a class="reference internal" href="#file-types">file type</a> configuration files. It is
+useful when a file type configuration file was modified, in order to the new
+configuration to be used without reloading the plugin.</dd>
+<dt><cite>Edit Current Language Configuration</cite></dt>
+<dd>This opens the configuration file that applies to the current document for
+editing. The opened configuration file has write permissions: if it was a
+system configuration file it is copied under your personal <a class="reference internal" href="#configuration-directories">configuration
+directory</a> transparently.</dd>
+<dt><cite>Open Manual</cite></dt>
+<dd>Opens this manual in a browser.</dd>
+</dl>
+</div>
+</div>
+<div class="section" id="preferences-dialog">
+<h2><a class="toc-backref" href="#id9">Preferences dialog</a></h2>
+<p>The preferences dialog, than can either be opened through <cite>Edit →
+Plugin Preferences</cite> or with the <cite>Preferences</cite> button in the plugin manager,
+allows to modify the following preferences:</p>
+<dl class="docutils">
+<dt><cite>General</cite></dt>
+<dd><dl class="first last docutils">
+<dt><cite>Save file before generating documentation</cite></dt>
+<dd>Choose whether the current document should be saved to disc before
+generating the documentation. This is a technical detail, but it is
+currently needed to have an up-to-date tag list. If you disable this option
+and ask for documentation generation on a modified document, the behavior
+may be surprising since the comment will be generated for the last saved
+state of the document and not the current one.</dd>
+<dt><cite>Indent inserted documentation</cite></dt>
+<dd>Chooses whether the inserted documentation should be indented to fit the
+indentation at the insertion position.</dd>
+</dl>
+</dd>
+<dt><cite>Documentation type</cite></dt>
+<dd>This list allows you to choose the documentation type to use with each file
+type. The special language <cite>All</cite> on top of the list is used to choose the
+default documentation type, used for all languages that haven't one set.</dd>
+<dt><cite>Global environment</cite></dt>
+<dd>Global environment overrides and additions. This is an environment that will
+be merged with the <a class="reference internal" href="#file-types">file type</a>-specific ones, possibly overriding some parts.
+It can be used to define some values for all the file types, such as whether
+to write the common <cite>Since</cite> tag, define the <a class="reference external" href="http://www.doxygen.org">Doxygen</a> prefix an so on.
+Its most use case is not to need to change a file type's environment to change
+the value of one of its elements.</dd>
+</dl>
+</div>
+</div>
 <div class="section" id="design">
-<h1><a class="toc-backref" href="#id5">Design</a></h1>
+<h1><a class="toc-backref" href="#id10">Design</a></h1>
 <p>GeanyGenDoc has an extensible design based on three points: file type,
 documentation type and rules.</p>
 <dl class="docutils">
@@ -161,9 +245,9 @@
 </dl>
 </div>
 <div class="section" id="syntax">
-<h1><a class="toc-backref" href="#id6">Syntax</a></h1>
+<h1><a class="toc-backref" href="#id11">Syntax</a></h1>
 <div class="section" id="key-value-pairs">
-<h2><a class="toc-backref" href="#id7">Key-Value pairs</a></h2>
+<h2><a class="toc-backref" href="#id12">Key-Value pairs</a></h2>
 <p>The syntax used by the configuration files is an extended key-value tree
 definition based on common concepts (trees, string literals, semicolon-ended
 values, etc.).</p>
@@ -194,12 +278,12 @@
 </pre>
 </div>
 <div class="section" id="naming">
-<h2><a class="toc-backref" href="#id8">Naming</a></h2>
+<h2><a class="toc-backref" href="#id13">Naming</a></h2>
 <p>Key-value pairs are often referred as <em>group</em> when they are meant to have
 multiple values and as <em>setting</em> when they have a single value.</p>
 </div>
 <div class="section" id="comments">
-<h2><a class="toc-backref" href="#id9">Comments</a></h2>
+<h2><a class="toc-backref" href="#id14">Comments</a></h2>
 <p>Is considered as comment (and therefore ignored) everything between a number
 sign (<tt class="docutils literal">#</tt>) and the following end of line, unless the <tt class="docutils literal">#</tt> occurs as part of
 another syntactic element (such as a string literal).</p>
@@ -211,7 +295,7 @@
 </pre>
 </div>
 <div class="section" id="value-types">
-<h2><a class="toc-backref" href="#id10">Value types</a></h2>
+<h2><a class="toc-backref" href="#id15">Value types</a></h2>
 <dl class="docutils">
 <dt>string</dt>
 <dd><p class="first">A string literal. String literals are surrounded by either single (<tt class="docutils literal">'</tt>) or
@@ -257,7 +341,7 @@
 </div>
 </div>
 <div class="section" id="file-types">
-<h1><a class="toc-backref" href="#id11">File types</a></h1>
+<h1><a class="toc-backref" href="#id16">File types</a></h1>
 <p>The file type determines which configuration applies to which document.
 <em>File type identifiers</em> are the lowercased name of the Geany's file type, for
 example &quot;c&quot; or &quot;python&quot;.</p>
@@ -267,7 +351,7 @@
 <p>A file type configuration can contain two type of things: file-type-wide
 settings and any number of <a class="reference internal" href="#documentation-types">documentation types</a>.</p>
 <div class="section" id="the-settings-group">
-<h2><a class="toc-backref" href="#id12">The <tt class="docutils literal">settings</tt> group</a></h2>
+<h2><a class="toc-backref" href="#id17">The <tt class="docutils literal">settings</tt> group</a></h2>
 <p>This group contains the file-type-wide settings.</p>
 <dl class="docutils">
 <dt><tt class="docutils literal">match_function_arguments</tt> (string)</dt>
@@ -281,12 +365,12 @@
 </dl>
 </div>
 <div class="section" id="the-doctypes-group">
-<h2><a class="toc-backref" href="#id13">The <tt class="docutils literal">doctypes</tt> group</a></h2>
+<h2><a class="toc-backref" href="#id18">The <tt class="docutils literal">doctypes</tt> group</a></h2>
 <p>This group contains a list of <a class="reference internal" href="#documentation-types">documentation types</a>.</p>
 </div>
 </div>
 <div class="section" id="documentation-types">
-<h1><a class="toc-backref" href="#id14">Documentation types</a></h1>
+<h1><a class="toc-backref" href="#id19">Documentation types</a></h1>
 <p>A documentation type is a named set of <a class="reference internal" href="#rules-the-cool-thing">rules</a> for a <a class="reference internal" href="#file-types">file type</a>, describing how
 to generate a particular type of documentation (i.e. <a class="reference external" href="http://www.doxygen.org">Doxygen</a>, <a class="reference external" href="http://www.gtk.org/gtk-doc/">Gtk-Doc</a>,
 <a class="reference external" href="http://www.valadoc.org/">Valadoc</a> or whatever).</p>
@@ -296,7 +380,7 @@
 same identifier in different file types when they generate the same type of
 documentation (even though it is completely up to you).</p>
 <div class="section" id="short-example">
-<h2><a class="toc-backref" href="#id15">Short example</a></h2>
+<h2><a class="toc-backref" href="#id20">Short example</a></h2>
 <pre class="literal-block">
 doxygen = {
   struct.member = {
@@ -309,14 +393,14 @@
 </div>
 </div>
 <div class="section" id="rules-the-cool-thing">
-<h1><a class="toc-backref" href="#id16">Rules: the cool thing</a></h1>
+<h1><a class="toc-backref" href="#id21">Rules: the cool thing</a></h1>
 <p>Rules are the actual definition of how documentation is generated. A rule
 applies to a symbol type and hierarchy, allowing fine control over which and
 how symbols are documented.</p>
 <p>A rule is represented as a group of <a class="reference internal" href="#rule-settings">settings</a> in a <a class="reference internal" href="#documentation-types">documentation type</a>.
 The name of this group is the <a class="reference internal" href="#type-hierarchy">type hierarchy</a> to which the settings applies.</p>
 <div class="section" id="type-hierarchy">
-<h2><a class="toc-backref" href="#id17">Type hierarchy</a></h2>
+<h2><a class="toc-backref" href="#id22">Type hierarchy</a></h2>
 <p>A type hierarchy is a hierarchy of the types that a symbol must have to match
 this rule.</p>
 <p>In the symbol side, the type hierarchy is the types of the symbol's parents,
@@ -332,7 +416,7 @@
 For example, the type hierarchy representing <tt class="docutils literal">namespace <span class="pre">-&gt;</span> class</tt> would be
 written <tt class="docutils literal">namespace.class</tt>.</p>
 <div class="section" id="known-types">
-<h3><a class="toc-backref" href="#id18">Known types</a></h3>
+<h3><a class="toc-backref" href="#id23">Known types</a></h3>
 <dl class="docutils">
 <dt><tt class="docutils literal">class</tt></dt>
 <dd>A class.</dd>
@@ -376,7 +460,7 @@
 </div>
 </div>
 <div class="section" id="rule-settings">
-<h2><a class="toc-backref" href="#id19">Rule settings</a></h2>
+<h2><a class="toc-backref" href="#id24">Rule settings</a></h2>
 <dl class="docutils">
 <dt><tt class="docutils literal">template</tt> (string)</dt>
 <dd><p class="first">A <a class="reference external" href="http://ctpl.tuxfamily.org/">CTPL</a> template that can include references to the following predefined
@@ -443,80 +527,6 @@
 </dl>
 </div>
 </div>
-<div class="section" id="user-interface-in-geany">
-<h1><a class="toc-backref" href="#id20">User interface in Geany</a></h1>
-<div class="section" id="menus">
-<h2><a class="toc-backref" href="#id21">Menus</a></h2>
-<p>GeanyGenDoc adds an item named <cite>Insert Documentation Comment</cite> in the editor's
-pop-up under the <cite>Insert Comments</cite> sub-menu; and a menu named
-<cite>Documentation Generator</cite> into the <cite>Tools</cite> menu.</p>
-<div class="section" id="editor-s-pop-up-menu">
-<h3><a class="toc-backref" href="#id22">Editor's pop-up menu</a></h3>
-<p>The item <cite>Editor's pop-up → Insert Comments → Insert Documentation Comment</cite>
-generates documentation for the current symbol. It has a keyboard shortcut
-that can be configured through Geany's keybinding configuration system, under
-<cite>GeanyGenDoc → Insert Documentation Comment</cite>.</p>
-</div>
-<div class="section" id="tools-menu">
-<h3><a class="toc-backref" href="#id23">Tools menu</a></h3>
-<p>The <cite>Documentation Generator</cite> menu under <cite>Tools</cite> contains the following items:</p>
-<dl class="docutils">
-<dt><cite>Document Current Symbol</cite></dt>
-<dd>This generates documentation for the current symbol. It is equivalent to the
-item <cite>Insert Documentation Comment</cite> that can be found in the editor's pop-up
-menu.</dd>
-<dt><cite>Document All Symbols</cite></dt>
-<dd>This generates documentation for all symbols in the document. This is
-equivalent to manually requesting documentation generation for each symbol in
-the document.</dd>
-<dt><cite>Reload Configuration Files</cite></dt>
-<dd>This force reloading of all the <a class="reference internal" href="#file-types">file type</a> configuration files. It is
-useful when a file type configuration file was modified, in order to the new
-configuration to be used without reloading the plugin.</dd>
-<dt><cite>Edit Current Language Configuration</cite></dt>
-<dd>This opens the configuration file that applies to the current document for
-editing. The opened configuration file has write permissions: if it was a
-system configuration file it is copied under your personal <a class="reference internal" href="#configuration-directories">configuration
-directory</a> transparently.</dd>
-<dt><cite>Open Manual</cite></dt>
-<dd>Opens this manual in a browser.</dd>
-</dl>
-</div>
-</div>
-<div class="section" id="preferences-dialog">
-<h2><a class="toc-backref" href="#id24">Preferences dialog</a></h2>
-<p>The preferences dialog, than can either be opened through <cite>Edit →
-Plugin Preferences</cite> or with the <cite>Preferences</cite> button in the plugin manager,
-allows to modify the following preferences:</p>
-<dl class="docutils">
-<dt><cite>General</cite></dt>
-<dd><dl class="first last docutils">
-<dt><cite>Save file before generating documentation</cite></dt>
-<dd>Choose whether the current document should be saved to disc before
-generating the documentation. This is a technical detail, but it is
-currently needed to have an up-to-date tag list. If you disable this option
-and ask for documentation generation on a modified document, the behavior
-may be surprising since the comment will be generated for the last saved
-state of the document and not the current one.</dd>
-<dt><cite>Indent inserted documentation</cite></dt>
-<dd>Chooses whether the inserted documentation should be indented to fit the
-indentation at the insertion position.</dd>
-</dl>
-</dd>
-<dt><cite>Documentation type</cite></dt>
-<dd>This list allows you to choose the documentation type to use with each file
-type. The special language <cite>All</cite> on top of the list is used to choose the
-default documentation type, used for all languages that haven't one set.</dd>
-<dt><cite>Global environment</cite></dt>
-<dd>Global environment overrides and additions. This is an environment that will
-be merged with the <a class="reference internal" href="#file-types">file type</a>-specific ones, possibly overriding some parts.
-It can be used to define some values for all the file types, such as whether
-to write the common <cite>Since</cite> tag, define the <a class="reference external" href="http://www.doxygen.org">Doxygen</a> prefix an so on.
-Its most use case is not to need to change a file type's environment to change
-the value of one of its elements.</dd>
-</dl>
-</div>
-</div>
 <div class="section" id="miscellaneous">
 <h1><a class="toc-backref" href="#id25">Miscellaneous</a></h1>
 <div class="section" id="configuration-directories">
@@ -540,8 +550,25 @@
 </div>
 <div class="section" id="appendix">
 <h1><a class="toc-backref" href="#id27">Appendix</a></h1>
+<div class="section" id="license">
+<h2><a class="toc-backref" href="#id28">License</a></h2>
+<div class="line-block">
+<div class="line">GeanyGenDoc, a Geany plugin to ease generation of source code documentation</div>
+<div class="line">Copyright (C) 2010  Colomban Wendling &lt;<a class="reference external" href="mailto:ban&#64;herbesfolles.org">ban&#64;herbesfolles.org</a>&gt;</div>
+</div>
+<p>This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.</p>
+<p>This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.</p>
+<p>You should have received a copy of the GNU General Public License
+along with this program.  If not, see &lt;<a class="reference external" href="http://www.gnu.org/licenses/">http://www.gnu.org/licenses/</a>&gt;.</p>
+</div>
 <div class="section" id="configuration-syntax-summary">
-<h2><a class="toc-backref" href="#id28">Configuration syntax summary</a></h2>
+<h2><a class="toc-backref" href="#id29">Configuration syntax summary</a></h2>
 <pre class="literal-block">
 string               ::= ( &quot;&quot;&quot; .* &quot;&quot;&quot; | &quot;'&quot; .* &quot;'&quot; )
 constant             ::= [_A-Z][_A-Z0-9]+
@@ -595,7 +622,7 @@
 </div>
 <div class="footer">
 <hr class="footer" />
-Generated on: 2010-05-22.
+Generated on: 2010-08-16.
 
 </div>
 </body>
diff -Nru geany-plugins-0.20~svn1474/geanygendoc/docs/manual.rst geany-plugins-0.20~svn1515/geanygendoc/docs/manual.rst
--- geany-plugins-0.20~svn1474/geanygendoc/docs/manual.rst	2010-05-27 16:16:40.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanygendoc/docs/manual.rst	2010-08-17 01:34:33.000000000 +0100
@@ -14,10 +14,96 @@
 Basically, it generates and inserts text chunks, particularly from document's
 symbols. Its goal is to ease writing documentation for the good.
 
+If you are impatient, you will probably want to discover the `user interface in
+Geany`_ first; but if you have the time to discover the tool, take a look at the
+`design`_ and learn how GeanyGenDoc works and how you can take the most of it.
+
 
 .. contents::
 
 
+User interface in Geany
+=======================
+
+Menus
+-----
+
+GeanyGenDoc adds an item named `Insert Documentation Comment` in the editor's
+pop-up under the `Insert Comments` sub-menu; and a menu named
+`Documentation Generator` into the `Tools` menu.
+
+Editor's pop-up menu
+~~~~~~~~~~~~~~~~~~~~
+
+The item `Editor's pop-up → Insert Comments → Insert Documentation Comment`
+generates documentation for the current symbol. It has a keyboard shortcut
+that can be configured through Geany's keybinding configuration system, under
+`GeanyGenDoc → Insert Documentation Comment`.
+
+Tools menu
+~~~~~~~~~~
+
+The `Documentation Generator` menu under `Tools` contains the following items:
+
+`Document Current Symbol`
+  This generates documentation for the current symbol. It is equivalent to the
+  item `Insert Documentation Comment` that can be found in the editor's pop-up
+  menu.
+
+`Document All Symbols`
+  This generates documentation for all symbols in the document. This is
+  equivalent to manually requesting documentation generation for each symbol in
+  the document.
+
+`Reload Configuration Files`
+  This force reloading of all the `file type`_ configuration files. It is
+  useful when a file type configuration file was modified, in order to the new
+  configuration to be used without reloading the plugin.
+
+`Edit Current Language Configuration`
+  This opens the configuration file that applies to the current document for
+  editing. The opened configuration file has write permissions: if it was a
+  system configuration file it is copied under your personal `configuration
+  directory`_ transparently.
+
+`Open Manual`
+  Opens this manual in a browser.
+
+
+Preferences dialog
+------------------
+
+The preferences dialog, than can either be opened through `Edit →
+Plugin Preferences` or with the `Preferences` button in the plugin manager,
+allows to modify the following preferences:
+
+`General`
+  `Save file before generating documentation`
+    Choose whether the current document should be saved to disc before
+    generating the documentation. This is a technical detail, but it is
+    currently needed to have an up-to-date tag list. If you disable this option
+    and ask for documentation generation on a modified document, the behavior
+    may be surprising since the comment will be generated for the last saved
+    state of the document and not the current one.
+
+  `Indent inserted documentation`
+    Chooses whether the inserted documentation should be indented to fit the
+    indentation at the insertion position.
+
+`Documentation type`
+  This list allows you to choose the documentation type to use with each file
+  type. The special language `All` on top of the list is used to choose the
+  default documentation type, used for all languages that haven't one set.
+
+`Global environment`
+  Global environment overrides and additions. This is an environment that will
+  be merged with the `file type`_-specific ones, possibly overriding some parts.
+  It can be used to define some values for all the file types, such as whether
+  to write the common `Since` tag, define the `Doxygen`_ prefix an so on.
+  Its most use case is not to need to change a file type's environment to change
+  the value of one of its elements.
+
+
 Design
 ======
 
@@ -360,88 +446,6 @@
   Whether to also document symbol's children (according to their own rules).
 
 
-User interface in Geany
-=======================
-
-Menus
------
-
-GeanyGenDoc adds an item named `Insert Documentation Comment` in the editor's
-pop-up under the `Insert Comments` sub-menu; and a menu named
-`Documentation Generator` into the `Tools` menu.
-
-Editor's pop-up menu
-~~~~~~~~~~~~~~~~~~~~
-
-The item `Editor's pop-up → Insert Comments → Insert Documentation Comment`
-generates documentation for the current symbol. It has a keyboard shortcut
-that can be configured through Geany's keybinding configuration system, under
-`GeanyGenDoc → Insert Documentation Comment`.
-
-Tools menu
-~~~~~~~~~~
-
-The `Documentation Generator` menu under `Tools` contains the following items:
-
-`Document Current Symbol`
-  This generates documentation for the current symbol. It is equivalent to the
-  item `Insert Documentation Comment` that can be found in the editor's pop-up
-  menu.
-
-`Document All Symbols`
-  This generates documentation for all symbols in the document. This is
-  equivalent to manually requesting documentation generation for each symbol in
-  the document.
-
-`Reload Configuration Files`
-  This force reloading of all the `file type`_ configuration files. It is
-  useful when a file type configuration file was modified, in order to the new
-  configuration to be used without reloading the plugin.
-
-`Edit Current Language Configuration`
-  This opens the configuration file that applies to the current document for
-  editing. The opened configuration file has write permissions: if it was a
-  system configuration file it is copied under your personal `configuration
-  directory`_ transparently.
-
-`Open Manual`
-  Opens this manual in a browser.
-
-
-Preferences dialog
-------------------
-
-The preferences dialog, than can either be opened through `Edit →
-Plugin Preferences` or with the `Preferences` button in the plugin manager,
-allows to modify the following preferences:
-
-`General`
-  `Save file before generating documentation`
-    Choose whether the current document should be saved to disc before
-    generating the documentation. This is a technical detail, but it is
-    currently needed to have an up-to-date tag list. If you disable this option
-    and ask for documentation generation on a modified document, the behavior
-    may be surprising since the comment will be generated for the last saved
-    state of the document and not the current one.
-
-  `Indent inserted documentation`
-    Chooses whether the inserted documentation should be indented to fit the
-    indentation at the insertion position.
-
-`Documentation type`
-  This list allows you to choose the documentation type to use with each file
-  type. The special language `All` on top of the list is used to choose the
-  default documentation type, used for all languages that haven't one set.
-
-`Global environment`
-  Global environment overrides and additions. This is an environment that will
-  be merged with the `file type`_-specific ones, possibly overriding some parts.
-  It can be used to define some values for all the file types, such as whether
-  to write the common `Since` tag, define the `Doxygen`_ prefix an so on.
-  Its most use case is not to need to change a file type's environment to change
-  the value of one of its elements.
-
-
 Miscellaneous
 =============
 
@@ -470,6 +474,26 @@
 Appendix
 ========
 
+License
+-------
+
+| GeanyGenDoc, a Geany plugin to ease generation of source code documentation
+| Copyright (C) 2010  Colomban Wendling <ban(at)herbesfolles(dot)org>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
 Configuration syntax summary
 ----------------------------
 
diff -Nru geany-plugins-0.20~svn1474/geanygendoc/HACKING geany-plugins-0.20~svn1515/geanygendoc/HACKING
--- geany-plugins-0.20~svn1474/geanygendoc/HACKING	1970-01-01 01:00:00.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanygendoc/HACKING	2010-08-17 01:34:54.000000000 +0100
@@ -0,0 +1,175 @@
+======================
+Hacking on GeanyGenDoc
+======================
+
+.. contents::
+
+
+Introduction
+============
+
+This file contains some information that may be useful to start hacking on
+GeanyGenDoc; but there might be some things that are missing. If you have a
+question for which you can't find the answer, feel free to ask a developer
+(me in fact, I'm currently the only one).
+
+
+Directory structure
+===================
+
+src/
+  Contains all the source code of GeanyGenDoc, see below for details.
+
+docs/
+  Contains the manual, this is the place to go to improve the end-user
+  documentation.
+
+data/
+  Contains the various data files of GeanyGenDoc.
+  
+  filetypes/
+    Contains the file type definitions. See the end-user documentation for
+    details on the syntax of these files.
+
+
+Code organisation
+=================
+
+All source files starts with the `ggd` prefix that, obviously, stands for
+GeanyGenDoc.
+
+ggd-plugin.{c,h}
+  This is the actual plugin, the part that interacts with Geany directly:
+  it implements all the symbols that a Geany plusing must export; it takes care
+  of setting everything necessary up, and so on. Think of it as the plugin's
+  `main()`.
+  
+  This is the only part of the plugin that is allowed to export symbols (see
+  below).
+
+ggd.{c,h}
+  This is the higher-level API of the plugin. It is meant to be the primary API
+  to use to build and insert documentation basis on a Geany document.
+
+ggd-doc-setting.{c,h}, ggd-doc-type.{c,h}, ggd-file-type.{c,h}
+  The main three data types of GeanyGenDoc, and their manipulation functions
+
+ggd-file-type-loader.{c,h}
+  File type loader
+
+ggd-file-type-manager.{c,h}
+  High-level loading and management of file types, also acting as a cache
+
+ggd-options.{c,h}
+  Configuration manager
+
+ggd-tag-utils.{c,h}
+  Geany's tagmanager management and utility functions. Almost all acces to tags
+  is done through this module
+
+ggd-macros.h, ggd-utils.{c,h}
+  Various utility functions and macros
+
+ggd-widget-*
+  These files are custom GTK+ widgets used by the UI part of the plugin.
+  
+  ggd-widget-doctype-selector.{c,h}
+    The documentation type selector and manager widget
+  
+  ggd-widget-frame.{c,h}
+    A custom frame widget
+
+
+Coding style
+============
+
+The first rule is: look at the code and follow the style.
+
+To give further consideration, the style is close to 1TBS-K&R with some
+GNU-style things. Here's an exemple, followed by notes about it:
+
+::
+
+  /**
+   * a_function:
+   * @arg1: something
+   * @n: another thing
+   * 
+   * This is the documentation of the function. Write documentation for each and
+   * every non-local function. Local function can has a full documentation but
+   * in a normal comment (starting with /* and not /**), or can either have only
+   * a few line describing it or no comment at all if it is enough explicit.
+   * 
+   * Returns: A number, obviously... but what does it mean?
+   */
+  int
+  a_function (const char *arg1,
+              int         n)
+  {
+    int         a;
+    const char *b;
+    
+    a = foo ();
+    if (a == n) {
+      b = arg1;
+    } else {
+      int tmp;
+      
+      b = stuff (arg1, n, A_LONG_CONSTANT, ,
+                 ANOTHER_LONG_CONSTANT_THAT_GOES_BEYOND_80TH_COLUMN);
+      if (got_it (&tmp)) {
+        a = tmp;
+      } else {
+        a = n;
+      }
+    }
+    if (! variable || (A_THIRD_WAY_TOO_LONG_CONSTANT && ITS_ME_AGAIN &&
+                       PLEASE_STOP_THIS)) {
+      /* you may want to explain why you do this operation, so put a comment
+       * just before it. it is also good to document magic numbers such as this
+       * "8" that comes from nowhere. */
+      a = n << 8;
+    }
+    
+    return a;
+  }
+
+You can see that (in random order):
+
+* The indentation consists of 2 spaces per level -- no tabs;
+* The return type is on its own line (as in GNU style);
+* There is a space between function name and argumen list;
+* Variables and arguments declarations are aligned, one per line.
+* If the arguments of a function call, a macro, an expression, etc., would
+  overflow the 80th column rule, it is split on two (or more, as needed) lines,
+  aligned on the corresponding parenthesis;
+* There is blank lines at two places: right after some variable declarations,
+  and right before the return statement;
+* There is no parenthesis around the return statement;
+* Put a space between the unary operator `!` and its operand;
+* There is a space around binary operators;
+* Use const everywhere it makes sense, almost like a sementic annotation;
+* There is braces around every block (1TBS style);
+* Constants are uppercase;
+* So are macros that may have side effects;
+* Decalre local variables at the scope they belongs;
+* Document non-local functions with a Gtk-Doc documentation comment -- you know
+  what? GeanyGenDoc can help!
+* You don't see it in this example, but give pointful names to functions,
+  variables, marcos, etc.
+
+
+API, ABI, exported symbols, stuff like that
+-------------------------------------------
+
+Always use static functions if they should have file scope; and prefix all
+non-local symbol with the `ggd` prefix (with the appropriate case).
+
+Besides this, don't pollute the list of exported symbols of the plugin. Even if
+all symbols that might be exported by accident are prefixed, exporting them has
+no point (this isn't a library) and only bloates the output ELF (or whatever)
+binary.
+
+To prevent this, all "public" (read: that is used outside its file/module)
+should have a protorype that is protected with `GGD_BEGIN_PLUGIN_API`
+and `GGD_END_PLUGIN_API` (see gdd-macros.h for details).
diff -Nru geany-plugins-0.20~svn1474/geanygendoc/Makefile.in geany-plugins-0.20~svn1515/geanygendoc/Makefile.in
--- geany-plugins-0.20~svn1474/geanygendoc/Makefile.in	2010-07-04 19:16:11.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanygendoc/Makefile.in	2010-08-19 01:10:12.000000000 +0100
@@ -34,8 +34,8 @@
 POST_UNINSTALL = :
 build_triplet = @build@
 host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/README.in $(top_srcdir)/build/vars.auxfiles.mk \
+DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(top_srcdir)/build/vars.auxfiles.mk \
 	$(top_srcdir)/build/vars.docs.mk AUTHORS COPYING ChangeLog \
 	INSTALL NEWS TODO
 subdir = geanygendoc
@@ -73,7 +73,7 @@
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES = README
+CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_GEN = $(am__v_GEN_$(V))
 am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
@@ -367,8 +367,6 @@
 $(ACLOCAL_M4):  $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
-README: $(top_builddir)/config.status $(srcdir)/README.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 mostlyclean-libtool:
 	-rm -f *.lo
diff -Nru geany-plugins-0.20~svn1474/geanygendoc/README geany-plugins-0.20~svn1515/geanygendoc/README
--- geany-plugins-0.20~svn1474/geanygendoc/README	1970-01-01 01:00:00.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanygendoc/README	2010-08-17 01:35:20.000000000 +0100
@@ -0,0 +1,93 @@
+===========
+GeanyGenDoc
+===========
+
+.. contents::
+
+
+About
+=====
+
+GeanyGenDoc is a plugin for Geany that aims to help code documentation by
+automatically generating documentation comment basis from the source code.
+
+
+Requirements
+============
+
+You will need the following packages to build GeanyGenDoc:
+
+* Geany >= 0.19 (http://www.geany.org/)
+* GTK+ >= 2.12 (http://www.gtk.org)
+* GLib >= 2.14 (http://www.gtk.org)
+* GIO >= 2.18 (http://www.gtk.org)
+* CTPL >= 0.2 (http://ctpl.tuxfamily.org/)
+* A working C compiler (GCC for example, http://gcc.gnu.org/)
+* A working make implementation (GNU make is recommended,
+  http://www.gnu.org/software/make/)
+
+You may also want the following packages that enables extra features:
+
+* Docutils (http://docutils.sourceforge.net/) -- or another implementation of
+  rst2html -- is needed to (re)generate the HTML manual.
+
+
+Installation
+============
+
+Compiling and installing the plugin is done by running the following
+commands from the top-level directory (it is the parent of the one
+containing this file if you're building GeanyGenDoc as part of Geany-plugins):
+
+::
+
+ $ ./configure
+ $ make
+ $ make install
+
+For more configuration details, run
+
+::
+
+ $ ./configure --help
+
+For detailed instructions, see the INSTALL file.
+
+
+Usage
+=====
+
+For more details about GeanyGenDoc, see the user manual that can be found in
+the docs/ subirectory or opened with the menu item `Tools → Documentation
+Generator → Open Manual` from the Geany window if you already runs GeanyGenDoc.
+
+
+Hacking
+=======
+
+See the HACKING file for information on how to get started on hacking
+GeanyGenDoc internals.
+
+
+License
+=======
+
+GeanyGenDoc is distributed under the terms of the GNU General Public License
+as published by the Free Software Foundation, either version 3 of the
+License, or (at your option) any later version. You should have received a copy
+of the GNU General Public License along with GeanyGenDoc.  If not, see
+<http://www.gnu.org/licenses/>.
+
+
+Contact
+=======
+
+You can mail me at <ban(at)herbesfolles(dot)org>, and I may also be on the
+#geany channel on FreeNode, under the `b4n` nickname.
+
+
+Bug reports and feature requests
+--------------------------------
+
+To report a bug or ask for a new feature, please use the Geany-Plugins tracker
+on SourceForge: http://sourceforge.net/tracker/?group_id=222729
diff -Nru geany-plugins-0.20~svn1474/geanygendoc/README.in geany-plugins-0.20~svn1515/geanygendoc/README.in
--- geany-plugins-0.20~svn1474/geanygendoc/README.in	2010-05-04 21:48:19.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanygendoc/README.in	1970-01-01 01:00:00.000000000 +0100
@@ -1,37 +0,0 @@
-General Information
-===================
-
-This is GeanyGenDoc @VERSION@, a plugin for Geany that aims to automatically
-generate documentation comment basis from the source code.
-
-Requirements
-============
-
-You will need the following packages to build GeanyGenDoc:
- - Geany >= 0.19 (http://www.geany.org/)
- - GTK+ >= 2.12 (http://www.gtk.org)
- - GLib >= 2.14 (http://www.gtk.org)
- - GIO >= 2.18 (http://www.gtk.org)
- - CTPL >= 0.2 (http://ctpl.tuxfamily.org/)
- - A working C compiler (GCC for example, http://gcc.gnu.org/)
- - A working make implementation (GNU make is recommended,
-   http://www.gnu.org/software/make/)
-
-You may also want the following packages that enables extra features:
- - Docutils (http://docutils.sourceforge.net/) -- or another implementation of
-   rst2html -- is needed to (re)generate the HTML manual.
-
-
-Installation
-============
-
-Compiling and installing the plugin is done by the following commands:
-
- $ ./configure
- $ make
- $ make install
-
-For more configuration details run
- $ ./configure --help
-
-For detailed instructions, see the INSTALL file.
diff -Nru geany-plugins-0.20~svn1474/geanylipsum/README geany-plugins-0.20~svn1515/geanylipsum/README
--- geany-plugins-0.20~svn1474/geanylipsum/README	2010-01-04 17:59:43.000000000 +0000
+++ geany-plugins-0.20~svn1515/geanylipsum/README	2010-08-13 19:54:30.000000000 +0100
@@ -39,12 +39,12 @@
 Sourceforge.net. Get the code from:
 
 svn checkout
-http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geanylipsum
+http://geany-plugins.svn.sourceforge.net/svnroot/geany-plugins/trunk/geany-plugins/geanylipsum
 
 If you want to create a patch, please respect the license of
 GeanyLipsum as well as intellectual property of third. Patches that
 should be included to the default distribution must be licensed under
-the same conditions as GeanySendMail by the copyright owner.
+the same conditions as GeanyLipsum by the copyright owner.
 
 
 Known issues
diff -Nru geany-plugins-0.20~svn1474/geanylua/ChangeLog geany-plugins-0.20~svn1515/geanylua/ChangeLog
--- geany-plugins-0.20~svn1474/geanylua/ChangeLog	2009-09-29 15:09:11.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanylua/ChangeLog	2010-08-16 16:46:01.000000000 +0100
@@ -1,3 +1,7 @@
+August 16, 2010 (ntrel)
+  Fix building against recent Geany trunk (patch from Enrico Tröger, 
+  thanks).
+
 September 29, 2009 (ntrel)
   Update to API 159.
 
diff -Nru geany-plugins-0.20~svn1474/geanylua/glspi_keycmd.h geany-plugins-0.20~svn1515/geanylua/glspi_keycmd.h
--- geany-plugins-0.20~svn1474/geanylua/glspi_keycmd.h	2009-08-28 13:23:10.000000000 +0100
+++ geany-plugins-0.20~svn1515/geanylua/glspi_keycmd.h	2010-08-16 16:46:01.000000000 +0100
@@ -28,9 +28,7 @@
 	{"FILE_CLOSE", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_CLOSE},
 	{"FILE_CLOSEALL", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_CLOSEALL},
 	{"FILE_RELOAD", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_RELOAD},
-	{"FILE_COUNT", GEANY_KEY_GROUP_FILE, GEANY_KEYS_FILE_COUNT},
 	{"PROJECT_PROPERTIES", GEANY_KEY_GROUP_PROJECT, GEANY_KEYS_PROJECT_PROPERTIES},
-	{"PROJECT_COUNT", GEANY_KEY_GROUP_PROJECT, GEANY_KEYS_PROJECT_COUNT},
 	{"EDITOR_UNDO", GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_UNDO},
 	{"EDITOR_REDO", GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_REDO},
 	{"EDITOR_DELETELINE", GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_DELETELINE},
@@ -45,18 +43,15 @@
 	{"EDITOR_AUTOCOMPLETE", GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_AUTOCOMPLETE},
 	{"EDITOR_CALLTIP", GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_CALLTIP},
 	{"EDITOR_MACROLIST", GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_MACROLIST},
-	{"EDITOR_COUNT", GEANY_KEY_GROUP_EDITOR, GEANY_KEYS_EDITOR_COUNT},
 	{"CLIPBOARD_CUT", GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_CUT},
 	{"CLIPBOARD_COPY", GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_COPY},
 	{"CLIPBOARD_PASTE", GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_PASTE},
 	{"CLIPBOARD_CUTLINE", GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_CUTLINE},
 	{"CLIPBOARD_COPYLINE", GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_COPYLINE},
-	{"CLIPBOARD_COUNT", GEANY_KEY_GROUP_CLIPBOARD, GEANY_KEYS_CLIPBOARD_COUNT},
 	{"SELECT_ALL", GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_ALL},
 	{"SELECT_WORD", GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_WORD},
 	{"SELECT_LINE", GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_LINE},
 	{"SELECT_PARAGRAPH", GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_PARAGRAPH},
-	{"SELECT_COUNT", GEANY_KEY_GROUP_SELECT, GEANY_KEYS_SELECT_COUNT},
 	{"FORMAT_TOGGLECASE", GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_TOGGLECASE},
 	{"FORMAT_COMMENTLINETOGGLE", GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_COMMENTLINETOGGLE},
 	{"FORMAT_COMMENTLINE", GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_COMMENTLINE},
@@ -69,12 +64,9 @@
 	{"FORMAT_SENDTOCMD1", GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_SENDTOCMD1},
 	{"FORMAT_SENDTOCMD2", GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_SENDTOCMD2},
 	{"FORMAT_SENDTOCMD3", GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_SENDTOCMD3},
-	{"FORMAT_COUNT", GEANY_KEY_GROUP_FORMAT, GEANY_KEYS_FORMAT_COUNT},
 	{"INSERT_DATE", GEANY_KEY_GROUP_INSERT, GEANY_KEYS_INSERT_DATE},
 	{"INSERT_ALTWHITESPACE", GEANY_KEY_GROUP_INSERT, GEANY_KEYS_INSERT_ALTWHITESPACE},
-	{"INSERT_COUNT", GEANY_KEY_GROUP_INSERT, GEANY_KEYS_INSERT_COUNT},
 	{"SETTINGS_PREFERENCES", GEANY_KEY_GROUP_SETTINGS, GEANY_KEYS_SETTINGS_PREFERENCES},
-	{"SETTINGS_COUNT", GEANY_KEY_GROUP_SETTINGS, GEANY_KEYS_SETTINGS_COUNT},
 	{"SEARCH_FIND", GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_FIND},
 	{"SEARCH_FINDNEXT", GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_FINDNEXT},
 	{"SEARCH_FINDPREVIOUS", GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_FINDPREVIOUS},
@@ -84,7 +76,6 @@
 	{"SEARCH_FINDPREVSEL", GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_FINDPREVSEL},
 	{"SEARCH_NEXTMESSAGE", GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_NEXTMESSAGE},
 	{"SEARCH_FINDUSAGE", GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_FINDUSAGE},
-	{"SEARCH_COUNT", GEANY_KEY_GROUP_SEARCH, GEANY_KEYS_SEARCH_COUNT},
 	{"GOTO_FORWARD", GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_FORWARD},
 	{"GOTO_BACK", GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_BACK},
 	{"GOTO_LINE", GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_LINE},
@@ -94,19 +85,16 @@
 	{"GOTO_PREVIOUSMARKER", GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_PREVIOUSMARKER},
 	{"GOTO_TAGDEFINITION", GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_TAGDEFINITION},
 	{"GOTO_TAGDECLARATION", GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_TAGDECLARATION},
-	{"GOTO_COUNT", GEANY_KEY_GROUP_GOTO, GEANY_KEYS_GOTO_COUNT},
 	{"VIEW_TOGGLEALL", GEANY_KEY_GROUP_VIEW, GEANY_KEYS_VIEW_TOGGLEALL},
 	{"VIEW_FULLSCREEN", GEANY_KEY_GROUP_VIEW, GEANY_KEYS_VIEW_FULLSCREEN},
 	{"VIEW_MESSAGEWINDOW", GEANY_KEY_GROUP_VIEW, GEANY_KEYS_VIEW_MESSAGEWINDOW},
 	{"VIEW_SIDEBAR", GEANY_KEY_GROUP_VIEW, GEANY_KEYS_VIEW_SIDEBAR},
 	{"VIEW_ZOOMIN", GEANY_KEY_GROUP_VIEW, GEANY_KEYS_VIEW_ZOOMIN},
 	{"VIEW_ZOOMOUT", GEANY_KEY_GROUP_VIEW, GEANY_KEYS_VIEW_ZOOMOUT},
-	{"VIEW_COUNT", GEANY_KEY_GROUP_VIEW, GEANY_KEYS_VIEW_COUNT},
 	{"FOCUS_EDITOR", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_EDITOR},
 	{"FOCUS_SCRIBBLE", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_SCRIBBLE},
 	{"FOCUS_VTE", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_VTE},
 	{"FOCUS_SEARCHBAR", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_SEARCHBAR},
-	{"FOCUS_COUNT", GEANY_KEY_GROUP_FOCUS, GEANY_KEYS_FOCUS_COUNT},
 	{"NOTEBOOK_SWITCHTABLEFT", GEANY_KEY_GROUP_NOTEBOOK, GEANY_KEYS_NOTEBOOK_SWITCHTABLEFT},
 	{"NOTEBOOK_SWITCHTABRIGHT", GEANY_KEY_GROUP_NOTEBOOK, GEANY_KEYS_NOTEBOOK_SWITCHTABRIGHT},
 	{"NOTEBOOK_SWITCHTABLASTUSED", GEANY_KEY_GROUP_NOTEBOOK, GEANY_KEYS_NOTEBOOK_SWITCHTABLASTUSED},
@@ -114,12 +102,10 @@
 	{"NOTEBOOK_MOVETABRIGHT", GEANY_KEY_GROUP_NOTEBOOK, GEANY_KEYS_NOTEBOOK_MOVETABRIGHT},
 	{"NOTEBOOK_MOVETABFIRST", GEANY_KEY_GROUP_NOTEBOOK, GEANY_KEYS_NOTEBOOK_MOVETABFIRST},
 	{"NOTEBOOK_MOVETABLAST", GEANY_KEY_GROUP_NOTEBOOK, GEANY_KEYS_NOTEBOOK_MOVETABLAST},
-	{"NOTEBOOK_COUNT", GEANY_KEY_GROUP_NOTEBOOK, GEANY_KEYS_NOTEBOOK_COUNT},
 	{"DOCUMENT_REPLACETABS", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_REPLACETABS},
 	{"DOCUMENT_FOLDALL", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_FOLDALL},
 	{"DOCUMENT_UNFOLDALL", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_UNFOLDALL},
 	{"DOCUMENT_RELOADTAGLIST", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_RELOADTAGLIST},
-	{"DOCUMENT_COUNT", GEANY_KEY_GROUP_DOCUMENT, GEANY_KEYS_DOCUMENT_COUNT},
 	{"BUILD_COMPILE", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_COMPILE},
 	{"BUILD_LINK", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_LINK},
 	{"BUILD_MAKE", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_MAKE},
@@ -128,10 +114,7 @@
 	{"BUILD_NEXTERROR", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_NEXTERROR},
 	{"BUILD_RUN", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_RUN},
 	{"BUILD_OPTIONS", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_OPTIONS},
-	{"BUILD_COUNT", GEANY_KEY_GROUP_BUILD, GEANY_KEYS_BUILD_COUNT},
 	{"TOOLS_OPENCOLORCHOOSER", GEANY_KEY_GROUP_TOOLS, GEANY_KEYS_TOOLS_OPENCOLORCHOOSER},
-	{"TOOLS_COUNT", GEANY_KEY_GROUP_TOOLS, GEANY_KEYS_TOOLS_COUNT},
 	{"HELP_HELP", GEANY_KEY_GROUP_HELP, GEANY_KEYS_HELP_HELP},
-	{"HELP_COUNT", GEANY_KEY_GROUP_HELP, GEANY_KEYS_HELP_COUNT},
 	{NULL, 0, 0}
 };
diff -Nru geany-plugins-0.20~svn1474/wscript geany-plugins-0.20~svn1515/wscript
--- geany-plugins-0.20~svn1474/wscript	2010-06-26 17:43:35.000000000 +0100
+++ geany-plugins-0.20~svn1515/wscript	2010-08-15 14:48:43.000000000 +0100
@@ -19,7 +19,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 #
-# $Id: wscript 1463 2010-06-26 16:43:35Z frlan $
+# $Id: wscript 1507 2010-08-15 13:48:43Z eht16 $
 
 """
 Waf build script for Geany Plugins.
@@ -98,8 +98,10 @@
 	Plugin('GeanyLUA',
 		 [ 'geanylua/geanylua.c' ], # the other source files are listed in build_lua()
 		 [ 'geanylua' ],
-		 # maybe you need to modify the package name of Lua, try one of these: lua5.1 lua51 lua-5.1
-		 [ [ 'lua', '5.1', True ] ]),
+		 [ [ 'lua', '5.1', False ],
+		   [ 'lua5.1', '5.1', False ],
+		   [ 'lua51', '5.1', False ],
+		   [ 'lua-5.1', '5.1', False ] ]),
 	Plugin('GeanyPrj', None, [ 'geanyprj/src' ]),
 	Plugin('Pretty-Printer', None, [ 'pretty-printer/src' ], [ [ 'libxml-2.0', '2.6.27', True ] ]),
 	Plugin('TreeBrowser', None, [ 'treebrowser/src' ], [ [ 'gio-2.0', '2.16', False ] ])
@@ -272,6 +274,11 @@
 		else:
 			conf.define('TTYHELPERDIR', conf.env['LIBEXECDIR'] + '/geany-plugins/geanygdb', 1)
 
+	if 'geanylua' in enabled_plugins:
+		if not conf.env['HAVE_LUA'] and not conf.env['HAVE_LUA5_1'] and \
+		   not conf.env['HAVE_LUA51'] and not conf.env['HAVE_LUA_5_1']:
+			enabled_plugins.remove('geanylua')
+
 	# Windows specials
 	if is_win32:
 		if conf.env['PREFIX'] == tempfile.gettempdir():