rollup merge of #17278 : steveklabnik/gh17242

This commit is contained in:
Alex Crichton 2014-09-17 08:49:08 -07:00
commit b27947ac4d

View file

@ -185,8 +185,8 @@ Next up is this line:
This line does all of the work in our little program. There are a number of
details that are important here. The first is that it's indented with four
spaces, not tabs. Please configure your editor of choice to insert four spaces
with the tab key. We provide some sample configurations for various editors
[here](https://github.com/rust-lang/rust/tree/master/src/etc).
with the tab key. We provide some [sample configurations for various
editors](https://github.com/rust-lang/rust/tree/master/src/etc).
The second point is the `println!()` part. This is calling a Rust **macro**,
which is how metaprogramming is done in Rust. If it were a function instead, it