SF.net SVN: geany: [406] trunk

eht16 at users.sourceforge.net eht16 at xxxxx
Sun Jun 4 13:10:47 UTC 2006


Revision: 406
Author:   eht16
Date:     2006-06-04 06:10:16 -0700 (Sun, 04 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/geany/?rev=406&view=rev

Log Message:
-----------
updated for Geany 0.7

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/README
    trunk/doc/geany.1
    trunk/doc/geany.docbook
    trunk/doc/geany.txt
    trunk/doc/html/apa.html
    trunk/doc/html/apb.html
    trunk/doc/html/apbs02.html
    trunk/doc/html/apbs03.html
    trunk/doc/html/ch01.html
    trunk/doc/html/ch01s02.html
    trunk/doc/html/ch01s03.html
    trunk/doc/html/ch01s04.html
    trunk/doc/html/ch02.html
    trunk/doc/html/ch02s02.html
    trunk/doc/html/ch02s03.html
    trunk/doc/html/ch03.html
    trunk/doc/html/ch03s02.html
    trunk/doc/html/ch03s03.html
    trunk/doc/html/ch03s04.html
    trunk/doc/html/ch03s05.html
    trunk/doc/html/ch03s06.html
    trunk/doc/html/ch03s07.html
    trunk/doc/html/index.html

Added Paths:
-----------
    trunk/doc/html/ch03s08.html
    trunk/doc/html/ch03s09.html
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/ChangeLog	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,3 +1,10 @@
+2006-06-04  Enrico Troeger  <enrico.troeger at uvena.de>
+
+ * README, NEWS: updated for Geany 0.7
+ * src/keybindings.c: changed default keybinding for menu_replace to
+                      Ctrl+E
+
+
 2006-06-03  Enrico Troeger  <enrico.troeger at uvena.de>
 
  * src/sci_cb.c: Fixed bug in auto completion of constructs.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/NEWS	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,3 +1,22 @@
+Geany 0.7 (June 04, 2006)
+
+        * user-definable keyboard shortcuts
+        * filetype definition files can be overridden in Geany's
+          configuration directory (please see documentation)
+        * added filetypes Ruby and Tcl/Tk
+        * improved build system (for Perl, Python, Ruby and others)
+        * loading of Virtual Terminal Emulation can be disabled in the
+          preferences dialog
+        * new menu item "Search" with Find items from Edit menu and new
+          item "Find Previous"
+        * fixed the bug which let Geany crash with newer GTK versions
+        * improved documentation: added documentation for keyboard
+          shortcuts, the build system and filetype definition files
+        * new translations: Catalan and Polish
+        * many small improvements
+        * fixed lots of bugs (please see ChangeLog for details)
+
+
 Geany 0.6 (April 30, 2006)
 
         * added option to place new file tabs to the right or left of

Modified: trunk/README
===================================================================
--- trunk/README	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/README	2006-06-04 13:10:16 UTC (rev 406)
@@ -32,8 +32,9 @@
 and header files. You will also need the Pango, Glib and ATK libraries and
 header files. All these files are available at http://www.gtk.org.
 
-Further more you need, of course, a C compiler, for the included
-Scintilla library a C++ compiler and the make tool.
+Furthermore you need, of course, a C compiler and the Make tool; a C++ compiler
+is also required for the included Scintilla library. The GNU versions of these
+tools are recommended.
 
 
 Installation
@@ -76,11 +77,10 @@
 Ideas, questions, patches and bug reports
 -----------------------------------------
 See http://geany.uvena.de
-or e-mail to enrico.troeger at uvena.de
 If you add something, or fix a bug, please send a patch (in 'diff -u'
-format) to enrico.troeger at uvena.de
+format) to the mailing list, enrico.troeger at uvena.de or nick.treleaven at btinternet.com.
 
 
 --
-2006 by Enrico Troeger
+2005-2006 by Enrico Troeger
 enrico.troeger at uvena.de

Modified: trunk/doc/geany.1
===================================================================
--- trunk/doc/geany.1	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/geany.1	2006-06-04 13:10:16 UTC (rev 406)
@@ -38,8 +38,7 @@
  
 .SH "AUTHOR" 
 .PP 
-This manual page was written by Enrico Troeger enrico.troeger at uvena.de for 
-the \fBDebian\fP system (but may be used by others).  Permission is 
+This manual page was written by Enrico Troeger enrico.troeger at uvena.de. Permission is 
 granted to copy, distribute and/or modify this document under 
 the terms of the GNU General Public License, Version 2 any 
 later version published by the Free Software Foundation. 
@@ -48,4 +47,4 @@
 On Debian systems, the complete text of the GNU General Public 
 License can be found in /usr/share/common-licenses/GPL. 
  
-.\" created by instant / docbook-to-man, Thu 27 Apr 2006, 18:33 
+.\" created by instant / docbook-to-man, Sun 04 Jun 2006, 14:58 

Modified: trunk/doc/geany.docbook
===================================================================
--- trunk/doc/geany.docbook	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/geany.docbook	2006-06-04 13:10:16 UTC (rev 406)
@@ -7,7 +7,7 @@
 <!ENTITY appurl "http://geany.uvena.de">
 <!ENTITY deburl "http://debian.uvena.de">
 <!ENTITY author_mail "enrico.troeger at uvena.de">
-<!ENTITY date "June 2, 2006">
+<!ENTITY date "June 4, 2006">
 <!ENTITY legal SYSTEM "geany_gpl.docbook">
 ]>
 

Modified: trunk/doc/geany.txt
===================================================================
--- trunk/doc/geany.txt	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/geany.txt	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,16 +1,20 @@
 
-Geany 0.6
+Geany 0.7
 
 Enrico Troeger
 
-   Copyright \xA9 2006
+Nick Treleaven
 
-   This document is distributed under the terms of the GNU Public
-   license as published by the Free Software Foundation; either
-   version 2 of the License, or (at your option) later version. A
-   copy of this license can be found in the file COPYING included
-   with the source code of this program and in the appendix of
-   this document.
+Frank Lanitz
+
+   Copyright \xA9 2005-2006
+
+   This document is distributed under the terms of the GNU
+   General Public License as published by the Free Software
+   Foundation; either version 2 of the License, or (at your
+   option) any later version. A copy of this license can be found
+   in the file COPYING included with the source code of this
+   program and in the appendix of this document.
      _________________________________________________________
 
    Table of Contents
@@ -18,7 +22,7 @@
 
         1.1. About Geany
         1.2. About this document
-        1.3. Where to get
+        1.3. Where to get it
         1.4. License
 
    2. Installation
@@ -35,7 +39,7 @@
    3. Usage
 
         3.1. Getting Started
-        3.2. Commandline options
+        3.2. Command line options
         3.3. General
 
               3.3.1. Startup
@@ -48,9 +52,24 @@
 
               3.5.1. Compile time options
 
-        3.6. File types
-        3.7. Templates
+        3.6. Build System
 
+              3.6.1. Compile
+              3.6.2. Build
+              3.6.3. Build with "make"
+              3.6.4. Build with make (custom target)
+              3.6.5. Execute
+              3.6.6. Set Includes and Arguments
+              3.6.7. File type configuration settings
+
+        3.7. Keybindings
+        3.8. Filetype definition files
+
+              3.8.1. Format
+              3.8.2. Special file filetypes.common
+
+        3.9. Templates
+
    A. Geany key mapping
 
         A.1. Geany key mapping
@@ -78,11 +97,14 @@
         B.3. How to Apply These Terms to Your New Programs
 
    List of Tables
-   3-1. Commandline Options
+   3-1. Command line Options
    3-2. Regular expressions
    3-3. Compile time options
-   3-4. Template wildcards
-   A-1. Key Table
+   3-4. Keybindings action table
+   3-5. General settings
+   3-6. Build settings
+   3-7. General settings
+   3-8. Template wildcards
 
    List of Figures
    3-1. Search dialog
@@ -90,32 +112,36 @@
    3-3. Editor tab in preferences dialog
    3-4. Tools tab in preferences dialog
    3-5. Template tab in preferences dialog
-   3-6. VTE tab in preferences dialog
+   3-6. Keybinding tab in preferences dialog
+   3-7. VTE tab in preferences dialog
+
+   List of Examples
+   3-1. Comment indentation
      _________________________________________________________
 
 Chapter 1. Introduction
 
 1.1. About Geany
 
-   Geany is a small and lightweight integrated development
-   environment. It was developed to provide a small and fast IDE,
+   Geany is a small and lightweight Integrated Development
+   Environment. It was developed to provide a small and fast IDE,
    which has only a few dependencies from other packages. Another
    goal was to be as independent as possible from a special
