From 65b6fcda677fa7baab2ec17e9e52e9d3a93c067c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=BA?= <3442853561@qq.com>
Date: Sun, 4 Dec 2016 13:50:36 +0800
Subject: [PATCH 1/7] 16.14.4.13.50
---
zh-CN/documentation.md | 13 +++++--------
zh-CN/index.html | 1 +
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/zh-CN/documentation.md b/zh-CN/documentation.md
index 0c41410f1..b7d905d4b 100644
--- a/zh-CN/documentation.md
+++ b/zh-CN/documentation.md
@@ -17,7 +17,7 @@ title: Rust 语言文档 · Rust 程序设计语言
[Rust 高级教程][nomicon]: 为高级 Rust 工程师准备的专门讲解如何编写不安全的Rust代码的书。
-[学习 Rust]: 由社区维护、收集的学习 Rust 资料合集。
+[学习 Rust][rust-learning]: 由社区维护、收集的学习 Rust 资料合集。
[常见问题][faq]
@@ -31,9 +31,8 @@ title: Rust 语言文档 · Rust 程序设计语言
[标准库][api]: Rust 标准库文档
-[Rust 语言参考手册][ref]. While Rust does not have a
-specification, the reference tries to describe its working in
-detail. It tends to be out of date.
+[Rust 语言参考手册][ref]: 当Rust还没有一个语言规范的时候,这个文档对它进行了尽可能详尽的描述。
+不过当有文档的时候某些内容可能已经过时了。
[语法索引][syn]: 本索引中包含 Rust 中与《Rust 程序设计语言》的部分交叉引用的所有语法示例。
@@ -42,7 +41,7 @@ detail. It tends to be out of date.
[编译器错误索引][err]: 编译器生成错误报告的扩展说明。
-[Release Notes][release_notes]. A recording of changes made during each release.
+[版本维护文档][release_notes]: 每次发布期间所做更改的记录文档。
[api]: https://doc.rust-lang.org/std/
[syn]: https://doc.rust-lang.org/book/syntax-index.html
@@ -71,9 +70,7 @@ other corners of the Rust world.
## 开发版与测试版文档
-Much of the official Rust documentation is also available for the
-[nightly] and [beta] releases in addition to the stable documentation
-linked above.
+除了上面链接的稳定文档外,大多数官方Rust文档也可用于[开发版][nightly]和[测试版][beta]。
[nightly]: https://doc.rust-lang.org/nightly/
[beta]: https://doc.rust-lang.org/beta/
diff --git a/zh-CN/index.html b/zh-CN/index.html
index 9195f7ae4..e4935cf47 100644
--- a/zh-CN/index.html
+++ b/zh-CN/index.html
@@ -54,6 +54,7 @@
特点
{% include zh-CN/example.rs.html %}
From 488c7875ba5e73bae4532e704cd5b3a3ce2a81ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=BA?= <3442853561@qq.com>
Date: Sun, 4 Dec 2016 13:59:19 +0800
Subject: [PATCH 2/7] 16.12.4.13.59
---
zh-CN/documentation.md | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/zh-CN/documentation.md b/zh-CN/documentation.md
index b7d905d4b..f00272d9d 100644
--- a/zh-CN/documentation.md
+++ b/zh-CN/documentation.md
@@ -50,19 +50,15 @@ title: Rust 语言文档 · Rust 程序设计语言
[err]: https://doc.rust-lang.org/error-index.html
[release_notes]: https://github.com/rust-lang/rust/blob/stable/RELEASES.md
-## Project policies
+## Rust 项目政策与策略
-[Rust security policy][security]. The project's policies for
-reporting, fixing and disclosing security-related bugs.
+[Rust 安全策略][security]。该项目策略,修复和披露安全相关问题策略。
-[Rust copyright and trademark policies][legal]. The Rust
-copyrights are owned by The Rust Project Developers, and its
-trademarks are owned by Mozilla. Appropriate usage of Rust's
-trademarks are described here.
+[Rust 版权和商标政策][legal]。 Rust的版权归 Rust 项目开发者所有,其商标归 Mozilla 所有。
+改政策描述了 Rust 的商标的使用范畴。
-[Code of Conduct][coc]. Applies to the rust-lang organization
-on GitHub, the official forums, IRC channels, and various
-other corners of the Rust world.
+[社区行为规范][coc]。 适用于包括但不仅限于 GitHub 上的 Rust-lang 组织,
+官方论坛,IRC 通道的所有 Rust 社区。
[security]: security.html
[legal]: legal.html
From 8346a66a5bc770204e78cb61b0ee3da8b7a1383e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=BA?= <3442853561@qq.com>
Date: Sun, 4 Dec 2016 14:05:56 +0800
Subject: [PATCH 3/7] 16.12.4.14.5
---
zh-CN/contribute.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/zh-CN/contribute.md b/zh-CN/contribute.md
index 0aa2777b6..f8d148624 100644
--- a/zh-CN/contribute.md
+++ b/zh-CN/contribute.md
@@ -19,7 +19,7 @@ mechanics of contributing to [rust-lang/rust].
这里有几条给新贡献者的建议:
* [发现问题、审查问题以及解决问题](contribute-bugs.html):
- The basic work of maintaining a large and active project like Rust.
+ 维持一个像 Rust 这样的庞大而活跃的项目基础工作。
* [文档](contribute-docs.html):
不只限于官方文档——库、博客及其他非官方的消息来源。
* [社区建设](contribute-community.html)
From bae70f52b5426417e05c490acc9dbfba774f1b22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=BA?= <3442853561@qq.com>
Date: Sun, 4 Dec 2016 14:08:35 +0800
Subject: [PATCH 4/7] 16.12.4.14.8
---
zh-CN/contribute.md | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/zh-CN/contribute.md b/zh-CN/contribute.md
index f8d148624..b067c9de5 100644
--- a/zh-CN/contribute.md
+++ b/zh-CN/contribute.md
@@ -23,7 +23,7 @@ mechanics of contributing to [rust-lang/rust].
* [文档](contribute-docs.html):
不只限于官方文档——库、博客及其他非官方的消息来源。
* [社区建设](contribute-community.html)
- 帮助你在Rust中的手足,以及壮大Rust。
+ 帮助你在 Rust 中的手足同胞,以及壮大 Rust。
* [工具、集成开发环境以及infrastructure](contribute-tools.html). The
important pieces that make using a language practical and painless.
* [库](contribute-libs.html):
@@ -34,8 +34,7 @@ mechanics of contributing to [rust-lang/rust].
如果您需要额外的指导请参考 [#rust-internals] 或 [internals.rust-lang.org]。
-We pride ourselves on maintaining civilized discourse, and to that end
-contributors are expected to follow our [行为规范][coc]。
+我们为保持自身修养而感到自豪,因此希望贡献者遵循我们的[社区行为规范][coc]。
如果您还要其他问题可以咨询我们的[社区团队][community team]。
[#rust-internals]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
-[CONTRIBUTING.md]: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md
+: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md
[bugs]: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md#bug-reports
[coc]: https://www.rust-lang.org/conduct.html
[community team]: https://www.rust-lang.org/team.html#Community
From 46e3adaef3f557c4a5407564482b953743ef3f6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=BA?= <3442853561@qq.com>
Date: Sun, 4 Dec 2016 14:31:13 +0800
Subject: [PATCH 7/7] 16.12.4.14.29
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
PS:My computer may suddenly power down, so I commit some more frequently
---
zh-CN/community.md | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/zh-CN/community.md b/zh-CN/community.md
index 47ead01f3..c7a070c21 100644
--- a/zh-CN/community.md
+++ b/zh-CN/community.md
@@ -124,7 +124,7 @@ Rust's developers coordinate in [#rust-internals][internals_irc]. It is for real
[webdev_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-webdev
[docs_irc]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-docs
-## Discussion Forums
+## 论坛
We have two forums for asynchronous discussion:
@@ -152,7 +152,7 @@ Contact the [community team][community_team] to add your own.
[user_group]: ./user-groups.html
[calendar]: https://www.google.com/calendar/embed?src=apd9vmbc22egenmtu5l6c5jbfc@group.calendar.google.com
-## The Rust Team
+## Rust 团队
Rust has a community-driven development process where most decisions are made
through open discussion and consensus, under the stewardship of various
@@ -206,7 +206,7 @@ help get you started.
[mod_team]: https://www.rust-lang.org/team.html#Moderation
[doc_team]: https://www.rust-lang.org/en-US/team.html#Documentation-team
-## Rust Development
+## Rust 开发
Rust has had over [1,200 different contributors][authors], a number that grows
every single week. [We'd love for you to join that list][contribute]!