From 1cc2022f4da9fa6c9a661db7fc911ce5397eae77 Mon Sep 17 00:00:00 2001 From: wusheng Date: Thu, 28 Dec 2017 22:10:52 +0800 Subject: [PATCH 1/3] Update readme to update architecture and make document easier to find. --- README.md | 7 ++++--- README_ZH.md | 10 ++++++---- docs/README.md | 3 --- docs/README_ZH.md | 3 --- 4 files changed, 10 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index cdb892f3f..252496084 100644 --- a/README.md +++ b/README.md @@ -22,12 +22,13 @@ Underlying technology is a distributed tracing system. * 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) -# Architecture - - # Document [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/document-中文-blue.svg)](docs/README_ZH.md) +# Architecture + + +# Code f conduct This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wusheng@apache.org. # Screenshots diff --git a/README_ZH.md b/README_ZH.md index 5e60fb898..ca0401aba 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -24,12 +24,14 @@ Apache SkyWalking | [English](README.md) * UI工程请查看 [skywalking-ui](https://github.com/apache/incubator-skywalking-ui) * 中文QQ群：392443393 -# Architecture - - # Document -[![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/document-中文-blue.svg)](docs/README_ZH.md) +[![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) + +# Architecture + + +# code of conduct This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wusheng@apache.org. # Screenshots diff --git a/docs/README.md b/docs/README.md index 900c41c81..df6a22d83 100644 --- a/docs/README.md +++ b/docs/README.md @@ -3,9 +3,6 @@ * Getting Started * [Quick start](en/Quick-start.md) - * [Deploy Standalone mode collector](en/Deploy-collector-in-standalone-mode.md) - * [Deploy Cluster mode collector](en/Deploy-collector-in-cluster-mode.md) - * [Deploy javaagent](en/Deploy-skywalking-agent.md) * [Deploy docker image](en/Deploy-docker-image.md) * [Supported middlewares, frameworks and libraries](Supported-list.md) * [How to disable plugins?](en/How-to-disable-plugin.md) diff --git a/docs/README_ZH.md b/docs/README_ZH.md index d09167189..4d63db9f3 100644 --- a/docs/README_ZH.md +++ b/docs/README_ZH.md @@ -3,9 +3,6 @@ * [项目简介](/README_ZH.md) * [快速入门](cn/Quick-start-CN.md) - * [部署单机collector](cn/Deploy-collector-in-standalone-mode-CN.md) - * [部署集群collector](cn/Deploy-collector-in-cluster-mode-CN.md) - * [部署探针Agent](cn/Deploy-skywalking-agent-CN.md) * [部署Collector镜像](cn/Deploy-docker-image.CN.md) * [中间件，框架与类库支持列表](Supported-list.md) * [如何关闭特定插件](cn/How-to-disable-plugin-CN.md) From fd543465347e2394fa8f2bdfc6cf3a1ff3b59488 Mon Sep 17 00:00:00 2001 From: wusheng Date: Thu, 28 Dec 2017 22:12:05 +0800 Subject: [PATCH 2/3] Fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 252496084..898f4b531 100644 --- a/README.md +++ b/README.md @@ -28,7 +28,7 @@ Underlying technology is a distributed tracing system. # Architecture -# Code f conduct +# Code of conduct This project adheres to the Contributor Covenant [code of conduct](CODE_OF_CONDUCT.md). By participating, you are expected to uphold this code. Please report unacceptable behavior to wusheng@apache.org. # Screenshots From 5795b17606497f99cc9bb10ec39901dc9ea0b2db Mon Sep 17 00:00:00 2001 From: wusheng Date: Thu, 28 Dec 2017 22:14:50 +0800 Subject: [PATCH 3/3] Update words. --- README.md | 2 +- README_ZH.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 898f4b531..976797310 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,7 @@ Underlying technology is a distributed tracing system. # Document [![EN doc](https://img.shields.io/badge/document-English-blue.svg)](docs/README.md) [![cn doc](https://img.shields.io/badge/document-中文-blue.svg)](docs/README_ZH.md) -# Architecture +# 5.x Architecture # Code of conduct diff --git a/README_ZH.md b/README_ZH.md index ca0401aba..6c7c2b504 100644 --- a/README_ZH.md +++ b/README_ZH.md @@ -28,7 +28,7 @@ Apache SkyWalking | [English](README.md) [![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) -# Architecture +# 5.x Architecture # code of conduct