about summary refs log tree commit diff
path: root/src/doc/tutorial.md
diff options
context:
space:
mode:
authorFelix S. Klock II <pnkfelix@pnkfx.org>2014-02-27 14:16:31 +0100
committerAlex Crichton <alex@alexcrichton.com>2014-02-27 21:04:05 -0800
commit1bcd8252ee22ea4f153de812e9bf83e3cfe4f8e0 (patch)
tree5523e5534c610dfe2c02d69b1ac9d5de5c5944c3 /src/doc/tutorial.md
parentd028079b88df0c642aefe4de4e338e4df14f3cd3 (diff)
downloadrust-1bcd8252ee22ea4f153de812e9bf83e3cfe4f8e0.tar.gz
rust-1bcd8252ee22ea4f153de812e9bf83e3cfe4f8e0.zip
Minor modifications to Axel's tutorial improvements (see also #12472).
Diffstat (limited to 'src/doc/tutorial.md')
-rw-r--r--src/doc/tutorial.md10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md
index 1c33d17ec66..339e5552d7f 100644
--- a/src/doc/tutorial.md
+++ b/src/doc/tutorial.md
@@ -133,8 +133,10 @@ fn main() {
     println!("hello?");
 }
 ~~~~
-> ***Note:*** *Macros* are explained in the [Syntax extensions
-> (3.4)](#syntax-extensions) section.
+> ***Note:*** An identifier followed by an exclamation point, like
+> `println!`, is a macro invocation.  Macros are explained
+> [later](#syntax-extensions); for now just remember to include the
+> exclamation point.
 
 If the Rust compiler was installed successfully, running `rustc
 hello.rs` will produce an executable called `hello` (or `hello.exe` on
@@ -1347,8 +1349,8 @@ assert!(xs.eq(&ys));
 assert!(!xs.ne(&ys));
 
 // The Eq trait also allows us to use the shorthand infix operators.
-assert!(xs == ys);
-assert!(!(xs != ys));
+assert!(xs == ys);    // `xs == ys` is short for `xs.eq(&ys)`
+assert!(!(xs != ys)); // `xs != ys` is short for `xs.ne(&ys)`
 ~~~
 
 # More on boxes