Merge branch 'master' of github.com:clojuredocs/guides

Author: seancorfield

articles/content.md

@@ -47,7 +47,7 @@ A brief introduction to Counterclockwise, a Clojure plugin for Eclipse.
 
 ### [Emacs for Clojure Development](/articles/tutorials/emacs.html)
 
-A brief introduction to Emacs, Clojure mode, SLIME and Clojure development workflow with Emacs.
+A brief introduction to Emacs, Clojure mode, CIDER and Clojure development workflow with Emacs.
 
 ### [Vim for Clojure Development](/articles/tutorials/vim_fireplace.html)
 

articles/ecosystem/core_typed/start/introduction_and_motivation.md

@@ -78,7 +78,7 @@ while making some compromises (it does the latter).
 
 This might seem discouraging, but in practice core.typed will catch all type errors in your code.
 The problem is some Clojure idioms are so flexible it is often impossible to distinguish
-between indended and unintended usage.
+between intended and unintended usage.
 
 A small example: `map` accepts either `nil` or a `Seqable` as a second argument. It is perfectly
 valid to provide an argument that is always `nil`, but it's probably not what the user intended.

articles/ecosystem/java_jdbc/using_sql.md

@@ -240,14 +240,14 @@ If you want to delete any rows from a table that match a simple predicate, the
 
 ```clojure
 (j/delete! db-spec :fruit ["grade < ?" 25.0])
-;; produces a sequence of the new of rows deleted, e.g., (1)
+;; produces a sequence of the number of rows deleted, e.g., (1)
 ```
 
 You can also use `execute!` for deleting rows:
 
 ```clojure
 (j/execute! db-spec ["DELETE FROM fruit WHERE grade < ?" 25.0])
-;; produces a sequence of the new of rows deleted, e.g., (1)
+;; produces a sequence of the number of rows deleted, e.g., (1)
 ```
 
 ## Using transactions

articles/tutorials/introduction.md

@@ -45,7 +45,7 @@ expressions into it as you go.
 > previous expression evaluates to.
 
 This introduction is a whirlwind tutorial of most of the basics of
-Clojure. Its goal is to rapidly get you acquainted with the core
+Clojure. Its goal is to rapidly get you familiar with the core
 areas of the language without wasting your time and also without getting
 too bogged down in details or advanced topics (the various topics will
 get more comprehensive coverage in the topic guides anyway).
@@ -56,7 +56,7 @@ simple language, and you're going to love it.
 
 
 
-## Preliminaries
+## The Basics
 
 Clojure is a general-purpose programming language, and a quite
 practical one at that.