Skip to content

Commit

Permalink
s/url/URL/
Browse files Browse the repository at this point in the history
  • Loading branch information
mjackson committed Oct 7, 2015
1 parent fa36469 commit 3ef848e
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions docs/API.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ making it an absolute path.
If left undefined, the router will try to match the child routes.

##### `component`
A single component to be rendered when the route matches the url. It can
A single component to be rendered when the route matches the URL. It can
be rendered by the parent route component with `this.props.children`.

```js
Expand All @@ -173,7 +173,7 @@ class App extends React.Component {

##### `components`
Routes can define multiple components as an object of `name:component`
pairs to be rendered when the path matches the url. They can be rendered
pairs to be rendered when the path matches the URL. They can be rendered
by the parent route component with `this.props.children[name]`.

```js
Expand Down Expand Up @@ -349,7 +349,7 @@ Note that the `<Redirect>` can be placed anywhere in the route hierarchy, though

## IndexRoute
Index Routes allow you to provide a default "child" to a parent
route when visitor is at the url of the parent, they provide convention
route when visitor is at the URL of the parent, they provide convention
for `<IndexLink>` to work.

Please see the [Index Routes guide](/docs/guides/basics/IndexRoutes.md).
Expand Down Expand Up @@ -494,15 +494,15 @@ Transitions to a new URL.

###### arguments
- `state` - the location state.
- `pathname` - the full url with or without the query.
- `pathname` - the full URL with or without the query.
- `query` - an object that will be stringified by the router.

##### `replaceState(state, pathname, query)`
Replaces the current URL with a new one, without affecting the length of the history (like a redirect).

###### arguments
- `state` - the location state.
- `pathname` - the full url with or without the query.
- `pathname` - the full URL with or without the query.
- `query` - an object that will be stringified by the router.

##### `go(n)`
Expand All @@ -524,7 +524,7 @@ Creates a URL, using the router's config. For example, it will add `#/` in front
Returns `true` or `false` depending on if the current path is active. Will be true for every route in the route branch matched by the `pathname` (child route is active, therefore parent is too).

###### arguments
- `pathname` - the full url with or without the query.
- `pathname` - the full URL with or without the query.
- `query` - an object that will be stringified by the router.

#### Examples
Expand Down
2 changes: 1 addition & 1 deletion docs/guides/advanced/ComponentLifecycle.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ your app. The most common thing is fetching data.

There is no difference in the lifecycle of a component in the router as
just React itself. Let's peel away the idea of routes, and just think
about the components being rendered at different urls.
about the components being rendered at different URLs.

Consider this route config:

Expand Down
2 changes: 1 addition & 1 deletion docs/guides/basics/IndexRoutes.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ route for `Home` that can participate in routing.
## Index Links

If you were to `<Link to="/">Home</Link>` in this app, it would always
be active since every url starts with `/`. This is a problem because
be active since every URL starts with `/`. This is a problem because
we'd like to link to `Home` but only be active if `Home` is rendered.

To have a link to `/` that is only active when the `Home` route is
Expand Down

0 comments on commit 3ef848e

Please sign in to comment.