diff options
| author | bors <bors@rust-lang.org> | 2013-10-03 00:56:34 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-03 00:56:34 -0700 |
| commit | 8f40641e01fe7f79e21f606733646c600820bbd8 (patch) | |
| tree | 931abc4a950022f38741d7b2216f84a436d5797d /src/libstd | |
| parent | b637798a5aa7878daa57c147028e98f2c5bc03c5 (diff) | |
| parent | d06043ba0b4f0ed871e5374aa0d6b37fa170dfc6 (diff) | |
| download | rust-8f40641e01fe7f79e21f606733646c600820bbd8.tar.gz rust-8f40641e01fe7f79e21f606733646c600820bbd8.zip | |
auto merge of #9691 : alexcrichton/rust/rustdoc, r=cmr
This slurps in the commits from #9684 as well as closing #9539.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/std.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/std.rs b/src/libstd/std.rs index ece623fab24..5501cdfdcd5 100644 --- a/src/libstd/std.rs +++ b/src/libstd/std.rs @@ -58,7 +58,8 @@ they contained the following prologue: #[crate_type = "lib"]; #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk.png", - html_favicon_url = "http://www.rust-lang.org/favicon.ico")]; + html_favicon_url = "http://www.rust-lang.org/favicon.ico", + html_root_url = "http://static.rust-lang.org/doc/master")]; // Don't link to std. We are std. #[no_std]; |