---

yaml
---
r: 147132
b: refs/heads/try2
c: fab5624
h: refs/heads/master
v: v3

Author: emberian

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: a44852a2d5ac12545a3c1b55dab1c3d4070872a1
+refs/heads/try2: fab5624eb6373d529f21309380ea467a8b4b5664
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/tutorial.md

@@ -1235,8 +1235,9 @@ xs = prepend::<int>(xs, 15);
 xs = prepend::<int>(xs, 20);
 ~~~
 
-In the type grammar, the language uses `Type<T, U, V>` to describe a list of
-type parameters, but expressions use `identifier::<T, U, V>`.
+In declarations, the language uses `Type<T, U, V>` to describe a list of type
+parameters, but expressions use `identifier::<T, U, V>`, to disambiguate the
+`<` operator.
 
 ## Defining list equality with generics
 
@@ -1313,7 +1314,7 @@ provide.
 
 In uncommon cases, the indirection can provide a performance gain or memory
 reduction by making values smaller. However, unboxed values should almost
-always be preferred.
+always be preferred when they are usable.
 
 Note that returning large unboxed values via boxes is unnecessary. A large
 value is returned via a hidden output parameter, and the decision on where to
@@ -1324,7 +1325,7 @@ fn foo() -> (u64, u64, u64, u64, u64, u64) {
     (5, 5, 5, 5, 5, 5)
 }
 
-let x = ~foo(); // allocates, and writes the integers directly to it
+let x = ~foo(); // allocates a ~ box, and writes the integers directly to it
 ~~~~
 
 Beyond the properties granted by the size, an owned box behaves as a regular
@@ -1403,7 +1404,7 @@ compute_distance(managed_box, owned_box);
 Here the `&` operator is used to take the address of the variable
 `on_the_stack`; this is because `on_the_stack` has the type `Point`
 (that is, a struct value) and we have to take its address to get a
-value. We also call this _borrowing_ the local variable
+reference. We also call this _borrowing_ the local variable
 `on_the_stack`, because we are creating an alias: that is, another
 route to the same data.