Add some docs about query parsing/stringifying

Author: mjackson

doc/00 Guides/Server Rendering.md

@@ -25,17 +25,17 @@ synchronously.
 
 ```js
 // server.js
-import { Router } from 'react-router';
-import ServerHistory from 'react-router/lib/ServerHistory';
+import { Router, Location } from 'react-router';
 import routes from './routes';
 
 // you'll want to configure your server to serve up static assets, and
 // and then handle the rest with React Router
 serveNonStaticPaths((req, res) => {
-  var history = new ServerHistory(req.path);
-  Router.match(routes, history, (err, initialState) => {
-    // do your own data fetching, perhaps using the branch of components
-    // in the initialState
+  var location = new Location('/the/path', { the: 'query' });
+
+  Router.match(routes, location, (err, transition, initialState) => {
+    // do your own data fetching, perhaps using the
+    // branch of components in the initialState
     fetchSomeData(initialState.components, (err, initialData) => {
       var html = React.renderToString(
         <Router history={history} {...initialState}/>

doc/02 Components/0 Router.md

@@ -15,7 +15,7 @@ route components nested inside the parents.
 
 Alias for `children`.
 
-### `history` (required)
+### `history`
 
 The [`History`][History] the router should set up and listen for changes
 on. When the history gets new entries, the router will update its state
@@ -29,6 +29,11 @@ of creating the elements when you're using some sort of data
 abstraction, like setting up subscriptions to stores, or passing in some
 sort of application module to each component via props.
 
+### `stringifyQuery(query)`
+
+A function that should be used to convert an object to a URL query string.
+By default, this function uses `qs.stringify(query, { arrayFormat: 'brackets' })`.
+
 
 #### Examples
 

doc/03 History/0 Histories.md

@@ -3,27 +3,20 @@
 an instance of one with your own options for query parsing.
 
 ```js
-// typical usage
-import BrowserHistory from 'react-router/lib/BrowserHistory';
-<Router history={BrowserHistory}/>
+import History from 'react-router/lib/BrowserHistory';
+<Router history={History}/>
 ```
 
 If you need to do your own query parsing:
 
 ```js
-// note the `{ ... }` in the import statement...
 import { BrowserHistory } from 'react-router/lib/BrowserHistory';
-// ...this gives you a class instead of a singleton instance
 
 var history = new BrowserHistory({
   parseQueryString(string) {
     return customParse(string);
-  },
-  stringifyQuery(obj) {
-    return customStringify(obj);
   }
 });
 
 var router = <Router history={history}/>;
 ```
-

doc/03 History/BrowserHistory.md

@@ -43,10 +43,10 @@ Example
 
 ```js
 import { Router } from 'react-router';
-import BrowserHistory from 'react-router/lib/BrowserHistory';
+import History from 'react-router/lib/BrowserHistory';
 
 React.render((
-  <Router history={BrowserHistory}>
+  <Router history={History}>
     {/* ... */}
   </Router>
 ), document.body);

doc/03 History/HashHistory.md

@@ -33,10 +33,10 @@ Normal usage
 
 ```js
 import { Router } from 'react-router';
-import HashHistory from 'react-router/lib/HashHistory';
+import History from 'react-router/lib/HashHistory';
 
 React.render((
-  <Router history={HashHistory}>
+  <Router history={History}>
     {/* ... */}
   </Router>
 ), document.body);
@@ -45,14 +45,13 @@ React.render((
 Opting in to the `state` features:
 
 ```js
-// note the `{ ... }` syntax on the import
 import { HashHistory } from 'react-router/lib/HashHistory';
 
 // use the default key which is `_key`
 var history = new HashHistory({ queryKey: true });
 
 // use your own
-var history = new HashHistory({queryKey: 'k'});
+var history = new HashHistory({ queryKey: 'k' });
 
 React.render((
   <Router history={history}>

doc/03 History/MemoryHistory.md

@@ -10,14 +10,14 @@ Example
 import { Router } from 'react-router';
 import MemoryHistory from 'react-router/lib/MemoryHistory';
 
+var history = new MemoryHistory([ '/', '/a/path' ]);
+
 React.render((
-  <Router history={MemoryHistory}>
+  <Router history={history}>
     {/* ... */}
   </Router>
 ), document.body);
 ```
 
-
-
   [Histories]:#TODO