Merge branch 'master' of https://github.com/v2ray/v2ray-core

Schezuk · Dec 1, 2015 · 2038cfa · 2038cfa
2 parents cab29a7 + a04cfb7
commit 2038cfa
Show file tree

Hide file tree

Showing 15 changed files with 3 additions and 448 deletions.
diff --git a/README.md b/README.md
@@ -5,11 +5,11 @@
 [![Coverage Status](https://coveralls.io/repos/v2ray/v2ray-core/badge.svg?branch=master&service=github)](https://coveralls.io/github/v2ray/v2ray-core?branch=master)
 [![GoDoc](https://godoc.org/github.com/v2ray/v2ray-core?status.svg)](https://godoc.org/github.com/v2ray/v2ray-core)
 
-[中文](https://github.com/V2Ray/v2ray-core/blob/master/README.md) | [English](https://github.com/V2Ray/v2ray-core/blob/master/spec/en/README.md)
-
 V2Ray 是一个模块化的代理软件包，它的目标是提供常用的代理软件模块，简化网络代理软件的开发。
 
-[官方网站](https://www.v2ray.com/)
+[官方网站](https://www.v2ray.com/) | [Wiki](https://github.com/v2ray/v2ray.github.io/wiki)
+
+V2Ray provides building blocks for network proxy development. Read our [Wiki](https://github.com/v2ray/v2ray.github.io/wiki/en-us:Home) for more information.
 
 ## License
 [The MIT License (MIT)](https://raw.githubusercontent.com/v2ray/v2ray-core/master/LICENSE)
diff --git a/spec/benchmark.md b/spec/benchmark.md
diff --git a/spec/design.md b/spec/design.md
diff --git a/spec/develop.md b/spec/develop.md
diff --git a/spec/donate.md b/spec/donate.md
diff --git a/spec/en/README.md b/spec/en/README.md
diff --git a/spec/errors.md b/spec/errors.md
diff --git a/spec/guide.md b/spec/guide.md
diff --git a/spec/install.md b/spec/install.md
diff --git a/spec/issue.md b/spec/issue.md
diff --git a/spec/roadmap.md b/spec/roadmap.md