Rearranged some more things 🚚

Author: timdorr

upgrade-guides/v2.0.0.md

@@ -60,11 +60,9 @@ import { browserHistory } from 'react-router'
 <Router history={browserHistory} />
 ```
 
-## Changes to context and Mixins
+## Changes to `this.context`
 
-Only an object named `router` is added to context. Accessing `this.context.history`, `this.context.location`, and `this.context.route` are all deprecated.
-
-Additionally, since [`context` is now documented](https://facebook.github.io/react/docs/context.html), all mixins are deprecated as they simply served to conceal usage of context.
+Only an object named `router` is added to context. Accessing `this.context.history`, `this.context.location`, and `this.context.route` are all deprecated. This new object contains the methods available from `history` (such as `push`, `replace`) along with `setRouteLeaveHook`. 
 
 ### Accessing location
 
@@ -83,14 +81,58 @@ const RouteComponent = React.createClass({
 })
 ```
 
-## History Mixin
-(see below)
+## Mixins are deprecated
+
+Since [`context` is now documented](https://facebook.github.io/react/docs/context.html), all mixins are deprecated as they simply served to conceal usage of context.
+
+### `RouteContext` Mixin
+
+```js
+// 1.x
+const RouteComponent = React.createClass({
+  mixins: [ RouteContext ]
+})
 
-## Route component `history` prop
-(see below)
+// 2.0.0
+const RouteComponent = React.createClass({
+  contextTypes: {
+    route: React.PropTypes.object
+  },
+  getChildContext() {
+    return {
+      route: this.props.route
+    }
+  }
+})
+```
 
-## `context.history`
-(see below)
+### `Lifecycle` Mixin
+
+```js
+// v1.0.x
+const RouteComponent = React.createClass({
+  mixins: [ Lifecycle ],
+  routerWillLeave() {
+    // ...
+  }
+})
+
+// v2.0.0
+const RouteComponent = React.createClass({
+  contextTypes: {
+    router: object.isRequired
+  },
+  componentDidMount() {
+    const { route } = this.props
+    const { router } = this.context
+    router.setRouteLeaveHook(route, this.routerWillLeave)
+  }
+})
+```
+You don't need to manually tear down the route leave hook in most cases. We automatically remove all attached route leave hooks after leaving the associated route.
+
+### History Mixin
+[See below](#navigating-inside-deeply-nested-components)
 
 ## Programatic Navigation
 
@@ -131,7 +173,7 @@ class RouteComponent extends React.Component {
 }
 ```
 
-## Navigating inside deeply nested components
+### Navigating inside deeply nested components
 
 ```js
 // v1.0.x
@@ -164,32 +206,6 @@ const DeepComponent = React.createClass({
 }
 ```
 
-## Lifecycle Mixin
-
-```js
-// v1.0.x
-const RouteComponent = React.createClass({
-  mixins: [ Lifecycle ],
-  routerWillLeave() {
-    // ...
-  }
-})
-
-// v2.0.0
-const RouteComponent = React.createClass({
-  contextTypes: {
-    router: object.isRequired
-  },
-  componentDidMount() {
-    const { route } = this.props
-    const { router } = this.context
-    router.setRouteLeaveHook(route, this.routerWillLeave)
-  }
-})
-```
-
-You don't need to manually tear down the route leave hook in most cases. We automatically remove all attached route leave hooks after leaving the associated route.
-
 ## `<Link to>` and `isActive` take location descriptors
 
 `<Link to>` can now take a location descriptor in addition to strings. The `query` and `state` props are deprecated.
@@ -215,37 +231,6 @@ router.isActive(pathname, query, indexOnly)
 router.isActive({ pathname, query }, indexOnly)
 ```
 
-## `RoutingContext` renamed to `RouterContext`
-
-```js
-// v1.0.x
-import { RoutingContext } from 'react-router'
-// v2.0.0
-import { RouterContext } from 'react-router'
-```
-
-
-## `RouteContext` Mixin
-
-```js
-// 1.x
-const RouteComponent = React.createClass({
-  mixins: [ RouteContext ]
-})
-
-// 2.0.0
-const RouteComponent = React.createClass({
-  contextTypes: {
-    route: React.PropTypes.object
-  },
-  getChildContext() {
-    return {
-      route: this.props.route
-    }
-  }
-})
-```
-
 ## Custom Query String Parsing
 
 ```js
@@ -265,8 +250,18 @@ const appHistory = useRouterHistory({
 
 <Router history={appHistory}/>
 ```
+## Other Changes
 
-## RoutingContext -> Router render prop
+### `RoutingContext` renamed to `RouterContext`
+
+```js
+// v1.0.x
+import { RoutingContext } from 'react-router'
+// v2.0.0
+import { RouterContext } from 'react-router'
+```
+
+### RoutingContext -> Router render prop
 
 You can now pass a `render` prop to `Router` for it to use for rendering. This allows you to create "middleware components" that participate in routing. Its critical for integrations with libraries like Relay, Redux, Resolver, Transmit, Async Props, etc.
 
@@ -276,5 +271,3 @@ You can now pass a `render` prop to `Router` for it to use for rendering. This a
 ```
 
 `RoutingContext` was undocumented and therefore has no backwards compatibility.
-
-