diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index e354c7e16a13c..0d7ec6071fbad 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -338,9 +338,11 @@ impl<T> Option<T> {
 
     /// Returns the contained value or a default.
     ///
-    /// Arguments passed to `unwrap_or` are eagerly evaluated; if you are passing 
-    /// the result of a function call, it is recommended to use `unwrap_or_else`, 
-    /// which is lazily evaluated. 
+    /// Arguments passed to `unwrap_or` are eagerly evaluated; if you are passing
+    /// the result of a function call, it is recommended to use [`unwrap_or_else`],
+    /// which is lazily evaluated.
+    ///
+    /// [`unwrap_or_else`]: #method.unwrap_or_else
     ///
     /// # Examples
     ///
@@ -456,7 +458,7 @@ impl<T> Option<T> {
     /// [`Ok(v)`] and [`None`] to [`Err(err)`].
     ///
     /// Arguments passed to `ok_or` are eagerly evaluated; if you are passing the
-    /// result of a function call, it is recommended to use `ok_or_else`, which is
+    /// result of a function call, it is recommended to use [`ok_or_else`], which is
     /// lazily evaluated.
     ///
     /// [`Result<T, E>`]: ../../std/result/enum.Result.html
@@ -464,6 +466,7 @@ impl<T> Option<T> {
     /// [`Err(err)`]: ../../std/result/enum.Result.html#variant.Err
     /// [`None`]: #variant.None
     /// [`Some(v)`]: #variant.Some
+    /// [`ok_or_else`]: #method.ok_or_else
     ///
     /// # Examples
     ///
@@ -618,9 +621,11 @@ impl<T> Option<T> {
     /// Returns the option if it contains a value, otherwise returns `optb`.
     ///
     /// Arguments passed to `or` are eagerly evaluated; if you are passing the
-    /// result of a function call, it is recommended to use `or_else`, which is
+    /// result of a function call, it is recommended to use [`or_else`], which is
     /// lazily evaluated.
     ///
+    /// [`or_else`]: #method.or_else
+    ///
     /// # Examples
     ///
     /// ```
diff --git a/src/libcore/result.rs b/src/libcore/result.rs
index 438b3ed46a145..97cfc2b4dbc53 100644
--- a/src/libcore/result.rs
+++ b/src/libcore/result.rs
@@ -626,11 +626,12 @@ impl<T, E> Result<T, E> {
     /// Returns `res` if the result is [`Err`], otherwise returns the [`Ok`] value of `self`.
     ///
     /// Arguments passed to `or` are eagerly evaluated; if you are passing the
-    /// result of a function call, it is recommended to use `or_else`, which is
+    /// result of a function call, it is recommended to use [`or_else`], which is
     /// lazily evaluated.
     ///
     /// [`Ok`]: enum.Result.html#variant.Ok
     /// [`Err`]: enum.Result.html#variant.Err
+    /// [`or_else`]: #method.or_else
     ///
     /// # Examples
     ///
@@ -694,12 +695,13 @@ impl<T, E> Result<T, E> {
     /// Unwraps a result, yielding the content of an [`Ok`].
     /// Else, it returns `optb`.
     ///
-    /// Arguments passed to `unwrap_or` are eagerly evaluated; if you are passing 
-    /// the result of a function call, it is recommended to use `unwrap_or_else`, 
-    /// which is lazily evaluated. 
+    /// Arguments passed to `unwrap_or` are eagerly evaluated; if you are passing
+    /// the result of a function call, it is recommended to use [`unwrap_or_else`],
+    /// which is lazily evaluated.
     ///
     /// [`Ok`]: enum.Result.html#variant.Ok
     /// [`Err`]: enum.Result.html#variant.Err
+    /// [`unwrap_or_else`]: #method.unwrap_or_else
     ///
     /// # Examples
     ///