<newsletter:master> Merge branch 'master' of git+ssh://git.uvena.de:18683/var/www/git.geany.org/repos/newsletter

[Frank Lanitz]

Updating branch refs/heads/master
         to 2bf26d5c23b0aa5f40f0b5b3ca78ddcac03331fd (commit)
       from 2c85a82ebbe39473a16d9e52f3936a40f736fa91 (commit)

commit 2bf26d5c23b0aa5f40f0b5b3ca78ddcac03331fd
Merge: 2c85a82 c979d63
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Wed Apr 6 00:15:04 2011 +0200

    Merge branch 'master' of git+ssh://git.uvena.de:18683/var/www/git.geany.org/repos/newsletter

commit c979d63f4245ba1656535f89221c5d78e26b6a80
Author: Russell Dickenson (AKA phayz) <russelldickenson at gmail.com>
Date:   Mon Apr 4 22:08:58 2011 +1000

    Minor grammatical correction
    
    * this is a real test of my 'git push' access

 vol_2/newsletter_2.rst |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/vol_2/newsletter_2.rst b/vol_2/newsletter_2.rst
index 3194976..799eff0 100644
--- a/vol_2/newsletter_2.rst
+++ b/vol_2/newsletter_2.rst
@@ -41,7 +41,7 @@ A detailed list of changes done with Scintilla can be found at
 Real-time tag parsing
 ^^^^^^^^^^^^^^^^^^^^^
 
-Parsing of the symbols (also known as tags) in file currently being
+Parsing of the symbols (also known as tags) in the file currently being
 edited can now be done directly in memory. This change allowed to make
 tag parsing for the current document happen in real time when the content
 changes; so keeping the symbol list reflecting the actual content of the