---

yaml
---
r: 15459
b: refs/heads/try
c: 93a1f5e
h: refs/heads/master
i:
  15457: d8f2882
  15455: fff8498
v: v3

Author: catamorphism

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: a1b305c8e526700e3e16e51d576691ac4ebdc335
+refs/heads/try: 93a1f5e85fb2d17c4dfca7a282d9bf6805dfaa16
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/libcore/task.rs

@@ -65,7 +65,7 @@ A task that completes without failing and whose supervised children complete
 without failing is considered to exit successfully.
 
 FIXME: This description does not indicate the current behavior for linked
-failure.
+failure. (See #1868)
 "]
 enum task_result {
     success,
@@ -486,7 +486,7 @@ fn spawn_raw(opts: task_opts, +f: fn~()) unsafe {
         // FIXME: The runtime supervision API is weird here because it
         // was designed to let the child unsupervise itself, when what
         // we actually want is for parents to unsupervise new
-        // children.
+        // children. (#1868, #1789)
         fn~() {
             rustrt::unsupervise();
             f();