-   Desktop Environment like KDE or GNOME. So it is using only the
-   GTK2 toolkit and therefore you need only the GTK2 runtime
-   libraries to run Geany.
+   Desktop Environment like KDE or GNOME, so Geany only requires
+   the GTK2 toolkit and therefore you only need the GTK2 runtime
+   libraries installed to run it.
 
    The basic features of Geany are:
 
-     * syntax highlighting
-     * code completion
-     * auto completion of often used constructs like if, for and
+     * Syntax highlighting
+     * Code completion
+     * Auto completion of often used constructs like if, for and
        while
-     * auto completion of XML and HTML tags
-     * call tips
-     * many supported filetypes like C, Java, PHP, HTML, Python,
+     * Auto completion of XML and HTML tags
+     * Call tips
+     * Many supported filetypes like C, Java, PHP, HTML, Python,
        Perl, Pascal
-     * symbol lists
+     * Tag/Symbol lists
      _________________________________________________________
 
 1.2. About this document
@@ -125,20 +151,20 @@
    http://geany.uvena.de.
      _________________________________________________________
 
-1.3. Where to get
+1.3. Where to get it
 
-   You can obtain Geany from http://geany.uvena.de or perhabs
+   You can obtain Geany from http://geany.uvena.de or perhaps
    from your distributor.
      _________________________________________________________
 
 1.4. License
 
-   Geany is distributed under the terms of the GNU Public license
-   as published by the Free Software Foundation; either version 2
-   of the License, or (at your option) later version. A copy of
-   this license can be found in the file COPYING included with
-   the source code of this program and in the appendix of this
-   document.
+   Geany is distributed under the terms of the GNU General Public
+   License as published by the Free Software Foundation; either
+   version 2 of the License, or (at your option) any later
+   version. A copy of this license can be found in the file
+   COPYING included with the source code of this program and in
+   the appendix of this document.
      _________________________________________________________
 
 Chapter 2. Installation
@@ -150,8 +176,10 @@
    and ATK libraries and header files. All these files are
    available at http://www.gtk.org.
 
-   Further more you need, of course, a C compiler, for the
-   included Scintilla library a C++ compiler and the make tool.
+   Furthermore you need, of course, a C compiler and the Make
+   tool; a C++ compiler is also required for the included
+   Scintilla library. The GNU versions of these tools are
+   recommended.
      _________________________________________________________
 
 2.2. Source Compilation
@@ -165,7 +193,7 @@
    detailed list, type
                                         % ./configure --help
 
-   In the case, that your system lacks dynamic linking loader
+   In the case that your system lacks dynamic linking loader
    support, you probably want to pass the option --disable-vte to
    the configure script. This prevents compiling Geany with
    dynamic linking loader support to automatically load
@@ -173,7 +201,7 @@
 
    Geany has been successfully compiled and tested under Debian
    3.1 Sarge, Debian 3.2 Etch, Fedora Core 4, LinuxFromScratch
-   and FreeBSD 6.0. It also compiles under Mircosoft Windows(TM),
+   and FreeBSD 6.0. It also compiles under Microsoft Windows(TM),
    but there are lots of changes to the makefiles necessary.
 
    If there are any errors during compilation, check your build
@@ -194,7 +222,7 @@
    Binary packages for Debian are available at
    http://debian.uvena.de/. You can add one of the following
    lines(depending on your system) to your apt sources.list to
-   get automatically get the latest version of Geany:
+   automatically get the latest version of Geany:
 
    deb http://debian.uvena.de/ ./stable/
 
@@ -203,7 +231,7 @@
 
 2.3.3. SuSE
 
-   There are not yet packages for SuSE available.
+   Packages for SuSE are not yet available.
      _________________________________________________________
 
 2.3.4. Gentoo
@@ -226,34 +254,34 @@
                                                                 % geany
      _________________________________________________________
 
-3.2. Commandline options
+3.2. Command line options
 
-   Table 3-1. Commandline Options
+   Table 3-1. Command line Options
    Short option Long option Function
    -n --no-ctags Do not load auto completion and call tip data.
-   Use this option, if you do not want to use them. For more
+   Use this option if you do not want to use them. For more
    information see Section 3.3.3.
    -m --no-msgwin Do not show the message window. Use this option
    if you do not need compiler messages or VTE support.
    -p --no-pipe Do not open files in a running instance, force
    opening a new instance.
-   -t --no-terminal Do not load terminal support. Use this
-   option, if you do not want to load the virtual terminal
-   emulator widget at startup. If you do not have libvte.so.4
-   installed, then terminal-support is automatically disabled.
+   -t --no-terminal Do not load terminal support. Use this option
+   if you do not want to load the virtual terminal emulator
+   widget at startup. If you do not have libvte.so.4 installed,
+   then terminal-support is automatically disabled.
    -l --vte-lib Specify explicitly the path including filename or
    only the filename to the VTE library, e.g. /usr/lib/libvte.so
-   or libvte.so. This option is only needed, when the
+   or libvte.so. This option is only needed when the
    autodetection does not work.
    -c directory_name --config=directory_name Use an alternate
    configuration directory. Default configuration directory is
-   ~/.geany/ and there resides geany.conf and some template
+   ~/.geany/ and there resides geany.conf and other configuration
    files.
-   -d --debug Runs Geany in debug mode, which means being verbose
+   -d --debug Run Geany in debug mode, which means being verbose
    and printing lots of information.
    -? --help Show help information and exit.
    -v --version Show version information and exit.
-     [files ...] Opens all given files at startup. This option
+     [files ...] Open all given files at startup. This option
    causes Geany to ignore loading stored files from the last
    session (if enabled).
    Geany supports all generic GTK options, a list is available on
@@ -264,77 +292,80 @@
 
 3.3.1. Startup
 
-   At startup, Geany loads the 15 first files from the last time,
+   At startup, Geany loads the first 15 files from the last time
    Geany was launched. You can disable this feature in the
    preferences dialog(see Figure 3-2). If you specify some files
-   on the commandline, only these files will be opened. But you
-   can find the files from the last session in the file menu.
-   There is an item "Recent files". It contains the last 15
-   recently opened files. It may be that Geany not exactly loads
-   15 files, this depends on the compile time option
-   GEANY_SESSION_FILES, the default is 15. For details see
+   on the command line, only these files will be opened, but you
+   can find the files from the last session in the file menu
+   under the "Recent files" item. This contains the last 15
+   recently opened files. It may be that Geany loads not exactly
+   15 session files, this depends on the compile time option
+   GEANY_SESSION_FILES; the default is 15. For details see
    Section 3.5.1.
      _________________________________________________________
 
 3.3.2. Detection of a running instance
 
-   Geany detects an already running instance of it and open new
-   files in the running one. So, you can use Geany like an editor
-   to view and edit files by opening them from other programs. If
-   you do not like this for some reason, you can it disable with
-   the appropriate commandline option.
+   Geany detects an already running instance of itself and opens
+   new files in the already running one. So, you can use Geany
+   like an editor to view and edit files by opening them from
+   other programs. If you do not like this for some reason, you
+   can disable it with the appropriate command line option.
 
    In the case that Geany crashed, you will get a message dialog
    at the next start, which asks you whether to delete an
    existing named pipe. If you are sure that there is no other
-   instance of Geany running, you can say Yes and Geany will
+   instance of Geany is running, you can say Yes and Geany will
    start as usual. Otherwise click No and Geany will not start.
      _________________________________________________________
 
 3.3.3. Global C tags
 
-   If a C file(with extension is c, cpp, h, etc.) is opened, a
+   If a C file (with extension .c, .cpp, .h, etc.) is opened, a
    global tags file is loaded once, which contains many function
-   declarations from the glibc and some other libraries, like X,
+   declarations from glibc and some other libraries, like X,
    Bonobo, Gnome, GTK, Glib and so on. These declarations are
    used for call tips and auto completion. These tags are only
-   useful if you are writing C or C++ source code. So if you
-   know, that you do not need these things, you can skip loading
-   this tag file. To do so, start Geany with the argument "-n" or
+   useful if you are writing C or C++ source code, so if you know
+   that you do not need these things, you can skip loading this
+   tag file. To do so, start Geany with the argument "-n" or
    "--no-ctags", for more information see Section 3.2.
      _________________________________________________________
 
 3.3.4. Virtual terminal emulator widget (VTE)
 
    If you have installed libvte.so in your system, it is loaded
-   automatically by Geany. Then you have a terminal widget in the
-   notebook at the bottom.
+   automatically by Geany, and you will have a terminal widget in
+   the notebook at the bottom.
 
    If Geany cannot find libvte.so at startup, the terminal widget
    will not be loaded. So there is no need to install the package
    containing this file in order to run Geany. Additionally, you
