about summary refs log tree commit diff
path: root/src/libextra
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-10-03 00:56:34 -0700
committerbors <bors@rust-lang.org>2013-10-03 00:56:34 -0700
commit8f40641e01fe7f79e21f606733646c600820bbd8 (patch)
tree931abc4a950022f38741d7b2216f84a436d5797d /src/libextra
parentb637798a5aa7878daa57c147028e98f2c5bc03c5 (diff)
parentd06043ba0b4f0ed871e5374aa0d6b37fa170dfc6 (diff)
downloadrust-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/libextra')
-rw-r--r--src/libextra/extra.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libextra/extra.rs b/src/libextra/extra.rs
index 796dd9c7c7e..74787e66fec 100644
--- a/src/libextra/extra.rs
+++ b/src/libextra/extra.rs
@@ -26,7 +26,8 @@ Rust extras are part of the standard Rust distribution.
        url = "https://github.com/mozilla/rust/tree/master/src/libextra")];
 
 #[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")];
 
 #[comment = "Rust extras"];
 #[license = "MIT/ASL2"];