about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--CONTRIBUTING.md2
-rw-r--r--README.md4
-rw-r--r--mk/docs.mk2
-rw-r--r--src/doc/complement-cheatsheet.md40
-rw-r--r--src/doc/not_found.md5
-rw-r--r--src/doc/rustdoc.md2
-rw-r--r--src/doc/tutorial.md10
-rw-r--r--src/liballoc/lib.rs2
-rw-r--r--src/libarena/lib.rs2
-rw-r--r--src/libcollections/lib.rs2
-rw-r--r--src/libcore/iter.rs2
-rw-r--r--src/libcore/lib.rs2
-rw-r--r--src/libflate/lib.rs2
-rw-r--r--src/libfourcc/lib.rs2
-rw-r--r--src/libgetopts/lib.rs2
-rw-r--r--src/libglob/lib.rs2
-rw-r--r--src/libgraphviz/lib.rs2
-rw-r--r--src/libgreen/lib.rs2
-rw-r--r--src/libhexfloat/lib.rs2
-rw-r--r--src/liblog/lib.rs2
-rw-r--r--src/libnative/lib.rs2
-rw-r--r--src/libnum/lib.rs2
-rw-r--r--src/librand/lib.rs2
-rw-r--r--src/libregex/lib.rs2
-rw-r--r--src/libregex_macros/lib.rs2
-rw-r--r--src/librlibc/lib.rs2
-rw-r--r--src/librustc/driver/mod.rs2
-rw-r--r--src/librustc/lib.rs2
-rw-r--r--src/libsemver/lib.rs2
-rw-r--r--src/libserialize/lib.rs2
-rw-r--r--src/libstd/lib.rs2
-rw-r--r--src/libsync/lib.rs2
-rw-r--r--src/libsyntax/ext/fmt.rs2
-rw-r--r--src/libsyntax/lib.rs2
-rw-r--r--src/libterm/lib.rs2
-rw-r--r--src/libtest/lib.rs2
-rw-r--r--src/libtime/lib.rs2
-rw-r--r--src/liburl/lib.rs2
-rw-r--r--src/libuuid/lib.rs2
-rw-r--r--src/libworkcache/lib.rs2
40 files changed, 73 insertions, 58 deletions
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 8552bcc6974..f214dcacb7c 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 
 If you're just reporting a bug, please see:
 
-http://static.rust-lang.org/doc/master/complement-bugreport.html
+http://doc.rust-lang.org/complement-bugreport.html
 
 ## Pull request procedure
 
diff --git a/README.md b/README.md
index 680dfddbe96..2f846725cd7 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ documentation.
 > [getting started][wiki-start] notes on the wiki.
 
 [installer]: http://www.rust-lang.org/install.html
-[tutorial]: http://static.rust-lang.org/doc/tutorial.html
+[tutorial]: http://doc.rust-lang.org/tutorial.html
 [wiki-start]: https://github.com/mozilla/rust/wiki/Note-getting-started-developing-Rust
 [win-wiki]: https://github.com/mozilla/rust/wiki/Using-Rust-on-Windows
 
@@ -60,7 +60,7 @@ documentation.
 
 [repo]: https://github.com/mozilla/rust
 [tarball]: http://static.rust-lang.org/dist/rust-nightly.tar.gz
-[tutorial]: http://static.rust-lang.org/doc/master/tutorial.html
+[tutorial]: http://doc.rust-lang.org/tutorial.html
 
 ## Notes
 
diff --git a/mk/docs.mk b/mk/docs.mk
index 4d00223fca8..b02cb548ad5 100644
--- a/mk/docs.mk
+++ b/mk/docs.mk
@@ -156,7 +156,7 @@ doc/footer.tex: $(D)/footer.inc | doc/
 # HTML (rustdoc)
 DOC_TARGETS += doc/not_found.html
 doc/not_found.html: $(D)/not_found.md $(HTML_DEPS) | doc/
