---

yaml
---
r: 93725
b: refs/heads/try
c: 69768f7
h: refs/heads/master
i:
  93723: cdf34a7
v: v3

Author: astrieanna

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d3e57dca68fde4effdda3e4ae2887aa535fcd6
-refs/heads/try: 5e3123bfa7a5754ec1c9b54a9831f13952bbaf4e
+refs/heads/try: 69768f7c9458f166d2549c0d60d66a4087a3adc3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/.gitignore

@@ -30,7 +30,6 @@
 *.cps
 *.log
 *.pdf
-*.epub
 *.html
 *.pg
 *.toc
@@ -89,4 +88,3 @@ config.stamp
 src/etc/dl
 .settings/
 build/
-i686-pc-mingw32/

branches/try/doc/favicon.inc

@@ -4,9 +4,4 @@
     display: block;
     padding-left: 2em;
   }
-  #influences blockquote p:last-child {
-    display: block;
-    line-height: 1.428571429;
-    color: #999999;
-  }
-</style>
+</style>

branches/try/doc/manual.inc

@@ -529,7 +529,7 @@ msgid ""
 "The basic example below illustrates this.\n"
 "~~~\n"
 "# fn make_a_sandwich() {};\n"
-"fn fib(n: u64) -> u64 {\n"
+"fn fib(n: uint) -> uint {\n"
 "    // lengthy computation returning an uint\n"
 "    12586269025\n"
 "}\n"

branches/try/doc/po/ja/tutorial-tasks.md.po

@@ -529,7 +529,7 @@ msgid ""
 "The basic example below illustrates this.\n"
 "~~~\n"
 "# fn make_a_sandwich() {};\n"
-"fn fib(n: u64) -> u64 {\n"
+"fn fib(n: uint) -> uint {\n"
 "    // lengthy computation returning an uint\n"
 "    12586269025\n"
 "}\n"

branches/try/doc/po/tutorial-tasks.md.pot

@@ -2,7 +2,7 @@
  * Copyright 2013 The Rust Project Developers. See the COPYRIGHT
  * file at the top-level directory of this distribution and at
  * http://rust-lang.org/COPYRIGHT.
- * With elements taken from Bootstrap v3.0.2 (MIT licensed).
+ * With elements taken from Bootstrap v3.0.0 (Apache v2.0 licensed).
  *
  * Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
  * http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
@@ -93,7 +93,6 @@ p {
 a {
 	text-decoration: none;
 	color: #428BCA;
-	background: transparent;
 }
 a:hover, a:focus {
 	color: #2A6496;
@@ -115,7 +114,7 @@ h5 a:link, h5 a:visited {color: black;}
 /* Code
    ========================================================================== */
 pre, code {
-	font-family: Menlo, Monaco, Consolas, "Courier New", monospace;
+	font-family: Monaco, Menlo, Consolas, "Courier New", monospace;
 	border-radius: 4px;
 }
 pre {
@@ -142,7 +141,7 @@ pre code {
 	color: inherit;
 	white-space: pre-wrap;
 	background-color: transparent;
-	border-radius: 0;
+	border: 0;
 }
 
 /* Code highlighting */
@@ -159,7 +158,7 @@ pre code {
 .cm-s-default span.cm-string {color: #a11;}
 .cm-s-default span.cm-string-2 {color: #f50;}
 .cm-s-default span.cm-meta {color: #555;}
-/*.cm-s-default span.cm-error {color: #f00;}*/
+.cm-s-default span.cm-error {color: #f00;}
 .cm-s-default span.cm-qualifier {color: #555;}
 .cm-s-default span.cm-builtin {color: #30a;}
 .cm-s-default span.cm-bracket {color: #cc7;}
@@ -188,7 +187,7 @@ pre code {
 }
 #versioninfo a.hash {
 	color: gray;
-	font-size: 70%;
+	font-size: 60%;
 }
 
 blockquote {
@@ -304,4 +303,4 @@ hr {
 	table td, table th {
 		background-color: #fff !important;
 	}
-}
+}

branches/try/doc/rust.css

@@ -254,7 +254,6 @@ common_escape : '\x5c'
 hex_digit : 'a' | 'b' | 'c' | 'd' | 'e' | 'f'
           | 'A' | 'B' | 'C' | 'D' | 'E' | 'F'
           | dec_digit ;
-oct_digit : '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' ;
 dec_digit : '0' | nonzero_dec ;
 nonzero_dec: '1' | '2' | '3' | '4'
            | '5' | '6' | '7' | '8' | '9' ;
@@ -319,9 +318,8 @@ r##"foo #"# bar"##;                // foo #"# bar
 ~~~~ {.ebnf .gram}
 
 num_lit : nonzero_dec [ dec_digit | '_' ] * num_suffix ?
-        | '0' [       [ dec_digit | '_' ] * num_suffix ?
+        | '0' [       [ dec_digit | '_' ] + num_suffix ?
               | 'b'   [ '1' | '0' | '_' ] + int_suffix ?
-              | 'o'   [ oct_digit | '_' ] + int_suffix ?
               | 'x'   [ hex_digit | '_' ] + int_suffix ? ] ;
 
 num_suffix : int_suffix | float_suffix ;

branches/try/doc/rust.md

@@ -120,7 +120,7 @@ Thus, there should be no need to pass a `-L` flag to rustpkg to tell it where to
 
 # Custom build scripts
 
-A file called `pkg.rs` at the root level in a package directory is called a *package script*.
+A file called `pkg.rs` at the root level in a workspace is called a *package script*.
 If a package script exists, rustpkg executes it to build the package
 rather than inferring crates as described previously.
 

branches/try/doc/rustpkg.md

@@ -351,7 +351,7 @@ The `raise` method maps a value of the condition's input type to its output type
 The input type should therefore convey all relevant information to the condition handler.
 The output type should convey all relevant information _for continuing execution at the site of error_.
 When the error site raises a condition handler,
-the `Condition::raise` method searches for the innermost installed task-local condition _handler_,
+the `Condition::raise` method searches task-local storage (TLS) for the innermost installed _handler_,
 and if any such handler is found, calls it with the provided input value.
 If no handler is found, `Condition::raise` will fail the task with an appropriate error message.