about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCorey Richardson <corey@octayn.net>2014-04-04 01:35:50 -0400
committerCorey Richardson <corey@octayn.net>2014-04-04 02:10:22 -0400
commit838a57ba9e24e1f7c293828de142f56e64a2900b (patch)
treee398d61edc07a8faaa7d3311a63ca526c94a0b03
parentd2648cc23f34da72be41701d50bc956e4244c77c (diff)
downloadrust-838a57ba9e24e1f7c293828de142f56e64a2900b.tar.gz
rust-838a57ba9e24e1f7c293828de142f56e64a2900b.zip
manual: refine ECMA-335 reference for attributes
-rw-r--r--src/doc/rust.md12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/doc/rust.md b/src/doc/rust.md
index 1ff0d92d19b..b2b550bfa82 100644
--- a/src/doc/rust.md
+++ b/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.