Some additional upgrade cleanups 🚿

Author: timdorr

upgrade-guides/v2.0.0.md

@@ -24,11 +24,17 @@ We have done our best to provide backwards compatibility with deprecated APIs. I
 
 The deprecation warnings should also lead you to the relevant part of this document. If one doesn't, please open a pull request with a fix. Also, if any part of this document could be improved, please let us know how. Confound it, our bias is often inescapable!
 
-## Router `history` prop
+## Using `history` with `Router`
 
-### Default Hash History
+### History singletons provided
 
-`Router` used to default to creating a hash history, it no longer creates a default, you must provide one. This helps keep your app's bundle size down by not including hash history no matter what history you're actually using.
+We now include singleton `history` instances for you to use in the router. They are `hashHistory` (hash-based URLs) and `browserHistory` (HTML5 pushState "pretty" URLs). They include any needed history wrappers (such as `useQueries`) so you don't have to write as much boilerplate as before.
+
+Another big change because of this is `history` is now a normal dependency. You no longer have to install and maintain `history` spearately. Batteries included!
+
+### No Default History
+
+`Router` used to default to creating a hash history. It no longer creates a default, you must provide one. This helps keep your app's bundle size down by not including hash history no matter what history you're actually using.
 
 ```js
 // v1.x
@@ -37,33 +43,32 @@ The deprecation warnings should also lead you to the relevant part of this docum
 // v2.0.0
 // hash history
 import { hashHistory } from 'react-router'
-<Router history={hashHistory}/>
+<Router history={hashHistory} />
 ```
 
-### Using Browser History
+### Using Browser (HTML5 pushState) History
+
+As already mentioned, you now use the singleton `browserHistory` exported from `react-router`.
 
 ```js
 // v1.x
 import createBrowserHistory from 'history/lib/createBrowserHistory'
-<Router history={createBrowserHistory()}/>
+<Router history={createBrowserHistory()} />
 
 // v2.0.0
 import { browserHistory } from 'react-router'
-<Router history={browserHistory}/>
+<Router history={browserHistory} />
 ```
 
-## Changes to provided context and Mixins
+## Changes to context and Mixins
 
-Only an object named `router` is added to context. Accessing `context.history`, `context.location`, and `context.route` are all deprecated.
+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, all mixins are deprecated as they simply served to conceal usage of context.
+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.
 
 ### Accessing location
 
-Access `location` from `this.props.location` of your route component. If
-you'd like to get it deeper in the tree, you can use whatever
-conventions your app has for getting props from high down low. One
-option is to provide it on context yourself:
+Access `location` from `this.props.location` of your `Route` component. If you'd like to get it deeper in the tree, you can use whatever conventions your app has for getting props from high down low. One option is to provide it on context yourself:
 
 ```js
 // v2.0.x