diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-22 17:58:42 -0800 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2013-11-22 17:58:42 -0800 |
commit | 77baad303bdf421acaab6a8db287484418293b34 (patch) | |
tree | 87320d0cb220095dc7298ccbaa546b832cbeedc2 | |
parent | 1296bb8bffc5f0c193ad3c77333567e8853a9ee6 (diff) | |
parent | 1d8e8ffa0f9e3334d4387b6dc074f924b41410ce (diff) | |
download | scala-77baad303bdf421acaab6a8db287484418293b34.tar.gz scala-77baad303bdf421acaab6a8db287484418293b34.tar.bz2 scala-77baad303bdf421acaab6a8db287484418293b34.zip |
Merge pull request #3186 from Blaisorblade/patch-1
Revise paragraph (a revised #3164)
-rw-r--r-- | src/library/scala/concurrent/impl/Promise.scala | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/library/scala/concurrent/impl/Promise.scala b/src/library/scala/concurrent/impl/Promise.scala index 418d859d79..b15601058e 100644 --- a/src/library/scala/concurrent/impl/Promise.scala +++ b/src/library/scala/concurrent/impl/Promise.scala @@ -82,11 +82,11 @@ private[concurrent] object Promise { * 2. Complete, with a result. * 3. Linked to another DefaultPromise. * - * If a DefaultPromise is linked it another DefaultPromise then it will + * If a DefaultPromise is linked to another DefaultPromise, it will * delegate all its operations to that other promise. This means that two * DefaultPromises that are linked will appear, to external callers, to have - * exactly the same state and behaviour. E.g. they will both appear to be - * either complete or incomplete, and with the same values. + * exactly the same state and behaviour. For instance, both will appear as + * incomplete, or as complete with the same result value. * * A DefaultPromise stores its state entirely in the AnyRef cell exposed by * AbstractPromise. The type of object stored in the cell fully describes the |