Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a7b8622

Browse files
committedJan 19, 2018
Auto merge of #47572 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 8 pull requests - Successful merges: #46938, #47334, #47420, #47508, #47510, #47512, #47535, #47559 - Failed merges:
2 parents 5965b79 + ce797d5 commit a7b8622

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+276
-114
lines changed
 

‎CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -301,12 +301,12 @@ It's absolutely fine to have multiple build directories with different
301301
[pull-requests]: #pull-requests
302302

303303
Pull requests are the primary mechanism we use to change Rust. GitHub itself
304-
has some [great documentation][pull-requests] on using the Pull Request feature.
304+
has some [great documentation][about-pull-requests] on using the Pull Request feature.
305305
We use the "fork and pull" model [described here][development-models], where
306306
contributors push changes to their personal fork and create pull requests to
307307
bring those changes into the source repository.
308308

309-
[pull-requests]: https://help.github.com/articles/about-pull-requests/
309+
[about-pull-requests]: https://help.github.com/articles/about-pull-requests/
310310
[development-models]: https://help.github.com/articles/about-collaborative-development-models/
311311

312312
Please make pull requests against the `master` branch.

‎src/doc/index.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Rust provides a number of book-length sets of documentation, collectively
2828
nicknamed 'The Rust Bookshelf.'
2929

3030
* [The Rust Programming Language][book] teaches you how to program in Rust.
31+
* [Rust By Example][rbe] teaches you how to program in Rust using editable examples.
3132
* [The Cargo Book][cargo-book] is a guide to Cargo, Rust's build tool and dependency manager.
3233
* [The Unstable Book][unstable-book] has documentation for unstable features.
3334
* [The Rustonomicon][nomicon] is your guidebook to the dark arts of unsafe Rust.
@@ -51,6 +52,7 @@ before this policy was put into place. That work is being tracked
5152
[refchecklist]: https://github.com/rust-lang-nursery/reference/issues/9
5253
[err]: error-index.html
5354
[book]: book/index.html
55+
[rbe]: rust-by-example/index.html
5456
[nomicon]: nomicon/index.html
5557
[unstable-book]: unstable-book/index.html
5658
[rustdoc-book]: rustdoc/index.html

0 commit comments

Comments
 (0)
Please sign in to comment.