-   can disable the use of the terminal widget by commandline
+   can disable the use of the terminal widget by command line
    option, for more information see Section 3.2.
 
    You can use this terminal (from now on called VTE) nearly as
-   an usual terminal program like xterm. There is a basic
-   clipboard support. You can paste the content of the clipboard
-   by pressing the middle mouse button in the VTE (on 2-button
-   mice, the middle button can often be simulated by pressing
-   both mouse buttons together) or by pressing the right mouse
-   button to open the popup menu and choose Paste. To copy text
-   from the VTE, just select the desired text and then press the
-   right mouse button and choose Copy from the popup menu.
+   an usual terminal program like xterm. There is basic clipboard
+   support. You can paste the contents of the clipboard by
+   pressing the right mouse button to open the popup menu and
+   choosing Paste. To copy text from the VTE, just select the
+   desired text and then press the right mouse button and choose
+   Copy from the popup menu. On systems running the X Window
+   System you can paste the last selected text by pressing the
+   middle mouse button in the VTE (on 2-button mice, the middle
+   button can often be simulated by pressing both mouse buttons
+   together).
 
    Note
 
    Geany tries to load libvte.so. If this fails, it tries to load
    libvte.so.4. If this fails too, you should check whether you
-   installed libvte correctly. Again, Geany runs also without
-   this library. But it could be, that the library is called
-   something else than libvte.so.4 (e.g. on FreeBSD 6.0 it is
-   called libvte.so.8). So please set a link to the correct file
-   (as root).
+   installed libvte correctly. Again, Geany also runs without
+   this library.
+
+   It could be, that the library is called something else than
+   libvte.so.4 (e.g. on FreeBSD 6.0 it is called libvte.so.8). So
+   please set a link to the correct file (as root).
 # ln -s /usr/lib/libvte.so.X /usr/lib/libvte.so.4
 
    Obviously, you have to adjust the paths and set X to the
@@ -344,7 +375,7 @@
 3.4. Search and Replace
 
    You can use regular expressions in the search dialog, just by
-   activating the check box(see the image below). Detailed
+   activating the check box (see the image below). Detailed
    information about special characters can be found in the Table
    3-2.
 
@@ -401,35 +432,42 @@
 
    [pref_dialog_templ.jpg]
 
-   Figure 3-6. VTE tab in preferences dialog
+   Figure 3-6. Keybinding tab in preferences dialog
 
+   [pref_dialog_keys.jpg]
+
+   Note
+
+   For more information see Section 3.7.
+
+   Figure 3-7. VTE tab in preferences dialog
+
    [pref_dialog_vte.jpg]
      _________________________________________________________
 
 3.5.1. Compile time options
 
-   There are some options which can only changed at compile time.
-   To change these options, look into src/geany.h to change these
-   settings. To find it, look for a block of lines starting with
-   "#define GEANY_*". All definitions which are not listed here,
-   should not be changed.
+   There are some options which can only be changed at compile
+   time. To change these options, edit the file src/geany.h. Look
+   for a block of lines starting with "#define GEANY_*". Any
+   definitions which are not listed here should not be changed.
 
    Table 3-3. Compile time options
    Option Description Default
-   GEANY_MAX_OPEN_FILES The limit how many files can be open at
-   the same time. 25
+   GEANY_MAX_OPEN_FILES The limit to how many files can be open
+   at the same time. 25
    GEANY_SESSION_FILES How many files should be reopened from the
    last run. Obviously, the value should be smaller than
    GEANY_MAX_OPEN_FILES. 15
-   GEANY_WORDCHARS These characters define the word boundaries.
-   (look at sourcecode)
-   GEANY_MAX_AUTOCOMPLETE_WORDS How many auto complete
+   GEANY_WORDCHARS These characters define word boundaries. (look
+   at sourcecode)
+   GEANY_MAX_AUTOCOMPLETE_WORDS How many auto completion
    suggestions should Geany provide. 30
-   GEANY_STRING_UNTITLED A string used as name for new files. Be
-   aware that the string can be translated, so change it only if
-   you know what you are doing. untitled
-   GEANY_CHECK_FILE_DELAY Time in seconds between a file is
-   checked for changes. 30
+   GEANY_STRING_UNTITLED A string used as the default name for
+   new files. Be aware that the string can be translated, so
+   change it only if you know what you are doing. untitled
+   GEANY_CHECK_FILE_DELAY Time in seconds between checking a file
+   for external changes. 30
    GEANY_WINDOW_MINIMAL_WIDTH The minimal width of the main
    window. 620
    GEANY_WINDOW_MINIMAL_HEIGHT The minimal height of the main
@@ -440,21 +478,350 @@
    window at the first start. 600
      _________________________________________________________
 
-3.6. File types
+3.6. Build System
 
-   should be written
+   Geany has an integrated build system. When you compile, link,
+   syntax check or otherwise process a source file, the output
+   will be captured in the Compiler notebook tab of the messages
+   window (assuming you have it visible). If there are any
+   warnings or errors with line numbers shown in the Compiler
+   output tab, you can double click on them and Geany will switch
+   to the relevant source file (if it is open) and mark the line
+   number so the problem can be corrected.
+
+   Depending on the current file's filetype, the Build menu will
+   contain the following items:
+
+     * Compile
+     * Build
+     * Build with "make"
+     * Build with make (custom target)
+     * Execute
+     * Set Includes and Arguments
      _________________________________________________________
 
-3.7. Templates
+3.6.1. Compile
 
