---

yaml
---
r: 211644
b: refs/heads/master
c: ac3301e
h: refs/heads/master
v: v3

Author: achiwhane

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 455b93151dc3cedfdc7af5e066627da72a8532c4
+refs/heads/master: ac3301ec3b71daee43a0ad5d671767d44d3280a4
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: ba0e1cd8147d452c356aacb29fb87568ca26f111
 refs/heads/try: 1864973ae17213c5a58c4dd3f9af6d1b6c7d2e05

trunk/src/doc/trpl/hello-cargo.md

@@ -34,7 +34,7 @@ $ mv main.rs src/main.rs
 
 Note that since we're creating an executable, we used `main.rs`. If we
 want to make a library instead, we should use `lib.rs`. This convention is required
-for Cargo to successfully compile our projects. 
+for Cargo to successfully compile our projects, but it can be overridden if we wish. 
 Custom file locations for the entry point can be specified
 with a [`[[lib]]` or `[[bin]]`][crates-custom] key in the TOML file described below.
 
@@ -64,7 +64,7 @@ authors = [ "Your name <[email protected]>" ]
 ```
 
 This file is in the [TOML][toml] format. TOML is similar to INI, but has some 
-extra goodies. According to the Rust docs, 
+extra goodies. According to the TOML docs, 
 
 > TOML aims to be a minimal configuration file format that's easy to read due
 > to obvious semantics. TOML is designed to map unambiguously to a hash table.