---

yaml
---
r: 121589
b: refs/heads/auto
c: 546b202
h: refs/heads/master
i:
  121587: 73c9011
v: v3

Author: steveklabnik

[refs]

@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 8cd906811a1f541772fd526fc61ff2b6ead86f2e
+refs/heads/auto: 546b202e0edbeb53a474c6126d8ad5d47081be2f
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/doc/guide.md

@@ -200,7 +200,10 @@ The second point is the `println!()` part. This is calling a Rust **macro**,
 which is how metaprogramming is done in Rust. If it were a function instead, it
 would look like this: `println()`. For our purposes, we don't need to worry
 about this difference. Just know that sometimes, you'll see a `!`, and that
-means that you're calling a macro instead of a normal function.
+means that you're calling a macro instead of a normal function. One last thing
+to mention: Rust's macros are significantly different than C++ templates, if
+you've used those. Don't be scared of using macros. We'll get to the details
+eventually, you'll just have to trust us for now.
 
 Next, `"Hello, world"` is a **string**. Strings are a surprisingly complicated
 topic in a systems programming language, and this is a **statically allocated**