-	$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css http://static.rust-lang.org/doc/master/rust.css $<
+	$(RUSTDOC) $(RUSTDOC_HTML_OPTS_NO_CSS) --markdown-css http://doc.rust-lang.org/rust.css $<
 
 define DEF_DOC
 
diff --git a/src/doc/complement-cheatsheet.md b/src/doc/complement-cheatsheet.md
index 4670a2922cf..211703642f7 100644
--- a/src/doc/complement-cheatsheet.md
+++ b/src/doc/complement-cheatsheet.md
@@ -4,7 +4,7 @@
 
 **Int to string**
 
-Use [`ToStr`](http://static.rust-lang.org/doc/master/std/to_str/trait.ToStr.html).
+Use [`ToStr`](../std/to_str/trait.ToStr.html).
 
 ~~~
 let x: int = 42;
@@ -13,7 +13,8 @@ let y: StrBuf = x.to_str().to_strbuf();
 
 **String to int**
 
-Use [`FromStr`](http://static.rust-lang.org/doc/master/std/from_str/trait.FromStr.html), and its helper function, [`from_str`](http://static.rust-lang.org/doc/master/std/from_str/fn.from_str.html).
+Use [`FromStr`](../std/from_str/trait.FromStr.html), and its helper function,
+[`from_str`](../std/from_str/fn.from_str.html).
 
 ~~~
 let x: Option<int> = from_str("42");
@@ -34,7 +35,8 @@ let y: StrBuf = format_strbuf!("{:X}", x);   // uppercase hexadecimal
 
 **String to int, in non-base-10**
 
-Use [`FromStrRadix`](http://static.rust-lang.org/doc/master/std/num/trait.FromStrRadix.html), and its helper function, [`from_str_radix`](http://static.rust-lang.org/doc/master/std/num/fn.from_str_radix.html).
+Use [`FromStrRadix`](../std/num/trait.FromStrRadix.html), and its helper
+function, [`from_str_radix`](../std/num/fn.from_str_radix.html).
 
 ~~~
 use std::num;
@@ -45,7 +47,8 @@ let y: i64 = x.unwrap();
 
 **Vector of Bytes to String**
 
-To return a Borrowed String Slice (&str) use the str helper function [`from_utf8`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8.html).
+To return a Borrowed String Slice (&str) use the str helper function
+[`from_utf8`](../std/str/fn.from_utf8.html).
 
 ~~~
 use std::str;
@@ -55,7 +58,8 @@ let x: Option<&str> = str::from_utf8(bytes);
 let y: &str = x.unwrap();
 ~~~
 
-To return an Owned String (StrBuf) use the str helper function [`from_utf8_owned`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html).
+To return an Owned String (StrBuf) use the str helper function
+[`from_utf8_owned`](../std/str/fn.from_utf8_owned.html).
 
 ~~~
 use std::str;
@@ -65,7 +69,10 @@ let x: Result<StrBuf,~[u8]> =
 let y: StrBuf = x.unwrap();
 ~~~
 
-To return a [`MaybeOwned`](http://static.rust-lang.org/doc/master/std/str/enum.MaybeOwned.html) use the str helper function [`from_utf8_lossy`](http://static.rust-lang.org/doc/master/std/str/fn.from_utf8_owned.html).  This function also replaces non-valid utf-8 sequences with U+FFFD replacement character.
+To return a [`MaybeOwned`](../std/str/enum.MaybeOwned.html) use the str helper
+function [`from_utf8_lossy`](../std/str/fn.from_utf8_owned.html).
+This function also replaces non-valid utf-8 sequences with U+FFFD replacement
+character.
 
 ~~~
 use std::str;
@@ -78,7 +85,13 @@ let y = str::from_utf8_lossy(x);
 
 ## How do I read from a file?
 
-Use [`File::open`](http://static.rust-lang.org/doc/master/std/io/fs/struct.File.html#method.open) to create a [`File`](http://static.rust-lang.org/doc/master/std/io/fs/struct.File.html) struct, which implements the [`Reader`](http://static.rust-lang.org/doc/master/std/io/trait.Reader.html) trait.
+Use
+[`File::open`](../std/io/fs/struct.File.html#method.open)
+to create a
+[`File`](../std/io/fs/struct.File.html)
+struct, which implements the
+[`Reader`](../std/io/trait.Reader.html)
+trait.
 
 ~~~ {.ignore}
 use std::path::Path;
@@ -91,7 +104,7 @@ let reader : File = File::open(&path).unwrap_or_else(on_error);
 
 ## How do I iterate over the lines in a file?
 
-Use the [`lines`](http://static.rust-lang.org/doc/master/std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](http://static.rust-lang.org/doc/master/std/io/buffered/struct.BufferedReader.html).
+Use the [`lines`](../std/io/trait.Buffer.html#method.lines) method on a [`BufferedReader`](../std/io/buffered/struct.BufferedReader.html).
 
 ~~~
 use std::io::BufferedReader;
@@ -109,7 +122,7 @@ for line in reader.lines() {
 
 ## How do I search for a substring?
 
-Use the [`find_str`](http://static.rust-lang.org/doc/master/std/str/trait.StrSlice.html#tymethod.find_str) method.
+Use the [`find_str`](../std/str/trait.StrSlice.html#tymethod.find_str) method.
 
 ~~~
 let str = "Hello, this is some random string";
@@ -120,7 +133,7 @@ let index: Option<uint> = str.find_str("rand");
 
 ## How do I get the length of a vector?
 
-The [`Container`](http://static.rust-lang.org/doc/master/std/container/trait.Container.html) trait provides the `len` method.
+The [`Container`](../std/container/trait.Container.html) trait provides the `len` method.
 
 ~~~
 let u: ~[u32] = ~[0, 1, 2];
@@ -132,7 +145,7 @@ println!("u: {}, v: {}, w: {}", u.len(), v.len(), w.len()); // 3, 4, 5
 
 ## How do I iterate over a vector?
 
-Use the [`iter`](http://static.rust-lang.org/doc/master/std/vec/trait.ImmutableVector.html#tymethod.iter) method.
+Use the [`iter`](../std/vec/trait.ImmutableVector.html#tymethod.iter) method.
 
 ~~~
 let values: ~[int] = ~[1, 2, 3, 4, 5];
@@ -141,7 +154,10 @@ for value in values.iter() {  // value: &int
 }
 ~~~
 
-(See also [`mut_iter`](http://static.rust-lang.org/doc/master/std/vec/trait.MutableVector.html#tymethod.mut_iter) which yields `&mut int` and [`move_iter`](http://static.rust-lang.org/doc/master/std/vec/trait.OwnedVector.html#tymethod.move_iter) which yields `int` while consuming the `values` vector.)
+(See also [`mut_iter`](../std/vec/trait.MutableVector.html#tymethod.mut_iter)
+which yields `&mut int` and
+[`move_iter`](../std/vec/trait.OwnedVector.html#tymethod.move_iter) which yields
+`int` while consuming the `values` vector.)
 
 # Type system
 
diff --git a/src/doc/not_found.md b/src/doc/not_found.md
index a19418ff667..a9df94d8138 100644
--- a/src/doc/not_found.md
+++ b/src/doc/not_found.md
@@ -13,8 +13,7 @@ Some things that might be helpful to you though:
 
 ## Reference
 * [The Rust official site](http://rust-lang.org)
-* [The Rust reference manual](http://static.rust-lang.org/doc/master/rust.html) (* [PDF](http://static.rust-lang.org/doc/master/rust.pdf))
+* [The Rust reference manual](http://doc.rust-lang.org/rust.html) (* [PDF](http://doc.rust-lang.org/rust.pdf))
 
 ## Docs
-* [The standard library (stable)](http://doc.rust-lang.org/doc/0.10/std/index.html)
-* [The standard library (master)](http://doc.rust-lang.org/doc/master/std/index.html)
+* [The standard library](http://doc.rust-lang.org/std/)
diff --git a/src/doc/rustdoc.md b/src/doc/rustdoc.md
index 3b7f4e1bf50..d6cb782bd83 100644
--- a/src/doc/rustdoc.md
+++ b/src/doc/rustdoc.md
@@ -67,7 +67,7 @@ documentation:
 ~~~
 #[doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-      html_root_url = "http://static.rust-lang.org/doc/master")];
+      html_root_url = "http://doc.rust-lang.org/")];
 ~~~
 
 The `html_root_url` is the prefix that rustdoc will apply to any references to
diff --git a/src/doc/tutorial.md b/src/doc/tutorial.md
index 0b076dcde5d..7a0a1662742 100644
--- a/src/doc/tutorial.md
+++ b/src/doc/tutorial.md
@@ -382,7 +382,7 @@ let y: uint = x as uint;
 assert!(y == 4u);
 ~~~~
 
-[transmute]: http://static.rust-lang.org/doc/master/std/cast/fn.transmute.html
+[transmute]: http://doc.rust-lang.org/std/mem/fn.transmute.html
 
 ## Syntax extensions
 
@@ -409,7 +409,7 @@ println!("what is this thing: {:?}", mystery_object);
 ~~~~
 
 [pf]: http://en.cppreference.com/w/cpp/io/c/fprintf
-[fmt]: http://static.rust-lang.org/doc/master/std/fmt/index.html
+[fmt]: http://doc.rust-lang.org/std/fmt/
 
 You can define your own syntax extensions with the macro system. For details,
 see the [macro tutorial][macros]. Note that macro definition is currently
@@ -959,8 +959,8 @@ that are `Send`, but non-`Send` types can still *contain* types with custom
 destructors. Example of types which are not `Send` are [`Gc<T>`][gc] and
 [`Rc<T>`][rc], the shared-ownership types.
 
-[gc]: http://static.rust-lang.org/doc/master/std/gc/struct.Gc.html
-[rc]: http://static.rust-lang.org/doc/master/std/rc/struct.Rc.html
+[gc]: http://doc.rust-lang.org/std/gc/struct.Gc.html
+[rc]: http://doc.rust-lang.org/std/rc/struct.Rc.html
 
 # Implementing a linked list
 
@@ -1486,7 +1486,7 @@ let mut x = 5;
 # x = 3;
 ~~~~
 
-[refcell]: http://static.rust-lang.org/doc/master/std/cell/struct.RefCell.html
+[refcell]: http://doc.rust-lang.org/std/cell/struct.RefCell.html
 
 # Dereferencing pointers
 
diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs
index 1a6d7bfaed0..bf870e101eb 100644
--- a/src/liballoc/lib.rs
+++ b/src/liballoc/lib.rs
@@ -65,7 +65,7 @@
 #![crate_type = "rlib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![no_std]
 #![feature(phase)]
diff --git a/src/libarena/lib.rs b/src/libarena/lib.rs
index 3c93cdac8bb..00ac70ccc16 100644
--- a/src/libarena/lib.rs
+++ b/src/libarena/lib.rs
@@ -25,7 +25,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![allow(missing_doc)]
 
 extern crate collections;
diff --git a/src/libcollections/lib.rs b/src/libcollections/lib.rs
index d45308bf193..4c5f55e5376 100644
--- a/src/libcollections/lib.rs
+++ b/src/libcollections/lib.rs
@@ -18,7 +18,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![feature(macro_rules, managed_boxes, default_type_params, phase)]
 
diff --git a/src/libcore/iter.rs b/src/libcore/iter.rs
index da1462a7047..178ba9fa5b8 100644
--- a/src/libcore/iter.rs
+++ b/src/libcore/iter.rs
@@ -59,7 +59,7 @@ This `for` loop syntax can be applied to any iterator over any type.
 ## Iteration protocol and more
 
 More detailed information about iterators can be found in the [container
-guide](http://static.rust-lang.org/doc/master/guide-container.html) with
+guide](http://doc.rust-lang.org/guide-container.html) with
 the rest of the rust manuals.
 
 */
diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index ffb9b676e7d..6de7e8bcaca 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -50,7 +50,7 @@
 #![crate_type = "rlib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![no_std]
 #![feature(globs, macro_rules, managed_boxes, phase)]
diff --git a/src/libflate/lib.rs b/src/libflate/lib.rs
index 76d803cdacc..54f147dead8 100644
--- a/src/libflate/lib.rs
+++ b/src/libflate/lib.rs
@@ -24,7 +24,7 @@ Simple [DEFLATE][def]-based compression. This is a wrapper around the
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![feature(phase)]
 #![deny(deprecated_owned_vector)]
 
diff --git a/src/libfourcc/lib.rs b/src/libfourcc/lib.rs
index 93aa978add5..194de7b2f4a 100644
--- a/src/libfourcc/lib.rs
+++ b/src/libfourcc/lib.rs
@@ -45,7 +45,7 @@ fn main() {
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![deny(deprecated_owned_vector)]
 #![feature(macro_registrar, managed_boxes)]
diff --git a/src/libgetopts/lib.rs b/src/libgetopts/lib.rs
index ba30e1a2e98..5d0b8c8a7e5 100644
--- a/src/libgetopts/lib.rs
+++ b/src/libgetopts/lib.rs
@@ -84,7 +84,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![feature(globs, phase)]
 #![deny(missing_doc)]
 #![deny(deprecated_owned_vector)]
diff --git a/src/libglob/lib.rs b/src/libglob/lib.rs
index 7b9260c7eb9..6b9bdf7c748 100644
--- a/src/libglob/lib.rs
+++ b/src/libglob/lib.rs
@@ -29,7 +29,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![deny(deprecated_owned_vector)]
 
diff --git a/src/libgraphviz/lib.rs b/src/libgraphviz/lib.rs
index a87bb1e6752..4d86ab530f2 100644
--- a/src/libgraphviz/lib.rs
+++ b/src/libgraphviz/lib.rs
@@ -272,7 +272,7 @@ pub fn main() {
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![experimental]
 
diff --git a/src/libgreen/lib.rs b/src/libgreen/lib.rs
index eec413635a5..05ac0e8ebb7 100644
--- a/src/libgreen/lib.rs
+++ b/src/libgreen/lib.rs
@@ -203,7 +203,7 @@
 #![crate_type = "dylib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 // NB this does *not* include globs, please keep it that way.
 #![feature(macro_rules, phase)]
diff --git a/src/libhexfloat/lib.rs b/src/libhexfloat/lib.rs
index dda14fb10af..1ab130ee6c9 100644
--- a/src/libhexfloat/lib.rs
+++ b/src/libhexfloat/lib.rs
@@ -42,7 +42,7 @@ fn main() {
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![deny(deprecated_owned_vector)]
 #![feature(macro_registrar, managed_boxes)]
diff --git a/src/liblog/lib.rs b/src/liblog/lib.rs
index 5981f87b4f2..c126eca24ba 100644
--- a/src/liblog/lib.rs
+++ b/src/liblog/lib.rs
@@ -111,7 +111,7 @@ if logging is disabled, none of the components of the log will be executed.
 #![crate_type = "dylib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![feature(macro_rules)]
 #![deny(missing_doc, deprecated_owned_vector)]
diff --git a/src/libnative/lib.rs b/src/libnative/lib.rs
index 8ba06133369..0a0e19e750d 100644
--- a/src/libnative/lib.rs
+++ b/src/libnative/lib.rs
@@ -47,7 +47,7 @@
 #![crate_type = "dylib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![deny(unused_result, unused_must_use)]
 #![allow(non_camel_case_types)]
 #![feature(macro_rules)]
diff --git a/src/libnum/lib.rs b/src/libnum/lib.rs
index 85967d4d942..d42c197cab7 100644
--- a/src/libnum/lib.rs
+++ b/src/libnum/lib.rs
@@ -50,7 +50,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![deny(deprecated_owned_vector)]
 
diff --git a/src/librand/lib.rs b/src/librand/lib.rs
index c7a29ff7285..1c4132b961c 100644
--- a/src/librand/lib.rs
+++ b/src/librand/lib.rs
@@ -75,7 +75,7 @@ println!("{:?}", tuple_ptr)
 #![crate_type = "rlib"]
 #![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_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![feature(macro_rules, managed_boxes, phase)]
 #![deny(deprecated_owned_vector)]
diff --git a/src/libregex/lib.rs b/src/libregex/lib.rs
index 93254c773ff..4cb51361f27 100644
--- a/src/libregex/lib.rs
+++ b/src/libregex/lib.rs
@@ -359,7 +359,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![feature(macro_rules, phase)]
 #![deny(missing_doc, deprecated_owned_vector)]
diff --git a/src/libregex_macros/lib.rs b/src/libregex_macros/lib.rs
index b85a1592eff..08b41ff2ac6 100644
--- a/src/libregex_macros/lib.rs
+++ b/src/libregex_macros/lib.rs
@@ -17,7 +17,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![feature(macro_registrar, managed_boxes, quote)]
 
diff --git a/src/librlibc/lib.rs b/src/librlibc/lib.rs
index 904fbe9be9b..8c804d4d254 100644
--- a/src/librlibc/lib.rs
+++ b/src/librlibc/lib.rs
@@ -25,7 +25,7 @@
 #![crate_type = "rlib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![no_std]
 #![experimental]
diff --git a/src/librustc/driver/mod.rs b/src/librustc/driver/mod.rs
index c4c145f5bd6..f911c24294a 100644
--- a/src/librustc/driver/mod.rs
+++ b/src/librustc/driver/mod.rs
@@ -42,7 +42,7 @@ pub fn main_args(args: &[StrBuf]) -> int {
 }
 
 static BUG_REPORT_URL: &'static str =
-    "http://static.rust-lang.org/doc/master/complement-bugreport.html";
+    "http://doc.rust-lang.org/complement-bugreport.html";
 
 fn run_compiler(args: &[StrBuf]) {
     let matches = match handle_options(Vec::from_slice(args)) {
diff --git a/src/librustc/lib.rs b/src/librustc/lib.rs
index 5f13ed4942e..350dec76768 100644
--- a/src/librustc/lib.rs
+++ b/src/librustc/lib.rs
@@ -25,7 +25,7 @@ This API is completely unstable and subject to change.
 #![crate_type = "rlib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
       html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-      html_root_url = "http://static.rust-lang.org/doc/master")]
+      html_root_url = "http://doc.rust-lang.org/")]
 
 #![allow(deprecated)]
 #![feature(macro_rules, globs, struct_variant, managed_boxes, quote,
diff --git a/src/libsemver/lib.rs b/src/libsemver/lib.rs
index 2f1d59b23a2..57a2ffee03a 100644
--- a/src/libsemver/lib.rs
+++ b/src/libsemver/lib.rs
@@ -34,7 +34,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![deny(deprecated_owned_vector)]
 
 use std::char;
diff --git a/src/libserialize/lib.rs b/src/libserialize/lib.rs
index 209a1439dda..ce1d49406fb 100644
--- a/src/libserialize/lib.rs
+++ b/src/libserialize/lib.rs
@@ -20,7 +20,7 @@ Core encoding and decoding interfaces.
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![feature(macro_rules, managed_boxes, default_type_params, phase)]
 
 // test harness access
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index a9ec9c1ddc5..b0d08c80fbc 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -102,7 +102,7 @@
 #![crate_type = "dylib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![feature(macro_rules, globs, asm, managed_boxes, thread_local, link_args,
            simd, linkage, default_type_params, phase, concat_idents, quad_precision_float)]
 
diff --git a/src/libsync/lib.rs b/src/libsync/lib.rs
index 3396425928e..e0cc57a4967 100644
--- a/src/libsync/lib.rs
+++ b/src/libsync/lib.rs
@@ -18,7 +18,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![feature(phase)]
 #![deny(deprecated_owned_vector)]
 
diff --git a/src/libsyntax/ext/fmt.rs b/src/libsyntax/ext/fmt.rs
index 0907541eee0..4185458bfbe 100644
--- a/src/libsyntax/ext/fmt.rs
+++ b/src/libsyntax/ext/fmt.rs
@@ -22,7 +22,7 @@ pub fn expand_syntax_ext(ecx: &mut base::ExtCtxt,
                          -> Box<base::MacResult> {
     ecx.span_err(sp, "`fmt!` is deprecated, use `format!` instead");
     ecx.parse_sess.span_diagnostic.span_note(sp,
-        "see http://static.rust-lang.org/doc/master/std/fmt/index.html \
+        "see http://doc.rust-lang.org/std/fmt/ \
          for documentation");
 
     base::MacExpr::new(ecx.expr_uint(sp, 2))
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 1086295d427..52612bb4dec 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -24,7 +24,7 @@ This API is completely unstable and subject to change.
 #![crate_type = "rlib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![feature(macro_rules, globs, managed_boxes, default_type_params, phase,
            quote)]
diff --git a/src/libterm/lib.rs b/src/libterm/lib.rs
index 622bc025ced..d454ad08e4f 100644
--- a/src/libterm/lib.rs
+++ b/src/libterm/lib.rs
@@ -45,7 +45,7 @@
 #![crate_type = "dylib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![feature(macro_rules, phase)]
 
diff --git a/src/libtest/lib.rs b/src/libtest/lib.rs
index dc3a18b8095..65aef8eef51 100644
--- a/src/libtest/lib.rs
+++ b/src/libtest/lib.rs
@@ -30,7 +30,7 @@
 #![crate_type = "dylib"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![feature(asm, macro_rules, phase)]
 #![deny(deprecated_owned_vector)]
diff --git a/src/libtime/lib.rs b/src/libtime/lib.rs
index 0e67076dc08..d45781d73d9 100644
--- a/src/libtime/lib.rs
+++ b/src/libtime/lib.rs
@@ -17,7 +17,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![feature(phase)]
 #![deny(deprecated_owned_vector)]
 
diff --git a/src/liburl/lib.rs b/src/liburl/lib.rs
index 5fc567f06d3..71b6cf07de7 100644
--- a/src/liburl/lib.rs
+++ b/src/liburl/lib.rs
@@ -16,7 +16,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![feature(default_type_params)]
 
 extern crate collections;
diff --git a/src/libuuid/lib.rs b/src/libuuid/lib.rs
index d2032b9d492..571bd37dc03 100644
--- a/src/libuuid/lib.rs
+++ b/src/libuuid/lib.rs
@@ -60,7 +60,7 @@ Examples of string representations:
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 
 #![feature(default_type_params)]
 
diff --git a/src/libworkcache/lib.rs b/src/libworkcache/lib.rs
index 5ac45d75156..01f7ce9794f 100644
--- a/src/libworkcache/lib.rs
+++ b/src/libworkcache/lib.rs
@@ -80,7 +80,7 @@
 #![license = "MIT/ASL2"]
 #![doc(html_logo_url = "http://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
        html_favicon_url = "http://www.rust-lang.org/favicon.ico",
-       html_root_url = "http://static.rust-lang.org/doc/master")]
+       html_root_url = "http://doc.rust-lang.org/")]
 #![feature(phase)]
 #![allow(visible_private_types)]
 #![deny(deprecated_owned_vector)]