From 0c97c728964b6205424fe620ffb37dac11e85e2b Mon Sep 17 00:00:00 2001
From: Stefan Sauer <ensonic@users.sf.net>
Date: Thu, 17 Jul 2014 20:30:25 +0200
Subject: [PATCH] release: update news and date in manual

---
 NEWS                        | 40 +++++++++++++++++++++++++++++++++++++---
 configure.ac                |  2 +-
 help/manual/C/index.docbook |  6 +++---
 3 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index a417f5f..05b4e74 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,41 @@
-GTK-Doc 1.20.1    (... .. 2014)
-==============
+GTK-Doc 1.21    (Jul 17 2014)
+============
+
+ Important notice - starting with the next release these long deprecated
+ features will be removed, please write to gtk-doc-list@gnome.org and tell us
+ your concerns:
+ o gtkdoc-mktmpl - please move all the comments into the sources.
+ o generating html via sgml tools (jade/openjade), using xsltproc and
+   docbook-xslt is pretty common and preferred since version 1.6
+
+ Changes
 
-Develoment version
+ o 170860 : gtk-doc should have definitions for stability
+ o 644111 : one cannot specify against which libs gtkdoc-fixxref should resolve links (problematic with multiple versions)
+ o 657444 :  &quot; enum foo { ... } &quot; ; not recognized
+ o 671519 : Self-test relies on nonportable (GNU enhanced) 'date' command
+ o 678094 : the word &quot; returns &quot; in a function description can be parsed as the &quot; Returns: &quot; section
+ o 722621 : gtk-doc tarball was created with 32bit uid/gid, unusable with mingw/msys tar
+ o 724739 : Self-test fail: gtkdoc-mkdb misusing perl datatype
+ o 725505 : new syntax highlighting for code is weird
+ o 725663 : configure: non POSIX test usage
+ o 730658 : Deprecation warning for non-deprecated type GParamFlags
+ o 730777 : Add support for nullable and optional annotations
+
+ Contributors
+
+ Christophe Fergeau
+ Damon Chaplin
+ Daniel Macks
+ Daniel Mustieles
+ Emmanuele Bassi
+ maria thukididu
+ Naohiro Aota
+ Philip Withnall
+ Rafael Ferreira
+ Stefan Sauer
+ Thomas Wood
+ William Jon McCann
 
 GTK-Doc 1.20    (Feb 16 2014)
 ============
diff --git a/configure.ac b/configure.ac
index 6d32d06..e7da82c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl Use a simple 2-digit version number for a while, since our old example
 dnl Makefile can only cope with that, i.e. use 1.1, 1.2, 1.3 ... 9.9.
 dnl FIXME: I can't see anything failing (1.14.1), lets try to use a three digit
 dnl number for the development version
-m4_define(gtk_doc_version, 1.20.1)
+m4_define(gtk_doc_version, 1.21)
 
 AC_INIT([gtk-doc],[gtk_doc_version],[http://bugzilla.gnome.org/enter_bug.cgi?product=gtk-doc],[gtk-doc])
 
diff --git a/help/manual/C/index.docbook b/help/manual/C/index.docbook
index dafd20d..c689d59 100644
--- a/help/manual/C/index.docbook
+++ b/help/manual/C/index.docbook
@@ -81,10 +81,10 @@
 
     <revhistory>
       <revision>
-        <revnumber>1.20.1</revnumber>
-        <date>16 Feb 2014</date>
+        <revnumber>1.21</revnumber>
+        <date>17 Jul 2014</date>
         <authorinitials>ss</authorinitials>
-        <revremark>development version</revremark>
+        <revremark>bug fixes, dropping deprecated features</revremark>
       </revision>
       <revision>
         <revnumber>1.20</revnumber>
-- 
2.11.4.GIT