Merge pull request #1 from rust-lang/master

Fork von rust-lang/book auf neuesten Stand aktualisieren

.travis.yml

@@ -3,7 +3,7 @@ dist: trusty
 language: rust
 cache: cargo
 rust:
-  - stable
+  - 1.31.1
 branches:
   only:
   - master

2018-edition/convert-quotes.sh

@@ -1,13 +1,4 @@
 #!/bin/bash
-# Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-# file at the top-level directory of this distribution and at
-# http://rust-lang.org/COPYRIGHT.
-#
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
 
 set -eu
 

2018-edition/nostarch.sh

@@ -1,13 +1,4 @@
 #!/bin/bash
-# Copyright 2016 The Rust Project Developers. See the COPYRIGHT
-# file at the top-level directory of this distribution and at
-# http://rust-lang.org/COPYRIGHT.
-#
-# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-# option. This file may not be copied, modified, or distributed
-# except according to those terms.
 
 set -eu
 
@@ -16,18 +7,18 @@ cargo build --release
 mkdir -p tmp
 rm -rf tmp/*.md
 
-# Get all the markdown files in the src dir,
+# Get all the Markdown files in the src dir,
 ls src/${1:-""}*.md | \
-# except for SUMMARY.md.
+# except for `SUMMARY.md`.
 grep -v SUMMARY.md | \
 # Extract just the filename so we can reuse it easily.
 xargs -n 1 basename | \
-# Remove all links followed by <!-- ignore -->, then
-# Change all remaining links from markdown to italicized inline text.
+# Remove all links followed by `<!-- ignore -->``, then
+# Change all remaining links from Markdown to italicized inline text.
 while IFS= read -r filename; do
   < "src/$filename" ./target/release/remove_links \
     | ./target/release/link2print \
     | ./target/release/remove_markup > "tmp/$filename"
 done
-# Concat the files into the nostarch dir.
+# Concatenate the files into the `nostarch` dir.
 ./target/release/concat_chapters tmp nostarch