aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-01-14 00:37:25 -0800
committerJason Zaugg <jzaugg@gmail.com>2014-01-14 00:37:25 -0800
commit0c2d2fa6e710655f5a15fe98d8b6b049d0b77065 (patch)
tree99eb2d12052091a51a804a2fb98dc4c2213a195e
parent9bbc14a6cd012c33bf8070a45fb5d424d5e2e01b (diff)
parent2efe5d466d6b06ff1f6ce1ccf55ffa4327e6de27 (diff)
downloadscala-async-0c2d2fa6e710655f5a15fe98d8b6b049d0b77065.tar.gz
scala-async-0c2d2fa6e710655f5a15fe98d8b6b049d0b77065.tar.bz2
scala-async-0c2d2fa6e710655f5a15fe98d8b6b049d0b77065.zip
Merge pull request #54 from akkomar/master
Minor fixes in Async`s scaladoc.
-rw-r--r--src/main/scala/scala/async/Async.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/scala/scala/async/Async.scala b/src/main/scala/scala/async/Async.scala
index c45a9c6..b02fa6a 100644
--- a/src/main/scala/scala/async/Async.scala
+++ b/src/main/scala/scala/async/Async.scala
@@ -11,7 +11,7 @@ import scala.reflect.internal.annotations.compileTimeOnly
/**
* Async blocks provide a direct means to work with [[scala.concurrent.Future]].
*
- * For example, to use an API to that fetches as web page to fetch
+ * For example, to use an API that fetches a web page to fetch
* two pages and add their lengths:
*
* {{{
@@ -45,7 +45,7 @@ object Async {
def async[T](body: T)(implicit execContext: ExecutionContext): Future[T] = macro internal.ScalaConcurrentAsync.asyncImpl[T]
/**
- * Non-blocking await the on result of `awaitable`. This may only be used directly within an enclosing `await` block.
+ * Non-blocking await the on result of `awaitable`. This may only be used directly within an enclosing `async` block.
*
* Internally, this will register the remainder of the code in enclosing `async` block as a callback
* in the `onComplete` handler of `awaitable`, and will *not* block a thread.