---

yaml
---
r: 39902
b: refs/heads/dist-snap
c: d81a7ab
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
 refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
-refs/heads/dist-snap: 056fc13e108a1b610661e0a1c617bda164370807
+refs/heads/dist-snap: d81a7aba3cc634ae11c412f528591a1647a02de1
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/doc/rust.md

@@ -2886,10 +2886,10 @@ non-executing state (blocked, dead) similarly deschedules the task.
 A call to `core::task::spawn`, passing a 0-argument function as its single
 argument, causes the runtime to construct a new task executing the passed
 function. The passed function is referred to as the _entry function_ for
-the spawned task, and any captured environment is carries is moved from the
+the spawned task, and any captured environment it carries is moved from the
 spawning task to the spawned task before the spawned task begins execution.
 
-The result of a `spawn` call is a `core::task::task` value.
+The result of a `spawn` call is a `core::task::Task` value.
 
 An example of a `spawn` call:
 
@@ -2938,16 +2938,20 @@ An example of a *receive*:
 let s = comm::recv(po);
 ~~~~~~~~
 
+Note: this communication system will be replaced by a higher-performance system called "pipes",
+in future versions of Rust.
+
 
 # Runtime services, linkage and debugging
 
 
-The Rust _runtime_ is a relatively compact collection of C and Rust code
+The Rust _runtime_ is a relatively compact collection of C++ and Rust code
 that provides fundamental services and datatypes to all Rust tasks at
 run-time. It is smaller and simpler than many modern language runtimes. It is
 tightly integrated into the language's execution model of memory, tasks,
 communication and logging.
 
+Note: The runtime library will merge with the `core` library in future versions of Rust.
 
 ### Memory allocation