summaryrefslogtreecommitdiffhomepage
path: root/clojure.html.markdown
diff options
context:
space:
mode:
authorAdam Bard <github@adambard.com>2013-07-01 08:40:15 -0700
committerAdam Bard <github@adambard.com>2013-07-01 08:40:15 -0700
commit0812f53ddbcddc5c2d86ce605f683a17375fcad6 (patch)
tree94202d86d3496d9409417d5a93ca03c9a0015b23 /clojure.html.markdown
parent2431545594963be4a79a2d4fbc79277fb30fef3b (diff)
parent1193d43e89326feb150d7f7c0e8d03428115c80b (diff)
Merge pull request #66 from e-user/patch-1
Rectified relationship to Lisp
Diffstat (limited to 'clojure.html.markdown')
-rw-r--r--clojure.html.markdown2
1 files changed, 1 insertions, 1 deletions
diff --git a/clojure.html.markdown b/clojure.html.markdown
index 12611fd3..cb202a92 100644
--- a/clojure.html.markdown
+++ b/clojure.html.markdown
@@ -5,7 +5,7 @@ author_url: http://adambard.com/
filename: test.clj
---
-Clojure is a variant of LISP developed for the Java Virtual Machine. It has
+Clojure is a Lisp family language developed for the Java Virtual Machine. It has
a much stronger emphasis on pure [functional programming](https://en.wikipedia.org/wiki/Functional_programming) than
Common Lisp, but includes several [STM](https://en.wikipedia.org/wiki/Software_transactional_memory) utilities to handle
state as it comes up.