Merge branch 'master' of github.com:apache/incubator-pegasus-website
diff --git a/_community/en/community.md b/_community/en/community.md
index f965f3e..e7124cb 100755
--- a/_community/en/community.md
+++ b/_community/en/community.md
@@ -28,11 +28,11 @@
- title: Pull Requests
description: >
We use <a href="">Github Pull Request</a> for development. Every pull request needs 2 approvals from the Pegasus committers before merged. You can make your review and comments on the PR even if you are not yet a Pegasus committer.
- Please read the <a href="/community/coding-guides">Coding Guides</a> before submitting a new code.
+ Please read the <a href="https://cwiki.apache.org/confluence/display/PEGASUS/Coding+guides">Coding Guides</a> before submitting a new code.
- title: Bug Fixes
description: >
The known bugs were collected here: <a href="https://github.com/apache/incubator-pegasus/labels/type%2Fbug">Issues: type/bug</a>. If you encounter problems that couldn't be found in the list, please report to us via issues.
- Bug finding is also a meaningful contribution to us. Furthermore, since we deeply value the readability and quality of our document, minor fixes like correcting spelling errors are also welcomed.
+ Bug finding is a meaningful contribution to us. Furthermore, since we strongly value the readability and quality of our document, minor fixes like correcting spelling errors are also welcomed.
---
\ No newline at end of file
diff --git a/_community/zh/community.md b/_community/zh/community.md
index 325d8ea..4d3921f 100755
--- a/_community/zh/community.md
+++ b/_community/zh/community.md
@@ -26,11 +26,11 @@
contributor_items:
- title: Pull Requests
description: >
- 我们的开发流程使用<a href="https://github.com/apache/incubator-pegasus/pulls">Github Pull Request</a>机制。你的提交至少需要两个Pegasus Committer的Code Review都通过才可合入主干分支。即使你并不是Pegasus Committer，你也可以对代码提出review，你的建议可能会有助于我们发现问题。你可以参照<a href="/community/coding-guides">Coding Guides</a>的规范来提交代码。
+ 我们的开发流程使用<a href="https://github.com/apache/incubator-pegasus/pulls">Github Pull Request</a>机制。你的提交至少需要两个Pegasus Committer的Code Review都通过才可合入主干分支。即使你并不是Pegasus Committer，你也可以对代码提出review，你的建议可能会有助于我们发现问题。你可以参照<a href="https://cwiki.apache.org/confluence/display/PEGASUS/Coding+guides">Coding Guides</a>的规范来提交代码。
- title: RoadMap
description: >
- 你可以在<a href="/community/roadmap">这里</a>找到我们近期的产品规划，对那些你最感兴趣的需求，你可以与我们进行合作开发。此外，我们也会在每次<a href="/releases">版本发布</a>时向大家同步Pegasus当前已完成开发的功能以及目标。
+ 你可以在<a href="https://cwiki.apache.org/confluence/display/PEGASUS/RoadMap">这里</a>找到我们近期的产品规划，对那些你最感兴趣的需求，你可以与我们进行合作开发。此外，我们也会在每次<a href="/releases">版本发布</a>时向大家同步Pegasus当前已完成开发的功能以及目标。
- title: Fixes
description: >
diff --git a/_community/zh/roadmap.md b/_community/zh/roadmap.md
index 8a17ddc..2554e32 100644
--- a/_community/zh/roadmap.md
+++ b/_community/zh/roadmap.md
@@ -1,51 +1,5 @@
---
-title: Roadmap
-layout: page
+permalink: /community/roadmap
+redirect_to:
+ - https://cwiki.apache.org/confluence/x/mCDZCQ
---
-
-### Pinned WIP (Work-In-Progress)
-
------
-
-#### 高效运维
-
-* Partition Split：[XiaoMi/rdsn#69](https://github.com/XiaoMi/rdsn/issues/69)
-* 跨机房热备：[XiaoMi/rdsn#118](https://github.com/XiaoMi/rdsn/pull/118)
-* 数据快速批量导入：[XiaoMi/pegasus#139](https://github.com/XiaoMi/pegasus/issues/139)
-* Capacity Unit统计：[XiaoMi/pegasus#235](https://github.com/XiaoMi/pegasus/issues/235)
-
-#### 用户接口
-
-* 客户端版本协商：[XiaoMi/pegasus#256](https://github.com/XiaoMi/pegasus/issues/256)
-* 客户端支持DNS寻址：[XiaoMi/pegasus-java-client#30](https://github.com/XiaoMi/pegasus-java-client/issues/30)
-* 身份认证：[xiaomi/pegasus#166](https://github.com/xiaomi/pegasus/issues/166)
-
-#### 部署支持
-
-* docker support：[XiaoMi/pegasus#140](https://github.com/XiaoMi/pegasus/issues/140)
-
-#### 性能优化
-
-* 客户端支持warmup功能：[XiaoMi/pegasus-java-client#26](https://github.com/XiaoMi/pegasus-java-client/issues/26)
-* 客户端支持backup request：[XiaoMi/pegasus#251](https://github.com/XiaoMi/pegasus/issues/251)
-* RPC 大包处理优化
-
-#### 重构化简
-
-* [XiaoMi/rdsn#141](https://github.com/XiaoMi/rdsn/issues/141)
-
------
-
-### In plan
-
-* 离线计算框架支持解析 Pegasus 的冷备份数据：[XiaoMi/pegasus#264](https://github.com/XiaoMi/pegasus/issues/264)
-* 冷备份支持通过 Fuse 备份至 HDFS：[XiaoMi/pegasus#136](https://github.com/XiaoMi/pegasus/issues/136)
-* 写放大优化(WiscKey&HashKV)：[XiaoMi/pegasus#265](https://github.com/XiaoMi/pegasus/issues/265)
-* Rack Awareness：[XiaoMi/pegasus#321](https://github.com/XiaoMi/pegasus/issues/321)
-* 磁盘均衡分布： [XiaoMi/pegasus#261](https://github.com/XiaoMi/pegasus/issues/261)
-* 权限管理（ACL）：[XiaoMi/pegasus#170](https://github.com/XiaoMi/pegasus/issues/170)
-* 离线计算框架支持生成 Pegasus 的冷备份数据
-* OpenTsDB 监控支持
-* 移除shared log
-* REST Proxy
-* 支持 Partition Set
diff --git a/_data/docs_menu.yml b/_data/docs_menu.yml
index eecff1c..dee4e9b 100644
--- a/_data/docs_menu.yml
+++ b/_data/docs_menu.yml
@@ -15,7 +15,7 @@
- name: title_cpp-client
link: /clients/cpp-client
- name: title_go-client
- link: /clients/go-client
+ link: https://github.com/XiaoMi/pegasus-go-client
- name: title_python-client
link: /clients/python-client
- name: title_node-client
diff --git a/_data/navigation.yml b/_data/navigation.yml
index 8c274bf..e076996 100644
--- a/_data/navigation.yml
+++ b/_data/navigation.yml
@@ -9,7 +9,7 @@
- name: title_coding-guides
link: https://cwiki.apache.org/confluence/display/PEGASUS/Coding+guides
- name: title_bug-tracking
- link: "{{ pegasus_github_url }}/labels/type%2Fbug"
+ link: https://github.com/apache/incubator-pegasus/issues?q=is%3Aissue+is%3Aopen+label%3Atype%2Fbug
- name: title_apache-proposal
link: https://cwiki.apache.org/confluence/display/INCUBATOR/PegasusProposal
- name: title_blog
@@ -17,4 +17,4 @@
icon: fas fa-rss
- name: title_releases
icon: fas fa-fire
- link: "{{ pegasus_github_url }}/releases"
+ link: /docs/downloads
diff --git a/_docs/en/build/compile-by-docker.md b/_docs/en/build/compile-by-docker.md
index fb8e2d0..a45c24e 100755
--- a/_docs/en/build/compile-by-docker.md
+++ b/_docs/en/build/compile-by-docker.md
@@ -22,7 +22,7 @@
```sh
docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:centos6 \
+ apachepegasus/build-env:{{ site.latest_pegasus_version }}-centos6 \
/bin/bash -c "./run.sh build -c"
```
@@ -34,7 +34,7 @@
```bash
docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:centos6 \
+ apachepegasus/build-env:{{ site.latest_pegasus_version }}-centos6 \
/bin/bash -c "./run.sh pack_server"
```
@@ -42,7 +42,7 @@
```bash
docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:centos6 \
+ apachepegasus/build-env:{{ site.latest_pegasus_version }}-centos6 \
/bin/bash -c "./run.sh pack_client"
```
@@ -50,7 +50,7 @@
```bash
docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:centos6 \
+ apachepegasus/build-env:{{ site.latest_pegasus_version }}-centos6 \
/bin/bash -c "./run.sh pack_tools"
```
diff --git a/_docs/en/clients/go-client.md b/_docs/en/clients/go-client.md
deleted file mode 100755
index 7315ddd..0000000
--- a/_docs/en/clients/go-client.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-permalink: clients/go-client
----
-
-TRANSLATING
diff --git a/_docs/en/downloads.md b/_docs/en/downloads.md
index f53af0b..3c2d19c 100644
--- a/_docs/en/downloads.md
+++ b/_docs/en/downloads.md
@@ -4,9 +4,14 @@
We recommend downloading the signed source release that follows [ASF Release Policy](http://www.apache.org/legal/release-policy.html):
-Package | Signature | Checksum | Release Notes |
----|---|---|---|
-[Apache Pegasus 2.1.0](https://dist.apache.org/repos/dist/release/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-source-release.zip) | [asc](https://dist.apache.org/repos/dist/release/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-source-release.zip.asc) | [sha512](https://dist.apache.org/repos/dist/release/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-source-release.zip.sha512) | [Apache Pegasus 2.1.0 Release Notes](https://cwiki.apache.org/confluence/display/PEGASUS/Apache+Pegasus+2.1.0+Release+Notes)
+[2.1.0-src]: https://www.apache.org/dyn/closer.cgi?path=/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-incubating-src.zip
+[2.1.0-asc]: https://downloads.apache.org/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-incubating-src.zip.asc
+[2.1.0-sha]: https://downloads.apache.org/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-incubating-src.zip.sha512
+[2.1.0-rn]: https://cwiki.apache.org/confluence/x/cxbZCQ
+
+Name | Package | Signature | Checksum | Release Notes |
+---|---|---|---|---|
+Apache Pegasus 2.1.0 | [Source][2.1.0-src] | [asc][2.1.0-asc] | [sha512][2.1.0-sha] | [Release Notes][2.1.0-rn]
You can also download the sources via git clone:
diff --git a/_docs/zh/1.x/installation.md b/_docs/zh/1.x/installation.md
index e312bfd..318f69d 100755
--- a/_docs/zh/1.x/installation.md
+++ b/_docs/zh/1.x/installation.md
@@ -1,5 +1,5 @@
---
-permalink: 1.x/docs/installation/
+permalink: 1.x/docs/build/compile-from-source/
version: 1.x
---
diff --git a/_docs/zh/build/compile-by-docker.md b/_docs/zh/build/compile-by-docker.md
index 0ecd92c..cfe16c6 100755
--- a/_docs/zh/build/compile-by-docker.md
+++ b/_docs/zh/build/compile-by-docker.md
@@ -22,7 +22,7 @@
```sh
docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:centos6 \
+ apachepegasus/build-env:{{ site.latest_pegasus_version }}-centos6 \
/bin/bash -c "./run.sh build -c"
```
@@ -34,7 +34,7 @@
```bash
docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:centos6 \
+ apachepegasus/build-env:{{ site.latest_pegasus_version }}-centos6 \
/bin/bash -c "./run.sh pack_server"
```
@@ -42,7 +42,7 @@
```bash
docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:centos6 \
+ apachepegasus/build-env:{{ site.latest_pegasus_version }}-centos6 \
/bin/bash -c "./run.sh pack_client"
```
@@ -50,7 +50,7 @@
```bash
docker run -v /your/local/apache-pegasus-source:/root/pegasus \
- apachepegasus/build-env:centos6 \
+ apachepegasus/build-env:{{ site.latest_pegasus_version }}-centos6 \
/bin/bash -c "./run.sh pack_tools"
```
diff --git a/_docs/zh/clients/go-client.md b/_docs/zh/clients/go-client.md
deleted file mode 100755
index 81587ca..0000000
--- a/_docs/zh/clients/go-client.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-permalink: clients/go-client
----
-
-## 项目地址
-
-<https://github.com/XiaoMi/pegasus-go-client>
-
-## 版本要求
-
-```
->= go 1.8
-```
-
-## 安装
-
-```
-go get github.com/XiaoMi/pegasus-go-client
-```
-
-## 使用
-
-### 示例
-
-完整的示例请参考[example](https://github.com/XiaoMi/pegasus-go-client/tree/master/example)。
-
-### log配置文件
-
-go-client 提供了简单的日志接口 pegalog，用户可以使用现有的日志库来实现该接口，go-client 会经由该接口来打印内部日志。
-
-```go
-type Logger interface {
- Fatal(args ...interface{})
- Fatalf(format string, args ...interface{})
- Fatalln(args ...interface{})
- Print(args ...interface{})
- Printf(format string, args ...interface{})
- Println(args ...interface{})
-}
-```
diff --git a/_docs/zh/downloads.md b/_docs/zh/downloads.md
index 1a27b0c..353ba24 100644
--- a/_docs/zh/downloads.md
+++ b/_docs/zh/downloads.md
@@ -4,9 +4,14 @@
我们推荐下载遵循[ASF Release Policy](http://www.apache.org/legal/release-policy.html)发布的源码包：
-Package | Signature | Checksum | Release Notes |
----|---|---|---|
-[Apache Pegasus 2.1.0](https://dist.apache.org/repos/dist/release/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-source-release.zip) | [asc](https://dist.apache.org/repos/dist/release/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-source-release.zip.asc) | [sha512](https://dist.apache.org/repos/dist/release/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-source-release.zip.sha512) | [Apache Pegasus 2.1.0 Release Notes](https://cwiki.apache.org/confluence/display/PEGASUS/Apache+Pegasus+2.1.0+Release+Notes)
+[2.1.0-src]: https://www.apache.org/dyn/closer.cgi?path=/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-incubating-src.zip
+[2.1.0-asc]: https://downloads.apache.org/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-incubating-src.zip.asc
+[2.1.0-sha]: https://downloads.apache.org/incubator/pegasus/2.1.0/apache-pegasus-2.1.0-incubating-src.zip.sha512
+[2.1.0-rn]: https://cwiki.apache.org/confluence/x/cxbZCQ
+
+Name | Package | Signature | Checksum | Release Notes |
+---|---|---|---|---|
+Apache Pegasus 2.1.0 | [Source][2.1.0-src] | [asc][2.1.0-asc] | [sha512][2.1.0-sha] | [Release Notes][2.1.0-rn]
你也可以通过git clone的方式获取Pegasus源码：
