diff options
| author | bors <bors@rust-lang.org> | 2014-08-14 09:31:19 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-08-14 09:31:19 +0000 |
| commit | 32098bbb0dabf45735648b4a6cae5291abbdb9c8 (patch) | |
| tree | 9e89d919128891918918c2961c63f554405d6c61 | |
| parent | 259e806db6f444b5836c72c9ca8e43d52a5e7f8a (diff) | |
| parent | a43dadb20495504c7647842a0603c4621f5ff0bd (diff) | |
| download | rust-32098bbb0dabf45735648b4a6cae5291abbdb9c8.tar.gz rust-32098bbb0dabf45735648b4a6cae5291abbdb9c8.zip | |
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.
| -rw-r--r-- | src/doc/guide-ffi.md | 6 | ||||
| -rw-r--r-- | src/doc/rust.md | 16 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/doc/guide-ffi.md b/src/doc/guide-ffi.md index fb03d7bc11f..600a9019e6b 100644 --- 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 ae4b33b6cb3..f9560b4a509 100644 --- 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 |