summaryrefslogtreecommitdiffhomepage
path: root/chapel.html.markdown
diff options
context:
space:
mode:
authorDennis Keller <dk.denniskeller@gmail.com>2015-10-31 11:11:06 +0100
committerDennis Keller <dk.denniskeller@gmail.com>2015-10-31 11:11:06 +0100
commitca6ea580c7df41730fe547b0c35b3406dc9e590f (patch)
tree8f6daf20606ce1dd0e050c8b65ebcef452e20d0e /chapel.html.markdown
parent2c99b0a9553f25a7ac43b04a14c4e2d78fe2b318 (diff)
parentedfc99e198fd2e87802ea81d6779fbadfab64919 (diff)
Merge remote-tracking branch 'upstream/master' into scala/de
Diffstat (limited to 'chapel.html.markdown')
-rw-r--r--chapel.html.markdown4
1 files changed, 2 insertions, 2 deletions
diff --git a/chapel.html.markdown b/chapel.html.markdown
index 7252a3e4..866e92d2 100644
--- a/chapel.html.markdown
+++ b/chapel.html.markdown
@@ -629,7 +629,7 @@ for (i, j) in zip( toThisArray.domain, -100..#5 ){
}
writeln( toThisArray );
-// This is all very important in undestanding why the statement
+// This is all very important in understanding why the statement
// var iterArray : [1..10] int = [ i in 1..10 ] if ( i % 2 == 1 ) then j;
// exhibits a runtime error.
// Even though the domain of the array and the loop-expression are
@@ -914,7 +914,7 @@ proc main(){
[ val in myBigArray ] val = 1 / val; // Parallel operation
// Atomic variables, common to many languages, are ones whose operations
- // occur uninterupted. Multiple threads can both modify atomic variables
+ // occur uninterrupted. Multiple threads can both modify atomic variables
// and can know that their values are safe.
// Chapel atomic variables can be of type bool, int, uint, and real.
var uranium: atomic int;