Merge branch 'master' into develop

README.md

@@ -338,7 +338,7 @@ An `effect handler` (function) actions the `effects` returned by `h`.
 
 Here's what `h` returned:
 ```clj
-{:db  (dissoc-in db [:items item-id])}
+{:db  (dissoc-in db [:items 2486])}
 ```
 Each key of the map identifies one kind 
 of `effect`, and the value for that key supplies further details. 
@@ -486,7 +486,7 @@ Next you need to read the other three articles in the [Introduction section](/do
 
 This will push your knowledge to about 70%. The
 final 30% will come incrementally with use, and by reading the other
-tutorials (of which there's a few).
+tutorials (of which there are a few).
 
 You can also experiment with these two examples: <br>
 https://github.com/Day8/re-frame/tree/master/examples

docs/CodeWalkthrough.md

@@ -30,7 +30,7 @@ Then:
   1. `git clone https://github.com/Day8/re-frame.git`
   2. `cd re-frame/examples/simple`
   3. `lein do clean, figwheel`
-  4. wait a minute and then open `http://localhost:3449/example.html`
+  4. wait a minute and then open <http://localhost:3449/example.html>
   
 So, what's just happened?  The ClojureScript code under `/src` has been compiled into `javascript` and
 put into `/resources/public/js/client.js` which is loaded into `/resources/public/example.html` (the HTML you just opened)

docs/External-Resources.md

@@ -36,6 +36,8 @@ Please add to this list by submitting a pull request.
 * [re-frame-youtube-fx](https://github.com/micmarsh/re-frame-youtube-fx) - YouTube iframe API wrapper
 * [re-frame-web3-fx](https://github.com/madvas/re-frame-web3-fx) - Ethereum Web3 API
 * [re-frame-google-analytics-fx](https://github.com/madvas/re-frame-google-analytics-fx) - Google Analytics API
+* [re-frame-storage](https://github.com/akiroz/re-frame-storage) - Local Storage based persistence
+* [re-frame-storage-fx](https://github.com/deg/re-frame-storage-fx) - Another take on Local Storage persistence
 
 ### Routing
 

examples/todomvc/src/todomvc/events.cljs

@@ -26,7 +26,7 @@
 (def ->local-store (after todos->local-store))
 
 ;; Each event handler can have its own set of interceptors (middleware)
-;; But we use the same set of interceptors for all event habdlers related
+;; But we use the same set of interceptors for all event handlers related
 ;; to manipulating todos.
 ;; A chain of interceptors is a vector.
 (def todo-interceptors [check-spec-interceptor               ;; ensure the spec is still valid

src/re_frame/std_interceptors.cljc

@@ -211,7 +211,7 @@
   eddting operation. Nice and efficient, but fiddly. A bug generator
   approach.
 
-  So, instead, we create an `f` which recalcualtes warnings from scratch
+  So, instead, we create an `f` which recalculates warnings from scratch
   every time there is ANY change. It will inspect all the todos, and
   reset ALL FLAGS every time (overwriting what was there previously)
   and fully recalculate the list of duplicates (displayed at the bottom?).