Skip to content

Commit

Permalink
Merge pull request #1 from yumi2011/yumi2011fix-typo
Browse files Browse the repository at this point in the history
Fix typo in welcome message
  • Loading branch information
yumi2011 authored Aug 7, 2019
2 parents 4b05bb6 + cdc63ce commit 2b22d5c
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions docs/CustomApp.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ title: "Including the Admin in Another App"

# Including React-Admin In Another Redux Application

The `<Admin>` tag is a great shortcut got be up and running with react-admin in minutes. However, in many cases, you will want to embed the admin in another application, or customize the admin redux store deeply.
The `<Admin>` tag is a great shortcut to be up and running with react-admin in minutes. However, in many cases, you will want to embed the admin in another application, or customize the admin redux store deeply.

**Tip**: Before going for the Custom App route, explore all the options of [the `<Admin>` component](./Admin.md). They allow you to add custom routes, custom reducers, custom sagas, and customize the layout.

Expand Down Expand Up @@ -82,7 +82,7 @@ export default ({
};
```

You can use this script as a base and then add your own middleares or enhancers, e.g. to allow store persistence with [redux-persist](https://github.com/rt2zz/redux-persist).
You can use this script as a base and then add your own middlewares or enhancers, e.g. to allow store persistence with [redux-persist](https://github.com/rt2zz/redux-persist).

Then, use the `<Admin>` component as you would in a standalone application. Here is an example with 3 resources: `posts`, `comments`, and `users`

Expand Down
2 changes: 1 addition & 1 deletion docs/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ Some use cases:

- Show/hide some inputs if another input has a value
- Show/hide some inputs if another input has a specific value
- Show/hide some inputs if the current form values matches specific constraints
- Show/hide some inputs if the current form value matches specific constraints

For all those cases, you can use the [aor-dependent-input](https://github.com/marmelab/aor-dependent-input) addon.

Expand Down
2 changes: 1 addition & 1 deletion docs/UnitTesting.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ At this point, your component should `mount` without errors and you can unit tes

## Enabling reducers to ensure actions are dispatched

If you component relies on a a reducer, e.g. redux-form submission, you can enable reducers using the `enableReducers` prop:
If you component relies on a reducer, e.g. redux-form submission, you can enable reducers using the `enableReducers` prop:

```jsx
myCustomEditView = mount(
Expand Down
2 changes: 1 addition & 1 deletion examples/demo/src/i18n/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export default {
welcome: {
title: 'Welcome to react-admin demo',
subtitle:
"This is the admin of an imaginary poster shop. Fell free to explore and modify the data - it's local to your computer, and will reset each time you reload.",
"This is the admin of an imaginary poster shop. Feel free to explore and modify the data - it's local to your computer, and will reset each time you reload.",
aor_button: 'react-admin site',
demo_button: 'Source for this demo',
},
Expand Down

0 comments on commit 2b22d5c

Please sign in to comment.