+   By default, the Compile command is setup to build binary
+   object files for compilable languages such as C and C++.
+
+   Java will be compiled to class file bytecode. Interpreted
+   languages such as Perl, Python, Ruby will compile to bytecode
+   if the language supports it, or will run a syntax check, or
+   failing that will run the file in the language interpreter.
+     _________________________________________________________
+
+3.6.2. Build
+
+   For compilable languages such as C and C++, the Build command
+   will link the current source file's equivalent object file
+   into an executable. If the object file does not exist, the
+   source will be compiled and linked in one step, producing just
+   the executable binary.
+
+   Interpreted languages do not use the Build command.
+     _________________________________________________________
+
+3.6.3. Build with "make"
+
+   This effectively runs "make all" in the same directory as the
+   current file. The Make tool path must be correctly set in the
+   Tools tab of the Preferences dialog.
+     _________________________________________________________
+
+3.6.4. Build with make (custom target)
+
+   This is identical to running 'Build with "make"' but you will
+   be prompted for the make target name to be passed to the Make
+   tool. For example, typing 'clean' in the dialog prompt will
+   run "make clean" (but using the full path to the Make tool set
+   in Preferences).
+     _________________________________________________________
+
+3.6.5. Execute
+
+   Execute will run the corresponding executable file, shell
+   script or interpreted script in a terminal window. Note that
+   the Terminal tool path must be correctly set in the Tools tab
+   of the Preferences dialog - you can use any terminal program
+   that runs a Bourne compatible shell. After your program or
+   script has finished executing, you will be prompted to press
+   the return key. This allows you to review any text output from
+   the program.
+     _________________________________________________________
+
+3.6.6. Set Includes and Arguments
+
+   By default the Compile and Build commands invoke the compiler
+   and linker with only the basic arguments needed by all
+   programs. Using 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. Note that if you are using the Build
+   command to compile and link in one step, you will need to set
+   both the compiler arguments and the linker arguments in the
+   linker command setting.
+
+   These settings are not saved when Geany is shut down. See
+   below for how to set permanent arguments.
+
+   If you need complex settings for your build system, or several
+   different settings, then writing a Makefile and using 'Build
+   with "make"' is recommended.
+     _________________________________________________________
+
+3.6.7. File type configuration settings
+
+   You can set the commands to run for compiling, building or
+   executing by opening the relevant filetypes.* configuration
+   file, and checking the build_settings section. See Section 3.8
+   for more information.
+     _________________________________________________________
+
+3.7. Keybindings
+
+   For all listed actions you can define your own keybindings.
+   Open the preferences dialog, select the desired action and
+   click on change. In the opening dialog you can press any key
+   combination you want and it will be saved when you press OK.
+   You can define only one key combination for one action.
+
+   Some of the default key combinations cannot be changed, e.g.
+   menu_new or menu_open. These are set by GTK and should be
+   kept, but you can still add other key combinations for these
+   actions. For example to execute menu_open by default Ctrl-O is
+   set, but you can also define Alt-O, so that the file open
+   dialog is shown by pressing either Ctrl-O or Alt-O.
+
+   The following table lists all available actions for keyboard
+   shortcuts.
+
+   Table 3-4. Keybindings action table
+   Action Description
+   Menu items
+   menu_new Creates a new file.
+   menu_open Opens a file.
+   menu_save Saves the current file.
+   menu_saveall Saves all open files.
+   menu_closeall Closes all open files.
+   menu_reloadfile Reloads the current file. All unsaved changes
+   will be lost.
+   menu_undo Undoes the last action.
+   menu_redo Redoes the last action.
+   menu_preferences Opens preferences dialog.
+   menu_findnext Finds next result.
+   menu_findprevious Finds previous result.
+   menu_replace Opens the replace dialog.
+   menu_gotoline Opens the Go To Line dialog.
+   menu_opencolorchooser Opens the colour chooser dialog.
+   menu_fullscreen Switches to fullscreen mode.
+   menu_messagewindow Toggles the message window (status and
+   compiler messages) on and off.
+   menu_zoomin Zooms in the text
+   menu_zoomout Zooms out the text
+   menu_replacetabs Replaces all tabs with the right amount of
+   spaces.
+   menu_foldall Folds all contractible code blocks.
+   menu_unfoldall Unfolds all contracted code blocks.
+   Build options
+   build_compile Compiles the current file.
+   build_link Builds (compiles if necessary and links) the
+   current file.
+   build_make Builds the current file with the Make tool.
+   build_makeowntarget Builds the current file with the Make tool
+   and a given target.
+   build_run Executes the current file in a terminal emulation.
+   build_run2 Executes the current file in a terminal emulation.
+   build_options Opens the build options dialog.
+   Miscellaneous
+   reloadtaglist Reloads the tag/symbol list.
+   switch_editor Switches to editor widget.
+   switch_scribble Switches to scribble widget.
+   switch_vte Switches to VTE widget.
+   switch_tableft Switches to the previous open document.
+   switch_tabright Switches to the next open document.
+   toggle_sidebar Shows or hides the sidebar.
+   Editing operations
+   edit_duplicateline Duplicates the current line.
+   edit_commentline Comments current line or selection.
+   edit_autocomplete Shows auto completion list.
+   edit_calltip Shows call tips for the current function or
+   method.
+   edit_macrolist Shows a list of available macros and variables
+   in the workspace.
+   edit_suppresscompletion If you type something like if or for
+   and press this key, it will not be auto completed.
+     _________________________________________________________
+
+3.8. Filetype definition files
+
+   All colour definitions and other filetype specific settings
+   are stored in the filetype definition files. Those settings
+   are colours for syntax highlighting, general settings like
+   comment characters or word delimiter characters as well as
+   compiler and linker settings.
+
+   The system-wide configuration files can be found in
+   $prefix/share/geany and are called filetypes.$ext, where
+   $prefix is the path where Geany is installed (commonly
+   /usr/local) and $ext is the name of the filetype. For every
+   filetype there is a corresponding definition file. There is
+   one exception: filetypes.common - this file is for general
+   settings, which are not specific to a certain filetype. It is
+   not recommended to edit the system-wide files, because they
+   will be overridden when Geany is updated.
+
+   To change the settings, copy a file from $prefix/share/geany
+   to the subdirectory filedefs in your configuration directory
+   (usually ~/.geany/).
+
+   For example:
+% cp /usr/local/share/geany/filetypes.c /home/username/.geany/filedefs/
+
+   Then you can edit the file and the changes are also available
+   after an update of Geany because they reside in your
+   configuration directory. Alternatively, you can create a file
+   ~/.geany/filedefs/filetypes.X and add only these settings you
+   want to change. All missing settings will be read from the
+   corresponding global definition file in $prefix/share/geany.
+     _________________________________________________________
+
+3.8.1. Format
+
+3.8.1.1. [styling] Section
+
+   In this section the colours for syntax highlighting are
+   defined. The format is always:
+   key=forground_colour;background_colour;bold;italic
+
+   Colours have to be specified as RGB hex values prefixed by 0x.
+   For example red is 0xff0000, blue is 0x0000ff. The values are
+   case-insensitive, but it is a good idea to use small letters.
+   Bold and italic are flags and should only be "true" or
+   "false". If their value is something other than "true" or
+   "false", "false" is assumed.
+     _________________________________________________________
+
+3.8.1.2. [keywords] Section
+
+   This section contains keys for different keyword lists
+   specific to the filetype. Some filetypes do not support
+   keywords, so adding a new key will not work. You can only add
+   or remove keywords to/from an existing list.
+
+   Important
+
+   The keywords list must be in one line without line ending
+   characters.
+     _________________________________________________________
+
+3.8.1.3. [settings] Section
+
+   Table 3-5. General settings
+   Key Description Example
+   wordchars Word delimiting characters. These characters define
+   word boundaries. (look at sourcecode)
+   comment_open A character or string which is used to comment
+   code. If you want to use multiline comments, also set
+   comment_close, otherwise leave it empty. comment_open=/*
+   comment_close If multiline comments are used, this is the
+   character or string to close the comment. comment_close=*/
+   comment_use_indent Set this to false if a comment character or
+   string should start at column 0 of a line. If set to true it
+   uses any indentation of the line.
+
+   Example 3-1. Comment indentation
+
+   comment_use_indent=true would generate this if a line is
+   commented (e.g. with Ctrl-D)
+        #command_example();
+
+   comment_use_indent=false would generate this if a line is
+   commented (e.g. with Ctrl-D)
+#command_example();
+
+   Note
+
+   This setting only works for single line comments.
+   comment_use_indent=true
+     _________________________________________________________
+
+3.8.1.4. [build_settings] Section
+
+   Table 3-6. Build settings
+   Key Description Example
+   compiler This item specifies the command to compile source
+   code files. But it is also possible to use it with interpreted
+   languages like Perl or Python. With these filetypes you can
+   use this option as a kind of syntax parser, which sends output
+   to the compiler message window.
+
+   You should quote the filename to also support filenames with
+   spaces. The following wildcards for filenames are available:
+
+     * %f - complete filename without path
+     * %e - filename without path and without extension
+
+   compiler=gcc -Wall -c "%f"
+   linker This item specifies the command to link the file. If
+   the file is not already compiled, it will be compiled while
+   linking. The -o option is automatically added by Geany. This
+   item works well with GNU gcc, but may be problematic with
+   other compilers (esp. with the linker). linker=gcc -Wall "%f"
+   run_cmd Use this item to execute your file. It has to have
+   been built already. Use the %e wildcard to have only the name
+   of the executable (i.e. without extension) or use the %f
+   wildcard if you need the complete filename, e.g. for shell
+   scripts. run_cmd="./%e"
+     _________________________________________________________
+
+3.8.2. Special file filetypes.common
+
+   There is a special filetype definition file called
+   filetypes.common. This file defines some general
+   non-filetype-specific settings.
+
+   Table 3-7. General settings
+   Key Description Example
+   default The default style for text (e.g. for files without
+   filetype). For the detailed format, please see the above
+   "[styling] Section". default=0x000000;0xffffff;false;false
+   selection The style for colouring selections. Only foreground
+   and background colour are interpreted.
+   selection=0xc0c0c0;0x00007F;false;false
+   brace_good The style for brace highlighting when a matching
+   brace was found. brace_good=0xff0000;0xFFFFFF;true;false
+   brace_bad The style for brace highlighting when no matching
+   brace was found. brace_bad=0x0000ff;0xFFFFFF;true;false
+   current_line The style for colouring the background of the
+   current line. Only the second argument is interpreted.
+   current_line=0x0;0xE5E5E5;false;false
+   folding_style The style of folding icons. Only first and
+   second arguments are used.
+
+   Valid values for the first argument are:
+
+     * 1 - for boxes
+     * 2 - for circles
+
+   Valid values for the second argument are:
+
+     * 1 - for straight lines
+     * 2 - for curved lines
+
+   folding_style=1;1;false;false
+     _________________________________________________________
+
+3.9. Templates
+
    Geany supports several templates for file headers, multiline
-   comments(frame comments), function descriptions, a typical
-   ChangeLog entry and a short GPL notice. To use this templates,
-   just open the edit menu or open the popup menu by
+   comments (frame comments), function descriptions, a typical
+   ChangeLog entry and a short GPL notice. To use these
+   templates, just open the Edit menu or open the popup menu by
    right-clicking in the editor widget, and choose "Insert
    Comments" and insert templates as you want.
 
-   Some templates like file header or ChangeLog entry, will
+   Some templates (like file header or ChangeLog entry) will
    always be inserted at the top of the file.
 
    To insert a function description, the cursor must be inside of
@@ -466,7 +833,7 @@
 
    Each template can be customized to your needs. The templates
    are in the configuration directory, which is in ~/.geany/ (see
-   Section 3.2 for further information about configuration
+   Section 3.2 for further information about the configuration
    directory). Just open the desired template with an editor
    (ideally Geany ;-) ) and edit the template as your needs.
    There are some wildcards which will be automatically replaced
