---

yaml
---
r: 30999
b: refs/heads/incoming
c: 3e47b4f
h: refs/heads/master
i:
  30997: 3cc3a20
  30995: c0b4530
  30991: 6226c56
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 83fdeddb914ce792aef609978675ee5c3dea0e57
+refs/heads/incoming: 3e47b4f17e690cb42b30fe6d09d1947556149406
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial-ffi.md

@@ -246,7 +246,7 @@ define a struct type with the same contents, and declare
 `gettimeofday` to take a pointer to such a struct.
 
 The second argument to `gettimeofday` (the time zone) is not used by
-this program, so it simply declares it to be a pointer to the unit
+this program, so it simply declares it to be a pointer to the nil
 type. Since all null pointers have the same representation regardless of
 their referent type, this is safe.
 

branches/incoming/doc/tutorial.md

@@ -294,11 +294,11 @@ are not semicolons in the blocks of the second snippet. This is
 important; the lack of a semicolon after the last statement in a
 braced block gives the whole block the value of that last expression.
 
-Put another way, the semicolon in Rust *ignores the value of an
-expression*.  Thus, if the branches of the `if` had looked like `{ 4; }`,
-the above example would simply assign `()` (unit or void) to
-`price`. But without the semicolon, each branch has a different value,
-and `price` gets the value of the branch that was taken.
+Put another way, the semicolon in Rust *ignores the value of an expression*.
+Thus, if the branches of the `if` had looked like `{ 4; }`, the above example
+would simply assign `()` (nil or void) to `price`. But without the semicolon, each
+branch has a different value, and `price` gets the value of the branch that
+was taken.
 
 In short, everything that's not a declaration (`let` for variables,
 `fn` for functions, et cetera) is an expression, including function bodies.
@@ -839,7 +839,7 @@ fn point_from_direction(dir: Direction) -> Point {
 Tuples in Rust behave exactly like structs, except that their fields
 do not have names (and can thus not be accessed with dot notation).
 Tuples can have any arity except for 0 or 1 (though you may consider
-unit, `()`, as the empty tuple if you like).
+nil, `()`, as the empty tuple if you like).
 
 ~~~~
 let mytup: (int, int, float) = (10, 20, 30.0);
@@ -891,7 +891,7 @@ fn int_to_str(i: int) -> ~str {
 }
 ~~~~
 
-Functions that do not return a value are said to return unit, `()`,
+Functions that do not return a value are said to return nil, `()`,
 and both the return type and the return value may be omitted from
 the definition. The following two functions are equivalent.