about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-06-12 10:47:03 +0000
committerbors <bors@rust-lang.org>2014-06-12 10:47:03 +0000
commit614e448b02dd2099e6797e56a42e07bf1d19da79 (patch)
treea7844b19ceeed88da7b7d23042b4ff2e266f50cd /src
parenteaabca6aebf48cfa35c5fee2e855e14087eb81d0 (diff)
parente5ebdb4c077d6d24d29edd397f8aa5acd4952e13 (diff)
downloadrust-614e448b02dd2099e6797e56a42e07bf1d19da79.tar.gz
rust-614e448b02dd2099e6797e56a42e07bf1d19da79.zip
auto merge of #14800 : reem/rust/patch-1, r=alexcrichton
According to #14767 and the grammar right above this documentation, nested comments are supported.
Diffstat (limited to 'src')
-rw-r--r--src/doc/rust.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/doc/rust.md b/src/doc/rust.md
index 35d356bb1b5..8f47e81ba5c 100644
--- a/src/doc/rust.md
+++ b/src/doc/rust.md
@@ -160,8 +160,8 @@ block_comment_body : [block_comment | character] * ;
 line_comment : "//" non_eol * ;
 ~~~~
 
-Comments in Rust code follow the general C++ style of line and block-comment forms,
-with no nesting of block-comment delimiters.
+Comments in Rust code follow the general C++ style of line and block-comment forms. 
+Nested block comments are supported.
 
 Line comments beginning with exactly _three_ slashes (`///`), and block
 comments beginning with exactly one repeated asterisk in the block-open