couple upgrade guide adjustments

Author: ryanflorence

UPGRADE_GUIDE.md

@@ -30,8 +30,8 @@ var ReactRouter = require('react-router');
 var Router = ReactRouter.Router;
 var Route = ReactRouter.Route;
 
-// or using object destructuring
-var { Router, Route } = require('react-router');
+// or using ES Modules
+import { Router, Route } from 'react-router';
 ```
 
 ### Rendering
@@ -73,7 +73,7 @@ let history = createBrowserHistory()
 render(<Router history={history}>{routes}</Router>, el)
 ```
 
-If you do not specify a history type (as in the example above) then you will notice some unusual behaviour after updating to 1.0.0. With the default hash based routing a querystring entry not defined by yourself will start appearing in your URLs called "_k". An example of how it looks is this: `?_k=umhx1s`.  
+If you do not specify a history type (as in the example above) then you will notice some unusual behaviour after updating to 1.0.0. With the default hash based routing a querystring entry not defined by yourself will start appearing in your URLs called `_k`. An example of how it looks is this: `?_k=umhx1s`
 
 This is intended and part of [createHashHistory](https://github.com/rackt/react-router/blob/master/docs/guides/basics/Histories.md#createhashhistory) (which is the default history approach used if one is not specified). You can read more about the feature [here](https://github.com/rackt/react-router/blob/master/docs/guides/basics/Histories.md#what-is-that-_kckuvup-junk-in-the-url) and how to opt out [here](https://rackt.github.io/history/stable/HashHistoryCaveats.html).
 
@@ -108,9 +108,6 @@ since it's simple with a `*` path.
 
 ### Redirect route
 
-- no more params
-- must have absolute `from` (for now)
-
 ```js
 // v0.13.x
 <Redirect from="some/where/:id" to="somewhere/else/:id" params={{id: 2}}/>
@@ -138,12 +135,13 @@ since it's simple with a `*` path.
 #### "active" class
 
 In 0.13.x links added the "active" class by default which you could
-override with `activeClassName`, or provide `activeStyle`s. Most links
-don't need this and the check is (currently) expensive.
+override with `activeClassName`, or provide `activeStyle`s. It's usually
+just a handful of navigation links that need this behavior.
 
-Links no longer add the "active" class by default, you opt-in by
-providing one; if no `activeClassName` or `activeStyle`s are provided,
-the link will not check if it's active.
+Links no longer add the "active" class by default (its expensive and
+usually not necessary), you opt-in by providing one; if no
+`activeClassName` or `activeStyle`s are provided, the link will not
+check if it's active.
 
 ```js
 // v0.13.x
@@ -180,6 +178,9 @@ active when on exactly that path.
 <IndexLink to="/">Home</IndexLink>
 ```
 
+This gives you more granular control of what causes a link to be active
+or not when there is an index route involved.
+
 #### onClick handler
 
 For consistency with React v0.14, returning `false` from a `Link`'s `onClick`
@@ -295,8 +296,9 @@ and where you get it now if you're a route component (`this.props`)
 | `getRoutes()`     | `routes`                           |
 | `isActive(to, params, query)` | `history.isActive(pathname, query, onlyActiveOnIndex)` |
 
-Here is another table of properties you used to get via the `State` and 
-where you can get it now if you are **not** a route component (`this.context`).
+Here is another table of properties you used to get via the `State` and
+where you can get it now if you are **not** a route component
+(`this.context`).
 
 | v0.13 (this)      | v1.0 (this.context)                |
 |-------------------|------------------------------------|
@@ -306,7 +308,7 @@ where you can get it now if you are **not** a route component (`this.context`).
 | `getQueryParams()`| `location.query`                   |
 | `isActive(to, params, query)` | `history.isActive(pathname, query, indexOnly)` |
 
-Note not all `State` functionality can be accessed via context in v1.0. 
+Note not all `State` functionality can be accessed via context in v1.0.
 For example, `params` is not available via context.
 
 ### Scrolling
@@ -331,10 +333,8 @@ Routes now define this behavior:
 // v0.13.x
 var Home = React.createClass({
   statics: {
-    willTransitionTo (transition, params, query, callback) {
-    }
-    willTransitionFrom (component, transition, params, query, callback) {
-    }
+    willTransitionTo (transition, params, query, callback) { }
+    willTransitionFrom (component, transition, params, query, callback) { }
   }
 })