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.

4 files changed, 15 insertions, 7 deletions

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 3523d63ef60..8864c678b95 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -371,7 +371,7 @@ pub enum Pat_ {
     PatTup(~[@Pat]),
     PatBox(@Pat),
     PatUniq(@Pat),
-    PatRegion(@Pat), // borrowed pointer pattern
+    PatRegion(@Pat), // reference pattern
     PatLit(@Expr),
     PatRange(@Expr, @Expr),
     // [a, b, ..i, y, z] is represented as
diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs
index 2eb0fe30b4b..234551ccb01 100644
--- a/src/libsyntax/ext/deriving/generic.rs
+++ b/src/libsyntax/ext/deriving/generic.rs
@@ -26,7 +26,7 @@ Supported features (fairly exhaustive):
   requires an explicit `Eq` bound at the
   moment. (`TraitDef.additional_bounds`)
 
-Unsupported: FIXME #6257: calling methods on borrowed pointer fields,
+Unsupported: FIXME #6257: calling methods on reference fields,
 e.g. deriving TotalEq/TotalOrd/Clone don't work on `struct A(&int)`,
 because of how the auto-dereferencing happens.
 
diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs
index 1610b77a661..5128cdd54cc 100644
--- a/src/libsyntax/lib.rs
+++ b/src/libsyntax/lib.rs
@@ -8,15 +8,23 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-/*! This module contains the Rust parser. It maps source text
- *  to token trees and to ASTs. It contains code for expanding
- *  macros.
- */
+/*!
+
+The Rust parser and macro expander.
+
+# Note
+
+This API is completely unstable and subject to change.
+
+*/
 
 #[crate_id = "syntax#0.9"];
 #[license = "MIT/ASL2"];
 #[crate_type = "dylib"];
 #[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")];
 
 #[feature(macro_rules, globs, managed_boxes)];
 
diff --git a/src/libsyntax/util/interner.rs b/src/libsyntax/util/interner.rs
index b694e1f702b..fdc54f1f140 100644
--- a/src/libsyntax/util/interner.rs
+++ b/src/libsyntax/util/interner.rs
@@ -83,7 +83,7 @@ impl<T:Eq + IterBytes + Hash + Freeze + Clone + 'static> Interner<T> {
 }
 
 // A StrInterner differs from Interner<String> in that it accepts
-// borrowed pointers rather than @ ones, resulting in less allocation.
+// references rather than @ ones, resulting in less allocation.
 pub struct StrInterner {
     priv map: @RefCell<HashMap<@str, Name>>,
     priv vect: @RefCell<~[@str]>,