---

yaml
---
r: 121591
b: refs/heads/auto
c: e4b8707
h: refs/heads/master
i:
  121589: e35efed
  121587: 73c9011
  121583: 64613e2
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: 15bcb2f9c6232472b391638af780b3d1a91a4584
+refs/heads/auto: e4b87077fb91fe676a2a977cd7e4d1e93e519fec
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/doc/guide.md

@@ -201,8 +201,8 @@ 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. 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
+to mention: Rust's macros are significantly different than C macros, 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