<newsletter:master> Merge master into branch

[Frank Lanitz]

Updating branch refs/heads/master
         to e850a37f414260eea16660af040a81ae38cf2f09 (commit)
       from bb38d3d86077958cc9f17484645116ae8ed6c04c (commit)

commit e850a37f414260eea16660af040a81ae38cf2f09
Merge: bb38d3d 9621eaa
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Sun Jun 19 22:03:21 2011 +0200

    Merge master into branch

commit 9621eaa3440275b9d103a1024cbfffd19efa43e9
Author: Enrico Tröger <enrico.troeger at uvena.de>
Date:   Sun Jun 19 13:14:46 2011 +0200

    fix more typos

commit 0f57cee082e98cdf03034f1dbeb0148f49c4dd84
Author: Colomban Wendling <ban at herbesfolles.org>
Date:   Sat Jun 18 18:57:05 2011 +0200

    And one more typo is gone...

commit 15aad952214ecdef2e7d041abe8bfe70f8a55bf0
Author: Colomban Wendling <ban at herbesfolles.org>
Date:   Sat Jun 18 18:54:24 2011 +0200

    Fix a typo in my given name and a few whitespace inconsistencies

commit ac492640bf4af42f4bc048f5f2fca43f60573cc4
Author: Colomban Wendling <ban at herbesfolles.org>
Date:   Sat Jun 18 18:53:25 2011 +0200

    Reword a little sentence about dependency bump

commit fce1eedd62a68c99d7c04c5200f20445438ca4fb
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Sat Jun 18 17:35:44 2011 +0200

    Extend ignore list by tex file for newsletter generated with make pdf

 .gitignore             |    1 +
 vol_3/newsletter_3.rst |   17 ++++++++---------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4f5f203..403e388 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.toc
 *.log
 *.aux
+vol_*/newsletter_*.tex
diff --git a/vol_3/newsletter_3.rst b/vol_3/newsletter_3.rst
index e8759da..97d9ba3 100644
--- a/vol_3/newsletter_3.rst
+++ b/vol_3/newsletter_3.rst
@@ -22,13 +22,12 @@ Geany 0.20.1
 Geany Development
 =================
 
-Bumping depedencies for GTK and glib
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Bumping dependencies for GTK2 and GLib
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
-Starting with svn r5839 Geany is starting to depend on GTK >= 2.12
-and GLib >= 2.16 to make usage of some new features added with this
-version and to avoid maintain duplicate code and complicated
-structures of #ifdef.
+Starting with SVN r5839 Geany depends on GTK2 >= 2.12 and GLib >= 2.16 to
+make use of some new features introduced with these releases and to avoid
+maintaining duplicate code and complicated #ifdef structures.
 
 
 Geany Universe
@@ -129,7 +128,7 @@ plans and favourite Geany plugin.
 Columban Wendling
 ^^^^^^^^^^^^^^^^^
 
-Thankyou to Columban Wendling for agreeing to an interview and
+Thank you to Colomban Wendling for agreeing to an interview and
 congratulations for being the very first. Now on to the questions...
 
 
@@ -146,7 +145,7 @@ projects?*
 	Philosophy, naivety... Actually I don't "develop for free" if it
 	only means "without being paid", I develop for free "as in
 	freedom" software because I like the ideology behind it. Not
-	being paid is only a  concern in the way I need to do some other
+	being paid is only a concern in the way I need to do some other
 	stuff beside to get money in.
 
 	What I probably prefer in free software is the fact one can
@@ -184,7 +183,7 @@ projects?*
 
 *What do you use Geany for?*
 
-    Every one of my programming tasks, and some other text editing.
+	Every one of my programming tasks, and some other text editing.
 
 *Do you use any editors other than Geany? (Of course the answer here
 should be "Absolutely not!" but I'm asking it anyway. :)*