apache · ralf0131 · Jan 16, 2019 · Jan 8, 2019 · Jan 9, 2019 · Jan 15, 2019
diff --git a/blog/en-us/dubbo-101.md b/blog/en-us/dubbo-101.md
@@ -385,6 +385,6 @@ Eventually, we give an outline of how to create a Dubbo application quickly base
 ---
 
 1. [Getting Started Using JavaTM RMI](https://docs.oracle.com/javase/6/docs/technotes/guides/rmi/hello/hello-world.html)
-2. [直连提供者](http://dubbo.apache.org/books/dubbo-user-book/demos/explicit-target.html)
-3. [Multicast 注册中心](http://dubbo.apache.org/books/dubbo-user-book/references/registry/multicast.html)
-4. [在线运维命令](http://dubbo.apache.org/books/dubbo-user-book/references/qos.html)   
+2. [Explicit target](http://dubbo.apache.org/en-us/docs/user/demos/explicit-target.html)
+3. [Multicast Registry](http://dubbo.apache.org/en-us/docs/user/references/registry/multicast.html)
+4. [Online QOS command](http://dubbo.apache.org/en-us/docs/user/references/qos.html)   
diff --git a/blog/en-us/dubbo-new-async.md b/blog/en-us/dubbo-new-async.md
@@ -11,7 +11,7 @@ Implementing the full asynchronous programming based on Dubbo, which is a new fe
 
 ## Asynchronous mode before version 2.6.x
 
-Dubbo Provides some asynchronous programming capabilities in 2.6.x and earlier versions, including [Asynchronous Call](http://dubbo.apache.org/books/dubbo-user-book/demos/async-call.html), [Parameter Callback](http://dubbo.apache.org/books/dubbo-user-book/demos/callback-parameter.html) and [Event Notification](http://dubbo.apache.org/books/dubbo-user-book/demos/events-notify.html) on Consumer side. There are some brief introductions to the usage and Demo in the above document links.
+Dubbo Provides some asynchronous programming capabilities in 2.6.x and earlier versions, including [Asynchronous Call](http://dubbo.apache.org/zh-cn/docs/user/demos/async-call.html), [Parameter Callback](http://dubbo.apache.org/zh-cn/docs/user/demos/callback-parameter.html) and [Event Notification](http://dubbo.apache.org/zh-cn/docs/user/demos/events-notify.html) on Consumer side. There are some brief introductions to the usage and Demo in the above document links.
 
 But the current asynchronous method has the following problems:
 

diff --git a/blog/en-us/dubbo2-js.md b/blog/en-us/dubbo2-js.md
@@ -268,7 +268,7 @@ Congratulations！
 
 ## More details
 
-The sample code in this article is available here, [https://github.com/lexburner/Dubbojs-Learning](https://github.com/lexburner/Dubbojs-Learning).
+The sample code in this article is available here, [https://github.com/dubbo/dubbo2.js](https://github.com/dubbo/dubbo2.js).
 If you don&#x27;t know much about the dubbo protocol and want to understand how it works, the project provides a sub-moudle: java-socket-consumer, which is implemented in a process-oriented approach, realizing a process of sending dubbo protocal message with native socket and making function calls, and then get response.
 
 
diff --git a/blog/zh-cn/dubbo-101.md b/blog/zh-cn/dubbo-101.md
@@ -376,6 +376,6 @@ As Consumer side:
 最后，简单的介绍了如何通过 Dubbo 团队提供的公共服务 start.dubbo.io 快速搭建基于 Spring Boot 的 Dubbo 应用，并通过 *qos* 来做 Dubbo 服务的简单运维。
 
 [^1]: [Getting Started Using JavaTM RMI](https://docs.oracle.com/javase/6/docs/technotes/guides/rmi/hello/hello-world.html)
-[^2]: [直连提供者](http://dubbo.apache.org/books/dubbo-user-book/demos/explicit-target.html)
-[^3]: [Multicast 注册中心](http://dubbo.apache.org/books/dubbo-user-book/references/registry/multicast.html)
-[^4]: [在线运维命令](http://dubbo.apache.org/books/dubbo-user-book/references/qos.html)
+[^2]: [直连提供者](http://dubbo.apache.org/zh-cn/docs/user/demos/explicit-target.html)
+[^3]: [Multicast 注册中心](http://dubbo.apache.org/zh-cn/docs/user/references/registry/multicast.html)
+[^4]: [在线运维命令](http://dubbo.apache.org/zh-cn/docs/user/references/qos.html)
diff --git a/blog/zh-cn/dubbo-contribue-to-opensource.md b/blog/zh-cn/dubbo-contribue-to-opensource.md
@@ -103,7 +103,7 @@ Mailing list 简单来说，就是一个邮件通知机制，所有的 Dubbo 开
 
 ### 3.1 撰写文档
 
- [Dubbo文档](http://dubbo.apache.org/zh-cn/)是其开源组成成分的重要一环，其内容源文件位于：https://github.com/apache/incubator-dubbo-website。同样也是一个 Git 仓库，任何你想要对 dubbo 知识点的补充，都可以在这儿提交 pull request，只需要一些 markdown 的语法知识，和一些可有可无的 npm 语法即可。如果你觉得贡献代码对于现在的自己仍然有点难度，不妨从贡献文档开始接触开源。
+ [Dubbo文档](http://dubbo.apache.org/zh-cn/)是其开源组成成分的重要一环，其内容源文件位于：[https://github.com/apache/incubator-dubbo-website](https://github.com/apache/incubator-dubbo-website)。同样也是一个 Git 仓库，任何你想要对 dubbo 知识点的补充，都可以在这儿提交 pull request，只需要一些 markdown 的语法知识，和一些可有可无的 npm 语法即可。如果你觉得贡献代码对于现在的自己仍然有点难度，不妨从贡献文档开始接触开源。
 
 ### 3.2 ISSUE
 

diff --git a/blog/zh-cn/dubbo-new-async.md b/blog/zh-cn/dubbo-new-async.md
@@ -11,7 +11,7 @@ description: 本文回顾了 2.6.x 版本的异步实现，然后引出了 2.7.0
 
 ## 2.6.x版本之前的异步方式
 
-在2.6.x及之前的版本提供了一定的异步编程能力，包括Consumer端[异步调用](http://dubbo.apache.org/books/dubbo-user-book/demos/async-call.html)、[参数回调](http://dubbo.apache.org/books/dubbo-user-book/demos/callback-parameter.html)、[事件通知](http://dubbo.apache.org/books/dubbo-user-book/demos/events-notify.html)等，在上面的文档链接中有关于使用方式的简单介绍和Demo。
+在2.6.x及之前的版本提供了一定的异步编程能力，包括Consumer端[异步调用](http://dubbo.apache.org/zh-cn/docs/user/demos/async-call.html)、[参数回调](http://dubbo.apache.org/zh-cn/docs/user/demos/callback-parameter.html)、[事件通知](http://dubbo.apache.org/zh-cn/docs/user/demos/events-notify.html)等，在上面的文档链接中有关于使用方式的简单介绍和Demo。
 
 但当前的异步方式存在以下问题：
 
@@ -160,7 +160,7 @@ Dubbo在2.7.0版本已经升级了对Java 8的支持，同时基于CompletableFu
 
 ## 示例1：CompletableFuture类型接口
 
-CompletableFuture类型的接口既可以用作同步调用，也可以实现Consumer或Provider的异步调用。本示例实现了Consumer和Provider端异步调用，代码参见[dubbo-samples-async-original-future](https://github.com/dubbo/dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-async-original-future)。
+CompletableFuture类型的接口既可以用作同步调用，也可以实现Consumer或Provider的异步调用。本示例实现了Consumer和Provider端异步调用，代码参见[dubbo-samples-async-original-future](https://github.com/apache/incubator-dubbo-samples/tree/samples-for-2.7.0-SNAPSHOT/dubbo-samples-async/dubbo-samples-async-original-future)。
 
 1. 定义接口
 

diff --git a/blog/zh-cn/dubbo2-js.md b/blog/zh-cn/dubbo2-js.md
@@ -274,4 +274,4 @@ Congratulation！
 
 ## 更多细节
 
-本文中的示例代码，提供在此处，<https://github.com/lexburner/Dubbojs-Learning> 。如果你对 dubbo 协议不甚了解，想要理解它的工作原理，项目中提供了一个子 moudle — java-socket-consumer，使用面向过程的思路实现了 java-socket-consumer，完成了原生 socket 发送 dubbo 协议报文，完成方法调用，并获取响应的全流程。
+本文中的示例代码，提供在此处，<https://github.com/dubbo/dubbo2.js> 。如果你对 dubbo 协议不甚了解，想要理解它的工作原理，项目中提供了一个子 moudle — java-socket-consumer，使用面向过程的思路实现了 java-socket-consumer，完成了原生 socket 发送 dubbo 协议报文，完成方法调用，并获取响应的全流程。
diff --git a/blog/zh-cn/prepare-an-apache-release.md b/blog/zh-cn/prepare-an-apache-release.md
@@ -221,7 +221,9 @@ keywords: Dubbo, Apache, Release
 ## 验证Release Candidates
 
 首先，从以下地址下载要发布的Release Candidate到本地环境：
+<pre>
 https://dist.apache.org/repos/dist/dev/incubator/dubbo/${release_version}/
+</pre>
 
 然后，开始验证环节，验证包含但不限于以下内容和形式
 

diff --git a/blog/zh-cn/use-zipkin-in-dubbo.md b/blog/zh-cn/use-zipkin-in-dubbo.md
@@ -601,4 +601,4 @@ $ mvn exec:java -Dexec.mainClass=com.alibaba.dubbo.samples.client.Application
 
 Zipkin 对 Dubbo 的支持是构建在 Dubbo 的 filter 扩展机制上的，有兴趣的读者可以通过 https://github.com/openzipkin/brave/blob/master/instrumentation/dubbo-rpc/src/main/java/brave/dubbo/rpc/TracingFilter.java 了解其实现细节。
 
-本文中涉及的例子可以从 https://github.com/dubbo/dubbo-samples 中的 "dubbo-samples-zipkin" 子模块中获取。另外，spring-cloud-sleth 2.0 中开始 [正式支持 Dubbo](https://cloud.spring.io/spring-cloud-static/spring-cloud-sleuth/2.0.0.RC2/single/spring-cloud-sleuth.html#_dubbo_rpc_support)，相关的文章和例子后续计划提供。
+本文中涉及的例子可以从 https://github.com/dubbo/dubbo-samples 中的 "dubbo-samples-zipkin" 子模块中获取。另外，spring-cloud-sleth 2.0 中开始 [正式支持 Dubbo](https://cloud.spring.io/spring-cloud-static/spring-cloud-sleuth/2.0.2.RELEASE/single/spring-cloud-sleuth.html#_dubbo_rpc_support)，相关的文章和例子后续计划提供。
diff --git a/docs/en-us/user/demos/accesslog.md b/docs/en-us/user/demos/accesslog.md
@@ -31,15 +31,15 @@ The above configuration will turn on `accesslog` switch for all provide services
         <appender-ref ref="accesslogAppender"/>
 </logger>
 ```
-The above is the demonstration of logback framework.Other logging framework is same too.It will logging the access log of all provide services into single file(`accesslog/logging.log`). And you can also config the access log of each provide service to logging separately,Only change `name` attribute of the `logger` tag,set the `name` attribute to `dubbo.accesslog.serviceInterfaceClassFullName`.The Example:
+The above is the demonstration of logback framework.Other logging framework is same too. It will logging the access log of all provide services into single file(`accesslog/logging.log`). And you can also config the access log of each provide service to logging separately,Only change `name` attribute of the `logger` tag,set the `name` attribute to `dubbo.accesslog.serviceInterfaceClassFullName`.The Example:
 
 ```xml
 <logger name="dubbo.accesslog.com.dubbo.FooServiceInterface" level="INFO" additivity="false">
         <appender-ref ref="fooServiceAccesslogAppender"/>
 </logger>
 ```
 
-If you only want logging the access log of specified provide service,but not all services.It's supported too.The Example:
+If you only want logging the access log of specified provide service,but not all services, it's supported too.The Example:
 ```xml
 <dubbo:service accesslog="true" .../>
 ```

diff --git a/docs/en-us/user/demos/config-connections.md b/docs/en-us/user/demos/config-connections.md
@@ -25,6 +25,6 @@ OR
 ```
 **NOTE:** If used default protocol(`dubbo` protocol), and the value of  `connections` attribute is great than 0,then each service reference will has itself connection,else all service which belong to same remote server will share only one connection. In this framework,we called `private` connection or `share` connection.
 
-If `<dubbo:service>` and `<dubbo:reference>` are both configured accepts/connections,`<dubbo:reference>` is preferred,Ref to [Configuration coverage strategy](http://dubbo.apache.org/books/dubbo-user-book-en/demos/config-rule.html).
+If `<dubbo:service>` and `<dubbo:reference>` are both configured accepts/connections,`<dubbo:reference>` is preferred,Ref to [Configuration coverage strategy](http://dubbo.apache.org/en-us/docs/user/configuration/xml.html).
 
 * : Because connection is connect on Server,so configure at Provider.
diff --git a/docs/en-us/user/demos/group-merger.md b/docs/en-us/user/demos/group-merger.md
@@ -2,7 +2,7 @@
 
 According to the group to invoke server and return the merge result [^1], such as the menu service, the same interface, but there are a variety of implementations, using group distinction, consumers call each group and get the results, the merger can merge the resules, so that you can achieve aggregation Menu Item.
 
-Related code can refer to [dubbo project example](https://github.com/apache/incubator-dubbo/tree/master/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/merge)
+Related code can refer to [dubbo project example](https://github.com/apache/incubator-dubbo-samples/tree/master/dubbo-samples-merge)
 
 ## Configuration
 

diff --git a/docs/en-us/user/demos/logger-strategy.md b/docs/en-us/user/demos/logger-strategy.md
@@ -20,4 +20,4 @@
     <dubbo:application logger="log4j" />
     ```
 
-[^1]: Custom Extensions[logger-adapter](http://dubbo.apache.org/books/dubbo-dev-book-en/impls/logger-adapter.html)
+[^1]: Custom Extensions[logger-adapter](http://dubbo.apache.org/en-us/docs/dev/impls/logger-adapter.html)
diff --git a/docs/en-us/user/demos/multi-registry.md b/docs/en-us/user/demos/multi-registry.md
@@ -80,4 +80,4 @@ When testing, the service needs to be temporarily register to two registries, wh
 </beans>
 ```
 
-[^1]: custom registry, see：[registry extension](http://dubbo.apache.org/books/dubbo-dev-book-en/impls/registry.html)
+[^1]: custom registry, see：[registry extension](http://dubbo.apache.org/en-us/docs/dev/impls/registry.html)
diff --git a/docs/en-us/user/demos/parameter-validation.md b/docs/en-us/user/demos/parameter-validation.md
@@ -179,5 +179,5 @@ public class ValidationConsumer {
 }
 ```
 
-[^1]: Support since `2.1.0` version. If you want to know how to use it, refer to  [Sample code in dubbo project] (https://github.com/apache/incubator-dubbo/tree/master/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation)
-[^2]: The validation method is extensible, refer to [Developer Extension](https://github.com/apache/incubator-dubbo/tree/master/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/validation) in the developer's manual.
+[^1]: Support since `2.1.0` version. If you want to know how to use it, refer to  [Sample code in dubbo project] (https://github.com/apache/incubator-dubbo-samples/tree/master/dubbo-samples-validation)
+[^2]: The validation method is extensible, refer to [Developer Extension](http://dubbo.apache.org/zh-cn/docs/dev/impls/validation.html) in the developer's manual.
diff --git a/docs/en-us/user/demos/result-cache.md b/docs/en-us/user/demos/result-cache.md
@@ -8,7 +8,7 @@ Cache Result [^1] is used to speed up access to popular data. Dubbo provides dec
 * `threadlocal` The current thread cache. For example, a page have a lot of portal and each portal need to check user information,  you can reduce this redundant visit with this cache.
 * `jcache` integrate with [JSR107](http://jcp.org/en/jsr/detail?id=107%27) , you can bridge a variety of cache implementation。
 
-Caching type can be extended，refer to：[Cache extension](http://dubbo.apache.org/books/dubbo-dev-book-en/impls/cache.html)
+Caching type can be extended，refer to：[Cache extension](http://dubbo.apache.org/en-us/docs/dev/impls/cache.html)
 
 ## Configuration
 
@@ -25,4 +25,4 @@ or：
 ```
 
 [^1]: Support since `2.1.0` 
-[^2]: [Sample](https://github.com/apache/incubator-dubbo/tree/master/dubbo-test/dubbo-test-examples/src/main/java/com/alibaba/dubbo/examples/cache)
+[^2]: [Sample](https://github.com/apache/incubator-dubbo-samples/tree/master/dubbo-samples-cache)
diff --git a/docs/en-us/user/demos/routing-rule.md b/docs/en-us/user/demos/routing-rule.md
@@ -187,7 +187,7 @@ The scope of the `request.tag` is for each invocation, using the attachment to p
 
 
 [^1]: Support since `2.2.0`   
-[^2]: Routing Rules Extension Point: [Route Extension](http://dubbo.apache.org/books/dubbo-dev-book-en/impls/router.html)   
+[^2]: Routing Rules Extension Point: [Route Extension](http://dubbo.apache.org/en-us/docs/dev/impls/router.html)   
 [^3]: Note: A service can only have one whitelist rule, otherwise the two rules will be filtered out.  
 [^4]: Note: Scripts have no sandbox constraints, can execute arbitrary code, and poses a backdoor risk.  
 [^5]: Support since `2.7.0`
diff --git a/docs/en-us/user/demos/service-container.md b/docs/en-us/user/demos/service-container.md
@@ -4,7 +4,7 @@ The service container is a standalone launcher because the backend service does
 
 The service container is just a simple Main method and loads a simple Spring container to expose the service.
 
-The content of Service container can be extended, built-in spring, jetty, log4j etc..  This can be expanded with [Container Extension Points](http://dubbo.apache.org/books/dubbo-dev-book-en/impls/container.html). Configure it with the -D parameter in the java command or `dubbo.properties`.
+The content of Service container can be extended, built-in spring, jetty, log4j etc..  This can be expanded with [Container Extension Points](http://dubbo.apache.org/en-us/docs/dev/impls/container.html). Configure it with the -D parameter in the java command or `dubbo.properties`.
 
 ## Container type
 

diff --git a/docs/en-us/user/quick-start.md b/docs/en-us/user/quick-start.md
@@ -33,7 +33,7 @@ public interface DemoService {
 }
 ```
 
-The proejct structure should look like this:
+The project structure should look like this:
 
 ```
 .