Merge remote-tracking branch 'super/master'

Author: knowbody

docs/Introduction.md

@@ -143,7 +143,9 @@ render((
 ), document.body)
 ```
 
-React Router knows how to build nested UI for us, so we don't have to manually figure out which `<Child>` component to render. Internally, the router converts your `<Route>` element hierarchy to a [route config](/docs/Glossary.md#routeconfig). But if you're not digging the JSX you can use plain objects instead:
+React Router knows how to build nested UI for us, so we don't have to manually figure out which `<Child>` component to render. For example, for a full path `/about` it would build `<App><About /></App>`.
+
+Internally, the router converts your `<Route>` element hierarchy to a [route config](/docs/Glossary.md#routeconfig). But if you're not digging the JSX you can use plain objects instead:
 
 ```js
 const routes = {
@@ -195,7 +197,15 @@ render((
 ), document.body)
 ```
 
-Now visits to URLs like `inbox/messages/Jkei3c32` will match the new route and nest the UI branch of `App -> Inbox -> Message`.
+Now visits to URLs like `inbox/messages/Jkei3c32` will match the new route and build this:
+
+```
+<App>
+  <Inbox>
+    <Message params={ {id: 'Jkei3c32'} } />
+  </Inbox>
+</App>
+```
 
 ### Getting URL Parameters
 

docs/guides/advanced/DynamicRouting.md

@@ -30,7 +30,9 @@ const CourseRoute = {
 
   getIndexRoute(location, callback) {
     require.ensure([], function (require) {
-      callback(null, require('./components/Index'))
+      callback(null, {
+        component: require('./components/Index'),
+      })
     })
   },
 

docs/guides/basics/Histories.md

@@ -33,6 +33,14 @@ When a history transitions around your app with `pushState` or `replaceState`, i
 
 The DOM API that hash history uses to transition around is simply `window.location.hash = newHash`, with no place to store location state.  But, we want all histories to be able to use location state, so we shim it by creating a unique key for each location and then store that state in session storage. When the visitor clicks "back" and "forward" we now have a mechanism to restore the location state.
 
+You can disable that feature (more [here](http://rackt.org/history/stable/HashHistoryCaveats.html)):
+```js
+// Opt-out of persistent state, not recommended.
+let history = createHistory({
+  queryKey: false
+});
+```
+
 ### `createBrowserHistory`
 Browser history is the recommended history for browser application with React Router. It uses the [History](https://developer.mozilla.org/en-US/docs/Web/API/History) API built into the browser to manipulate the URL, creating real URLs that look like `example.com/some/path`.
 
@@ -66,7 +74,7 @@ If you're using nginx, use the [`try_files` directive](http://nginx.org/en/docs/
 server {
   ...
   location / {
-    try_files $uri /index.html
+    try_files $uri /index.html;
   }
 }
 ```

modules/RoutingContext.js

@@ -26,14 +26,13 @@ class RoutingContext extends Component {
 
   static childContextTypes = {
     history: object.isRequired,
-    location: object.isRequired
+    location: object.isRequired,
+    params: object.isRequired
   }
 
   getChildContext() {
-    return {
-      history: this.props.history,
-      location: this.props.location
-    }
+    const { history, location, params } = this.props
+    return { history, location, params }
   }
 
   createElement(component, props) {

modules/__tests__/RouteComponent-test.js

@@ -5,6 +5,8 @@ import { render, unmountComponentAtNode } from 'react-dom'
 import createHistory from 'history/lib/createMemoryHistory'
 import Router from '../Router'
 
+const { object } = React.PropTypes
+
 describe('a Route Component', function () {
 
   let node
@@ -41,4 +43,28 @@ describe('a Route Component', function () {
     ), node, done)
   })
 
+  it('receives the right context', function (done) {
+    class RouteComponent extends Component {
+      static contextTypes = {
+        history: object.isRequired,
+        location: object.isRequired,
+        params: object.isRequired
+      }
+      componentDidMount() {
+        expect(this.context.history).toEqual(this.props.history)
+        expect(this.context.location).toEqual(this.props.location)
+        expect(this.context.params).toEqual(this.props.params)
+      }
+      render() {
+        return null
+      }
+    }
+
+    const route = { path: '/', component: RouteComponent }
+
+    render((
+      <Router history={createHistory('/')} routes={route}/>
+    ), node, done)
+  })
+
 })