Merge branch 'master' into next

Author: taion

README.md

@@ -22,7 +22,7 @@ React Router keeps your UI in sync with the URL. It has a simple API with powerf
 
 **Older Versions:**
 
-- 0.13.x - [docs](https://github.com/reactjs/react-router/tree/0.13.x/doc) / [guides](https://github.com/reactjs/react-router/tree/0.13.x/docs/guides) / [code](https://github.com/reactjs/react-router/tree/0.13.x) / [upgrade guide](https://github.com/reactjs/react-router/blob/master/upgrade-guides/v1.0.0.md)
+- 0.13.x - [docs](https://github.com/reactjs/react-router/tree/v0.13.6/doc) / [guides](https://github.com/reactjs/react-router/tree/v0.13.6/docs/guides) / [code](https://github.com/reactjs/react-router/tree/v0.13.6) / [upgrade guide](https://github.com/reactjs/react-router/blob/master/upgrade-guides/v1.0.0.md)
 - 1.0.x - [docs](https://github.com/reactjs/react-router/tree/1.0.x/docs) / [code](https://github.com/reactjs/react-router/tree/1.0.x) / [upgrade guide](https://github.com/reactjs/react-router/blob/master/upgrade-guides/v2.0.0.md)
 
 For questions and support, please visit [our channel on Reactiflux](https://discord.gg/0ZcbPKXt5bYaNQ46) or [Stack Overflow](http://stackoverflow.com/questions/tagged/react-router).

docs/API.md

@@ -328,6 +328,28 @@ Called when a route is about to be entered. It provides the next router state an
 
 If `callback` is listed as a 3rd argument, this hook will run asynchronously, and the transition will block until `callback` is called.
 
+###### `callback` signature
+`cb(err)`
+
+```js
+const userIsInATeam = (nextState, replace, callback) => {
+  fetch(...)
+    .then(response = response.json())
+    .then(userTeams => {
+      if (userTeams.length === 0) {
+        replace(`/users/${nextState.params.userId}/teams/new`)
+      }
+      callback();
+    })
+    .catch(error => {
+      // do some error handling here
+      callback(error);
+    })
+}
+
+<Route path="/users/:userId/teams" onEnter={userIsInATeam} />
+```
+
 ##### `onChange(prevState, nextState, replace, callback?)`
 Called on routes when the location changes, but the route itself neither enters or leaves. For example, this will be called when a route's children change, or when the location query changes. It provides the previous router state, the next router state, and a function to redirect to another path. `this` will be the route instance that triggered the hook.