---

yaml
---
r: 212239
b: refs/heads/tmp
c: ac3301e
h: refs/heads/master
i:
  212237: e63b4c9
  212235: a8f109b
  212231: 24bc812
  212223: 987c9a9
v: v3

Author: achiwhane

[refs]

@@ -32,7 +32,7 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 62e70d35be3fe532c26a400b499c58a18f18dd3a
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 455b93151dc3cedfdc7af5e066627da72a8532c4
+refs/heads/tmp: ac3301ec3b71daee43a0ad5d671767d44d3280a4
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: b77d60adb019bb5de05e884a99f3290ec4694137
 refs/heads/gate: 97c84447b65164731087ea82685580cc81424412

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