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 `` 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 `` 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.
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 (
-
Ghettohub Issues
+
React Router Tutorial
About
Repos
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.
```
-And the css file:
+And the CSS file:
```css
.active {
diff --git a/lessons/06-params/README.md b/lessons/06-params/README.md
index 0349c8c5..d165bc7e 100644
--- a/lessons/06-params/README.md
+++ b/lessons/06-params/README.md
@@ -1,25 +1,25 @@
# 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]`.
## 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:
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
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 :)
---
diff --git a/lessons/11-productionish-server/README.md b/lessons/11-productionish-server/README.md
index 4603928d..30582eba 100644
--- a/lessons/11-productionish-server/README.md
+++ b/lessons/11-productionish-server/README.md
@@ -27,8 +27,18 @@ 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
+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`.
Now we're ready to create a production server with Express and add a new file at root dir. Here's a
@@ -38,7 +48,6 @@ first attempt:
// server.js
var express = require('express')
var path = require('path')
-var compression = require('compression')
var app = express()
@@ -61,7 +70,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
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
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.