Clarified that the Future is in the Scala Standard Library. See #2314

This commit is contained in:
Björn Antonsson 2012-08-30 14:52:25 +02:00
parent 217a9c2cf9
commit 6a23ff6add
2 changed files with 4 additions and 4 deletions

View file

@ -6,8 +6,8 @@ Futures (Java)
Introduction Introduction
------------ ------------
In Scala, a `Future <http://en.wikipedia.org/wiki/Futures_and_promises>`_ is a data structure used In the Scala Standard Library, a `Future <http://en.wikipedia.org/wiki/Futures_and_promises>`_ is a data structure
to retrieve the result of some concurrent operation. This result can be accessed synchronously (blocking) used to retrieve the result of some concurrent operation. This result can be accessed synchronously (blocking)
or asynchronously (non-blocking). To be able to use this from Java, Akka provides a java friendly interface or asynchronously (non-blocking). To be able to use this from Java, Akka provides a java friendly interface
in ``akka.dispatch.Futures``. in ``akka.dispatch.Futures``.

View file

@ -7,8 +7,8 @@ Futures (Scala)
Introduction Introduction
------------ ------------
In Scala, a `Future <http://en.wikipedia.org/wiki/Futures_and_promises>`_ is a data structure used to In the Scala Standard Library, a `Future <http://en.wikipedia.org/wiki/Futures_and_promises>`_ is a data structure
retrieve the result of some concurrent operation. This result can be accessed synchronously (blocking) used to retrieve the result of some concurrent operation. This result can be accessed synchronously (blocking)
or asynchronously (non-blocking). or asynchronously (non-blocking).
Execution Contexts Execution Contexts