diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-07-27 21:36:13 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2013-07-27 21:36:13 -0700 |
| commit | 9e17c91bcec0a576c04027d2afd8480dc02d6e68 (patch) | |
| tree | 434b73f97bdf68e9467a4ab6405967c73f375a28 | |
| parent | cc288dbf1a27ce9074e2183c7e6ea19501f359f4 (diff) | |
| parent | 3a35480209284a4169039179260194430789515c (diff) | |
| download | scala-9e17c91bcec0a576c04027d2afd8480dc02d6e68.tar.gz scala-9e17c91bcec0a576c04027d2afd8480dc02d6e68.tar.bz2 scala-9e17c91bcec0a576c04027d2afd8480dc02d6e68.zip | |
Merge pull request #2778 from xuwei-k/fix-promise-scaladoc
fix Promise scaladoc
| -rw-r--r-- | src/library/scala/concurrent/Promise.scala | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/concurrent/Promise.scala b/src/library/scala/concurrent/Promise.scala index f950b13b78..cdde019cd0 100644 --- a/src/library/scala/concurrent/Promise.scala +++ b/src/library/scala/concurrent/Promise.scala @@ -82,7 +82,7 @@ trait Promise[T] { /** Completes the promise with a value. * - * @param v The value to complete the promise with. + * @param value The value to complete the promise with. * * $promiseCompletion */ @@ -98,7 +98,7 @@ trait Promise[T] { /** Completes the promise with an exception. * - * @param t The throwable to complete the promise with. + * @param cause The throwable to complete the promise with. * * $allowedThrowables * |