auto merge of #11405 : huonw/rust/moredocs, r=huonw

Various documentation changes, change the 'borrowed pointer' terminology to 'reference', fix a problem with 'make dist' on windows.

2 files changed, 3 insertions, 3 deletions

diff --git a/src/libextra/future.rs b/src/libextra/future.rs
index cb82c1abe1e..c6c876aff79 100644
--- a/src/libextra/future.rs
+++ b/src/libextra/future.rs
@@ -60,8 +60,8 @@ impl<A> Future<A> {
 
     pub fn get_ref<'a>(&'a mut self) -> &'a A {
         /*!
-        * Executes the future's closure and then returns a borrowed
-        * pointer to the result.  The borrowed pointer lasts as long as
+        * Executes the future's closure and then returns a reference
+        * to the result.  The reference lasts as long as
         * the future.
         */
         match self.state {
diff --git a/src/libextra/sync.rs b/src/libextra/sync.rs
index 988a642e583..12566ac8551 100644
--- a/src/libextra/sync.rs
+++ b/src/libextra/sync.rs
@@ -431,7 +431,7 @@ struct RWLockInner {
     // (or reader/downgrader) race.
     // By the way, if we didn't care about the assert in the read unlock path,
     // we could instead store the mode flag in write_downgrade's stack frame,
-    // and have the downgrade tokens store a borrowed pointer to it.
+    // and have the downgrade tokens store a reference to it.
     read_mode:  bool,
     // The only way the count flag is ever accessed is with xadd. Since it is
     // a read-modify-write operation, multiple xadds on different cores will