@@ -474,32 +841,32 @@
 
    All wildcards must be enclosed by "{" and "}", e.g. {date}.
 
-   In the configuration dialog you can find a tab "Templates"(see
-   Figure 3-5). You can define the default values which will be
-   inserted in the templates. You should restart Geany after made
-   changes, because they are only read at startup.
+   In the configuration dialog you can find a tab "Templates"
+   (see Figure 3-5). You can define the default values which will
+   be inserted in the templates. You should restart Geany after
+   making changes, because they are only read at startup.
 
    Since Geany 0.3 there are also templates for creating new
    files. They can be found in ~/.geany/, too. All template files
    for creating new files begin with template.filetype. followed
    by the filetype. At creating a new file with a filetype
    template, the template for the fileheader is automatically
-   prepended. Please note, that the complete behaviour is still
+   prepended. Please note that the complete behaviour is still
    under development and will probably be changed in one of the
    next releases. Sorry.
 
 
-   Table 3-4. Template wildcards
+   Table 3-8. Template wildcards
    Wildcard Description Available in following templates
    developer The name of the developer. filetypes, file header,
    function description, ChangeLog entry
-   initial The initials of the developer name, e.g. "ET" for
-   Enrico Troeger or "JFD" for John Foobar Doe. filetypes, file
-   header, function description, ChangeLog entry
+   initial The developer's initials, e.g. "ET" for Enrico Troeger
+   or "JFD" for John Foobar Doe. filetypes, file header, function
+   description, ChangeLog entry
    mail The email address of the developer. file header, function
    description, ChangeLog entry
-   company The company name, the developer is working for.
-   filetypes, file header, function description, ChangeLog entry
+   company The company the developer is working for. filetypes,
+   file header, function description, ChangeLog entry
    year The current year in the format: YYYY filetypes, file
    header, function description, ChangeLog entry
    version The initial version of a new file. filetypes, file
@@ -509,14 +876,14 @@
    untitled The string "untitled" (this will be translated to
    your locale), used in filetype templates filetypes, file
    header, function description, ChangeLog entry
-   geanyversion The actual Geany version, e.g. "Geany 0.6"
+   geanyversion The actual Geany version, e.g. "Geany 0.7"
    filetypes, file header, function description, ChangeLog entry
    datetime The current date and time in the format: DD.MM.YYYY
    HH:mm:ss ZZZZ file header, function description
    filename The filename of the current file. Only available for
    the file header template. file header
    gpl This wildcard inserts a short GPL notice. file header
-   functionname The function name of the function at cursor
+   functionname The function name of the function at the cursor
    position. This wildcard will only be replaced in the function
    description template. function description
    If you need any other wildcards or a special date/time format,
@@ -527,60 +894,8 @@
 
 A.1. Geany key mapping
 
-   The following table lists several useful key codes, which you
-   can use in Geany.
-
-   Table A-1. Key Table
-   Key Function
-   File operations
-   Ctrl-N Create new file
-   Ctrl-O Open file
-   Ctrl-S Save current file
-   Ctrl-R Reload the current file. All unsaved changes will be
-   lost.
-   Ctrl-Shift-S Save all open files
-   Ctrl-W Close current file
-   Alt-D Close all open files
-   Editing operations
-   Ctrl-X Cut the current selection and copy it into the
-   clipboard
-   Ctrl-C Copy the current selection into the clipboard
-   Ctrl-V Paste the content of the clipboard at the current
-   position
-   Ctrl-Z Undo the last action
-   Ctrl-Y Redo the last action
-   Ctrl-G Duplicate the current line
-   Ctrl-A Select all
-   Ctrl-D Comment current line or selection
-   Ctrl-Space Show auto completion list
-   Ctrl-Return Show list of available(in the workspace) macros
-   and variables
-   Alt-Space Show call tips for the current function or method
-   Shift-Space Insert just a blank. Useful after typing if or
-   while, to explicitly suppress the use of construct auto
-   completion
-   Ctrl-Shift-R Reload the tag/symbol list
-   Finding text
-   Ctrl-F Open find dialog
-   F3 Find next
-   Building files
-   F8 Compile the current file.
-   F9 Build the current file.
-   Shift-F9 Build the current file with the make tool.
-   F5 Execute the current file in a terminal emulation.
-   Miscellaneous
-   Ctrl-Left Moves the cursor to the left word boundary.
-   Ctrl-Right Moves the cursor to the next word.
-   Alt-Left Switch to the previous open document
-   Alt-Right Switch to the next open document
-   Ctrl-+ Zoom in the text
-   Ctrl-- Zoom out the text
-   Ctrl-P Open preferences dialog
-   F1 Show help
-   F6 Switch to VTE widget
-   F11 Switch to fullscreen mode
-   F12 Switch to Scribble widget
-   Ctrl-Q Quit
+   Since Geany 0.7, most of the keybindings are definable in the
+   preferences dialog. See Section 3.7.
      _________________________________________________________
 
 Appendix B. GNU General Public License

Modified: trunk/doc/html/apa.html
===================================================================
--- trunk/doc/html/apa.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/apa.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,13 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Appendix A. Geany key mapping</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="index.html" title="
			Geany 0.6
		" /><link rel="prev" href="ch03s07.html" title="Templates" /><link rel="next" href="apb.html" title="Appendix B. GNU General Public License" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix A. <span class="application">Geany</span> key mapping</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s07.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="apb.html">Next</a></td></tr></table><hr /></div><div class="appendix" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title"><a id="shortcuts"></a>Appendix A. <span class="application">Geany</span> key mapping</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="apa.html#id2531879"><span class="application">Geany</span> key mapping</a></span></dt></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2531879"></a><span class="application">Geany</span> key mapping</h2></div></div></div><p>
-				The following table lists several useful key codes, which you can use in
-				<span class="application">Geany</span>.
-			</p><p>
-				</p><div class="table"><a id="id2531902"></a><p class="title"><b>Table A.1. Key Table</b></p><table summary="Key Table" cellspacing="0" cellpadding="4" border="1"><colgroup><col /><col /></colgroup><thead><tr><th>Key</th><th>Function</th></tr></thead><tbody><tr><td colspan="2" align="left">File operations</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">N</strong></span></td><td>Create new file</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">O</strong></span></td><td>Open file</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">S</strong></span></td><td>Save current file</td></tr><tr><td>
-									<span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">R</strong></span>
-								</td><td>Reload the current file. All unsaved changes will be lost.</td></tr><tr><td>
-									<span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">Shift</strong></span>-<span><strong class="keycap">S</strong></span>
-								</td><td>Save all open files</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">W</strong></span></td><td>Close current file</td></tr><tr><td><span><strong class="keycap">Alt</strong></span>-<span><strong class="keycap">D</strong></span></td><td>Close all open files</td></tr><tr><td colspan="2" align="left">Editing operations</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">X</strong></span></td><td>Cut the current selection and copy it into the clipboard</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">C</strong></span></td><td>Copy the current selection into the clipboard</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">V</strong></span></td><td>Paste the content of the clipboard at the current position</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">Z</strong></span></td><td>Undo the last action</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">Y</strong></span></td><td>Redo the last action</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">G</strong></span></td><td>Duplicate the current line</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">A</strong></span></td><td>Select all</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">D</strong></span></td><td>Comment current line or selection</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">Space</strong></span></td><td>Show auto completion list</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">Return</strong></span></td><td>Show list of available(in the workspace) macros and variables</td></tr><tr><td><span><strong class="keycap">Alt</strong></span>-<span><strong class="keycap">Space</strong></span></td><td>Show call tips for the current function or method</td></tr><tr><td><span><strong class="keycap">Shift</strong></span>-<span><strong class="keycap">Space</strong></span></td><td>Insert just a blank. Useful after typing if or while, to explicitly
-								suppress the use of construct auto completion</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">Shift</strong></span>-<span><strong class="keycap">R</strong></span></td><td>Reload the tag/symbol list</td></tr><tr><td colspan="2" align="left">Finding text</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">F</strong></span></td><td>Open find dialog</td></tr><tr><td><span><strong class="keycap">F3</strong></span></td><td>Find next</td></tr><tr><td colspan="2" align="left">Building files</td></tr><tr><td><span><strong class="keycap">F8</strong></span></td><td>Compile the current file.</td></tr><tr><td><span><strong class="keycap">F9</strong></span></td><td>Build the current file.</td></tr><tr><td><span><strong class="keycap">Shift</strong></span>-<span><strong class="keycap">F9</strong></span></td><td>Build the current file with the make tool.</td></tr><tr><td><span><strong class="keycap">F5</strong></span></td><td>Execute the current file in a terminal emulation.</td></tr><tr><td colspan="2" align="left">Miscellaneous</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">Left</strong></span></td><td>Moves the cursor to the left word boundary.</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">Right</strong></span></td><td>Moves the cursor to the next word.</td></tr><tr><td><span><strong class="keycap">Alt</strong></span>-<span><strong class="keycap">Left</strong></span></td><td>Switch to the previous open document</td></tr><tr><td><span><strong class="keycap">Alt</strong></span>-<span><strong class="keycap">Right</strong></span></td><td>Switch to the next open document</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">+</strong></span></td><td>Zoom in the text</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">-</strong></span></td><td>Zoom out the text</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">P</strong></span></td><td>Open preferences dialog</td></tr><tr><td><span><strong class="keycap">F1</strong></span></td><td>Show help</td></tr><tr><td><span><strong class="keycap">F6</strong></span></td><td>Switch to VTE widget</td></tr><tr><td><span><strong class="keycap">F11</strong></span></td><td>Switch to fullscreen mode</td></tr><tr><td><span><strong class="keycap">F12</strong></span></td><td>Switch to Scribble widget</td></tr><tr><td><span><strong class="keycap">Ctrl</strong></span>-<span><strong class="keycap">Q</strong></span></td><td>Quit</td></tr></tbody></table></div><p>
-			</p></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s07.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="apb.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Templates </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix B. GNU General Public License</td></tr></table></div></body></html>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Appendix A. Geany key mapping</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.7
		" /><link rel="up" href="index.html" title="
			Geany 0.7
		" /><link rel="prev" href="ch03s09.html" title="Templates" /><link rel="next" href="apb.html" title="Appendix B. GNU General Public License" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix A. <span class="application">Geany</span> key mapping</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch03s09.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="apb.html">Next</a></td></tr></table><hr /></div><div class="appendix" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title"><a id="shortcuts"></a>Appendix A. <span class="application">Geany</span> key mapping</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="apa.html#id2533351"><span class="application">Geany</span> key mapping</a></span></dt></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2533351"></a><span class="application">Geany</span> key mapping</h2></div></div></div><p>
