Merge branch 'master' of https://github.com/clojure-cookbook/clojure-cookbook

Ryan Neufeld · Ryan Neufeld · commit e5cf647e24c1 · 2013-11-29T17:41:10.000-05:00
diff --git a/frontmatter/conventions.asciidoc b/frontmatter/conventions.asciidoc
@@ -140,5 +140,5 @@ _Italic_::
   examples to show both input and output; and in regular text to show
   literal code.
 *+Constant Width Bold+*::
-  is used to indicate commands that should you should enter literally
-  at the command-line.
+  is used to indicate commands that you should enter literally at the
+  command-line.
diff --git a/primitive-data/introduction.asciidoc b/primitive-data/introduction.asciidoc
@@ -3,10 +3,10 @@
 Clojure is a fantastic language for tackling *hard* problems. Its
 _simple_ tools let us software developers build up layer upon layer of
 abstractions until we've tackled some of the world's most difficult
-problems with ease. Like chemistry every great Clojure program boils
+problems with ease. Like chemistry, every great Clojure program boils
 down to simple atoms--these are our primitives.
 
-Standing on the shoulder of the Java giants from days of yore, Clojure
+Standing on the shoulders of the Java giants from days of yore, Clojure
 leverages a fantastic array of battle-hardened types present in the
 JVM; strings, numeric types, dates, UUIDs, you name it, Clojure has
 it all. This chapter dives in to the primitives of Clojure and how to
@@ -15,9 +15,9 @@ accomplish common tasks.
 ==== Strings
 
 Almost every programming language knows how to work with and deal in
-strings. Clojure is no exception, and despite a few differences,
+strings. Clojure is no exception and, despite a few differences,
 Clojure provides the same general capabilites as most other
-languages.Here are a few key differences we think you should know
+languages. Here are a few key differences we think you should know
 about:
 
 First, Clojure strings are backed by Java's UTF-16 strings. You don't
@@ -30,14 +30,14 @@ libraries, Clojure has a rather spartan built-in string
 manipulation library. This may seem odd at first, but Clojure prefers
 simple and composable tools; any of the plethora of collection
 modifying functions in Clojure are all perfectly capable of accepting
-strings - they're collections too! For this reason Clojure's string
+strings - they're collections too! For this reason, Clojure's string
 library is unexpectedly small. You'll find that small set of very
 string-specific functions in the +clojure.string+ namespace.
 
 Clojure also embraces its host platform (the JVM), and does not
 duplicate functionality already adequalty performed by Java's
 +java.lang.String+ class. Using Java interop in Clojure is not a
-failure - the langauge is designed to make it straightforward, and
+failure--the langauge is designed to make it straightforward, and
 using the built-in string methods is usually just as easy as invoking
 a Clojure function.
 
