about summary refs log tree commit diff
path: root/doc/tutorial-tasks.md
diff options
context:
space:
mode:
authorSimon BD <simon@server>2012-10-06 13:15:18 -0500
committerSimon BD <simon@server>2012-10-06 13:15:18 -0500
commit0e3bec0ced8d781cdd93996e7b8eeedb13f81ba8 (patch)
tree4738dcf131910061f5253ee5ef42960b9aef35f5 /doc/tutorial-tasks.md
parentd4a54837d4ab28219727e1f1e0c131ba6033ba94 (diff)
parentf96a2a2ca16a44f869336f7e28fc261551c1184c (diff)
downloadrust-0e3bec0ced8d781cdd93996e7b8eeedb13f81ba8.tar.gz
rust-0e3bec0ced8d781cdd93996e7b8eeedb13f81ba8.zip
Merge remote-tracking branch 'original/incoming' into incoming
Diffstat (limited to 'doc/tutorial-tasks.md')
-rw-r--r--doc/tutorial-tasks.md10
1 files changed, 5 insertions, 5 deletions
diff --git a/doc/tutorial-tasks.md b/doc/tutorial-tasks.md
index 405f4ac7347..8b9d0c0c2a7 100644
--- a/doc/tutorial-tasks.md
+++ b/doc/tutorial-tasks.md
@@ -47,7 +47,7 @@ In particular, there are currently two independent modules that provide
 a message passing interface to Rust code: `core::comm` and `core::pipes`.
 `core::comm` is an older, less efficient system that is being phased out
 in favor of `pipes`. At some point the existing `core::comm` API will
-be romoved and the user-facing portions of `core::pipes` will be moved
+be removed and the user-facing portions of `core::pipes` will be moved
 to `core::comm`. In this tutorial we will discuss `pipes` and ignore
 the `comm` API.
 
@@ -58,7 +58,7 @@ concurrency at the moment.
 * [`core::comm`] - The deprecated message passing API
 * [`core::pipes`] - The new message passing infrastructure and API
 * [`std::comm`] - Higher level messaging types based on `core::pipes`
-* [`std::sync`] - More exotic synchronization tools, including locks 
+* [`std::sync`] - More exotic synchronization tools, including locks
 * [`std::arc`] - The ARC type, for safely sharing immutable data
 * [`std::par`] - Some basic tools for implementing parallel algorithms
 
@@ -151,7 +151,7 @@ commonly used, which we will cover presently.
 
 The simplest way to create a pipe is to use the `pipes::stream`
 function to create a `(Chan, Port)` pair. In Rust parlance a 'channel'
-is a sending endpoint of a pipe, and a 'port' is the recieving
+is a sending endpoint of a pipe, and a 'port' is the receiving
 endpoint. Consider the following example of performing two calculations
 concurrently.
 
@@ -183,7 +183,7 @@ let (chan, port): (Chan<int>, Port<int>) = stream();
 ~~~~
 
 The channel will be used by the child task to send data to the parent task,
-which will wait to recieve the data on the port. The next statement
+which will wait to receive the data on the port. The next statement
 spawns the child task.
 
 ~~~~
@@ -307,7 +307,7 @@ unrecoverable within a single task - once a task fails there is no way
 to "catch" the exception.
 
 All tasks are, by default, _linked_ to each other, meaning their fate
-is interwined, and if one fails so do all of them.
+is intertwined, and if one fails so do all of them.
 
 ~~~
 # use task::spawn;