Merge branch 'master' into galley-release

Ryan Neufeld · Ryan Neufeld · commit 9fa782824720 · 2013-10-21T14:51:54.000-04:00
diff --git a/clojurescript/boids/boids.asciidoc b/clojurescript/boids/boids.asciidoc
@@ -19,7 +19,7 @@ In your dependencies:
 ----
 
 
-Before looking at the whole version, try building a minimal viabale
+Before looking at the whole version, try building a minimal viable
 solution to see the core bits of creating objects and animating them
 in a web page.
 
@@ -76,7 +76,7 @@ http://s.trokes.org/dribnet/6460749[Live demo here]
 
 
 https://github.com/dribnet/strokes[strokes] is a library which
-provides idomatic use of http://d3js.org/[D3.js] from
+provides idiomatic use of http://d3js.org/[D3.js] from
 ClojureScript. Here, 5 objects were put in a vector wrapped by an atom
 to represent the boids, and then D3's timer function was used to
 repeatedly update and rerender these objects. Before getting too
diff --git a/clojurescript/dommy/dommy.asciidoc b/clojurescript/dommy/dommy.asciidoc
@@ -43,7 +43,7 @@ functional and idiomatic code.
 (deftemplate my-list [items]
   [:#my-list.shopping-list
     [:ul (map list-element items)]
-    [:buttom.remove-button "Clear list"])
+    [:button.remove-button "Clear list"])
 ----
 
 To select for a DOM element, use either the +sel1+ function, which returns the first element matching a
@@ -122,7 +122,7 @@ Let's take a closer look at what's actually going on in the two templates from b
 (deftemplate my-list [items]
   [:#my-list.shopping-list
     [:ul (map list-element items)]
-    [:buttom.remove-button "Clear list"])
+    [:button.remove-button "Clear list"])
 ----
 
 * The first keyword in each vector always describes the element tag, including its classes and id, using css syntax.
diff --git a/local-io/console/parse-command-line-arguments/parse-command-line-arguments.asciidoc b/local-io/console/parse-command-line-arguments/parse-command-line-arguments.asciidoc
@@ -91,7 +91,7 @@ Everything after the argument name and description will be interpreted
 as options in key-value pairs. tools.cli provides the following
 options:
 
-* +:default+: The default value returned in the absense of user-input.
+* +:default+: The default value returned in the absence of user-input.
   Without specifying, the default of default is +nil+.
 * +:flag+: If truthy (not +false+ or +nil+), indicates an argument
   behaves like a flag or switch. This argument will *not* take any
@@ -121,7 +121,7 @@ Here's a complete example:
 
 When writing flag options, a useful shortcut is to omit the +:flag+
 option and add a "`[no-]`" prefix to the arguments name. +cli+ will
-interpet this argument spec as including +:flag true+ without having
+interpret this argument spec as including +:flag true+ without having
 to specify it as such.
 
 [source,clojure]
diff --git a/local-io/unknown-reader-literals/unknown-reader-literals.asciidoc b/local-io/unknown-reader-literals/unknown-reader-literals.asciidoc
@@ -117,7 +117,7 @@ read from untrusted sources. This means user data, remote servers
 being a little extreme, of course, but we want you to be safe.)
 
 In the event that you *do* have a safe environment and absolutely need
-to evalute some code, then by all means use the +clojure.core+
+to evaluate some code, then by all means use the +clojure.core+
 readers. These readers do have a different interface for setting
 options than +clojure.edn+ readers, though; instead of passing an
 +opts+ you'll need to change various dynamic bindings to adjust the
diff --git a/webapps/ring/introduction/introduction.asciidoc b/webapps/ring/introduction/introduction.asciidoc
@@ -77,7 +77,7 @@ machine demonstrates the structure of a request:
 You can see that this is comprehensive, but low level, with the
 salient features of the request parsed into Clojure data structures
 without additional abstraction. Typically, additional code or
-libraries are used to extract meaninful information from this data
+libraries are used to extract meaningful information from this data
 structure.
 
 The jetty adapter is used to run an embedded Jetty server. Ring also
@@ -87,4 +87,4 @@ Note that the call to `run-jetty` is synchronous, and will not return
 as long as the server is running. If you call it from the REPL, you
 should wrap it in a `future` (or use some other concurrency mechanism)
 so the server runs on another thread and your REPL does not become
-unresponsive.
+unresponsive.
