summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorDominik Gruntz <dominik.gruntz@fhnw.ch>2014-07-15 11:04:54 +0200
committerAntoine Gourlay <antoine@gourlay.fr>2014-08-11 17:55:30 +0200
commite54b77247c5f895fe795f4ca0425d0d304cff975 (patch)
tree333da05ebbc2b3ff2cbaa873e74f547234f59b52 /src/library
parent9ef3d29d044da28218fea03d0c6678e281c4c550 (diff)
downloadscala-e54b77247c5f895fe795f4ca0425d0d304cff975.tar.gz
scala-e54b77247c5f895fe795f4ca0425d0d304cff975.tar.bz2
scala-e54b77247c5f895fe795f4ca0425d0d304cff975.zip
[backport] Did not know of the fix for SI-8672. Followed the recommendation given by som-snytt.
(cherry picked from commit ec4abf5483e890976ae460252e80a66a95674e61)
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/concurrent/Future.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index a9b7d79e63..e93a3284dc 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -102,7 +102,7 @@ trait Future[+T] extends Awaitable[T] {
/* Callbacks */
- /** When this future is completed successfully (i&period;e&period; with a value),
+ /** When this future is completed successfully (i.e., with a value),
* apply the provided partial function to the value if the partial function
* is defined at that value.
*
@@ -118,7 +118,7 @@ trait Future[+T] extends Awaitable[T] {
case _ =>
}
- /** When this future is completed with a failure (i&period;e&period; with a throwable),
+ /** When this future is completed with a failure (i.e., with a throwable),
* apply the provided callback to the throwable.
*
* $caughtThrowables