Preparing for 3.2 release, hopefully very soon.

3 files changed, 35 insertions, 3 deletions

diff --git a/bitlbee.h b/bitlbee.h
index f60934f6..2532b11e 100644
--- a/bitlbee.h
+++ b/bitlbee.h
@@ -1,7 +1,7 @@
   /********************************************************************\
   * BitlBee -- An IRC to other IM-networks gateway                     *
   *                                                                    *
-  * Copyright 2002-2004 Wilmer van der Gaast and others                *
+  * Copyright 2002-2013 Wilmer van der Gaast and others                *
   \********************************************************************/
 
 /* Main file                                                            */
@@ -38,10 +38,10 @@ extern "C" {
 #define _WIN32_WINNT 0x0501
 
 #define PACKAGE "BitlBee"
-#define BITLBEE_VERSION "3.0.6"
+#define BITLBEE_VERSION "3.2"
 #define VERSION BITLBEE_VERSION
 #define BITLBEE_VER(a,b,c) (((a) << 16) + ((b) << 8) + (c))
-#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 0, 6)
+#define BITLBEE_VERSION_CODE BITLBEE_VER(3, 2, 0)
 
 #define MAX_STRING 511
 
diff --git a/doc/CHANGES b/doc/CHANGES
index 0822c5d4..5ec57be3 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -3,6 +3,28 @@ found in the bzr commit logs, for example you can try:
 
 http://bugs.bitlbee.org/bitlbee/timeline?daysback=90&changeset=on
 
+Version 3.2:
+- By far the most important change, a thorough update to the Twitter
+  module:
+  * Now using Twitter API 1.1,
+  * which means it's now using JSON instead of XML,
+  * which means access to the streaming API (Twitter only, other Twitter
+    API services don't seem to have it). No more 60-second polls, #twitter
+    looks even more like real IRC now!
+  * Also, the streaming API means nice things like receiving DMs.
+  * show_ids, already enabled by default for a while, now uses hexa-
+    decimal numbers, which means a 256-entry backlog instead of just 100.
+  * Added a mode=strict setting which requires everything to be a command.
+    The "post" command should then be used to post a Tweet.
+- Jabber module bugfix that fixes connection issues with at least Google
+  Talk but reportedly some other servers (OpenFire?) as well.
+- SSL modules improved a little bit. GnuTLS module now supports SNI and
+  session caching. Shouldn't change much, but hopefully reduces latency
+  and bandwidth usage a little bit.  
+- A bunch of other fixes/improvements here and there.
+
+Finished ... 2013
+
 Version 3.0.6:
 - Updated MSN module to speak MSNP18:
   * Biggest change is that this brings MPOP support (you can sign in to
diff --git a/doc/user-guide/misc.xml b/doc/user-guide/misc.xml
index 3eb5dd68..ac2734ca 100644
--- a/doc/user-guide/misc.xml
+++ b/doc/user-guide/misc.xml
@@ -385,4 +385,14 @@ by updating your <emphasis>bitlbee.conf</emphasis>.
 </para>
 </sect1>
 
+<sect1 id="whatsnew030200">
+<title>New stuff in BitlBee 3.2</title>
+
+<para>
+Upgradeed to Twitter API version 1.1. This is necessary because previous
+versions will stop working from March 2013. At the same time, BitlBee now
+supports the streaming API and incoming direct messages.
+</para>
+</sect1>
+
 </chapter>