about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-19 03:11:12 +0000
committerbors <bors@rust-lang.org>2014-08-19 03:11:12 +0000
commiteaf810a219b136fff67e75840ad3c5efde9ae1e5 (patch)
treeda97483b6971a9753d3a6bcf48fa3df36ea68ab3
parentef5ad07272ed8133fd7c200b923cd4e59d624bdc (diff)
parentb1428279f152c39f5be4c90e649de36fbe914bdf (diff)
downloadrust-eaf810a219b136fff67e75840ad3c5efde9ae1e5.tar.gz
rust-eaf810a219b136fff67e75840ad3c5efde9ae1e5.zip
auto merge of #16345 : EduardoBautista/rust/fix-error-message-in-guide, r=steveklabnik
Just some simple changes to the guide.
-rw-r--r--src/doc/guide.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/guide.md b/src/doc/guide.md
index 50b64279b50..ad44e55e57d 100644
--- a/src/doc/guide.md
+++ b/src/doc/guide.md
@@ -517,7 +517,7 @@ note: in expansion of format_args!
 <std macros>:1:1: 3:2 note: in expansion of println!
 src/hello_world.rs:4:5: 4:42 note: expansion site
 error: aborting due to previous error
-Could not execute process `rustc src/hello_world.rs --crate-type bin --out-dir /home/you/projects/hello_world/target -L /home/you/projects/hello_world/target -L /home/you/projects/hello_world/target/deps` (status=101)
+Could not compile `hello_world`.
 ```
 
 Rust will not let us use a value that has not been initialized. So why let us
@@ -532,7 +532,7 @@ in the middle of a string." We add a comma, and then `x`, to indicate that we
 want `x` to be the value we're interpolating. The comma is used to separate
 arguments we pass to functions and macros, if you're passing more than one.
 
-When you just use the double curly braces, Rust will attempt to display the
+When you just use the curly braces, Rust will attempt to display the
 value in a meaningful way by checking out its type. If you want to specify the
 format in a more detailed manner, there are a [wide number of options
 available](/std/fmt/index.html). For now, we'll just stick to the default: