---

yaml
---
r: 35811
b: refs/heads/try2
c: c639f44
h: refs/heads/master
i:
  35809: 8487872
  35807: d4e3d01
v: v3

Author: graydon

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 58807b05007b627606a8466c9559fac45970a2eb
+refs/heads/try2: c639f44adbb6652232650084df15422093ed4f56
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/doc/rust.md

@@ -478,11 +478,8 @@ with values. `proto!` is an item, defining a new name.
 
 ## Macros
 
-User-defined syntax extensions are called "macros", and they can be defined
-with the `macro_rules!` syntax extension. User-defined macros can currently
-only be invoked in expression position.
+~~~~~~~~ {.ebnf .gram}
 
-~~~~ {.ebnf .gram}
 expr_macro_rules : "macro_rules" '!' ident '(' macro_rule * ')'
 macro_rule : '(' matcher * ')' "=>" '(' transcriber * ')' ';'
 matcher : '(' matcher * ')' | '[' matcher * ']'
@@ -494,13 +491,18 @@ transcriber : '(' transcriber * ')' | '[' transcriber * ']'
             | '$' '(' transcriber * ')' sep_token? [ '*' | '+' ]
             | non_special_token
 
-~~~~
+~~~~~~~~
+
+User-defined syntax extensions are called "macros", and they can be defined
+with the `macro_rules!` syntax extension. User-defined macros can currently
+only be invoked in expression position.
+
 (A `sep_token` is any token other than `*` and `+`. A `non_special_token` is
 any token other than a delimiter or `$`.)
 
 Macro invocations are looked up by name, and each macro rule is tried in turn;
 the first successful match is transcribed. The matching and transcribing
-processes are close cousins, and will be described together:
+processes are closely related, and will be described together:
 
 ### Macro By Example