---

yaml
---
r: 24527
b: refs/heads/try2
c: 70070b8
h: refs/heads/master
i:
  24525: c77f4b2
  24523: 4bf03e6
  24519: 48786d8
  24511: 5a437a0
v: v3

Author: bblum

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: efb3227fb341f91040f408af40e5b95de285944b
+refs/heads/try2: 70070b8bbcf2b0f8a4715aa92528cda37ee458ce
 refs/heads/incoming: 05543fd04dfb3f63b453a331e239ceb1a9a219f9
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/src/libcore/task.rs

@@ -88,13 +88,13 @@ enum notification {
 
 #[doc = "Scheduler modes"]
 enum sched_mode {
-    #[doc = "All tasks run in the same OS thread"]
+    #[doc = "1:N -- All tasks run in the same OS thread"]
     single_threaded,
-    #[doc = "Tasks are distributed among available CPUs"]
+    #[doc = "M:N -- Tasks are distributed among available CPUs"]
     thread_per_core,
-    #[doc = "Each task runs in its own OS thread"]
+    #[doc = "N:N -- Each task runs in its own OS thread"]
     thread_per_task,
-    #[doc = "Tasks are distributed among a fixed number of OS threads"]
+    #[doc = "?:N -- Tasks are distributed among a fixed number of OS threads"]
     manual_threads(uint),
     #[doc = "
     Tasks are scheduled on the main OS thread
@@ -168,7 +168,7 @@ Provides detailed control over the properties and behavior of new tasks.
 // it only applies to a single task, so then you have to maintain some
 // potentially tricky state to ensure that everything behaves correctly
 // when you try to reuse the builder to spawn a new task. We'll just
-// sidestep that whole issue by making builder's uncopyable and making
+// sidestep that whole issue by making builders uncopyable and making
 // the run function move them in.
 enum builder {
     builder_({