Merge pull request #2887 from austinzheng/az-1

lattner · lattner · commit 71379a4b3b74 · 2016-06-04T12:57:15.000-06:00
[gardening] Adding note clarifying status of Concurrency.rst
diff --git a/docs/proposals/Concurrency.rst b/docs/proposals/Concurrency.rst
@@ -3,6 +3,8 @@
 .. @raise litre.TestsAreMissing
 .. ConcurrencyModel:
 
+*Note*: This document is **not an accepted Swift proposal**. It does not describe Swift's concurrency mechanisms as they currently exist, nor is it a roadmap for the addition of concurrency mechanisms in future versions of Swift.
+
 Swift Thread Safety
 ===================
 
