Auto merge of #25836 - steveklabnik:gh25305, r=alexcrichton

Fixes #25794
This commit is contained in:
bors 2015-06-09 23:11:25 +00:00
commit 2228ce10c6
2 changed files with 4 additions and 3 deletions

View File

@ -169,6 +169,7 @@ DOC_TARGETS += doc/not_found.html
doc/not_found.html: $(D)/not_found.md $(HTML_DEPS) | doc/ doc/not_found.html: $(D)/not_found.md $(HTML_DEPS) | doc/
@$(call E, rustdoc: $@) @$(call E, rustdoc: $@)
$(Q)$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) \ $(Q)$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) \
--markdown-no-toc \
--markdown-css http://doc.rust-lang.org/rust.css $< --markdown-css http://doc.rust-lang.org/rust.css $<
define DEF_DOC define DEF_DOC

View File

@ -11,7 +11,7 @@ Looks like you've taken a wrong turn.
Some things that might be helpful to you though: Some things that might be helpful to you though:
## Search # Search
* <form action="https://duckduckgo.com/"> * <form action="https://duckduckgo.com/">
<input type="text" id="site-search" name="q" size="80"></input> <input type="text" id="site-search" name="q" size="80"></input>
@ -19,12 +19,12 @@ Some things that might be helpful to you though:
</form> </form>
* Rust doc search: <span id="core-search"></span> * Rust doc search: <span id="core-search"></span>
## Reference # Reference
* [The Rust official site](http://rust-lang.org) * [The Rust official site](http://rust-lang.org)
* [The Rust reference](http://doc.rust-lang.org/reference.html) * [The Rust reference](http://doc.rust-lang.org/reference.html)
## Docs # Docs
* [The standard library](http://doc.rust-lang.org/std/) * [The standard library](http://doc.rust-lang.org/std/)