Merge branch 'master' into servicecomb

README.md

@@ -22,7 +22,6 @@ Underlying technology is a distributed tracing system.
   * Use **@Trace** annotation for any methods you want to trace.
   * Integrate traceId into logs for log4j, log4j2 and logback.
 * Pure Java server implementation, provide RESTful and gRPC services. Compatibility with other language agents/SDKs. 
-* The UI released on [skywalking-ui](https://github.com/apache/incubator-skywalking-ui)
 
 # Document
 [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/文档-中文版-blue.svg)](docs/README_ZH.md)

README_ZH.md

@@ -15,7 +15,7 @@ Apache SkyWalking | [English](README.md)
 
 
 * Java自动探针，**不需要修改应用程序源代码**
-  * 高性能探针，针对单实例5000tps的应用，在**全量采集的情况下**，只增加**10%**的CPU开销。
+  * 高性能探针，针对单实例5000tps的应用，在**全量采集的情况下**，只增加 **10%** 的CPU开销。
   * [中间件，框架与类库支持列表](docs/Supported-list.md).
 * 手动探针
   * [使用OpenTracing手动探针API](http://opentracing.io/documentation/pages/supported-tracers)
@@ -23,8 +23,6 @@ Apache SkyWalking | [English](README.md)
   * 将 traceId 集成到 log4j, log4j2 或 logback这些日志组件中
 * 纯Java后端Collector实现，提供RESTful和gRPC接口。兼容接受其他语言探针发送数据 
   * [如何将探针的Metric和Trace数据上传到Collector？](/docs/cn/How-to-communicate-with-the-collector-CN.md)
-* UI工程请查看 [skywalking-ui](https://github.com/apache/incubator-skywalking-ui)
-* 中文QQ群：392443393
 
 # Document
 [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/文档-中文版-blue.svg)](docs/README_ZH.md)
@@ -60,7 +58,7 @@ This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDU
 - 自动化集成测试报告
   - [Java探针测试报告](https://github.com/SkywalkingTest/agent-integration-test-report)
 - 性能测试报告
-  - [Java探针测试报告](https://skywalkingtest.github.io/Agent-Benchmarks/)
+  - [Java探针测试报告](https://skywalkingtest.github.io/Agent-Benchmarks/)
 
 # Contact Us
 * 直接提交Issue

apm-protocol/apm-network/src/main/proto

@@ -1 +1 @@
-Subproject commit 86bfe4f6635a8f71abca2383f54565b621ed3f94
+Subproject commit 04e6ecad27f19ee09068e1fdf9a42012dece0f30

docs/README.md

@@ -22,6 +22,10 @@
     * [Plugin development guide](en/Plugin-Development-Guide.md)
     * Protocol
       * [Cross Process Propagation Headers Protocol, v1.0](en/Skywalking-Cross-Process-Propagation-Headers-Protocol-v1.md)
+  * Resources provided by community
+    * [Public speakings](https://github.com/OpenSkywalking/Community#public-speakings)
+    * [Videos](https://github.com/OpenSkywalking/Community#videos)
+    * [Articles](https://github.com/OpenSkywalking/Community#articles)
   * FAQ
     * [Why only traces in UI?](cn/FAQ/Why-have-traces-no-others.md)
     * [Too many GRPC logs in the console](cn/FAQ/Too-many-gRPC-logs.md)

docs/README_ZH.md

@@ -25,6 +25,10 @@
     * 交互协议
         * [Cross Process Propagation Headers Protocol, v1.0  跨进程追踪上下文传递协议](cn/Skywalking-Cross-Process-Propagation-Headers-Protocol-CN-v1.md)
         * [SkyWalking Trace Data Protocol 探针与Collector间网络协议](cn/Trace-Data-Protocol-CN.md)
+  * 社区提供的共享资源
+    * [公开演讲](https://github.com/OpenSkywalking/Community#public-speakings)
+    * [视频](https://github.com/OpenSkywalking/Community#videos)
+    * [文章](https://github.com/OpenSkywalking/Community#articles)
   * FAQ
     * [Trace查询有数据，但是没有拓扑图和JVM数据?](cn/FAQ/Why-have-traces-no-others-CN.md)
     * [加载探针，Console被GRPC日志刷屏](cn/FAQ/Too-many-gRPC-logs-CN.md)

docs/cn/How-to-build-CN.md

@@ -6,6 +6,9 @@
 
 ### 编译步骤
 1. 准备环境，jdk8，Maven
+1. `git clone https://github.com/apache/incubator-skywalking.git`
+1. `git submodule init`
+1. `git submodule update`
 1. 执行`mvn clean package`
 1. 生成包在`/packages`目录下，包括一个`skywalking-agent`的探针目录，以及两个collector包（.tar.gz是linux环境，.zip是windows环境）
 

docs/en/How-to-build.md

@@ -3,6 +3,9 @@ This document helps people to compile and build the project in your maven and ID
 
 ## Build in maven
 1. Prepare JDK8 and maven3
+1. `git clone https://github.com/apache/incubator-skywalking.git`
+1. `git submodule init`
+1. `git submodule update`
 1. Run `mvn clean package`
 1. All packages are in `/packages`, which includes `skywalking-agent` folder, and two collector files(.tar.gz for Linux and .zip for Windows)