---

yaml
---
r: 34203
b: refs/heads/snap-stage3
c: 263136d
h: refs/heads/master
i:
  34201: 393bfcc
  34199: a7cd279
v: v3

Author: brson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 9057e98a0103e9d13d9320cdf33af938fb83e080
+refs/heads/snap-stage3: 263136d389ec72d8ab52d3ad8303a100fd1d4254
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/doc/tutorial.md

@@ -2143,11 +2143,11 @@ for example, an `@Circle` may not be cast to an `~Drawable`.
 # impl int: Drawable { fn draw() {} }
 # fn new_circle() -> int { 1 }
 # fn new_rectangle() -> int { 2 }
-// A managed trait instance
+// A managed object
 let boxy: @Drawable = @new_circle() as @Drawable;
-// An owned trait instance
+// An owned object
 let owny: ~Drawable = ~new_circle() as ~Drawable;
-// A borrowed trait instance
+// A borrowed object
 let stacky: &Drawable = &new_circle() as &Drawable;
 ~~~