summaryrefslogtreecommitdiff
path: root/src/library
diff options
context:
space:
mode:
authorArnout Engelen <github@bzzt.net>2016-01-25 14:44:53 +0100
committerArnout Engelen <github@bzzt.net>2016-01-25 14:44:53 +0100
commitde2db63d3bfa2582272dda1d067e43aad58bcfce (patch)
tree65669093d92d1bcdf78414dab9edcb2979376982 /src/library
parentc06aed997f5a0c98434d7cec0ebe5f0da3de790e (diff)
downloadscala-de2db63d3bfa2582272dda1d067e43aad58bcfce.tar.gz
scala-de2db63d3bfa2582272dda1d067e43aad58bcfce.tar.bz2
scala-de2db63d3bfa2582272dda1d067e43aad58bcfce.zip
Link 'Future' scaladoc to 'Futures and Promises'
Diffstat (limited to 'src/library')
-rw-r--r--src/library/scala/concurrent/Future.scala2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/library/scala/concurrent/Future.scala b/src/library/scala/concurrent/Future.scala
index 294ca2aa48..ebc1e76ca1 100644
--- a/src/library/scala/concurrent/Future.scala
+++ b/src/library/scala/concurrent/Future.scala
@@ -43,6 +43,8 @@ import scala.reflect.ClassTag
*
* @author Philipp Haller, Heather Miller, Aleksandar Prokopec, Viktor Klang
*
+ * @see [[http://docs.scala-lang.org/overviews/core/futures.html Futures and Promises]]
+ *
* @define multipleCallbacks
* Multiple callbacks may be registered; there is no guarantee that they will be
* executed in a particular order.