+				Since <span class="application">Geany</span> 0.7, most of the keybindings are definable
+				in the preferences dialog. See <a href="ch03s07.html" title="Keybindings">the section called “Keybindings”</a>.
+			</p></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch03s09.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="apb.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Templates </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Appendix B. GNU General Public License</td></tr></table></div></body></html>

Modified: trunk/doc/html/apb.html
===================================================================
--- trunk/doc/html/apb.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/apb.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Appendix B. GNU General Public License</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="index.html" title="
			Geany 0.6
		" /><link rel="prev" href="apa.html" title="Appendix A. Geany key mapping" /><link rel="next" href="apbs02.html" title="TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix B. GNU General Public License</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="apa.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="apbs02.html">Next</a></td></tr></table><hr /></div><div class="appendix" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="geany-gpl"></a>GNU General Public License</h1></div><div><p class="releaseinfo">      Version 2, June 1991</p></div><div><p class="copyright">Copyright © 1989, 1991 Free Software Foundation, Inc.</p></div><div><div class="legalnotice"><a id="id2532817"></a><p>
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Appendix B. GNU General Public License</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.7
		" /><link rel="up" href="index.html" title="
			Geany 0.7
		" /><link rel="prev" href="apa.html" title="Appendix A. Geany key mapping" /><link rel="next" href="apbs02.html" title="TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Appendix B. GNU General Public License</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="apa.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="apbs02.html">Next</a></td></tr></table><hr /></div><div class="appendix" lang="en" xml:lang="en"><div class="titlepage"><div><div><h1 class="title"><a id="geany-gpl"></a>GNU General Public License</h1></div><div><p class="releaseinfo">      Version 2, June 1991</p></div><div><p class="copyright">Copyright © 1989, 1991 Free Software Foundation, Inc.</p></div><div><div class="legalnotice"><a id="id2533403"></a><p>
 	</p><div class="address"><p>Free Software Foundation, Inc.<br />
 	  <span class="street">59 Temple Place, Suite 330</span>,<br />
 	  <span class="city">Boston</span>,<br />
@@ -9,18 +9,18 @@
 	  <span class="country">USA</span><br />
 	</p></div><p>.
       </p><p>	Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed.
-      </p></div></div><div><p class="pubdate">Version 2, June 1991</p></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="apb.html#id2533469">Preamble</a></span></dt><dt><span class="sect1"><a href="apbs02.html">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</a></span></dt><dd><dl><dt><span class="sect2"><a href="apbs02.html#id2533576">Section 0</a></span></dt><dt><span class="sect2"><a href="apbs02.html#sect1">Section 1</a></span></dt><dt><span class="sect2"><a href="apbs02.html#sect2">Section 2</a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2533763">Section 3
-      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2533864">Section 4
-      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2533881">Section 5
-      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2533900">Section 6
-      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2533917">Section 7
-      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2533968">Section 8
-      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2533986">Section 9
-      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534019">Section 10
-      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534037">Section 11 NO WARRANTY
-      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534058">Section 12
+      </p></div></div><div><p class="pubdate">Version 2, June 1991</p></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="sect1"><a href="apb.html#id2534055">Preamble</a></span></dt><dt><span class="sect1"><a href="apbs02.html">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</a></span></dt><dd><dl><dt><span class="sect2"><a href="apbs02.html#id2534162">Section 0</a></span></dt><dt><span class="sect2"><a href="apbs02.html#sect1">Section 1</a></span></dt><dt><span class="sect2"><a href="apbs02.html#sect2">Section 2</a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534349">Section 3
+      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534450">Section 4
+      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534467">Section 5
+      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534486">Section 6
+      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534503">Section 7
+      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534554">Section 8
+      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534572">Section 9
+      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534605">Section 10
+      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534623">Section 11 NO WARRANTY
+      </a></span></dt><dt><span class="sect2"><a href="apbs02.html#id2534644">Section 12
       </a></span></dt></dl></dd><dt><span class="sect1"><a href="apbs03.html">How to Apply These Terms to Your New Programs
-    </a></span></dt></dl></div><div class="sect1" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2533469"></a>Preamble</h2></div></div></div><p>      The licenses for most software are designed to take away your
+    </a></span></dt></dl></div><div class="sect1" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2534055"></a>Preamble</h2></div></div></div><p>      The licenses for most software are designed to take away your
       freedom to share and change it. By contrast, the GNU General Public License is
       intended to guarantee your freedom to share and change
       free software - to make sure the software is free for all its users.

Modified: trunk/doc/html/apbs02.html
===================================================================
--- trunk/doc/html/apbs02.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/apbs02.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="apb.html" title="Appendix B. GNU General Public License" /><link rel="prev" href="apb.html" title="Appendix B. GNU General Public License" /><link rel="next" href="apbs03.html" title="How to Apply These Terms to Your New Programs
    " /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="apb.html">Prev</a> </td><th width="60%" align="center">Appendix B. GNU General Public License</th><td width="20%" align="right"> <a accesskey="n" href="apbs03.html">Next</a></td></tr></table><hr /></div><div class="sect1" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2533569"></a>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h2></div></div></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2533576"></a>Section 0</h3></div></div></div><p>	This License applies to any program or other work which contains a notice
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.7
		" /><link rel="up" href="apb.html" title="Appendix B. GNU General Public License" /><link rel="prev" href="apb.html" title="Appendix B. GNU General Public License" /><link rel="next" href="apbs03.html" title="How to Apply These Terms to Your New Programs
    " /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="apb.html">Prev</a> </td><th width="60%" align="center">Appendix B. GNU General Public License</th><td width="20%" align="right"> <a accesskey="n" href="apbs03.html">Next</a></td></tr></table><hr /></div><div class="sect1" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2534155"></a>TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION</h2></div></div></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534162"></a>Section 0</h3></div></div></div><p>	This License applies to any program or other work which contains a notice
 	placed by the copyright holder saying it may be distributed under the terms
 	of this General Public License. The "Program", below, refers to any such
 	program or work, and a
