summaryrefslogtreecommitdiffhomepage
path: root/clojure.html.markdown
diff options
context:
space:
mode:
authorAdam Bard <github@adambard.com>2013-10-09 09:21:19 -0700
committerAdam Bard <github@adambard.com>2013-10-09 09:21:19 -0700
commitd3bf3aa77f1a371471b81d8cb95a3eba6a701f93 (patch)
tree40e47779ac159a793ca292ab681b640a82905047 /clojure.html.markdown
parentdac3063ddf1781eeff8704f0b61d38a302b42db7 (diff)
parent9a4721785cd51360472c329d1c9614fb6783d5e1 (diff)
Merge pull request #374 from bzg/master
[clojure/en][clojure/fr-fr] Fix some typos in the Clojure tutorial and add the french translation
Diffstat (limited to 'clojure.html.markdown')
-rw-r--r--clojure.html.markdown6
1 files changed, 3 insertions, 3 deletions
diff --git a/clojure.html.markdown b/clojure.html.markdown
index a502a95c..779c28ae 100644
--- a/clojure.html.markdown
+++ b/clojure.html.markdown
@@ -63,7 +63,7 @@ and often automatically.
; If you want to create a literal list of data, use ' to stop it from
; being evaluated
'(+ 1 2) ; => (+ 1 2)
-; (shorthand for (quote (+ 1 2))
+; (shorthand for (quote (+ 1 2)))
; You can eval a quoted list
(eval '(+ 1 2)) ; => 3
@@ -205,7 +205,7 @@ keymap ; => {:a 1, :c 3, :b 2}
;("a" stringmap)
; => Exception: java.lang.String cannot be cast to clojure.lang.IFn
-; Retrieving a non-present value returns nil
+; Retrieving a non-present key returns nil
(stringmap "d") ; => nil
; Use assoc to add new keys to hash-maps
@@ -341,7 +341,7 @@ keymap ; => {:a 1, :b 2, :c 3}
(swap! my-atom assoc :a 1) ; Sets my-atom to the result of (assoc {} :a 1)
(swap! my-atom assoc :b 2) ; Sets my-atom to the result of (assoc {:a 1} :b 2)
- ; Use '@' to dereference the atom and get the value
+; Use '@' to dereference the atom and get the value
my-atom ;=> Atom<#...> (Returns the Atom object)
@my-atom ; => {:a 1 :b 2}