Merge pull request #15 from rust-lang/master

16.12.29.12.43

Author: 3442853561

_config.yml

@@ -1,18 +1,18 @@
 name: The Rust Programming Language
-stable: "1.13.0"
-stable_date: "2016-11-10"
-stable_blog: "https://blog.rust-lang.org/2016/11/10/Rust-1.13.html"
-stable_full_version: "rustc 1.13.0 (2c6933acc 2016-11-07)"
-beta: "1.14"
-beta_date: "2016-12-22"
-nightly: "1.15"
+stable: "1.14.0"
+stable_date: "2016-12-22"
+stable_blog: "https://blog.rust-lang.org/2016/12/22/Rust-1.14.html"
+stable_full_version: "rustc 1.14.0 (2c6933acc 2016-11-07)"
+beta: "1.15"
+beta_date: "2017-02-02"
+nightly: "1.16"
 channels:
   - name: "stable"
-    vers: "1.13.0"
-    package: "1.13.0"
+    vers: "1.14.0"
+    package: "1.14.0"
   - name: "beta"
-    vers: "1.14"
+    vers: "1.15"
     package: "beta"
   - name: "nightly"
-    vers: "1.15"
+    vers: "1.16"
     package: "nightly"

_data/platforms.yml

@@ -27,7 +27,14 @@ stable:
     - i686-pc-windows-gnu
     - i686-pc-windows-msvc
     - i686-unknown-linux-gnu
+    - mips-unknown-linux-gnu
+    - mipsel-unknown-linux-gnu
+    - mips64-unknown-linux-gnuabi64
   -
+    - powerpc-unknown-linux-gnu
+    - powerpc64-unknown-linux-gnu
+    - powerpc64le-unknown-linux-gnu
+    - s390x-unknown-linux-gnu
     - x86_64-apple-darwin
     - x86_64-pc-windows-gnu
     - x86_64-pc-windows-msvc

_layouts/ko-KR/basic.html

@@ -27,7 +27,7 @@
 	</li>
 	<li class="col-xs-12 col-md-10 menu">
 	  <h2><a href="/ko-KR/documentation.html">문서</a></h2>
-	  <h2><a href="/ko-KR/install.html">Install</a></h2>
+	  <h2><a href="/ko-KR/install.html">설치</a></h2>
 	  <h2><a href="/ko-KR/community.html">커뮤니티</a></h2>
 	  <h2><a href="/ko-KR/contribute.html">기여하기</a></h2>
 	</li>

_layouts/zh-CN/basic.html

@@ -27,7 +27,7 @@
 	</li>
 	<li class="col-xs-12 col-md-10 menu">
 	  <h2><a href="/zh-CN/documentation.html">文档</a></h2>
-	  <h2><a href="/zh-CN/install.html">Install</a></h2>
+	  <h2><a href="/zh-CN/install.html">安装</a></h2>
 	  <h2><a href="/zh-CN/community.html">社区</a></h2>
 	  <h2><a href="/zh-CN/contribute.html">贡献</a></h2>
 	</li>

_layouts/zh-CN/faq.html

@@ -0,0 +1,10 @@
+---
+layout: default
+---
+
+<link href='https://fonts.googleapis.com/css?family=Source+Serif+Pro:400,600' rel='stylesheet' type='text/css'>
+<link href='/css/syntax-highlight.css' rel='stylesheet' type='text/css'>
+
+<div class="faq">
+  {{ content }}
+</div>

zh-CN/contribute.md

@@ -43,7 +43,7 @@ libs / community building
 -->
 
 [#rust-internals]: https://client00.chat.mibbit.com/?server=irc.mozilla.org&channel=%23rust-internals
-: https://github.com/rust-lang/rust/blob/master/CONTRIBUTING.md
+[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

zh-CN/documentation.md

@@ -6,7 +6,7 @@ title:  Rust 语言文档 · Rust 程序设计语言
 # Rust 语言文档
 
 如果您还不了解 Rust ,那么请先阅读 [Rust 程序设计语言][book]。
-它将会帮您理清思路： Rust 是什么样的语言、如何按照它、以及它的语法概念（syntax and concepts）。
+它将会帮您理清思路： Rust 是什么样的语言、如何安装它、以及它的语法概念（syntax and concepts）。
 在看完本书后，您将成为一个登堂入室（intermediate）的 Rust 开发人员，并将很好地理解 Rust 背后的基本理念。
 
 ## 学习 Rust

zh-CN/index.html

@@ -13,9 +13,9 @@
       </div>
       <div class="col-md-4">
         <a class="release-button" href="install.html">
-          <div class="release-version">Install Rust <span>{{ site.stable }}</span></div>
+          <div class="release-version">安装 Rust <span>{{ site.stable }}</span></div>
         </a>
-        <div class="release-date">{{ site.stable_date | date: "%B %-d, %Y" }}</div>
+        <div class="release-date">{{ site.stable_date | date: "%Y 年 %b 月 %-d 日" }}</div>
       </div>
     </div>
 

zh-CN/install.html

@@ -2,7 +2,7 @@
 layout: zh-CN/default
 title: Installation · The Rust Programming Language
 ---
-    <h1 class="rustup">Install Rust</h1>
+    <h1 class="rustup">安装 Rust</h1>
 
     <div class="row rustup-row">
       <div class="col-md-8 instr-column">
@@ -13,14 +13,14 @@ <h1 class="rustup">Install Rust</h1>
 
         <div id="platform-instructions-win" class="instructions" style="display: none;">
           <p>
-            To install Rust, download and run
+            安装 Rust：下载并运行
             <a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
-            then follow the onscreen instructions.
+            然后按照屏幕上的说明进行操作
           </p>
         </div>
 
         <div id="platform-instructions-android" class="instructions" style="display: none;"> 
-         <p>It looks like you are running Android.</p>
+         <p>您似乎正在安卓(Android)操作系统上浏览本页面</p>
           <p>
             The Rust compiler does not run on Android directly (yet),
             but it does make it easy to cross-compile <em>to</em> Android.
@@ -59,9 +59,9 @@ <h1 class="rustup">Install Rust</h1>
 
           <div>
             <p>
-              If you are running Windows,<br/>download and run
+              您正在使用的是 Windows 操作系统<br/>下载并运行
               <a href="https://win.rustup.rs">rustup&#x2011;init.exe</a>
-              then follow the onscreen instructions.
+              然后按照屏幕上的说明进行操作。
             </p>
           </div>
         </div>
@@ -72,7 +72,7 @@ <h1 class="rustup">Install Rust</h1>
         <div>
           <div class="release-version">Rust <span>{{ site.stable }}</span></div>
           <a href="{{ site.stable_blog }}">
-            <div class="release-date">{{ site.stable_date | date: "%B %-d, %Y" }}</div>
+            <div class="release-date">{{ site.stable_date | date: "%Y 年 %b 月 %-d日" }}</div>
           </a>
 
           <br>