auto merge of #5716 : dhardy/rust/master, r=thestinger

bors · bors · commit 717ed51f123a · 2013-04-04T06:12:49.000-07:00
diff --git a/doc/tutorial.md b/doc/tutorial.md
@@ -1191,7 +1191,7 @@ they are frozen:
 let x = @mut 5;
 let y = x;
 {
-    let y = &*y; // the managed box is now frozen
+    let z = &*y; // the managed box is now frozen
     // modifying it through x or y will cause a task failure
 }
 // the box is now unfrozen again

Original file line number	Diff line number	Diff line change
`@@ -1191,7 +1191,7 @@ they are frozen:`
`1191`	`1191`	`let x = @mut 5;`
`1192`	`1192`	`let y = x;`
`1193`	`1193`	`{`
`1194`		`- let y = &*y; // the managed box is now frozen`
	`1194`	`+ let z = &*y; // the managed box is now frozen`
`1195`	`1195`	`// modifying it through x or y will cause a task failure`
`1196`	`1196`	`}`
`1197`	`1197`	`// the box is now unfrozen again`