---

yaml
---
r: 31075
b: refs/heads/incoming
c: f5c95de
h: refs/heads/master
i:
  31073: 94d70c4
  31071: 0ab2593
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 035cfcbe7218018c1bab29a987ee1152ccd1dcf7
+refs/heads/incoming: f5c95de212d7851c7f8788a328455ed381e38978
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/doc/tutorial.md

@@ -15,21 +15,17 @@ As a multi-paradigm language, Rust supports writing code in
 procedural, functional and object-oriented styles. Some of its
 pleasant high-level features include:
 
-* **Pattern matching and algebraic data types (enums).** As
-  popularized by functional languages, pattern matching on ADTs
-  provides a compact and expressive way to encode program logic.
-* **Type inference.** Type annotations on local variable
-  declarations are optional.
-* **Task-based concurrency.** Rust uses lightweight tasks that do
-  not share memory.
-* **Higher-order functions.** Rust's efficient and flexible closures
-  are heavily relied on to provide iteration and other control
-  structures
-* **Parametric polymorphism (generics).** Functions and types can be
-  parameterized over type variables with optional trait-based type
-  constraints.
-* **Trait polymorphism.** Rust's type system features a unique
-  combination of type classes and object-oriented interfaces.
+* **Type inference.** Type annotations on local variable declarations
+  are optional.
+* **Safe task-based concurrency.** Rust's lightweight tasks do not share
+  memory and communicate through messages.
+* **Higher-order functions.** Efficient and flexible closures provide
+  iteration and other control structures
+* **Pattern matching and algebraic data types.** Pattern matching on
+  Rust's enums is a compact and expressive way to encode program
+  logic.
+* **Polymorphism.** Rust has type-parameric functions and
+  types, type classes and OO-style interfaces.
 
 ## Scope