---

yaml
---
r: 211941
b: refs/heads/auto
c: ac3301e
h: refs/heads/master
i:
  211939: dc76fa0
v: v3

Author: achiwhane

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 455b93151dc3cedfdc7af5e066627da72a8532c4
+refs/heads/auto: ac3301ec3b71daee43a0ad5d671767d44d3280a4
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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.