---

yaml
---
r: 109917
b: refs/heads/master
c: 838a57b
h: refs/heads/master
i:
  109915: b80eb51
v: v3

Author: emberian

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d2648cc23f34da72be41701d50bc956e4244c77c
+refs/heads/master: 838a57ba9e24e1f7c293828de142f56e64a2900b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: c7fac4471201977fdb1c0c0a26c87287e12dc644
 refs/heads/try: f64fdf524a434f0e5cd0bc91d09c144723f3c90d

trunk/src/doc/rust.md

@@ -1685,10 +1685,10 @@ attr : ident [ '=' literal
 ~~~~
 
 Static entities in Rust -- crates, modules and items -- may have _attributes_
-applied to them. Attributes in Rust are modeled on Attributes in ECMA-335, C#.
-An attribute is a general, free-form metadatum that is interpreted according
-to name, convention, and language and compiler version.  Attributes may appear
-as any of:
+applied to them. Attributes in Rust are modeled on Attributes in ECMA-335,
+with the syntax coming from ECMA-334 (C#). An attribute is a general,
+free-form metadatum that is interpreted according to name, convention, and
+language and compiler version. Attributes may appear as any of:
 
 * A single identifier, the attribute name
 * An identifier followed by the equals sign '=' and a literal, providing a
@@ -1881,8 +1881,8 @@ For any lint check `C`:
  * `deny(C)` signals an error after encountering a violation of `C`,
  * `allow(C)` overrides the check for `C` so that violations will go
     unreported,
- * `forbid(C)` is the same as `deny(C)`, but also forbids uses of
-   `allow(C)` within the attribute.
+ * `forbid(C)` is the same as `deny(C)`, but also forbids changing the lint
+    level afterwards.
 
 The lint checks supported by the compiler can be found via `rustc -W help`,
 along with their default settings.