Update NEWS and UPGRADING for 0.99.2

2 files changed, 24 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index d40b01cae..36c7226ae 100644
--- a/NEWS
+++ b/NEWS
@@ -1,7 +1,26 @@
 telepathy-glib 0.99.2 (UNRELEASED)
 ==================================
 
-…
+The “forgotten tea” release.
+
+This is another snapshot, so that the 'next' branch of telepathy-salut
+can work.
+
+Dependencies:
+
+• GLib ≥ 2.34 is required
+
+API changes:
+
+• Protocol names may now contain underscores, but not hyphen/minus
+  (telepathy-spec 0.99.1 says this is OK).
+
+• Connection manager names may now start with underscores
+  (telepathy-spec 0.99.1 does not allow this, but the next snapshot will).
+
+Fixes:
+
+• Merged from telepathy-glib master, see NEWS-0.x
 
 telepathy-glib 0.99.1 (2013-09-17)
 ==================================
diff --git a/UPGRADING b/UPGRADING
index b98674ca9..395979887 100644
--- a/UPGRADING
+++ b/UPGRADING
@@ -97,3 +97,7 @@ API/Behaviour changes
  - TpBaseContactList is not a channel manager anymore. An instance should be
    created in TpBaseConnection::constructed instead of
    TpBaseConnection::create_channel_factories.
+
+ - Protocol and service names contain "_" where they used to contain "-"
+   (in real life, this mostly affects Salut and Haze for local_xmpp,
+   and Haze for skype_dbus and skype_x11).