From 6a23ff6add04dfccf12f52a460cbe9dfcad71986 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Antonsson?= Date: Thu, 30 Aug 2012 14:52:25 +0200 Subject: [PATCH] Clarified that the Future is in the Scala Standard Library. See #2314 --- akka-docs/java/futures.rst | 4 ++-- akka-docs/scala/futures.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/akka-docs/java/futures.rst b/akka-docs/java/futures.rst index 03a8f17aec..b3ef1b5be5 100644 --- a/akka-docs/java/futures.rst +++ b/akka-docs/java/futures.rst @@ -6,8 +6,8 @@ Futures (Java) Introduction ------------ -In Scala, a `Future `_ is a data structure used -to retrieve the result of some concurrent operation. This result can be accessed synchronously (blocking) +In the Scala Standard Library, a `Future `_ is a data structure +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 in ``akka.dispatch.Futures``. diff --git a/akka-docs/scala/futures.rst b/akka-docs/scala/futures.rst index cbe890e6a1..1b4df4154b 100644 --- a/akka-docs/scala/futures.rst +++ b/akka-docs/scala/futures.rst @@ -7,8 +7,8 @@ Futures (Scala) Introduction ------------ -In Scala, a `Future `_ is a data structure used to -retrieve the result of some concurrent operation. This result can be accessed synchronously (blocking) +In the Scala Standard Library, a `Future `_ is a data structure +used to retrieve the result of some concurrent operation. This result can be accessed synchronously (blocking) or asynchronously (non-blocking). Execution Contexts