Merge branch 'master' into asf-site
diff --git a/_developers/cn/setup-develop-environment.md b/_developers/cn/setup-develop-environment.md
index 79dac9f..16d1cdd 100755
--- a/_developers/cn/setup-develop-environment.md
+++ b/_developers/cn/setup-develop-environment.md
@@ -15,7 +15,7 @@
* **JDK 1.8**，安装详情可参考[JDK安装教程](https://docs.oracle.com/javase/8/docs/technotes/guides/install/install_overview.html){:target="_blank"}
* **Maven 3.x**，安装详情可参考[Maven安装教程](https://maven.apache.org/install.html){:target="_blank"}
* **Docker**，安装详情可参考[Docker 安装教程](https://docs.docker.com/engine/installation/){:target="_blank"}
-* **Service Center**, 安装详情可参考[Service Center安装教程](/cn/users/setup-environment/#运行service-center)
+* **Service Center**, 安装详情可参考[Service Center安装教程](/cn/docs/service-center/install/)
* **IntelliJ Idea IDE**(可选，您可以使用其他心仪的IDE，如eclipse)，安装详情可参考[IntelliJ安装教程](https://www.jetbrains.com/help/idea/installing-and-launching.html){:target="_blank"}
## Git配置
diff --git a/_docs/cn/quick-start.md b/_docs/cn/quick-start.md
index b80b49f..a14b284 100755
--- a/_docs/cn/quick-start.md
+++ b/_docs/cn/quick-start.md
@@ -16,12 +16,12 @@
* 安装Maven 3.x，详情可参考[Maven安装教程](https://maven.apache.org/install.html){:target="_blank"}。
-* 安装 ServiceComb Java Chassis(SDK)，执行以下指令：
+* 下载ServiceComb-Sample
```bash
- git clone https://github.com/apache/servicecomb-java-chassis.git
- cd servicecomb-java-chassis
- mvn clean install -DskipTests
+ git clone https://github.com/apache/servicecomb-samples.git
+ cd servicecomb-samples/java-chassis-samples/bmi
+ mvn clean install
```
## 运行 Service Center
@@ -30,10 +30,10 @@
docker pull servicecomb/service-center
docker run -d -p 30100:30100 servicecomb/service-center:latest
```
-*您可以通过阅读[环境配置](/cn/users/setup-environment/#运行service-center)获取在本地以二进制方式运行Service Center的方法。*
+*您可以通过阅读[环境安装](/cn/docs/service-center/install/)获取在本地以二进制方式运行Service Center的方法。*
## 创建第一个微服务
-本指南将以一个简单的 **体质指数(BMI)** 应用开展微服务之旅。[体质指数](https://baike.baidu.com/item/BMI%E6%8C%87%E6%95%B0){:target="_blank"}主要用于衡量人体胖瘦程度。该应用主要包含两个微服务：
+本指南将以一个简单的 **体质指数(BMI)** 应用开展微服务之旅。[体质指数](https://baike.baidu.com/item/%E4%BD%93%E8%B4%A8%E6%8C%87%E6%95%B0){:target="_blank"}主要用于衡量人体胖瘦程度。该应用主要包含两个微服务：
* **体质指数计算器**：负责处理运算事务。
@@ -49,7 +49,7 @@
1. 进入 **体质指数** 应用代码目录。
```bash
- cd samples/bmi
+ cd servicecomb-samples/java-chassis-samples/bmi
```
**注意**：在windows开发环境下，docker是在虚拟机中启动，因此需要修改微服务的 **Service Center** IP地址为虚拟机IP地址。修改2个配置文件[calculator\|webapp]/src/main/resources/microservice.yaml，将其中<a>http://127.0.0.1:30100</a>修改为<a>http://192.168.99.100:30100</a>，其中192.168.99.100是虚拟机IP，需要与开发环境中的虚拟机IP保持一致。
diff --git a/_docs/getstarted/servicecomb/cn/getting-started.md b/_docs/getstarted/servicecomb/cn/getting-started.md
index f62ffac..4aa96be 100644
--- a/_docs/getstarted/servicecomb/cn/getting-started.md
+++ b/_docs/getstarted/servicecomb/cn/getting-started.md
@@ -10,7 +10,7 @@
{% include toc %}
## 入门
Apache ServiceComb 是一个微服务的开源解决方案。其包含多个组件，通过组件之间的搭配，可以灵活的应对不同的场景。本指南可以帮助你快速的使用 Apache ServiceComb，针对初次使用的用户，这是开始尝试的最佳入口。
-1. 下载 [ServiceComb 发布版本](/release/)组件
+1. 下载 [ServiceComb 发布版本](/cn/release/)组件
2. [服务中心环境安装](/cn/docs/service-center/install/)
3. [服务注册与发现](/cn/docs/service-center/registration-discovery/)
4. 相应开发语言的快速入门说明进行使用
diff --git a/_docs/quick-start.md b/_docs/quick-start.md
index 287aa9e..1409e04 100755
--- a/_docs/quick-start.md
+++ b/_docs/quick-start.md
@@ -16,12 +16,12 @@
* Install Maven 3.x, details can refer to [Maven Installing Guide](https://maven.apache.org/install.html){:target="_blank"}.
-* Install ServiceComb Java Chassis(SDK) by executing the following commands.
+* Download ServiceComb-Samples.
```bash
- git clone https://github.com/apache/servicecomb-java-chassis.git
- cd servicecomb-java-chassis
- mvn clean install -DskipTests
+ git clone https://github.com/apache/servicecomb-samples.git
+ cd servicecomb-samples/java-chassis-samples/bmi
+ mvn clean install
```
## Run Service Center
@@ -30,7 +30,7 @@
docker pull servicecomb/service-center
docker run -d -p 30100:30100 servicecomb/service-center:latest
```
-*Reference to [service center deployment](/users/setup-environment/#运行service-center) to learn deploying Service Center as a local binary.*
+*Reference to [Install of ServiceCenter](/docs/service-center/install/) to learn deploying Service Center as a local binary.*
## Create your first microservice application
Let\'s start the journey of microservice with a simple **Body Mass Index(BMI)** application. The [BMI](https://en.wikipedia.org/wiki/Body_mass_index){:target="_blank"} is an attempt to quantify the amount of tissue mass in an individual. This application contains two separate microservices:
@@ -49,7 +49,7 @@
1. Enter BMI codes directory.
```bash
- cd samples/bmi
+ cd servicecomb-samples/java-chassis-samples/bmi
```
**Note**: In windows development environment, the docker runs inside the virtual machine. The IP address of **Service Center** needs to be modified as the virtual machine\'s IP address. Modify the 2 configuration files [calculator\|webapp]/src/main/resources/microservice.yaml, changed <a>http://127.0.0.1:30100</a> to <a>http://192.168.99.100:30100</a> , where 192.168.99.100 is the virtual machine\'s IP address.
diff --git a/_release/release.md b/_release/release.md
index 8c9e35f..58a5ba5 100755
--- a/_release/release.md
+++ b/_release/release.md
@@ -18,17 +18,17 @@
* [ServiceComb toolkit 0.1.0](/release/toolkit-downloads/) (released on 2019-09-04)
-* [ServiceComb Pack 0.5.0](/release/servicecomb-pack-downloads/) (released on 2019-08-26)
+* [ServiceComb Pack 0.5.0](/release/pack-downloads/) (released on 2019-08-26)
-* [ServiceComb Java-Chassis 1.3.0](/release/servicecomb-java-chassis-downloads/) (released on 2019-10-31)
+* [ServiceComb Java-Chassis 1.3.0](/release/java-chassis-downloads/) (released on 2019-10-31)
-* [ServiceComb Saga Actuator 0.3.0](/release/servicecomb-saga-actuator-downloads/) (released on 2018-12-18)
+* [ServiceComb Saga Actuator 0.3.0](/release/saga-actuator-downloads/) (released on 2018-12-18)
-* [ServiceComb Saga 0.2.1](/release/servicecomb-saga-downloads/) (released on 2018-11-23)
+* [ServiceComb Saga 0.2.1](/release/saga-downloads/) (released on 2018-11-23)
-* [ServiceComb Mesher 1.6.3](/release/servicecomb-mesher-downloads/) (released on 2019-9-9)
+* [ServiceComb Mesher 1.6.3](/release/mesher-downloads/) (released on 2019-9-9)
-* [ServiceComb Kie 0.1.0](/release/servicecomb-kie-downloads/) (released on 2019-10-26)
+* [ServiceComb Kie 0.1.0](/release/kie-downloads/) (released on 2019-10-26)
**Earlier Releases :**
* [ServiceComb Service-Center 1.2.0](/release/service-center-downloads/) (released on 2019-04-06)
@@ -37,17 +37,17 @@
* [ServiceComb Service-Center 1.0.0-m2](/release/service-center-downloads/) (released on 2018-06-21)
* [ServiceComb Service-Center 1.0.0-m1](/release/service-center-downloads/) (released on 2018-03-27)
-* [ServiceComb Java-Chassis 1.2.1](/release/servicecomb-java-chassis-downloads/) (released on 2019-05-19)
-* [ServiceComb Java-Chassis 1.2.0](/release/servicecomb-java-chassis-downloads/) (released on 2019-04-12)
-* [ServiceComb Java-Chassis 1.1.0](/release/servicecomb-java-chassis-downloads/) (released on 2018-11-30)
-* [ServiceComb Java-Chassis 1.0.0](/release/servicecomb-java-chassis-downloads/) (released on 2018-08-02)
-* [ServiceComb Java-Chassis 1.0.0-m2](/release/servicecomb-java-chassis-downloads/) (released on 2018-06-21)
-* [ServiceComb Java-Chassis 1.0.0-m1](/release/servicecomb-java-chassis-downloads/) (released on 2018-04-02)
+* [ServiceComb Java-Chassis 1.2.1](/release/java-chassis-downloads/) (released on 2019-05-19)
+* [ServiceComb Java-Chassis 1.2.0](/release/java-chassis-downloads/) (released on 2019-04-12)
+* [ServiceComb Java-Chassis 1.1.0](/release/java-chassis-downloads/) (released on 2018-11-30)
+* [ServiceComb Java-Chassis 1.0.0](/release/java-chassis-downloads/) (released on 2018-08-02)
+* [ServiceComb Java-Chassis 1.0.0-m2](/release/java-chassis-downloads/) (released on 2018-06-21)
+* [ServiceComb Java-Chassis 1.0.0-m1](/release/java-chassis-downloads/) (released on 2018-04-02)
-* [ServiceComb Pack 0.4.0](/release/servicecomb-pack-downloads/) (released on 2019-04-06)
-* [ServiceComb Pack 0.3.0](/release/servicecomb-pack-downloads/) (released on 2019-01-02)
-* [ServiceComb Saga 0.2.0](/release/servicecomb-saga-downloads/) (released on 2018-06-21)
-* [ServiceComb Saga 0.1.0](/release/servicecomb-saga-downloads/) (released on 2018-03-27)
+* [ServiceComb Pack 0.4.0](/release/pack-downloads/) (released on 2019-04-06)
+* [ServiceComb Pack 0.3.0](/release/pack-downloads/) (released on 2019-01-02)
+* [ServiceComb Saga 0.2.0](/release/saga-downloads/) (released on 2018-06-21)
+* [ServiceComb Saga 0.1.0](/release/saga-downloads/) (released on 2018-03-27)
**NOTE:**
