From a51f921c67ae51e71809ba53c05bde997c652668 Mon Sep 17 00:00:00 2001
From: Feng <ery.lee@gmail.com>
Date: Sat, 10 Sep 2016 13:19:52 +0800
Subject: [PATCH] 2.0-beta.2

---
 docs/source/changes.rst | 36 +++++++++++++++++++-----------------
 docs/source/plugins.rst |  4 ++--
 2 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/docs/source/changes.rst b/docs/source/changes.rst
index e2126807c..7616f8b76 100644
--- a/docs/source/changes.rst
+++ b/docs/source/changes.rst
@@ -5,24 +5,19 @@
 Changes
 =======
 
-.. _release_2.0:
+.. _release_2.0_beta.2:
 
--------------------------------
-Version 2.0 (West of West Lake)
--------------------------------
-
-*Release Date: 2016-09-30*
-
-*Release Name: West of West Lake*
-
-TODO: ...
-
------------------
-Version 2.0-beta2
------------------
+------------------
+Version 2.0-beta.2
+------------------
 
 *Release Date: 2016-09-10*
 
+CoAP Support
+------------
+
+Release an experimental CoAP Gateway: https://github.com/emqtt/emqttd_coap
+
 API Breaking Changes
 --------------------
 
@@ -37,10 +32,17 @@ Tab 'retained_message' -> 'mqtt_retained'
 Bugfix
 ------
 
+[2.0 beta1] FORMAT ERROR: "~s PUBLISH to ~s: ~p" (PR #671)
 
------------------
-Version 2.0-beta1
------------------
+Fixing issues in cluster mode. (PR #681)
+
+Fixing issues with unsubscribe hook (PR #673)
+
+.. _release_2.0_beta.1:
+
+------------------
+Version 2.0-beta.1
+------------------
 
 *Release Date: 2016-08-30*
 
diff --git a/docs/source/plugins.rst b/docs/source/plugins.rst
index c93aedc4a..aecc1966d 100644
--- a/docs/source/plugins.rst
+++ b/docs/source/plugins.rst
@@ -820,10 +820,10 @@ The plugin could register callbacks for hooks. The hooks will be run by the brok
 +------------------------+-----------------------------------------+
 | client.subscribe       | Run before a client subscribes topics   |
 +------------------------+-----------------------------------------+
-| session.subscribed     | Run after a client subscribed a topic   |
-+------------------------+-----------------------------------------+
 | client.unsubscribe     | Run when a client unsubscribes topics   |
 +------------------------+-----------------------------------------+
+| session.subscribed     | Run after a client subscribed a topic   |
++------------------------+-----------------------------------------+
 | session.unsubscribed   | Run after a client unsubscribed a topic |
 +------------------------+-----------------------------------------+
 | message.publish        | Run when a message is published         |