---

yaml
---
r: 39533
b: refs/heads/incoming
c: d098faa
h: refs/heads/master
i:
  39531: 606a4df
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: 21c9d0858b1ee0c6fe508a9eb1d229713a2649e4
+refs/heads/incoming: d098faa8555d48a9bc1de34542fc6d1dd5a2ab9c
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial.md

@@ -2127,15 +2127,15 @@ This usage of traits is similar to Java interfaces.
 
 We can write a trait declaration that _inherits_ from other traits, called _supertraits_.
 Types that implement a trait must also implement its supertraits.
-
-For example, we can define a `Circle` trait that only types that also have the `Shape` trait can have:
+For example,
+we can define a `Circle` trait that inherits from `Shape`.
 
 ~~~~
 trait Shape { fn area(&self) -> float; }
 trait Circle : Shape { fn radius(&self) -> float; }
 ~~~~
 
-Now, implementations of `Circle` methods can call `Shape` methods:
+Now, we can implement `Circle` on a type only if we also implement `Shape`.
 
 ~~~~
 # trait Shape { fn area(&self) -> float; }
@@ -2153,6 +2153,8 @@ impl CircleStruct: Shape {
 }   
 ~~~~
 
+Notice that methods of `Circle` can call methods on `Shape`, as our
+`radius` implementation calls the `area` method.
 This is a silly way to compute the radius of a circle
 (since we could just return the `circle` field), but you get the idea.