aboutsummaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorPhilipp Haller <hallerp@gmail.com>2013-04-03 13:06:05 -0700
committerPhilipp Haller <hallerp@gmail.com>2013-04-03 13:06:05 -0700
commitb87b924ea82262c825a037d40d49ce4d61aa214a (patch)
tree073d097aec96d25230f3dfb55a89164036de7476 /README.md
parent3eabc750f4ba79c72b5541bc0971dfadd2d6f6ba (diff)
parent41a47b3ca7d2e9f9e683acbb8fe2a50cd37d54f6 (diff)
downloadscala-async-b87b924ea82262c825a037d40d49ce4d61aa214a.tar.gz
scala-async-b87b924ea82262c825a037d40d49ce4d61aa214a.tar.bz2
scala-async-b87b924ea82262c825a037d40d49ce4d61aa214a.zip
Merge pull request #2 from viktorklang/patch-1
Update README.md
Diffstat (limited to 'README.md')
-rw-r--r--README.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/README.md b/README.md
index 1bd68fd..10c71f4 100644
--- a/README.md
+++ b/README.md
@@ -53,7 +53,7 @@ has finished, we trigger it again, and suspend again.
Finally, we add the results and complete `combined`, which
in turn will release line 5 (unless it had already timed out).
-It is important to note that while this code is non-blocking,
+It is important to note that while line 1-4 is non-blocking,
it is not parallel. If we wanted to parallelize the two computations,
we could rearrange the code as follows.