<newsletter:port_old_newsletter_to_new_system> Merge current master into branch

[frlan]

Updating branch refs/heads/port_old_newsletter_to_new_system
         to 1e240b6a58a4f2a8ec8ebdf124578acfa07d585b (commit)
       from 9dd2a2b70d8be1719c0ce7b31eab3c8863a826cf (commit)

commit 1e240b6a58a4f2a8ec8ebdf124578acfa07d585b
Merge: 9dd2a2b e380b3b
Author: frlan <frank at frank.uvena.de>
Date:   Sat Jun 18 08:36:32 2011 +0200

    Merge current master into branch
    
    Conflicts:
    	Makefile

commit e380b3b078bd5b82cbe0b35d95985261a076b247
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Mon Jun 13 22:46:24 2011 +0200

    Adding some note about bumping glib and gtk dependency on current svn version

commit 2347e21a65352cbab2cb524faf837ad30bdff400
Author: Frank Lanitz <frank at frank.uvena.de>
Date:   Mon Jun 13 19:57:32 2011 +0200

    Bump Makefile to generate vol 3 as default as we are currently working on

 Makefile               |    2 +-
 vol_3/newsletter_3.rst |   11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index dd07caf..bf0c345 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-VOL			?= 2
+VOL			?= 3
 
 NAME		=	vol_$(VOL)/newsletter_$(VOL)
 OUTPUT_HTML	=	$(NAME).html
diff --git a/vol_3/newsletter_3.rst b/vol_3/newsletter_3.rst
index 9208390..e8759da 100644
--- a/vol_3/newsletter_3.rst
+++ b/vol_3/newsletter_3.rst
@@ -19,6 +19,17 @@ More information about Geany can be found at
 Geany 0.20.1
 ============
 
+Geany Development
+=================
+
+Bumping depedencies for GTK 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.
+
 
 Geany Universe
 ==============