update original text: #a203290

Author: rinthel

CONTRIBUTING.md

@@ -1,99 +1,42 @@
 # Contributing
 
-## First edition
+We'd love your help! Thanks for caring about the book.
 
-The first edition of the book is no longer actively being worked on, since
-we're concentrating our efforts on bringing the second edition to print. We
-will accept pull requests for small tweaks to the first edition; any larger
-work should be spent improving the second edition. Issues will likely be closed
-unless they are also issues in the second edition.
+## Licensing
 
-## Second edition
+This repository is under the same license as Rust itself, MIT/Apache2. You
+can find the full text of each license in the `LICENSE-*` files in this
+repository.
 
-We're currently working with No Starch Press to bring the second edition of the
-book to print. Each chapter goes through [a number of stages][project]:
+## Code of Conduct
 
-[project]: https://github.com/rust-lang/book/projects/1
+The Rust project has [a code of conduct](http://rust-lang.org/policies/code-of-conduct)
+that governs all sub-projects, including this one. Please respect it!
 
-* We write and edit a chapter's initial content
-* No Starch provides a round of edits and questions
-* We revise, clarify, and check those edits
-* A Technical Reviewer checks for the accuracy of technical details
-* No Starch copyedits the chapter for spelling, grammar, wording, consistency
-* We revise, clarify, and check the copyedits
-* The chapter goes to layout, at which point only minor changes should be made
+## Review
 
-### Documenting newly stabilized features
-
-New features added to Rust will be documented in the ["Newest Features"
-Appendix][new] per [RFC 1636][rfc]. We'd love pull requests adding new
-sections! These sections may be incorporated into the book at some point, but
-we have no timeline for doing so; see the Post-publication section below for
-more details.
-
-[new]: https://github.com/rust-lang/book/blob/master/second-edition/src/appendix-07-newest-features.md
-[rfc]: https://github.com/rust-lang/rfcs/pull/1636#issuecomment-247325313
-
-### Corrections and Modifications
-
-We would love issues and pull requests to the Markdown files in the src
-directory, up until the chapter goes to layout with No Starch. At that point,
-we will likely only be accepting changes that correct factual errors or major
-problems and not, for example, minor wording changes.
-
-You can check which chapters have gone to layout and are frozen on the [project
-page][project] by scrolling all the way to the right to find the column titled
-**Frozen**.
-
-### Review
-
-Our [open pull requests][pulls] are new chapters or edits that we're currently
-working on. We would love if you would read through those and make comments for
-any suggestions or corrections!
+Our [open pull requests][pulls] are new chapters or edits that we're
+currently working on. We would love if you would read through those and make
+comments for any suggestions or corrections!
 
 [pulls]: https://github.com/rust-lang/book/pulls
 
-### Translations
+## Help wanted
 
-We'd especially love help translating the second edition of the book! See the
-[Translations] label to join in efforts that are currently in progress. Open
-a new issue to start working on a new language! We're waiting on [mdbook
-support] for multiple languages before we merge any in, but feel free to
-start! The chapters in [the frozen column] of the project won't see major
-changes, so if you start with those, you won't have to redo work :)
-
-[Translations]: https://github.com/rust-lang/book/issues?q=is%3Aopen+is%3Aissue+label%3ATranslations
-[mdbook support]: https://github.com/azerupi/mdBook/issues/5
-[the frozen column]: https://github.com/rust-lang/book/projects/1
-
-### Help wanted
-
-If you're looking for ways to help that don't involve large amounts of reading
-or writing, check out the [open issues with the E-help-wanted
-label][help-wanted]. These might be small fixes to the text Rust code, frontend
-code, or shell scripts that would help us be more efficient or enhance the book
-in some way!
+If you're looking for ways to help that don't involve large amounts of
+reading or writing, check out the [open issues with the E-help-wanted
+label][help-wanted]. These might be small fixes to the text Rust code,
+frontend code, or shell scripts that would help us be more efficient or
+enhance the book in some way!
 
 [help-wanted]: https://github.com/rust-lang/book/issues?q=is%3Aopen+is%3Aissue+label%3AE-help-wanted
 
-### Post-publication
-
-After the second edition of the book goes to print, here are our intentions for
-changes:
+## Translations
 
-* The online version should stay fairly close to the printed version. For
-  example, you should be able to look at listing 10-3 in the book and find
-  listing 10-3 in the online version and copy-paste the code if you want to
-  play with it. Major changes to correct errors should get documented in
-  errata.
-* There are multiple efforts starting to translate the online book into
-  other languages. It would help the translations stay in sync if we're not
-  constantly changing the text.
-* Someday there might be a third edition, once there are enough large, new
-  features in Rust to warrant such a thing. We don't have any schedule in mind
-  for that though, nor have we decided if it would be modifications to the
-  second edition or a ground-up rewrite. Until we have plans for that, we won't
-  be accepting pull requests that aren't fixing errors, for example, changing
-  the way something is worded.
+We'd love help translating the book! See the [Translations] label to join in
+efforts that are currently in progress. Open a new issue to start working on
+a new language! We're waiting on [mdbook support] for multiple languages
+before we merge any in, but feel free to start!
 
-This repository is under the same license as Rust itself, MIT/Apache2.
+[Translations]: https://github.com/rust-lang/book/issues?q=is%3Aopen+is%3Aissue+label%3ATranslations
+[mdbook support]: https://github.com/azerupi/mdBook/issues/5

Cargo.lock

@@ -0,0 +1,37 @@
+[package]
+name = "rust-book"
+version = "0.0.1"
+authors = ["Steve Klabnik <[email protected]>"]
+description = "The Rust Book"
+edition = "2018"
+
+[[bin]]
+name = "concat_chapters"
+path = "tools/src/bin/concat_chapters.rs"
+
+[[bin]]
+name = "lfp"
+path = "tools/src/bin/lfp.rs"
+
+[[bin]]
+name = "link2print"
+path = "tools/src/bin/link2print.rs"
+
+[[bin]]
+name = "remove_links"
+path = "tools/src/bin/remove_links.rs"
+
+[[bin]]
+name = "remove_markup"
+path = "tools/src/bin/remove_markup.rs"
+
+[[bin]]
+name = "convert_quotes"
+path = "tools/src/bin/convert_quotes.rs"
+
+[dependencies]
+walkdir = "0.1.5"
+docopt = "0.6.82"
+rustc-serialize = "0.3.19"
+regex = "0.1.73"
+lazy_static = "0.2.1"

Cargo.toml

@@ -0,0 +1,7 @@
+[book]
+title = "The Rust Programming Language"
+author = "Steve Klabnik and Carol Nichols, with Contributions from the Rust Community"
+
+[output.html]
+additional-css = ["ferris.css", "theme/2018-edition.css"]
+additional-js = ["ferris.js"]

book.toml

@@ -1,29 +1,21 @@
-# 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.
+#!/bin/bash
 
 set -e
 
 export PATH=$PATH:/home/travis/.cargo/bin;
 
-# feature check
+# Feature check
 cd ci/stable-check
 
-cargo run -- ../../first-edition/src
-cargo run -- ../../second-edition/src
+cargo run -- ../../src
 
 cd ../..
 
-# tests for the second edition
-
-cd second-edition
-bash spellcheck.sh list
+echo 'Spellchecking...'
+bash ci/spellcheck.sh list
+echo 'Testing...'
 mdbook test
+echo 'Building...'
 mdbook build
+echo 'Linting for local file paths...'
 cargo run --bin lfp src