summaryrefslogtreecommitdiffhomepage
path: root/julia.html.markdown
diff options
context:
space:
mode:
authorchenbridge <chenbridge@Bridge-Mac.local>2016-02-29 09:35:27 +0800
committerchenbridge <chenbridge@Bridge-Mac.local>2016-02-29 09:35:27 +0800
commit447e80f31d06b5976864ad19b7c7cde71dc64c9c (patch)
tree3e1c32153d012a56111542e277a725ff798a76c3 /julia.html.markdown
parentfbe569a5252d88e0b24ae05c1faa903a4da3d138 (diff)
parent326fa410fae93dc0f4767444759042515d7c28d5 (diff)
Merge remote-tracking branch 'adambard/master'
Diffstat (limited to 'julia.html.markdown')
-rw-r--r--julia.html.markdown4
1 files changed, 2 insertions, 2 deletions
diff --git a/julia.html.markdown b/julia.html.markdown
index 2810555e..db72e8ba 100644
--- a/julia.html.markdown
+++ b/julia.html.markdown
@@ -155,7 +155,7 @@ b = [4; 5; 6] # => 3-element Int64 Array: [4, 5, 6]
b[1] # => 4
b[end] # => 6
-# 2-dimentional arrays use space-separated values and semicolon-separated rows.
+# 2-dimensional arrays use space-separated values and semicolon-separated rows.
matrix = [1 2; 3 4] # => 2x2 Int64 Array: [1 2; 3 4]
# Arrays of a particular Type
@@ -420,7 +420,7 @@ varargs(1,2,3) # => (1,2,3)
# The ... is called a splat.
# We just used it in a function definition.
-# It can also be used in a fuction call,
+# It can also be used in a function call,
# where it will splat an Array or Tuple's contents into the argument list.
Set([1,2,3]) # => Set{Array{Int64,1}}([1,2,3]) # produces a Set of Arrays
Set([1,2,3]...) # => Set{Int64}(1,2,3) # this is equivalent to Set(1,2,3)