---

yaml
---
r: 186086
b: refs/heads/auto
c: fa4cb49
h: refs/heads/master
v: v3

Author: tshepang

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 0cea2b7c3c32ea5028227f85431f8af7636ef558
+refs/heads/auto: fa4cb49b0475232d7e7eed2b77cdd017b762db8c
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/thread.rs

@@ -92,10 +92,6 @@
 //! return the result produced by the thread.  A handle to the thread
 //! itself is available via the `thread` method of the join guard.
 //!
-//! (Note: eventually, the `scoped` constructor will allow the parent and child
-//! threads to data that lives on the parent thread's stack, but some language
-//! changes are needed before this is possible.)
-//!
 //! ## Configuring threads
 //!
 //! A new thread can be configured before it is spawned via the `Builder` type,