[incubator-skywalking] branch v6-doc updated: Make default setting consistent .

[wu...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wusheng pushed a commit to branch v6-doc
in repository https://gitbox.apache.org/repos/asf/incubator-skywalking.git


The following commit(s) were added to refs/heads/v6-doc by this push:
     new 7c1a995  Make default setting consistent .
7c1a995 is described below

commit 7c1a995bfaff9dcf62093dca15188c881b881bdf
Author: Wu Sheng <wu...@foxmail.com>
AuthorDate: Sun Oct 28 16:54:24 2018 +0800

    Make default setting consistent .
---
 CHANGES.md                                    | 2 +-
 apm-webapp/src/main/assembly/webapp.yml       | 2 +-
 apm-webapp/src/main/resources/application.yml | 2 +-
 docs/en/protocols/Trace-Data-Protocol.md      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6fa8c0d..80f7039 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 6ff1c10..bb67538 100644
--- a/apm-webapp/src/main/assembly/webapp.yml
+++ b/apm-webapp/src/main/assembly/webapp.yml
@@ -22,7 +22,7 @@ collector:
   ribbon:
     ReadTimeout: 10000
     # Point to all backend's restHost:restPort, split by ,
-    listOfServers: 127.0.0.1:10800
+    listOfServers: 127.0.0.1:12800
 
 security:
   user:
diff --git a/apm-webapp/src/main/resources/application.yml b/apm-webapp/src/main/resources/application.yml
index 8bff13b..7271314 100644
--- a/apm-webapp/src/main/resources/application.yml
+++ b/apm-webapp/src/main/resources/application.yml
@@ -28,7 +28,7 @@ collector:
   path: /graphql
   ribbon:
     # Point to all backend's restHost:restPort, split by ,
-    listOfServers: 127.0.0.1:10800
+    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 0222a22..870acd1 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**