about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-08-03 01:21:08 +0000
committerbors <bors@rust-lang.org>2014-08-03 01:21:08 +0000
commit12306da80ca4b881d784d6590f7d3fee36cf97ac (patch)
treed9e3542981dd0fde5d1607a1833724cd5c0c31ef
parent4d4eb10230a58071c6c83f3009c74040b700fbb7 (diff)
parentcf279105d5369b76468935ed0b333da94437e7dc (diff)
downloadrust-12306da80ca4b881d784d6590f7d3fee36cf97ac.tar.gz
rust-12306da80ca4b881d784d6590f7d3fee36cf97ac.zip
auto merge of #16189 : steveklabnik/rust/gh15494, r=alexcrichton
Fixes #15494.
-rw-r--r--src/doc/rust.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/doc/rust.md b/src/doc/rust.md
index 7259588233e..1413bc92d9f 100644
--- a/src/doc/rust.md
+++ b/src/doc/rust.md
@@ -1823,11 +1823,11 @@ meta_item : ident [ '=' literal
 meta_seq : meta_item [ ',' meta_seq ] ? ;
 ~~~~
 
-Static entities in Rust &mdash; crates, modules and items &mdash; may have _attributes_
-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:
+Any item declaration may have an _attribute_ applied to it. 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