@@ -63,7 +63,7 @@
       </p><p>	In addition, mere aggregation of another work not based on the Program with the Program
 	(or with a work based on the Program) on a volume of a storage or distribution medium
 	does not bring the other work under the scope of this License.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2533763"></a>Section 3
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534349"></a>Section 3
       </h3></div></div></div><p>	You may copy and distribute the Program (or a work based on it, under
 	<a href="apbs02.html#sect2" title="Section 2">Section 2</a> in object code or executable form under the terms of
 	<a href="apbs02.html#sect1" title="Section 1">Sections 1</a> and
@@ -92,26 +92,26 @@
 	designated place, then offering equivalent access to copy the source code from the same place
 	counts as distribution of the source code, even though third parties are not compelled to
 	copy the source along with the object code.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2533864"></a>Section 4
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534450"></a>Section 4
       </h3></div></div></div><p>	You may not copy, modify, sublicense, or distribute the Program except as expressly provided
 	under this License. Any attempt otherwise to copy, modify, sublicense or distribute the
 	Program is void, and will automatically terminate your rights under this License. However,
 	parties who have received copies, or rights, from you under this License will not have their
 	licenses terminated so long as such parties remain in full compliance.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2533881"></a>Section 5
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534467"></a>Section 5
       </h3></div></div></div><p>	You are not required to accept this License, since you have not signed it. However, nothing
 	else grants you permission to modify or distribute the Program or its derivative works.
 	These actions are prohibited by law if you do not accept this License. Therefore, by modifying
 	or distributing the Program (or any work based on the Program), you indicate your acceptance
 	of this License to do so, and all its terms and conditions for copying, distributing or
 	modifying the Program or works based on it.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2533900"></a>Section 6
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534486"></a>Section 6
       </h3></div></div></div><p>	Each time you redistribute the Program (or any work based on the Program), the recipient
 	automatically receives a license from the original licensor to copy, distribute or modify
 	the Program subject to these terms and conditions. You may not impose any further restrictions
 	on the recipients' exercise of the rights granted herein. You are not responsible for enforcing
 	compliance by third parties to this License.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2533917"></a>Section 7
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534503"></a>Section 7
       </h3></div></div></div><p>	If, as a consequence of a court judgment or allegation of patent infringement or for any other
 	reason (not limited to patent issues), conditions are imposed on you (whether by court order,
 	agreement or otherwise) that contradict the conditions of this License, they do not excuse you
@@ -133,13 +133,13 @@
 	system and a licensee cannot impose that choice.
       </p><p>	This section is intended to make thoroughly clear what is believed to be a consequence of the
 	rest of this License.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2533968"></a>Section 8
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534554"></a>Section 8
       </h3></div></div></div><p>	If the distribution and/or use of the Program is restricted in certain countries either by patents
 	or by copyrighted interfaces, the original copyright holder who places the Program under this License
 	may add an explicit geographical distribution limitation excluding those countries, so that
 	distribution is permitted only in or among countries not thus excluded. In such case, this License
 	incorporates the limitation as if written in the body of this License.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2533986"></a>Section 9
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534572"></a>Section 9
       </h3></div></div></div><p>	The Free Software Foundation may publish revised and/or new versions of the General Public License
 	from time to time. Such new versions will be similar in spirit to the present version, but may differ
 	in detail to address new problems or concerns.
@@ -148,20 +148,20 @@
 	and conditions either of that version or of any later version published by the Free Software
 	Foundation. If the Program does not specify a version number of this License, you may choose any
 	version ever published by the Free Software Foundation.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534019"></a>Section 10
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534605"></a>Section 10
       </h3></div></div></div><p>	If you wish to incorporate parts of the Program into other free programs whose distribution
 	conditions are different, write to the author to ask for permission. For software which is copyrighted
 	by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions
 	for this. Our decision will be guided by the two goals of preserving the free status of all
 	derivatives of our free software and of promoting the sharing and reuse of software generally.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534037"></a>Section 11 NO WARRANTY
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534623"></a>Section 11 NO WARRANTY
       </h3></div></div></div><p>	BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT
 	PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
 	OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
 	INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 	PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
 	PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534058"></a>Section 12
+      </p></div><div class="sect2" lang="en" xml:lang="en"><div class="titlepage"><div><div><h3 class="title"><a id="id2534644"></a>Section 12
       </h3></div></div></div><p>	IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR
 	ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU
 	FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE

Modified: trunk/doc/html/apbs03.html
===================================================================
--- trunk/doc/html/apbs03.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/apbs03.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>How to Apply These Terms to Your New Programs
-    </title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="apb.html" title="Appendix B. GNU General Public License" /><link rel="prev" href="apbs02.html" title="TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">How to Apply These Terms to Your New Programs
-    </th></tr><tr><td width="20%" align="left"><a accesskey="p" href="apbs02.html">Prev</a> </td><th width="60%" align="center">Appendix B. GNU General Public License</th><td width="20%" align="right"> </td></tr></table><hr /></div><div class="sect1" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2534083"></a>How to Apply These Terms to Your New Programs
+    </title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.7
		" /><link rel="up" href="apb.html" title="Appendix B. GNU General Public License" /><link rel="prev" href="apbs02.html" title="TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">How to Apply These Terms to Your New Programs
+    </th></tr><tr><td width="20%" align="left"><a accesskey="p" href="apbs02.html">Prev</a> </td><th width="60%" align="center">Appendix B. GNU General Public License</th><td width="20%" align="right"> </td></tr></table><hr /></div><div class="sect1" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2534669"></a>How to Apply These Terms to Your New Programs
     </h2></div></div></div><p>
       If you develop a new program, and you want it to be of the greatest
       possible use to the public, the best way to achieve this is to make it

Modified: trunk/doc/html/ch01.html
===================================================================
--- trunk/doc/html/ch01.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/ch01.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -2,19 +2,19 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 1. 
 			Introduction
-		</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="index.html" title="
			Geany 0.6
		" /><link rel="prev" href="index.html" title="
			Geany 0.6
		" /><link rel="next" href="ch01s02.html" title="About this document" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. 
+		</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.7
		" /><link rel="up" href="index.html" title="
			Geany 0.7
		" /><link rel="prev" href="index.html" title="
			Geany 0.7
		" /><link rel="next" href="ch01s02.html" title="About this document" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 1. 
 			Introduction
 		</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ch01s02.html">Next</a></td></tr></table><hr /></div><div class="chapter" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title"><a id="intro"></a>Chapter 1. 
 			Introduction
-		</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="ch01.html#id2517979">About Geany</a></span></dt><dt><span class="section"><a href="ch01s02.html">About this document</a></span></dt><dt><span class="section"><a href="ch01s03.html">Where to get</a></span></dt><dt><span class="section"><a href="ch01s04.html">License</a></span></dt></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2517979"></a>About Geany</h2></div></div></div><p>
-				<span class="application">Geany</span> is a small and lightweight integrated development environment.
+		</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="ch01.html#id2469176">About Geany</a></span></dt><dt><span class="section"><a href="ch01s02.html">About this document</a></span></dt><dt><span class="section"><a href="ch01s03.html">Where to get it</a></span></dt><dt><span class="section"><a href="ch01s04.html">License</a></span></dt></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2469176"></a>About Geany</h2></div></div></div><p>
+				<span class="application">Geany</span> is a small and lightweight Integrated Development Environment.
 				It was developed to provide a small and fast IDE, which has only a few dependencies from other
 				packages. Another goal was to be as independent as possible from a special Desktop Environment
-				like KDE or GNOME. So it is using only the GTK2 toolkit and therefore you need only the
-				GTK2 runtime libraries to run <span class="application">Geany</span>.
+				like KDE or GNOME, so <span class="application">Geany</span> only requires the GTK2 toolkit
+				and therefore you only need the GTK2 runtime libraries installed to run it.
 			</p><p>
 				The basic features of <span class="application">Geany</span> are:
-				</p><div class="itemizedlist"><ul type="disc"><li><p>syntax highlighting</p></li><li><p>code completion</p></li><li><p>auto completion of often used constructs like if, for and while</p></li><li><p>auto completion of XML and HTML tags</p></li><li><p>call tips</p></li><li><p>many supported filetypes like C, Java, PHP, HTML, Python, Perl, Pascal</p></li><li><p>symbol lists</p></li></ul></div><p>
+				</p><div class="itemizedlist"><ul type="disc"><li><p>Syntax highlighting</p></li><li><p>Code completion</p></li><li><p>Auto completion of often used constructs like if, for and while</p></li><li><p>Auto completion of XML and HTML tags</p></li><li><p>Call tips</p></li><li><p>Many supported filetypes like C, Java, PHP, HTML, Python, Perl, Pascal</p></li><li><p>Tag/Symbol lists</p></li></ul></div><p>
 			</p></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ch01s02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">
-			Geany 0.6
+			Geany 0.7
 		 </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> About this document</td></tr></table></div></body></html>

Modified: trunk/doc/html/ch01s02.html
===================================================================
--- trunk/doc/html/ch01s02.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/ch01s02.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>About this document</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="ch01.html" title="Chapter 1. 
			Introduction
		" /><link rel="prev" href="ch01.html" title="Chapter 1. 
			Introduction
		" /><link rel="next" href="ch01s03.html" title="Where to get" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">About this document</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01.html">Prev</a> </td><th width="60%" align="center">Chapter 1. 
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>About this document</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.7
		" /><link rel="up" href="ch01.html" title="Chapter 1. 
			Introduction
		" /><link rel="prev" href="ch01.html" title="Chapter 1. 
			Introduction
		" /><link rel="next" href="ch01s03.html" title="Where to get it" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">About this document</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01.html">Prev</a> </td><th width="60%" align="center">Chapter 1. 
 			Introduction
-		</th><td width="20%" align="right"> <a accesskey="n" href="ch01s03.html">Next</a></td></tr></table><hr /></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2518022"></a>About this document</h2></div></div></div><p>
+		</th><td width="20%" align="right"> <a accesskey="n" href="ch01s03.html">Next</a></td></tr></table><hr /></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2518054"></a>About this document</h2></div></div></div><p>
 				This documentation is available in various formats like HTML, text and PDF. The latest version is
 				always available at <a href="http://geany.uvena.de" target="_top">http://geany.uvena.de</a>.
 			</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s03.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Chapter 1. 
 			Introduction
-		 </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Where to get</td></tr></table></div></body></html>
+		 </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Where to get it</td></tr></table></div></body></html>

Modified: trunk/doc/html/ch01s03.html
===================================================================
--- trunk/doc/html/ch01s03.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/ch01s03.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Where to get</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="ch01.html" title="Chapter 1. 
			Introduction
		" /><link rel="prev" href="ch01s02.html" title="About this document" /><link rel="next" href="ch01s04.html" title="License" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Where to get</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s02.html">Prev</a> </td><th width="60%" align="center">Chapter 1. 
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Where to get it</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.7
		" /><link rel="up" href="ch01.html" title="Chapter 1. 
			Introduction
		" /><link rel="prev" href="ch01s02.html" title="About this document" /><link rel="next" href="ch01s04.html" title="License" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Where to get it</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s02.html">Prev</a> </td><th width="60%" align="center">Chapter 1. 
 			Introduction
-		</th><td width="20%" align="right"> <a accesskey="n" href="ch01s04.html">Next</a></td></tr></table><hr /></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2518040"></a>Where to get</h2></div></div></div><p>
+		</th><td width="20%" align="right"> <a accesskey="n" href="ch01s04.html">Next</a></td></tr></table><hr /></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2518070"></a>Where to get it</h2></div></div></div><p>
 				You can obtain <span class="application">Geany</span> from <a href="http://geany.uvena.de" target="_top">http://geany.uvena.de</a>
-				or perhabs from your distributor.
+				or perhaps from your distributor.
 			</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s02.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch01s04.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">About this document </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> License</td></tr></table></div></body></html>

Modified: trunk/doc/html/ch01s04.html
===================================================================
--- trunk/doc/html/ch01s04.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/ch01s04.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>License</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="ch01.html" title="Chapter 1. 
			Introduction
		" /><link rel="prev" href="ch01s03.html" title="Where to get" /><link rel="next" href="ch02.html" title="Chapter 2. 
			Installation
		" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">License</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s03.html">Prev</a> </td><th width="60%" align="center">Chapter 1. 
+<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>License</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.7
		" /><link rel="up" href="ch01.html" title="Chapter 1. 
			Introduction
		" /><link rel="prev" href="ch01s03.html" title="Where to get it" /><link rel="next" href="ch02.html" title="Chapter 2. 
			Installation
		" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">License</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s03.html">Prev</a> </td><th width="60%" align="center">Chapter 1. 
 			Introduction
-		</th><td width="20%" align="right"> <a accesskey="n" href="ch02.html">Next</a></td></tr></table><hr /></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2518052"></a>License</h2></div></div></div><p>
-				<span class="application">Geany</span> is distributed under the terms of the GNU Public license as published
-				by the Free	Software Foundation; either version 2 of the License, or (at your option) later version.
+		</th><td width="20%" align="right"> <a accesskey="n" href="ch02.html">Next</a></td></tr></table><hr /></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2468433"></a>License</h2></div></div></div><p>
+				<span class="application">Geany</span> is distributed under the terms of the GNU General Public License as published
+				by the Free	Software Foundation; either version 2 of the License, or (at your option) any later version.
 				A copy of this license can be found in the file COPYING included with the source code of this
 				program and in the appendix of this document.
-			</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s03.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Where to get </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 2. 
+			</p></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s03.html">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="ch01.html">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="ch02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Where to get it </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Chapter 2. 
 			Installation
 		</td></tr></table></div></body></html>

Modified: trunk/doc/html/ch02.html
===================================================================
--- trunk/doc/html/ch02.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/ch02.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -2,15 +2,16 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Chapter 2. 
 			Installation
-		</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="index.html" title="
			Geany 0.6
		" /><link rel="prev" href="ch01s04.html" title="License" /><link rel="next" href="ch02s02.html" title="Source Compilation" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 2. 
+		</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.7
		" /><link rel="up" href="index.html" title="
			Geany 0.7
		" /><link rel="prev" href="ch01s04.html" title="License" /><link rel="next" href="ch02s02.html" title="Source Compilation" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Chapter 2. 
 			Installation
 		</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch01s04.html">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="ch02s02.html">Next</a></td></tr></table><hr /></div><div class="chapter" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title"><a id="installation"></a>Chapter 2. 
 			Installation
-		</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="ch02.html#id2468433">Requirements</a></span></dt><dt><span class="section"><a href="ch02s02.html">Source Compilation</a></span></dt><dt><span class="section"><a href="ch02s03.html">Binary Packages</a></span></dt><dd><dl><dt><span class="section"><a href="ch02s03.html#id2468599">Fedora</a></span></dt><dt><span class="section"><a href="ch02s03.html#id2468616">Debian</a></span></dt><dt><span class="section"><a href="ch02s03.html#id2468643">SuSE</a></span></dt><dt><span class="section"><a href="ch02s03.html#id2468654">Gentoo</a></span></dt></dl></dd></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2468433"></a>Requirements</h2></div></div></div><p>
+		</h2></div></div></div><div class="toc"><p><b>Table of Contents</b></p><dl><dt><span class="section"><a href="ch02.html#id2468464">Requirements</a></span></dt><dt><span class="section"><a href="ch02s02.html">Source Compilation</a></span></dt><dt><span class="section"><a href="ch02s03.html">Binary Packages</a></span></dt><dd><dl><dt><span class="section"><a href="ch02s03.html#id2468632">Fedora</a></span></dt><dt><span class="section"><a href="ch02s03.html#id2468649">Debian</a></span></dt><dt><span class="section"><a href="ch02s03.html#id2468702">SuSE</a></span></dt><dt><span class="section"><a href="ch02s03.html#id2468717">Gentoo</a></span></dt></dl></dd></dl></div><div class="section" lang="en" xml:lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a id="id2468464"></a>Requirements</h2></div></div></div><p>
 				For compiling <span class="application">Geany</span> yourself, you will need the GTK (>= 2.6.0)
 				libraries and header files. You will also need the Pango, Glib and ATK libraries and header files.
 				All these files are available at <a href="http://www.gtk.org" target="_top">http://www.gtk.org</a>.
 			</p><p>
-				Further more you need, of course, a C compiler, for the included Scintilla library a C++
-				compiler and the make tool.
+				Furthermore you need, of course, a C compiler and the Make tool; a C++ compiler is
+				also required for the included Scintilla library. The GNU versions of these tools are
+				recommended.
 			</p></div></div><div class="navfooter"><hr /><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="ch01s04.html">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="ch02s02.html">Next</a></td></tr><tr><td width="40%" align="left" valign="top">License </td><td width="20%" align="center"><a accesskey="h" href="index.html">Home</a></td><td width="40%" align="right" valign="top"> Source Compilation</td></tr></table></div></body></html>

Modified: trunk/doc/html/ch02s02.html
===================================================================
--- trunk/doc/html/ch02s02.html	2006-06-04 13:06:25 UTC (rev 405)
+++ trunk/doc/html/ch02s02.html	2006-06-04 13:10:16 UTC (rev 406)
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /><title>Source Compilation</title><link rel="stylesheet" href="geany.css" type="text/css" /><meta name="generator" content="DocBook XSL Stylesheets V1.68.1" /><link rel="start" href="index.html" title="
			Geany 0.6
		" /><link rel="up" href="ch02.html" title="Chapter 2. 
			Installation
		" /><link rel="prev" href="ch02.html" title="Chapter 2. 
			Installation
		" /><link rel="next" href="ch02s03.html" title="Binary Packages" /></head><body><div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Source Compilation</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="ch02.html">Prev</a> </td><th width="60%" align="center">Chapter 2. 

@@ Diff output truncated at 100000 characters. @@

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




More information about the Commits mailing list