From 06eef1039f787074dc795574616f660a7d040b20 Mon Sep 17 00:00:00 2001
From: Matt Lane <lane.matthew@gmail.com>
Date: Sun, 24 Jul 2016 19:34:45 -0700
Subject: [PATCH 01/13] fix typo, make App.js h1 name consistent (#191)

---
 lessons/04-nested-routes/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lessons/04-nested-routes/README.md b/lessons/04-nested-routes/README.md
index c2c98330..bac8f2cd 100644
--- a/lessons/04-nested-routes/README.md
+++ b/lessons/04-nested-routes/README.md
@@ -46,7 +46,7 @@ automatically becomes nested UI.
 
 ## Sharing Our Navigation
 
-Lets nest our `About` and `Repos` components inside of `App` so that we
+Let's nest our `About` and `Repos` components inside of `App` so that we
 can share the navigation with all screens in the app. We do it in two
 steps:
 
@@ -75,7 +75,7 @@ Next, render children inside of `App`.
   render() {
     return (
       <div>
-        <h1>Ghettohub Issues</h1>
+        <h1>React Router Tutorial</h1>
         <ul role="nav">
           <li><Link to="/about">About</Link></li>
           <li><Link to="/repos">Repos</Link></li>

From a4f21d7f956cc10253bade4f47bce755878736d0 Mon Sep 17 00:00:00 2001
From: Sudheer Satyanarayana <sudheer.zzz@sudheer.net>
Date: Mon, 25 Jul 2016 08:04:57 +0530
Subject: [PATCH 02/13] CSS in uppercase (#196)

Minor text fix
---
 lessons/05-active-links/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lessons/05-active-links/README.md b/lessons/05-active-links/README.md
index 49aec02d..f8552f60 100644
--- a/lessons/05-active-links/README.md
+++ b/lessons/05-active-links/README.md
@@ -34,7 +34,7 @@ point if you can add a `link` tag from memory.
 <link rel="stylesheet" href="http://github.com/index.css" />
 ```
 
-And the css file:
+And the CSS file:
 
 ```css
 .active {

From aa5fcdfdb99cbaff3562c4e4e748bcff0d2cee73 Mon Sep 17 00:00:00 2001
From: Sudheer Satyanarayana <sudheer.zzz@sudheer.net>
Date: Mon, 25 Jul 2016 08:05:09 +0530
Subject: [PATCH 03/13] Abbreviations in uppercase (#197)

Minor text change. url to URL
---
 lessons/06-params/README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lessons/06-params/README.md b/lessons/06-params/README.md
index 0349c8c5..e5066a2e 100644
--- a/lessons/06-params/README.md
+++ b/lessons/06-params/README.md
@@ -1,19 +1,19 @@
 # URL Params
 
-Consider the following urls:
+Consider the following URLs:
 
 ```
 /repos/reactjs/react-router
 /repos/facebook/react
 ```
 
-These urls would match a route path like this:
+These URLs would match a route path like this:
 
 ```
 /repos/:userName/:repoName
 ```
 
-The parts that start with `:` are url parameters whose values will be
+The parts that start with `:` are URL parameters whose values will be
 parsed out and made available to route components on
 `this.props.params[name]`.
 

From d54d32ec6dd1d3a643f54b8a8755d99b663f7194 Mon Sep 17 00:00:00 2001
From: Sudheer Satyanarayana <sudheer.zzz@sudheer.net>
Date: Mon, 25 Jul 2016 08:05:20 +0530
Subject: [PATCH 04/13] Clarify IndexLink and punctuation fix (#198)

* Clarify that we want to use IndexLink instead of NavLink
* Apostrophe was missing in `let's`
---
 lessons/09-index-links/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lessons/09-index-links/README.md b/lessons/09-index-links/README.md
index c2f79efc..013b1ff3 100644
--- a/lessons/09-index-links/README.md
+++ b/lessons/09-index-links/README.md
@@ -23,7 +23,7 @@ index route is rendered.
 
 ## IndexLink
 
-First lets use the `IndexLink`
+First let's use the `IndexLink` instead of `NavLink`
 
 ```js
 // App.js

From 8aa12c0ef313252eacf6b3d2e20596c763c4ebdf Mon Sep 17 00:00:00 2001
From: Sudheer Satyanarayana <sudheer.zzz@sudheer.net>
Date: Mon, 25 Jul 2016 08:05:29 +0530
Subject: [PATCH 05/13] Capitalize URL (#199)

---
 lessons/10-clean-urls/README.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lessons/10-clean-urls/README.md b/lessons/10-clean-urls/README.md
index 3eb8d916..1a3bb2e7 100644
--- a/lessons/10-clean-urls/README.md
+++ b/lessons/10-clean-urls/README.md
@@ -24,7 +24,7 @@ render((
 ), document.getElementById('app'))
 ```
 
-Now go click around and admire your clean urls.
+Now go click around and admire your clean URLs.
 
 Oh yeah, the catch. Click on a link and then refresh your browser. What
 happens?
@@ -35,8 +35,8 @@ Cannot GET /repos
 
 ## Configuring Your Server
 
-Your server needs to deliver your app no matter what url comes in,
-because your app, in the browser, is manipulating the url. Our current
+Your server needs to deliver your app no matter what URL comes in,
+because your app, in the browser, is manipulating the URL. Our current
 server doesn't know how to handle the URL.
 
 The Webpack Dev Server has an option to enable this. Open up
@@ -47,7 +47,7 @@ The Webpack Dev Server has an option to enable this. Open up
 ```
 
 We also need to change our relative paths to absolute paths in
-`index.html` since the urls will be at deep paths and the app, if it
+`index.html` since the URLs will be at deep paths and the app, if it
 starts at a deep path, won't be able to find the files.
 
 ```html
@@ -60,7 +60,7 @@ starts at a deep path, won't be able to find the files.
 ```
 
 Stop your server if it's running, then `npm start` again. Look at those
-clean urls :)
+clean URLs :)
 
 ---
 

From d87d8965356aa22bf8fe7b0ad61b224a2eeecf83 Mon Sep 17 00:00:00 2001
From: Sudheer Satyanarayana <sudheer.zzz@sudheer.net>
Date: Mon, 25 Jul 2016 08:05:47 +0530
Subject: [PATCH 06/13] Clarify and change wording (#200)

Minor text update
---
 lessons/11-productionish-server/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lessons/11-productionish-server/README.md b/lessons/11-productionish-server/README.md
index 4603928d..11b28da4 100644
--- a/lessons/11-productionish-server/README.md
+++ b/lessons/11-productionish-server/README.md
@@ -27,8 +27,8 @@ scripts entry in package.json to look like this:
 },
 ```
 
-Now when we run `npm start` it will check if our `NODE_ENV` is
-production. If it is, we run `npm run start:prod`, if it's not, we run
+When you run `npm start` it checks if the value of our `NODE_ENV` environment variable is
+`production`. If yes, it runs `npm run start:prod`, if not, it runs
 `npm run start:dev`.
 
 Now we're ready to create a production server with Express and add a new file at root dir. Here's a

From c748dc25dac019f71492065591f5a901f64483b1 Mon Sep 17 00:00:00 2001
From: Sudheer Satyanarayana <sudheer.zzz@sudheer.net>
Date: Mon, 25 Jul 2016 08:05:54 +0530
Subject: [PATCH 07/13] Capitalize URL (#201)

---
 lessons/12-navigating/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lessons/12-navigating/README.md b/lessons/12-navigating/README.md
index 46439ea7..cc9d1d6c 100644
--- a/lessons/12-navigating/README.md
+++ b/lessons/12-navigating/README.md
@@ -49,7 +49,7 @@ There are two ways you can do this, the first is simpler than the
 second.
 
 First we can use the `browserHistory` singleton that we passed into
-`Router` in `index.js` and push a new url into the history.
+`Router` in `index.js` and push a new URL into the history.
 
 ```js
 // modules/Repos.js

From b04cceeb2cdb2a1f9076ddfebce8891314dacd4d Mon Sep 17 00:00:00 2001
From: ChrisG <chris7.guyot@gmail.com>
Date: Mon, 25 Jul 2016 04:36:09 +0200
Subject: [PATCH 08/13] added '&&' for Windows command to work (#202)

* added '&&' for Windows command to work

added '&&' for Windows command to work

* added quotes
---
 lessons/11-productionish-server/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lessons/11-productionish-server/README.md b/lessons/11-productionish-server/README.md
index 11b28da4..0dc31466 100644
--- a/lessons/11-productionish-server/README.md
+++ b/lessons/11-productionish-server/README.md
@@ -61,7 +61,7 @@ Now run:
 ```sh
 NODE_ENV=production npm start
 # For Windows users:
-# SET NODE_ENV=production npm start
+# SET "NODE_ENV=production" && npm start
 ```
 
 Congratulations! You now have a production server for this app. After

From 6be300f4cac7f4478ca8369bc3829088a8a136a4 Mon Sep 17 00:00:00 2001
From: Wilfred Hughes <me@wilfred.me.uk>
Date: Tue, 23 Aug 2016 14:33:28 -0400
Subject: [PATCH 09/13] Minor grammar fixes (#216)

---
 lessons/03-navigating-with-link/README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lessons/03-navigating-with-link/README.md b/lessons/03-navigating-with-link/README.md
index c1aaa332..fd1518d8 100644
--- a/lessons/03-navigating-with-link/README.md
+++ b/lessons/03-navigating-with-link/README.md
@@ -1,7 +1,7 @@
 # Navigating with Link
 
-Perhaps the most used component in your app is `Link`. Its almost
-identical to the `<a/>` tag you're used to except that its aware of
+Perhaps the most used component in your app is `Link`. It's almost
+identical to the `<a/>` tag you're used to except that it's aware of
 the `Router` it was rendered in.
 
 Let's create some navigation in our `App` component.

From e8e8f3a62a21fc337ee8e52e575a6cf93e5a4f94 Mon Sep 17 00:00:00 2001
From: YarnBall <yarnball@users.noreply.github.com>
Date: Thu, 22 Sep 2016 00:42:59 +1000
Subject: [PATCH 10/13] Missing step- adding path the webpack.js (#224)

Raised issue, asked to to PR.

https://github.com/reactjs/react-router-tutorial/issues/218#issuecomment-241829117
---
 lessons/11-productionish-server/README.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lessons/11-productionish-server/README.md b/lessons/11-productionish-server/README.md
index 0dc31466..1ddfd278 100644
--- a/lessons/11-productionish-server/README.md
+++ b/lessons/11-productionish-server/README.md
@@ -27,6 +27,16 @@ scripts entry in package.json to look like this:
 },
 ```
 
+In the root directly, go open up `webpack.config.js` and add the publicPath '/' as per below:
+```
+// webpack.config.js
+  output: {
+    path: 'public',
+    filename: 'bundle.js',
+    publicPath: '/'
+  },
+```
+
 When you run `npm start` it checks if the value of our `NODE_ENV` environment variable is
 `production`. If yes, it runs `npm run start:prod`, if not, it runs
 `npm run start:dev`.

From c84de30119ea732dd13a63750b1b30037667d98f Mon Sep 17 00:00:00 2001
From: Derek Bytheway <derekbtw@gmail.com>
Date: Wed, 21 Sep 2016 08:43:19 -0600
Subject: [PATCH 11/13] Fix RouterContext comment (#227)

I make the same mistake all the time :)
---
 lessons/13-server-rendering/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lessons/13-server-rendering/README.md b/lessons/13-server-rendering/README.md
index 4a631854..a8aa94b7 100644
--- a/lessons/13-server-rendering/README.md
+++ b/lessons/13-server-rendering/README.md
@@ -152,7 +152,7 @@ import routes from './modules/routes'
 app.get('*', (req, res) => {
   // match the routes to the url
   match({ routes: routes, location: req.url }, (err, redirect, props) => {
-    // `RouterContext` is the what `Router` renders. `Router` keeps these
+    // `RouterContext` is what the `Router` renders. `Router` keeps these
     // `props` in its state as it listens to `browserHistory`. But on the
     // server our app is stateless, so we need to use `match` to
     // get these props before rendering.

From d2b309185fc59b79dc38a3073fc2dfc1651a1e8a Mon Sep 17 00:00:00 2001
From: johanneserber <jerber@alkemics.com>
Date: Wed, 21 Sep 2016 16:44:07 +0200
Subject: [PATCH 12/13] Dependency is not needed at this point (#230)

---
 lessons/11-productionish-server/README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lessons/11-productionish-server/README.md b/lessons/11-productionish-server/README.md
index 1ddfd278..30582eba 100644
--- a/lessons/11-productionish-server/README.md
+++ b/lessons/11-productionish-server/README.md
@@ -48,7 +48,6 @@ first attempt:
 // server.js
 var express = require('express')
 var path = require('path')
-var compression = require('compression')
 
 var app = express()
 

From 66d013c983fb722973d60fcff6a046aad1579437 Mon Sep 17 00:00:00 2001
From: blackmiaool <blackmiaool@gmail.com>
Date: Wed, 21 Sep 2016 22:44:35 +0800
Subject: [PATCH 13/13] Fix typo (#233)

---
 lessons/06-params/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lessons/06-params/README.md b/lessons/06-params/README.md
index e5066a2e..d165bc7e 100644
--- a/lessons/06-params/README.md
+++ b/lessons/06-params/README.md
@@ -19,7 +19,7 @@ parsed out and made available to route components on
 
 ## Adding a Route with Parameters
 
-Lets teach our app how to render screens at `/repos/:userName/:repoName`.
+Let's teach our app how to render screens at `/repos/:userName/:repoName`.
 
 First we need a component to render at the route, make a new file at
 `modules/Repo.js` that looks something like this: