Merge pull request #20 from rust-lang/master

17.6.10.12.17

Author: 3442853561

_config.yml

@@ -1,18 +1,18 @@
 name: The Rust Programming Language
-stable: "1.17.0"
-stable_date: "2017-04-27"
-stable_blog: "https://blog.rust-lang.org/2017/04/27/Rust-1.17.html"
-stable_full_version: "rustc 1.17.0 (56124baa9 2017-04-24)"
-beta: "1.18"
-beta_date: "2017-06-08"
-nightly: "1.19"
+stable: "1.18.0"
+stable_date: "2017-06-08"
+stable_blog: "https://blog.rust-lang.org/2017/06/08/Rust-1.18.html"
+stable_full_version: "rustc 1.18.0 (03fc9d622 2017-06-06)"
+beta: "1.19"
+beta_date: "2017-07-20"
+nightly: "1.20"
 channels:
   - name: "stable"
-    vers: "1.17.0"
-    package: "1.17.0"
+    vers: "1.18.0"
+    package: "1.18.0"
   - name: "beta"
-    vers: "1.18"
+    vers: "1.19"
     package: "beta"
   - name: "nightly"
-    vers: "1.19"
+    vers: "1.20"
     package: "nightly"

_data/team.yml

@@ -156,6 +156,10 @@ people:
     name: Yehuda Katz
   japaric:
     name: Jorge Aparicio
+  scottmcm:
+    name: Scott McMurray
+  cramertj:
+    name: Taylor Cramer
 
 # Information about each team. Omit `lead` for teams without leaders.
 #
@@ -171,7 +175,7 @@ teams:
     lead: nikomatsakis
   - name: Language team shepherds
     responsibility: "helping guide language RFCs to completion, assisting the language team with its work"
-    members: [solson, joshtriplett, whitequark]
+    members: [solson, joshtriplett, whitequark, cramertj, scottmcm]
   - name: Library team
     responsibility: "the Rust standard library, rust-lang crates, conventions, and ecosystem support"
     members: [brson, alexcrichton, sfackler, BurntSushi, Kimundi, dtolnay, aturon]

_data/users.yml

@@ -163,10 +163,10 @@
   logo: etcface.png
   how: "ETCDEV Team is a group of professional software engineers working full time on Ethereum Classic core projects."
 -
-  name: Ethcore
-  url: https://ethcore.io
-  logo: ethcore.png
-  how: "<a href='https://ethcore.io/parity.html'>Powering the Ethereum revolution.</a>"
+  name: Parity Technologies
+  url: https://parity.io/
+  logo: parity.png
+  how: "<a href='https://parity.io/parity.html'>Powering the Ethereum revolution.</a>"
 -
   name: Everlane
   url: http://www.everlane.com/
@@ -247,6 +247,11 @@
   url: https://www.ovh.com
   logo: ovh.png
   how: "We used Rust to build a high performance, highly available <a href='https://www.runabove.com/paas-logs.xml'>log management system</a>."
+-
+  name: Postlight
+  url: https://postlight.com/
+  logo: postlight.svg
+  how: "We use Rust to generate logos from favicons in the <a href='https://mercury.postlight.com/amp-converter'>Mercury AMP Converter</a>."
 -
   name: Postmates
   url: https://postmates.com/
@@ -267,6 +272,11 @@
   url: https://sandstorm.io
   logo: sandstorm-logo-rust.svg
   how: "The backend of <a href='https://sandstorm.io/news/2016-08-09-collections-app'>our Collections app</a> is written in Rust."
+-
+  name: Scality
+  url: https://scality.com
+  logo: scality.svg
+  how: "Software-defined storage georeplication daemon"
 -
   name: Sentry
   url: https://www.getsentry.com/
@@ -387,3 +397,13 @@
   url: https://www.angelcam.com
   logo: angelcam.png
   how: "We developed an open lightweight client that finds compatible IP cameras on a local network and connects them to the cloud via encrypted tunnel."
+-
+  name: tCell
+  url: https://www.tcell.io
+  logo: tcell.png
+  how: "<a href='https://www.tcell.io/2017/06/agents-rust/'>tCell's agent is built using Rust</a> and runs in the app server as a means to collect data and block attacks."
+-
+  name: Structure Systems
+  url: https://www.structure.systems
+  logo: structuresystems.svg
+  how: "We develop software in Rust that helps organizations comply with information privacy/data protection rules."

_includes/example.rs

@@ -1,4 +1,4 @@
-fn main() { 
+fn main() {
     let greetings = ["Hello", "Hola", "Bonjour",
                      "Ciao", "こんにちは", "안녕하세요",
                      "Cześć", "Olá", "Здравствуйте",
@@ -10,7 +10,7 @@ fn main() {
             0 =>  println!("This code is editable and runnable!"),
             1 =>  println!("Este código es editable y ejecutable!"),
             2 =>  println!("Ce code est modifiable et exécutable!"),
-            3 =>  println!("Questo codice è modificabile e eseguibile!"),
+            3 =>  println!("Questo codice è modificabile ed eseguibile!"),
             4 =>  println!("このコードは編集して実行出来ます！"),
             5 =>  println!("여기에서 코드를 수정하고 실행할 수 있습니다!"),
             6 =>  println!("Ten kod można edytować oraz uruchomić!"),

_layouts/zh-CN/basic.html

@@ -6,7 +6,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <title>{{ page.title }}</title>
-    <meta name="keywords" content="Rust, Rust 编程语言, rustlang, rust-lang, Mozilla Rust">
+    <meta name="keywords" content="Rust, Rust 编程语言, Rust 语言, Rust 程序设计语言, rustlang, rust-lang, Mozilla Rust">
     <meta name="description" content="一种注重高效、安全、并行的系统程序语言。">
 
     <link rel="stylesheet" href="/css/bootstrap.css">
@@ -18,7 +18,7 @@
 
   <body class="container">
     <a href="https://github.com/rust-lang/rust">
-      <img class="ribbon" style="display: none" src="/logos/forkme_zh_cn.svg" alt="Fork 在 GitHub 上的代码" width="298" height="298">
+      <img class="ribbon" style="display: none" src="/logos/forkme_zh_cn.svg" alt="从 GitHub 上拷贝源码" width="298" height="298">
     </a>
 
     <header>
@@ -40,7 +40,7 @@ <h2><a href="/zh-CN/contribute.html">贡献</a></h2>
     {{ content }}
 
     <footer>
-      <p>其他语言页面：
+      <p>本土化页面：
 	    {% include footer.html %}
       </p>
     </footer>

en-US/faq.md

@@ -1497,7 +1497,7 @@ their new owners).
 How can I interoperate with C++ from Rust, or with Rust from C++?
 </a></h3>
 
-Rust and C++ can interoperate through C. Both Rust and C++ provide a [foreign function interface](https://doc.rust-lang.org/book/ffi.html) for C, and can use that to communicate between each other. If writing C bindings is too tedious, you can always use [rust-bindgen](https://github.com/crabtw/rust-bindgen) to help automatically generate workable C bindings.
+Rust and C++ can interoperate through C. Both Rust and C++ provide a [foreign function interface](https://doc.rust-lang.org/book/ffi.html) for C, and can use that to communicate between each other. If writing C bindings is too tedious, you can always use [rust-bindgen](https://github.com/servo/rust-bindgen) to help automatically generate workable C bindings.
 
 <h3><a href="#does-rust-have-cxx-style-constructors" name="does-rust-have-cxx-style-constructors">
 Does Rust have C++-style constructors?

es-ES/faq.md

@@ -1490,7 +1490,7 @@ their new owners).
 How can I interoperate with C++ from Rust, or with Rust from C++?
 </a></h3>
 
-Rust and C++ can interoperate through C. Both Rust and C++ provide a [foreign function interface](https://doc.rust-lang.org/book/ffi.html) for C, and can use that to communicate between each other. If writing C bindings is too tedious, you can always use [rust-bindgen](https://github.com/crabtw/rust-bindgen) to help automatically generate workable C bindings.
+Rust and C++ can interoperate through C. Both Rust and C++ provide a [foreign function interface](https://doc.rust-lang.org/book/ffi.html) for C, and can use that to communicate between each other. If writing C bindings is too tedious, you can always use [rust-bindgen](https://github.com/servo/rust-bindgen) to help automatically generate workable C bindings.
 
 <h3><a href="#does-rust-have-cxx-style-constructors" name="does-rust-have-cxx-style-constructors">
 Does Rust have C++-style constructors?

fr-FR/faq.md

@@ -1490,7 +1490,7 @@ their new owners).
 How can I interoperate with C++ from Rust, or with Rust from C++?
 </a></h3>
 
-Rust and C++ can interoperate through C. Both Rust and C++ provide a [foreign function interface](https://doc.rust-lang.org/book/ffi.html) for C, and can use that to communicate between each other. If writing C bindings is too tedious, you can always use [rust-bindgen](https://github.com/crabtw/rust-bindgen) to help automatically generate workable C bindings.
+Rust and C++ can interoperate through C. Both Rust and C++ provide a [foreign function interface](https://doc.rust-lang.org/book/ffi.html) for C, and can use that to communicate between each other. If writing C bindings is too tedious, you can always use [rust-bindgen](https://github.com/servo/rust-bindgen) to help automatically generate workable C bindings.
 
 <h3><a href="#does-rust-have-cxx-style-constructors" name="does-rust-have-cxx-style-constructors">
 Does Rust have C++-style constructors?

it-IT/faq.md

@@ -1708,7 +1708,7 @@ Come posso interoperare il C++ da Rust, o il Rust da C++?
 </a></h3>
 
 Il Rust è il C++ possono interoperare tramite il C. Sia il Rust che il C++ forniscono una [foreign function interface](https://doc.rust-lang.org/book/ffi.html) per il C, che può essere utilizzata per comunicare tra di loro.
-Se scrivere dei collegamenti in C è troppo complicato, puoi sempre utilizzare [rust-bindgen](https://github.com/crabtw/rust-bindgen) per generare automaticamente dei collegamenti C++ funzionanti.
+Se scrivere dei collegamenti in C è troppo complicato, puoi sempre utilizzare [rust-bindgen](https://github.com/servo/rust-bindgen) per generare automaticamente dei collegamenti C++ funzionanti.
 
 <h3><a href="#does-rust-have-cxx-style-constructors" name="does-rust-have-cxx-style-constructors">
 Rust possiede dei costruttori in stile C++?