summaryrefslogtreecommitdiffhomepage
path: root/chapel.html.markdown
diff options
context:
space:
mode:
authorJacob Ward <jacobward1898@gmail.com>2015-10-30 07:39:58 -0600
committerJacob Ward <jacobward1898@gmail.com>2015-10-30 07:39:58 -0600
commitbb006a51c12e59ba215a7eab340bbbac8d024278 (patch)
tree1920b3770541783fb9e83e9ee41017c6f060cf33 /chapel.html.markdown
parent011c0b5fc7c723011f79554720593873f5275cca (diff)
parentf0a4c88acfac9514aca6dd33e2d3f8c4d5e815dc (diff)
Merge remote-tracking branch 'adambard/master'
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;