---

yaml
---
r: 52090
b: refs/heads/dist-snap
c: 587ce48
h: refs/heads/master
v: v3

Author: brson

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: 9433284a11920ea3b48ac298c8872fb577eaa44d
+refs/heads/dist-snap: 587ce4894e0a4b2b785b7b5e803e7ab4c9241258
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/AUTHORS.txt

@@ -16,6 +16,7 @@ Arkaitz Jimenez <[email protected]>
 Armin Ronacher <[email protected]>
 Austin Seipp <[email protected]>
 auREAX <[email protected]>
+Ben Alpert <[email protected]>
 Ben Blum <[email protected]>
 Ben Striegel <[email protected]>
 Benjamin Herr <[email protected]>
@@ -49,6 +50,7 @@ Erick Tryzelaar <[email protected]>
 Erik Rose <[email protected]>
 Evan McClanahan <[email protected]>
 Francisco Souza <[email protected]>
+Franklin Chen <[email protected]>
 Gabriel <[email protected]>
 Gareth Daniel Smith <[email protected]>
 Glenn Willen <[email protected]>
@@ -119,6 +121,7 @@ Sean Stangl <[email protected]>
 Simon Barber-Dueck <[email protected]>
 startling <[email protected]>
 Stefan Plantikow <[email protected]>
+Steve Klabnik <[email protected]>
 Taras Shpot <[email protected]>
 Ted Horst <[email protected]>
 Tim Chevalier <[email protected]>

branches/dist-snap/README.md

@@ -65,10 +65,11 @@ API-documentation tool, and `cargo`, the Rust package manager.
 
 ## License
 
-Rust is primarily distributed under the terms of the MIT license, with
-portions covered by various BSD-like licenses.
+Rust is primarily distributed under the terms of both the MIT license
+and the Apache License (Version 2.0), with portions covered by various
+BSD-like licenses.
 
-See LICENSE.txt for details.
+See LICENSE-APACHE, LICENSE-MIT, and COPYRIGHT for details.
 
 ## More help
 

branches/dist-snap/doc/rust.md

@@ -3258,12 +3258,12 @@ crate name the crate is given a default name that matches the source file,
 with the extension removed. In that case, to turn on logging for a program
 compiled from, e.g. `helloworld.rs`, `RUST_LOG` should be set to `helloworld`.
 
-As a convenience, the logging spec can also be set to a special psuedo-crate,
+As a convenience, the logging spec can also be set to a special pseudo-crate,
 `::help`. In this case, when the application starts, the runtime will
 simply output a list of loaded modules containing log expressions, then exit.
 
 The Rust runtime itself generates logging information. The runtime's logs are
-generated for a number of artificial modules in the `::rt` psuedo-crate,
+generated for a number of artificial modules in the `::rt` pseudo-crate,
 and can be enabled just like the logs for any standard module. The full list
 of runtime logging modules follows.
 
@@ -3341,7 +3341,7 @@ have come and gone during the course of Rust's development:
 
 * The Newsqueak (1988), Alef (1995), and Limbo (1996) family. These
   languages were developed by Rob Pike, Phil Winterbottom, Sean Dorward and
-  others in their group at Bell labs Computing Sciences Research Center
+  others in their group at Bell Labs Computing Sciences Research Center
   (Murray Hill, NJ, USA).
 
 * The Napier (1985) and Napier88 (1988) family. These languages were

branches/dist-snap/doc/tutorial-macros.md

@@ -43,7 +43,7 @@ macro_rules! early_return(
             _ => {}
         }
     );
-);
+)
 // ...
 early_return!(input_1 special_a);
 // ...
@@ -160,7 +160,7 @@ macro_rules! early_return(
             _ => {}
         }
     );
-);
+)
 // ...
 early_return!(input_1, [special_a|special_c|special_d]);
 // ...