diff --git a/.travis.yml b/.travis.yml index 58ed7c562..d375fe9d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ install: - cargo install mdbook --version 0.3.7 - cargo install mdbook-linkcheck --version 0.5.0 script: -- git rebase origin master # this will exit with an error on conflict +- git log --oneline | head -n 10 - mdbook build notifications: email: diff --git a/src/SUMMARY.md b/src/SUMMARY.md index 4f818fadf..c900070a4 100644 --- a/src/SUMMARY.md +++ b/src/SUMMARY.md @@ -5,6 +5,7 @@ --- - [Part 1: Building, debugging, and contributing to Rustc](./part-1-intro.md) + - [Prerequisites](./building/prerequisites.md) - [Getting Started](./getting-started.md) - [About the compiler team](./compiler-team.md) - [How to Build and Run the Compiler](./building/how-to-build-and-run.md) diff --git a/src/building/prerequisites.md b/src/building/prerequisites.md new file mode 100644 index 000000000..aa13c7524 --- /dev/null +++ b/src/building/prerequisites.md @@ -0,0 +1,3 @@ +# Prerequisites + +** Coming Soon: https://github.com/rust-lang/rustc-dev-guide/pull/723 ** diff --git a/src/getting-started.md b/src/getting-started.md index 4cd997200..a848b0b75 100644 --- a/src/getting-started.md +++ b/src/getting-started.md @@ -355,7 +355,7 @@ incredibly helpful: - [Working groups][wg]: there are a bunch of working groups on a wide variety of rust-related things. -[iceb]: ./ice-breaker/cleanup-crew.md +[iceb]: ./notification-groups/cleanup-crew.md [wg]: https://rust-lang.github.io/compiler-team/working-groups/