auto merge of #17402 : steveklabnik/rust/update_manual, r=brson

Because I'm still 😷 😷 😷 , I figured some mindless tasks would be better than trying to finish the ownership guide. 

The manual has long been waiting for some ❤️ ❤️ ❤️ , and so I gave it a quick once-over. I made small commits in case any of the changes are a bit weird, I mostly did a few things:

1. changed 'manual' to 'reference.' I feel like this name is better. If it's not, It's not a huge deal. it shouldn't be `rust.md` though.
2. word wrapped everything appropriately. Changes 1&2 are in the first commit, so that its' easier to see the changes in the later ones.
3. fixed other small style issues
4. removed references to things that are in the standard library, and not the language itself

There's still lots of gross in here, but I didn't want to pile on too too many changes.

/cc @brson @nikomatsakis
This commit is contained in:
bors 2014-09-23 22:05:38 +00:00
commit c669411afa
7 changed files with 4298 additions and 4422 deletions

View File

@ -29,9 +29,9 @@ DOCS := index intro tutorial guide guide-ffi guide-macros guide-lifetimes \
guide-tasks guide-container guide-pointers guide-testing \ guide-tasks guide-container guide-pointers guide-testing \
guide-runtime complement-bugreport \ guide-runtime complement-bugreport \
complement-lang-faq complement-design-faq complement-project-faq rust \ complement-lang-faq complement-design-faq complement-project-faq rust \
rustdoc guide-unsafe guide-strings rustdoc guide-unsafe guide-strings reference
PDF_DOCS := guide rust PDF_DOCS := guide reference
RUSTDOC_DEPS_rust := doc/full-toc.inc RUSTDOC_DEPS_rust := doc/full-toc.inc
RUSTDOC_FLAGS_rust := --html-in-header=doc/full-toc.inc RUSTDOC_FLAGS_rust := --html-in-header=doc/full-toc.inc

View File

@ -30,7 +30,7 @@ To generate an HTML version of a doc from Markdown manually, you can do
something like: something like:
~~~~ ~~~~
pandoc --from=markdown --to=html5 --number-sections -o rust.html rust.md pandoc --from=markdown --to=html5 --number-sections -o reference.html reference.md
~~~~ ~~~~
(rust.md being the Rust Reference Manual.) (rust.md being the Rust Reference Manual.)

View File

@ -46,7 +46,7 @@ development of Rust itself is discussed.
# Specification # Specification
Rust does not have an exact specification, but an effort to describe as much of Rust does not have an exact specification, but an effort to describe as much of
the language in as much detail as possible is in [the manual](rust.html). the language in as much detail as possible is in [the reference](reference.html).
# Guides # Guides

View File

@ -13,7 +13,7 @@ Some things that might be helpful to you though:
## Reference ## Reference
* [The Rust official site](http://rust-lang.org) * [The Rust official site](http://rust-lang.org)
* [The Rust reference manual](http://doc.rust-lang.org/rust.html) (* [PDF](http://doc.rust-lang.org/rust.pdf)) * [The Rust reference](http://doc.rust-lang.org/reference.html) (* [PDF](http://doc.rust-lang.org/reference.pdf))
## Docs ## Docs
* [The standard library](http://doc.rust-lang.org/std/) * [The standard library](http://doc.rust-lang.org/std/)

4291
src/doc/reference.md Normal file

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -23,7 +23,7 @@ pub fn expand_syntax_ext<'cx>(cx: &'cx mut ExtCtxt,
-> Box<base::MacResult+'cx> { -> Box<base::MacResult+'cx> {
cx.span_warn(sp, "`bytes!` is deprecated, use `b\"foo\"` literals instead"); cx.span_warn(sp, "`bytes!` is deprecated, use `b\"foo\"` literals instead");
cx.parse_sess.span_diagnostic.span_note(sp, cx.parse_sess.span_diagnostic.span_note(sp,
"see http://doc.rust-lang.org/rust.html#byte-and-byte-string-literals \ "see http://doc.rust-lang.org/reference.html#byte-and-byte-string-literals \
for documentation"); for documentation");
cx.parse_sess.span_diagnostic.span_note(sp, cx.parse_sess.span_diagnostic.span_note(sp,
"see https://github.com/rust-lang/rust/blob/master/src/etc/2014-06-rewrite-bytes-macros.py \ "see https://github.com/rust-lang/rust/blob/master/src/etc/2014-06-rewrite-bytes-macros.py \