Merge branch 'master' into rackt-eslint-config

docs/introduction/Ecosystem.md

@@ -11,6 +11,7 @@ On this page we will only feature a few of them that the Redux maintainers have
 * [react-redux](https://github.com/gaearon/react-redux) — React
 * [ng-redux](https://github.com/wbuchwalter/ng-redux) — Angular
 * [ng2-redux](https://github.com/wbuchwalter/ng2-redux) — Angular 2
+* [backbone-redux](https://github.com/redbooth/backbone-redux) — Backbone
 
 ## Middleware
 
@@ -32,7 +33,7 @@ On this page we will only feature a few of them that the Redux maintainers have
 
 ## Reducer Enhancers
 
-* [redux-optimist](https://github.com/ForbesLindesay/redux-optimist) — Optimistically apply actions that can be later commited or reverted
+* [redux-optimist](https://github.com/ForbesLindesay/redux-optimist) — Optimistically apply actions that can be later committed or reverted
 * [redux-undo](https://github.com/omnidan/redux-undo) — Effortless undo/redo and action history for your reducers
 * [redux-ignore](https://github.com/omnidan/redux-ignore) — Ignore redux actions by array or filter function
 * [redux-recycle](https://github.com/omnidan/redux-recycle) — Reset the redux state on certain actions

docs/recipes/MigratingToRedux.md

@@ -27,5 +27,4 @@ Your process will look like this:
 
 ## From Backbone
 
-Sorry, you’ll need to rewrite your model layer.  
-It’s way too different!
+Backbone’s model layer is quite different from Redux, so we don’t suggest to mix them. If possible, it is best that you rewrite your app’s model layer from scratch instead of connecting Backbone to Redux. However, if a rewrite is not feasible, you may use [backbone-redux](https://github.com/redbooth/backbone-redux) to migrate gradually, and keep the Redux store in sync with Backbone models and collections.

examples/async/server.js

@@ -3,7 +3,7 @@ var webpackDevMiddleware = require('webpack-dev-middleware')
 var webpackHotMiddleware = require('webpack-hot-middleware')
 var config = require('./webpack.config')
 
-var app = new require('express')()
+var app = new (require('express'))()
 var port = 3000
 
 var compiler = webpack(config)

examples/counter/server.js

@@ -3,7 +3,7 @@ var webpackDevMiddleware = require('webpack-dev-middleware')
 var webpackHotMiddleware = require('webpack-hot-middleware')
 var config = require('./webpack.config')
 
-var app = new require('express')()
+var app = new (require('express'))()
 var port = 3000
 
 var compiler = webpack(config)

examples/real-world/server.js

@@ -3,7 +3,7 @@ var webpackDevMiddleware = require('webpack-dev-middleware')
 var webpackHotMiddleware = require('webpack-hot-middleware')
 var config = require('./webpack.config')
 
-var app = new require('express')()
+var app = new (require('express'))()
 var port = 3000
 
 var compiler = webpack(config)

examples/shopping-cart/server.js

@@ -3,7 +3,7 @@ var webpackDevMiddleware = require('webpack-dev-middleware')
 var webpackHotMiddleware = require('webpack-hot-middleware')
 var config = require('./webpack.config')
 
-var app = new require('express')()
+var app = new (require('express'))()
 var port = 3000
 
 var compiler = webpack(config)

examples/todomvc/server.js

@@ -3,7 +3,7 @@ var webpackDevMiddleware = require('webpack-dev-middleware')
 var webpackHotMiddleware = require('webpack-hot-middleware')
 var config = require('./webpack.config')
 
-var app = new require('express')()
+var app = new (require('express'))()
 var port = 3000
 
 var compiler = webpack(config)

examples/todos-with-undo/server.js

@@ -3,7 +3,7 @@ var webpackDevMiddleware = require('webpack-dev-middleware')
 var webpackHotMiddleware = require('webpack-hot-middleware')
 var config = require('./webpack.config')
 
-var app = new require('express')()
+var app = new (require('express'))()
 var port = 3000
 
 var compiler = webpack(config)