diff --git a/CHANGES.md b/CHANGES.md
index 6fa8c0d46..80f703942 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -11,7 +11,7 @@ tracing system with analysis and visualization capabilities. We are an **Observa
 
 The core and most important features in v6 are
 1. Support to collect telemetry data from different sources, such as multiple language agents and service mesh.
-1. Extensible stream analysis core. Make SQL and cache analysis available in core level, although not
+1. Extensible stream analysis core. Make SQL and cache analysis available in core level, although haven't
 provided in this release.
 1. Provide **Observability Analysis Language(OAL)** to make analysis metric customization available.
 1. New GraphQL query protocol. Not binding with UI now.
diff --git a/apm-webapp/src/main/assembly/webapp.yml b/apm-webapp/src/main/assembly/webapp.yml
index 8e0f7d195..bb6753810 100644
--- a/apm-webapp/src/main/assembly/webapp.yml
+++ b/apm-webapp/src/main/assembly/webapp.yml
@@ -21,9 +21,12 @@ collector:
   path: /graphql
   ribbon:
     ReadTimeout: 10000
-    listOfServers: 127.0.0.1:10800
+    # Point to all backend's restHost:restPort, split by ,
+    listOfServers: 127.0.0.1:12800
 
 security:
   user:
+    # username
     admin:
+      # password
       password: admin
diff --git a/apm-webapp/src/main/resources/application.yml b/apm-webapp/src/main/resources/application.yml
index b5d5a2002..727131444 100644
--- a/apm-webapp/src/main/resources/application.yml
+++ b/apm-webapp/src/main/resources/application.yml
@@ -27,7 +27,8 @@ zuul:
 collector:
   path: /graphql
   ribbon:
-    listOfServers: 127.0.0.1:10800
+    # Point to all backend's restHost:restPort, split by ,
+    listOfServers: 127.0.0.1:12800
 
 security:
   user:
diff --git a/docs/en/protocols/Trace-Data-Protocol.md b/docs/en/protocols/Trace-Data-Protocol.md
index 0222a223d..870acd139 100644
--- a/docs/en/protocols/Trace-Data-Protocol.md
+++ b/docs/en/protocols/Trace-Data-Protocol.md
@@ -113,7 +113,7 @@ Input：
 ## Deprecated services
 **Deprecated service**(s) are the gRPC services SkyWalking used before. In SkyWalking v6, in order to match the common 
 concepts in CloudNative world, these services are deprecated. 
-Although there services are still supported at this moment, but it will be removed after 6 months later(Feb. 2019).
+Although there services are still supported at this moment, but it will keep in supported at least before the end of 2019.
 
 ## ~~Application Register Service~~
 **Deprecated service** 
diff --git a/docs/en/setup/backend/backend-receivers.md b/docs/en/setup/backend/backend-receivers.md
index 9fba9ed57..768020f10 100644
--- a/docs/en/setup/backend/backend-receivers.md
+++ b/docs/en/setup/backend/backend-receivers.md
@@ -23,6 +23,10 @@ receiver-jvm:
   default:
 service-mesh:
   default:
+    bufferPath: ../mesh-buffer/  # Path to mesh telemetry data buffer files, suggest to use absolute path
+    bufferOffsetMaxFileSize: 100 # Unit is MB
+    bufferDataMaxFileSize: 500 # Unit is MB
+    bufferFileCleanWhenRestart: false
 istio-telemetry:
   default:
 ```
\ No newline at end of file
diff --git a/docs/en/setup/backend/backend-storage.md b/docs/en/setup/backend/backend-storage.md
index 50b9e3746..e75aa9e0f 100644
--- a/docs/en/setup/backend/backend-storage.md
+++ b/docs/en/setup/backend/backend-storage.md
@@ -6,11 +6,17 @@ use is by changing the `application.yml`
 - [**ElasticSearch 6**](#elasticsearch-6)
 
 ## H2
-Active H2 as storage, set storage provider to **H2**. Default in distribution package.
+Active H2 as storage, set storage provider to **H2** In-Memory Databases. Default in distribution package.
+Please read `Database URL Overview` in [H2 official document](http://www.h2database.com/html/features.html),
+you could set the target to H2 in **Embedded**, **Server** and **Mixed** modes.
 
 Setting fragment example
 ```yaml
-
+storage:
+  h2:
+    driver: org.h2.jdbcx.JdbcDataSource
+    url: jdbc:h2:mem:skywalking-oap-db
+    user: sa
 ```
 
 ## ElasticSearch 6
diff --git a/docs/en/setup/backend/ui-setup.md b/docs/en/setup/backend/ui-setup.md
index ae0438b93..733c84f9b 100644
--- a/docs/en/setup/backend/ui-setup.md
+++ b/docs/en/setup/backend/ui-setup.md
@@ -11,3 +11,23 @@ Setting file of UI is  `webapp/webapp.yml` in distribution package. It is consti
 1. Backend connect info.
 1. Auth setting.
 
+```yaml
+server:
+  port: 8080
+
+collector:
+  path: /graphql
+  ribbon:
+    ReadTimeout: 10000
+    # Point to all backend's restHost:restPort, split by , 
+    listOfServers: 10.2.34.1:10800,10.2.34.2:10800
+
+security:
+  user:
+    # username
+    admin:
+      # password
+      password: admin
+
+```
+
diff --git a/oap-server/server-starter/src/main/assembly/application.yml b/oap-server/server-starter/src/main/assembly/application.yml
index 7064bc30c..c4fc5740f 100644
--- a/oap-server/server-starter/src/main/assembly/application.yml
+++ b/oap-server/server-starter/src/main/assembly/application.yml
@@ -69,7 +69,7 @@ receiver-jvm:
   default:
 service-mesh:
   default:
-    bufferPath: ../mesh-buffer/  # Path to trace buffer files, suggest to use absolute path
+    bufferPath: ../mesh-buffer/  # Path to mesh telemetry data buffer files, suggest to use absolute path
     bufferOffsetMaxFileSize: 100 # Unit is MB
     bufferDataMaxFileSize: 500 # Unit is MB
     bufferFileCleanWhenRestart: false