Merge pull request #998 from Bear-Foot/master

Remove diffs in docs and update contexts in examples

Author: gaearon

docs/api/RouterContext.md

@@ -13,7 +13,7 @@ For old-style React classes:
 ```js
 var User = React.createClass({
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   ...
@@ -28,7 +28,7 @@ class User extends React.Component {
 }
 
 User.contextTypes = {
-  router: React.PropTypes.func.isRequired
+  router: React.PropTypes.func
 };
 ```
 
@@ -136,11 +136,7 @@ Often you'll want access to params and query:
 // handler
 var User = React.createClass({
   contextTypes: {
-<<<<<<< HEAD
-    router: React.PropTypes.func.isRequired
-=======
     router: React.PropTypes.func
->>>>>>> update docs to show how to get access to context
   },
 
   render: function () {
@@ -162,7 +158,7 @@ var Link = require('react-router').Link;
 
 var Tab = React.createClass({
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   render: function () {
@@ -187,11 +183,7 @@ Some navigation:
 ```js
 React.createClass({
   contextTypes: {
-<<<<<<< HEAD
-    router: React.PropTypes.func.isRequired
-=======
     router: React.PropTypes.func
->>>>>>> update docs to show how to get access to context
   },
 
   render: function() {

examples/animations/app.js

@@ -6,7 +6,7 @@ var { Route, RouteHandler, Link } = Router;
 var App = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   render: function () {

examples/auth-flow/app.js

@@ -67,7 +67,7 @@ var Dashboard = React.createClass({
 var Login = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   getInitialState: function () {

examples/data-flow/app.js

@@ -5,7 +5,7 @@ var { Route, RouteHandler, Link } = Router;
 var App = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   getInitialState: function () {
@@ -58,7 +58,7 @@ var App = React.createClass({
 var Taco = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   remove: function () {

examples/dynamic-segments/app.js

@@ -19,7 +19,7 @@ var App = React.createClass({
 var User = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   render () {
@@ -41,7 +41,7 @@ var User = React.createClass({
 var Task = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   render () {

examples/master-detail/app.js

@@ -69,7 +69,7 @@ var Index = React.createClass({
 var Contact = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   getStateFromStore: function () {
@@ -126,7 +126,7 @@ var Contact = React.createClass({
 var NewContact = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   createContact: function (event) {

examples/query-params/app.js

@@ -20,7 +20,7 @@ var App = React.createClass({
 var User = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   render: function () {

examples/rx/app.js

@@ -20,7 +20,7 @@ var App = React.createClass({
 var User = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   render () {

examples/simple-master-detail/app.js

@@ -40,7 +40,7 @@ var Index = React.createClass({
 var State = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   imageUrl: function (name) {

examples/transitions/app.js

@@ -31,7 +31,7 @@ var Dashboard = React.createClass({
 var Form = React.createClass({
 
   contextTypes: {
-    router: React.PropTypes.func.isRequired
+    router: React.PropTypes.func
   },
 
   statics: {