summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaolo G. Giarrusso <p.giarrusso@gmail.com>2013-11-23 02:57:09 +0100
committerPaolo G. Giarrusso <p.giarrusso@gmail.com>2013-11-23 02:57:09 +0100
commit1d8e8ffa0f9e3334d4387b6dc074f924b41410ce (patch)
tree4cace3ce42e2ff35543c242857a8bc0571c01a7b
parentc243435f113615b2f7407fbd683c93ec16c73749 (diff)
downloadscala-1d8e8ffa0f9e3334d4387b6dc074f924b41410ce.tar.gz
scala-1d8e8ffa0f9e3334d4387b6dc074f924b41410ce.tar.bz2
scala-1d8e8ffa0f9e3334d4387b6dc074f924b41410ce.zip
Revise paragraph (a revised #3164)
Revise text further, following suggestions in #3164 and part of the suggestions by @som-snytt. But I've kept "appear", since this paragraph documents the external behavior, not the implementation.
-rw-r--r--src/library/scala/concurrent/impl/Promise.scala6
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