Skip to content

Commit 0c2d2fa

Browse files
committed
Merge pull request #54 from akkomar/master
Minor fixes in Async`s scaladoc.
2 parents 9bbc14a + 2efe5d4 commit 0c2d2fa

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/main/scala/scala/async/Async.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import scala.reflect.internal.annotations.compileTimeOnly
1111
/**
1212
* Async blocks provide a direct means to work with [[scala.concurrent.Future]].
1313
*
14-
* For example, to use an API to that fetches as web page to fetch
14+
* For example, to use an API that fetches a web page to fetch
1515
* two pages and add their lengths:
1616
*
1717
* {{{
@@ -45,7 +45,7 @@ object Async {
4545
def async[T](body: T)(implicit execContext: ExecutionContext): Future[T] = macro internal.ScalaConcurrentAsync.asyncImpl[T]
4646

4747
/**
48-
* Non-blocking await the on result of `awaitable`. This may only be used directly within an enclosing `await` block.
48+
* Non-blocking await the on result of `awaitable`. This may only be used directly within an enclosing `async` block.
4949
*
5050
* Internally, this will register the remainder of the code in enclosing `async` block as a callback
5151
* in the `onComplete` handler of `awaitable`, and will *not* block a thread.

0 commit comments

Comments
 (0)