diff --git a/docs/source/getstarted.rst b/docs/source/getstarted.rst
index 1145d614f..2b0b407e8 100644
--- a/docs/source/getstarted.rst
+++ b/docs/source/getstarted.rst
@@ -81,9 +81,9 @@ Installing from Source
 
     cd emqttd && make && make dist
 
---------------------
+-------------
 Web Dashboard
---------------------
+-------------
 
 .. image:: ./_static/images/dashboard.png
 
@@ -240,9 +240,9 @@ Test Client
     sysctl -w net.ipv4.ip_local_port_range="500 65535"
     echo 1000000 > /proc/sys/fs/nr_open
 
-----------------------
-emqtt Client Libraries
-----------------------
+---------------------
+MQTT Client Libraries
+---------------------
 
 GitHub: https://github.com/emqtt
 
diff --git a/docs/source/guide.rst b/docs/source/guide.rst
index 1cc2c5e15..d3e7a893e 100644
--- a/docs/source/guide.rst
+++ b/docs/source/guide.rst
@@ -5,14 +5,32 @@
 User Guide
 ==========
 
+------------------------
+Pluggable Authentication
+------------------------
+
 ----------
 MQTT Basic
 ----------
 
+Publish/Subscribe
+-----------------
+
 Understanding QoS
-------------------
+-----------------
+
+Retained Message
+----------------
+
+Will Message
+------------
+
+----------------
+HTTP Publish API
+----------------
+
+-------------------
+MQTT Over WebSocket
+-------------------
 
---------
-HTTP API
---------