---

yaml
---
r: 55962
b: refs/heads/auto
c: f0d0cbf
h: refs/heads/master
v: v3

Author: Bryan Dunsmore

[refs]

@@ -14,6 +14,6 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: ac9e694d595a95c75fd96b149bf5e7edce366027
+refs/heads/auto: f0d0cbfff8d1aadda1cdb3b914361f3355c9a9cc
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c

branches/auto/doc/rust.md

@@ -1653,12 +1653,11 @@ Path expressions are [lvalues](#lvalues-rvalues-and-temporaries).
 
 ### Tuple expressions
 
-Tuples are written by enclosing one or more comma-separated
+Tuples are written by enclosing two or more comma-separated
 expressions in parentheses. They are used to create [tuple-typed](#tuple-types)
 values.
 
 ~~~~~~~~ {.tuple}
-(0,);
 (0f, 4.5f);
 ("a", 4u, true);
 ~~~~~~~~
@@ -2579,7 +2578,7 @@ to the record type-constructor. The differences are as follows:
 
 Tuple types and values are denoted by listing the types or values of their
 elements, respectively, in a parenthesized, comma-separated
-list.
+list. Single-element tuples are not legal; all tuples have two or more values.
 
 The members of a tuple are laid out in memory contiguously, like a record, in
 order specified by the tuple type.

branches/auto/doc/tutorial.md

@@ -495,7 +495,10 @@ omitted.
 
 A powerful application of pattern matching is *destructuring*:
 matching in order to bind names to the contents of data
-types. Assuming that `(float, float)` is a tuple of two floats:
+types.
+
+> ***Note:*** The following code makes use of tuples (`(float, float)`) which
+> are explained later. For now you can think of tuples as a list of items.
 
 ~~~~
 fn angle(vector: (float, float)) -> float {
@@ -747,7 +750,7 @@ fn area(sh: Shape) -> float {
 
 Tuples in Rust behave exactly like structs, except that their fields
 do not have names. Thus, you cannot access their fields with dot notation.
-Tuples can have any arity except for 0 (though you may consider
+Tuples can have any arity except for 0 or 1 (though you may consider
 unit, `()`, as the empty tuple if you like).
 
 ~~~~