---

yaml
---
r: 187857
b: refs/heads/tmp
c: f49fd40
h: refs/heads/master
i:
  187855: e86affb
v: v3

Author: jxcl

[refs]

@@ -34,5 +34,5 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 522d09dfecbeca1595f25ac58c6d0178bbd21d7d
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 0685e7a185d8687f2886af72b63965cbfdc2525e
+refs/heads/tmp: f49fd40f208827798ccd91394e3a3986c8bc6886
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/tmp/src/doc/trpl/hello-cargo.md

@@ -26,7 +26,7 @@ To Cargo-ify our project, we need to do two things: Make a `Cargo.toml`
 configuration file, and put our source file in the right place. Let's
 do that part first:
 
-```{bash}
+```bash
 $ mkdir src
 $ mv main.rs src/main.rs
 ```
@@ -38,7 +38,7 @@ place for everything, and everything in its place.
 
 Next, our configuration file:
 
-```{bash}
+```bash
 $ editor Cargo.toml
 ```
 
@@ -75,7 +75,7 @@ well as what it is named.
 
 Once you have this file in place, we should be ready to build! Try this:
 
-```{bash}
+```bash
 $ cargo build
    Compiling hello_world v0.0.1 (file:///home/yourname/projects/hello_world)
 $ ./target/hello_world
@@ -113,7 +113,7 @@ can start developing right away.
 
 To start a new project with Cargo, use `cargo new`:
 
-```{bash}
+```bash
 $ cargo new hello_world --bin
 ```
 
@@ -122,7 +122,7 @@ were making a library, we'd leave it off.
 
 Let's check out what Cargo has generated for us:
 
-```{bash}
+```bash
 $ cd hello_world
 $ tree .
 .
@@ -138,21 +138,21 @@ manager. It's not necessary, but it's certainly useful.
 
 This is all we need to get started. First, let's check out `Cargo.toml`:
 
-```{toml}
+```toml
 [package]
 
 name = "hello_world"
 version = "0.0.1"
 authors = ["Your Name <[email protected]>"]
 ```
 
-Cargo has populated this file with reasonable defaults based off the arguments
-you gave it and your Git global config. You may notice that Cargo has also initialized
-the `hello_world` directory as a Git repository.
+Cargo has populated this file with reasonable defaults based off the arguments you gave
+it and your `git` global configuration. You may notice that Cargo has also initialized
+the `hello_world` directory as a `git` repository.
 
 Here's what's in `src/main.rs`:
 
-```{rust}
+```rust
 fn main() {
     println!("Hello, world!");
 }