auto merge of #16440 : bheesham/rust/master, r=brson

  * `rust.md`: changes for consistency

  * `guide-ffi.md`: wrapped inline code

NOTE: This is a duplicate of #16375. I completely messed up that fork, so I made a new fork.

diff --git a/src/doc/guide-ffi.md b/src/doc/guide-ffi.md
index fb03d7bc11f5ea9e9b14c8b4f5f3c4f34cc6c6ed..600a9019e6b944478780f0c632e1a3e74297ab69 100644 (file)
--- a/src/doc/guide-ffi.md
+++ b/src/doc/guide-ffi.md
@@ -350,9 +350,9 @@ linking to, and in the second case `bar` is the type of native library that the
 compiler is linking to. There are currently three known types of native
 libraries:
 
-* Dynamic - `#[link(name = "readline")]
-* Static - `#[link(name = "my_build_dependency", kind = "static")]
-* Frameworks - `#[link(name = "CoreFoundation", kind = "framework")]
+* Dynamic - `#[link(name = "readline")]`
+* Static - `#[link(name = "my_build_dependency", kind = "static")]`
+* Frameworks - `#[link(name = "CoreFoundation", kind = "framework")]`
 
 Note that frameworks are only available on OSX targets.
 

diff --git a/src/doc/rust.md b/src/doc/rust.md
index ae4b33b6cb3bae02932b8c0cd10dd86e60cbea96..f9560b4a50963cdb6500de848c96807b40267b58 100644 (file)
--- a/src/doc/rust.md
+++ b/src/doc/rust.md
@@ -135,9 +135,9 @@ The `ident` production is any nonempty Unicode string of the following form:
 
 that does _not_ occur in the set of [keywords](#keywords).
 
-Note: `XID_start` and `XID_continue` as character properties cover the
-character ranges used to form the more familiar C and Java language-family
-identifiers.
+> **Note**: `XID_start` and `XID_continue` as character properties cover the
+> character ranges used to form the more familiar C and Java language-family
+> identifiers.
 
 ### Delimiter-restricted productions
 
@@ -933,9 +933,9 @@ Usually a `use` declaration is used to shorten the path required to refer to a
 module item. These declarations may appear at the top of [modules](#modules) and
 [blocks](#blocks).
 
-*Note*: Unlike in many languages,
-`use` declarations in Rust do *not* declare linkage dependency with external crates.
-Rather, [`extern crate` declarations](#extern-crate-declarations) declare linkage dependencies.
+> **Note**: Unlike in many languages,
+> `use` declarations in Rust do *not* declare linkage dependency with external crates.
+> Rather, [`extern crate` declarations](#extern-crate-declarations) declare linkage dependencies.
 
 Use declarations support a number of convenient shortcuts:
 
@@ -2573,8 +2573,8 @@ within a statement block is simply a way of restricting its scope to a narrow
 region containing all of its uses; it is otherwise identical in meaning to
 declaring the item outside the statement block.
 
-Note: there is no implicit capture of the function's dynamic environment when
-declaring a function-local item.
+> **Note**: there is no implicit capture of the function's dynamic environment when
+> declaring a function-local item.
 
 #### Slot declarations