doc: Fix some broken links

5 files changed, 13 insertions, 14 deletions

diff --git a/src/doc/rust.md b/src/doc/rust.md
index 9a9e3747963..652f8f6c42f 100644
--- a/src/doc/rust.md
+++ b/src/doc/rust.md
@@ -17,14 +17,13 @@ This document does not serve as a tutorial introduction to the
 language. Background familiarity with the language is assumed. A separate
 [tutorial] document is available to help acquire such background familiarity.
 
-This document also does not serve as a reference to the [standard] or [extra]
-libraries included in the language distribution. Those libraries are
+This document also does not serve as a reference to the [standard]
+library included in the language distribution. Those libraries are
 documented separately by extracting documentation attributes from their
 source code.
 
 [tutorial]: tutorial.html
 [standard]: std/index.html
-[extra]: extra/index.html
 
 ## Disclaimer
 
diff --git a/src/libcore/result.rs b/src/libcore/result.rs
index 337b2ac89dd..0960b646eef 100644
--- a/src/libcore/result.rs
+++ b/src/libcore/result.rs
@@ -24,7 +24,7 @@
 //!
 //! Functions return `Result` whenever errors are expected and
 //! recoverable. In the `std` crate `Result` is most prominently used
-//! for [I/O](../io/index.html).
+//! for [I/O](../../std/io/index.html).
 //!
 //! A simple function returning `Result` might be
 //! defined and used like so:
diff --git a/src/librustdoc/html/item_type.rs b/src/librustdoc/html/item_type.rs
index f59e8cb2487..a19d0b6fb30 100644
--- a/src/librustdoc/html/item_type.rs
+++ b/src/librustdoc/html/item_type.rs
@@ -44,9 +44,9 @@ impl ItemType {
         match *self {
             Module          => "mod",
             Struct          => "struct",
-            Enum            => "enum",
+            Enum            => "type",
             Function        => "fn",
-            Typedef         => "typedef",
+            Typedef         => "type",
             Static          => "static",
             Trait           => "trait",
             Impl            => "impl",
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 72d41ae1dd2..ae2436ad3b4 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -16,11 +16,11 @@
 //!
 //! ## Intrinsic types and operations
 //!
-//! The [`ptr`](ptr/index.html), [`mem`](mem/index.html),
-//! and [`cast`](cast/index.html) modules deal with unsafe pointers,
+//! The [`ptr`](../core/ptr/index.html), [`mem`](../core/mem/index.html),
+//! and [`cast`](../core/cast/index.html) modules deal with unsafe pointers,
 //! memory manipulation, and coercion.
-//! [`kinds`](kinds/index.html) defines the special built-in traits,
-//! and [`raw`](raw/index.html) the runtime representation of Rust types.
+//! [`kinds`](../core/kinds/index.html) defines the special built-in traits,
+//! and [`raw`](../core/raw/index.html) the runtime representation of Rust types.
 //! These are some of the lowest-level building blocks of Rust
 //! abstractions.
 //!
@@ -35,9 +35,9 @@
 //!
 //! The [`option`](option/index.html) and [`result`](result/index.html)
 //! modules define optional and error-handling types, `Option` and `Result`.
-//! [`iter`](iter/index.html) defines Rust's iterator protocol
+//! [`iter`](../core/iter/index.html) defines Rust's iterator protocol
 //! along with a wide variety of iterators.
-//! [`Cell` and `RefCell`](cell/index.html) are for creating types that
+//! [`Cell` and `RefCell`](../core/cell/index.html) are for creating types that
 //! manage their own mutability.
 //!
 //! ## Vectors, slices and strings
diff --git a/src/libstd/result.rs b/src/libstd/result.rs
index cc9e6684d28..ecbc164590b 100644
--- a/src/libstd/result.rs
+++ b/src/libstd/result.rs
@@ -226,8 +226,8 @@
 //! similar and complementary: they are often employed to indicate a
 //! lack of a return value; and they are trivially converted between
 //! each other, so `Result`s are often handled by first converting to
-//! `Option` with the [`ok`](enum.Result.html#method.ok) and
-//! [`err`](enum.Result.html#method.ok) methods.
+//! `Option` with the [`ok`](../../core/result/enum.Result.html#method.ok) and
+//! [`err`](../../core/result/enum.Result.html#method.ok) methods.
 //!
 //! Whereas `Option` only indicates the lack of a value, `Result` is
 //! specifically for error reporting, and carries with it an error