---

yaml
---
r: 36815
b: refs/heads/try2
c: 263136d
h: refs/heads/master
i:
  36813: a818c5d
  36811: b339ec5
  36807: 26d70ce
  36799: e96cc20
v: v3

Author: brson

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9057e98a0103e9d13d9320cdf33af938fb83e080
+refs/heads/try2: 263136d389ec72d8ab52d3ad8303a100fd1d4254
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/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;
 ~~~