Merge branch 'master' of https://github.com/dubbo/dubbo-docs
diff --git a/README.md b/README.md
index 1865728..857323f 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,19 @@
-A collection of dubbo docs
+# A collection of dubbo docs
+
+* [Dubbo user manual(English)](http://dubbo.io/books/dubbo-user-book-en/) or [Dubbo用户手册(中文)](http://dubbo.io/books/dubbo-user-book/) - Describe how to use Dubbo and all features of Dubbo concretely.
+* [Dubbo developer guide(English)](http://dubbo.io/books/dubbo-dev-book-en/) or [Dubbo开发手册(中文)](http://dubbo.io/books/dubbo-dev-book/) - Detailly introduce the design principal, extension mechanisms, code conventions, version control and building project, etc.
+* [Dubbo admin manual(English)](http://dubbo.io/books/dubbo-admin-book-en/) or [Dubbo管理手册(中文)](http://dubbo.io/books/dubbo-admin-book/) - Describe how to use Dubbo registry and admin-console.
+
+## How to Visit (Publish Address):
+
+* The Chinese version is released under the `dubbo.io` domain, for example, you can visit User Mannual through http://dubbo.io/books/dubbo-user-book/.
+* The English version is published to `dubbo.io` as well, in addition, it is also published to `dubbo.gitbooks.io`. This way, you can visit the User Mannul through http://dubbo.io/books/dubbo-user-book-en/ or https://dubbo.gitbooks.io/user-book-en/.
+
+## How to Publish
+
+This repository only stores markdown sources, in order to be visited by users, it should be published everytime when there's an update. It will not be published automatically, so the committers need to publish mannually following rules below:
+
+* Publish to dubbo.io. You can find [the publish script](https://github.com/dubbo/dubbo.github.io/blob/master/script/deploy) stored in repo dubbo/dubbo.github.io(the official site), clone that repo and run the script, all resources will be published automatically to dubbo.io.
+* Publish to dubbo.gitbooks.io(only for english version). There's no publish script for this approach, what you need to do is merge the master branch to the corresponding branch. Because the gitbooks is watching the branches in this repo:gitbook-admin-en, gitbook-user-en, gitbook-dev-en, every change will be published automitically.
+
+
diff --git a/dubbo-user-book/dependencies.md b/dubbo-user-book/dependencies.md
index 25b4739..684ae49 100644
--- a/dubbo-user-book/dependencies.md
+++ b/dubbo-user-book/dependencies.md
@@ -1,55 +1,58 @@
# 依赖
## 必须依赖
-JDK 1.5+ [^1]
+JDK 1.6+ [^1]
## 缺省依赖
通过 `mvn dependency:tree > dep.log` 命令分析，Dubbo 缺省依赖以下三方库：
```
-[INFO] +- com.alibaba:dubbo:jar:2.1.2:compile
-[INFO] | +- log4j:log4j:jar:1.2.16:compile
-[INFO] | +- org.javassist:javassist:jar:3.15.0-GA:compile
-[INFO] | +- org.springframework:spring:jar:2.5.6.SEC03:compile
-[INFO] | +- commons-logging:commons-logging:jar:1.1.1:compile
+[INFO] +- com.alibaba:dubbo:jar:2.5.9-SNAPSHOT:compile
+[INFO] | +- org.springframework:spring-context:jar:4.3.10.RELEASE:compile
+[INFO] | +- org.javassist:javassist:jar:3.21.0-GA:compile
[INFO] | \- org.jboss.netty:netty:jar:3.2.5.Final:compile
```
这里所有依赖都是换照 Dubbo 缺省配置选的，这些缺省值是基于稳定性和性能考虑的。
-
-* log4j.jar 和 commons-logging.jar [^2]: 可以直接去掉，dubbo 本身的日志会自动切换为 JDK 的 java.util.logging 输出。但如果其它三方库比如 spring.jar 间接依赖 commons-logging，则不能去掉。
+
* javassist.jar [^3]: 如果 `<dubbo:provider proxy="jdk" />` 或 `<dubbo:consumer proxy="jdk" />`，以及 `<dubbo:application compiler="jdk" />`，则不需要。
-* spring.jar [^4]: 如果用 `ServiceConfig` 和 `ReferenceConfig` 的 API 调用，则不需要。
+* spring-context.jar [^4]: 如果用 `ServiceConfig` 和 `ReferenceConfig` 的 API 调用，则不需要。
* netty.jar [^5]: 如果 `<dubbo:protocol server="mina"/>` 或 `<dubbo:protocol server="grizzly"/>`，则换成 mina.jar 或 grizzly.jar。如果 `<protocol name="rmi"/>`，则不需要。
## 可选依赖
以下依赖，在主动配置使用相应实现策略时用到，需自行加入依赖。
+* netty-all 4.0.35.Final
* mina: 1.1.7
* grizzly: 2.1.4
-* httpclient: 4.1.2
+* httpclient: 4.5.3
* hessian_lite: 3.2.1-fixed
-* xstream: 1.4.1
-* fastjson: 1.1.8
-* zookeeper: 3.3.3
-* jedis: 2.0.0
+* fastjson: 1.2.31
+* zookeeper: 3.4.9
+* jedis: 2.9.0
* xmemcached: 1.3.6
-* jfreechart: 1.0.13
-* hessian: 4.0.7
+* hessian: 4.0.38
* jetty: 6.1.26
-* hibernate-validator: 4.2.0.Final
-* zkclient: 0.1
-* curator: 1.1.10
-* cxf: 2.6.1
+* hibernate-validator: 5.4.1.Final
+* zkclient: 0.2
+* curator: 2.12.0
+* cxf: 3.0.14
* thrift: 0.8.0
-* servlet: 2.5 [^6]
-* bsf: 3.1 [^6]
-* validation-api: 1.0.0.GA [^6]
-* jcache: 0.4 [^6]
+* servlet: 3.0 [^6]
+* validation-api: 1.1.0.GA [^6]
+* jcache: 1.0.0 [^6]
+* javax.el: 3.0.1-b08 [^6]
+* kryo: 4.0.1
+* kryo-serializers: 0.42
+* fst: 2.48-jdk-6
+* resteasy: 3.0.19.Final
+* tomcat-embed-core: 8.0.11
+* slf4j: 1.7.25
+* log4j: 1.2.16
-[^1]: 理论上 Dubbo 可以只依赖 JDK，不依赖于任何三方库运行，只需配置使用 JDK 相关实现策略
-[^2]: 日志输出包
-[^3]: 字节码生成
-[^4]: 配置解析
-[^5]: 网络传输
-[^6]: JEE
\ No newline at end of file
+[^1]: 理论上 Dubbo 可以只依赖 JDK，不依赖于任何三方库运行，只需配置使用 JDK 相关实现策略
+[^2]: 日志输出包
+[^3]: 字节码生成
+[^4]: 配置解析
+[^5]: 网络传输
+[^6]: JEE
