Merge pull request #7 from foriacus/master

fix typo error.

Author: sorrycc

v1/en-us/concepts.md

@@ -12,7 +12,7 @@
 
 `type State = any`
 
-The state tree of your models. Usually, the state is a javascript object(Technically it can be any type), witch is a immutable data.
+The state tree of your models. Usually, the state is a javascript object(Technically it can be any type), which is a immutable data.
 
 In dva, you can access top state tree data by `_store`.
 
@@ -25,7 +25,7 @@ console.log(app._store); // top state
 
 `type AsyncAction = any`
 
-Just like Redux's Action, in dva, action is a plain object that represents an intention to change the state. Actions are the only way to get data into the store. Any data, whether from UI events, network callbacks, or other sources such as WebSockets needs to eventually be dispatched as actions.action.(ps:dispatch  is realized trhough props by connecting components.) 
+Just like Redux's Action, in dva, action is a plain object that represents an intention to change the state. Actions are the only way to get data into the store. Any data, whether from UI events, network callbacks, or other sources such as WebSockets needs to eventually be dispatched as actions.action.(ps:dispatch is realized through props by connecting components.)
 
 ```javascript
 dispatch({
@@ -39,7 +39,7 @@ dispatch({
 
 A dispatching function (or simply dispatch function) is a function that accepts an action or an async action; it then may or may not dispatch one or more actions to the store.
 
-Dispatching function is a function for triggering action, action is the only way to change state, but it just describes an action. while dispatch can be regarded as a way to trigger this action, and Reducer is to describe how to change state. 
+Dispatching function is a function for triggering action, action is the only way to change state, but it just describes an action. while dispatch can be regarded as a way to trigger this action, and Reducer is to describe how to change state.
 
 ```javascript
 dispatch({
@@ -54,23 +54,23 @@ dispatch({
 
 Just like Redux's Reducer, a reducer (also called a reducing function) is a function that accepts an accumulation and a value and returns a new accumulation. They are used to reduce a collection of values down to a single value.
 
-Reducer's concepets from FP:
+Reducer's concepts from FP:
 
 ```javascript
-[{x:1},{y:2},{z:3}].reduce(function(prev, next){ 
-    return Object.assign(prev, next); 
+[{x:1},{y:2},{z:3}].reduce(function(prev, next){
+    return Object.assign(prev, next);
 })
 //return {x:1, y:2, z:3}
 ```
 
-In dva, reducers accumule current model's state. There are some things need to be notice that reducer must be [pure function](https://github.com/MostlyAdequate/mostly-adequate-guide/blob/master/ch3.md) and every caclulated data must be [immutable data](https://github.com/MostlyAdequate/mostly-adequate-guide/blob/master/ch3.md#reasonable).
+In dva, reducers accumulate current model's state. There are some things need to be notice that reducer must be [pure function](https://github.com/MostlyAdequate/mostly-adequate-guide/blob/master/ch3.md) and every calculated data must be [immutable data](https://github.com/MostlyAdequate/mostly-adequate-guide/blob/master/ch3.md#reasonable).
 
 ### Effect
 
-In dva, we use [redux-sagas](http://yelouafi.github.io/redux-saga/) to control asynchronous flow. 
+In dva, we use [redux-sagas](http://yelouafi.github.io/redux-saga/) to control asynchronous flow.
 You can learn more in [Mostly adequate guide to FP](https://github.com/MostlyAdequate/mostly-adequate-guide).
 
-In our applications, the most well-known side effect is asynchronous operation, it comes from the conception of fuctional programing, it is called side effect because it makes our function impure, and the same input may not result in the same output.
+In our applications, the most well-known side effect is asynchronous operation, it comes from the conception of functional programing, it is called side effect because it makes our function impure, and the same input may not result in the same output.
 
 ### Subscription
 
@@ -93,7 +93,7 @@ app.model({
 
 ## Router
 
-Hereby router usually means frontend router. Because our current app is singel page app, frontend codes are required to control the router logics. Through History API provided by the browser, we can monitor the change of the browser's url, so as to control the router.
+Hereby router usually means frontend router. Because our current app is single page app, frontend codes are required to control the router logics. Through History API provided by the browser, we can monitor the change of the browser's url, so as to control the router.
 
 dva provide `router` function to control router, based on [react-router](https://github.com/reactjs/react-router)。
 
@@ -108,13 +108,12 @@ app.router(({history}) =>
 
 ## Route Components
 
-In dva, we restrict container components to route componenst, because we use page dimension to design container components.
+In dva, we restrict container components to route components, because we use page dimension to design container components.
 
-therefore, almost all connet model componets are route components, route components in `/routes/` directory, presentational Components in `/components/` directory.
+therefore, almost all connected model components are route components, route components in `/routes/` directory, presentational Components in `/components/` directory.
 
 ## References
 - [redux docs](http://redux.js.org/docs/Glossary.html)
 - [Mostly adequate guide to FP](https://github.com/MostlyAdequate/mostly-adequate-guide)
 - [choo docs](https://github.com/yoshuawuyts/choo)
 - [elm](http://elm-lang.org/blog/farewell-to-frp)
-

v1/en-us/getting-started.md

@@ -18,7 +18,7 @@ Some questions you may ask.
 2. How to organize code after created app?
 3. How to build, deploy and publish after development?
 
-And somethins about code organization.
+And somethings about code organization.
 
 1. How to write Component?
 1. How to write CSS?
@@ -77,7 +77,7 @@ Open http://localhost:8989/ in browser. If success, you will see a page with "He
 
 ## Define models
 
-When get the task, you should not write code immediatly. But recommend to do state design in `god mode`.
+When get the task, you should not write code immediately. But recommend to do state design in `god mode`.
 
 1. design models
 2. design components
@@ -99,7 +99,7 @@ app.model({
 
 ## Write components
 
-After designed model, we start to write component. Recommend to organize Component with [stateless functions](https://facebook.github.io/react/docs/reusable-components.html#stateless-functions). Because we don't need state almostly in dva architecture.
+After designed model, we start to write component. Recommend to organize Component with [stateless functions](https://facebook.github.io/react/docs/reusable-components.html#stateless-functions). Because we don't need state almost in dva architecture.
 
 ```javascript
 import styles from './index.less';
@@ -132,7 +132,7 @@ Notice:
 
 We need two reducers, `add` and `minus`. Please notice `add` will only be recorded if it's highest.
 
-> Notice: `add` and `minus` don't need to add namespace prefix in `count` model. But if outside the model, action must prefix namespace seperated with `/`. e.g. `count/add`.
+> Notice: `add` and `minus` don't need to add namespace prefix in `count` model. But if outside the model, action must prefix namespace separated with `/`. e.g. `count/add`.
 
 ```diff
 app.model({
@@ -165,7 +165,7 @@ Notice:
 
 > Remember `count` and `dispatch` props used in the Component before? Where are them come from?
 
-After defined Model and Component, we need to connect them together. After connect, Component can use the data from Model, and Model can receive actions dispatched from Component.
+After define Model and Component, we need to connect them together. After connect, Component can use the data from Model, and Model can receive actions dispatched from Component.
 
 In this task, we only need to bind `count` .
 
@@ -204,7 +204,7 @@ Refresh page in browser, if success, you will see page below.
 
 ## Add StyleSheet
 
-We define stylesheet in `css modules`, which doesn't have many difference from normal css. Because we have already hooked className in Component, at this moment, we only need to replace `index.less` with follow content:
+We define stylesheet in `css modules`, which doesn't have many differences from normal css. Because we have already hooked className in Component, at this moment, we only need to replace `index.less` with follow content:
 
 ```css
 .normal {
@@ -276,9 +276,9 @@ Notice:
 
 Refresh you browser, if success, it should have all the effects of beginning gif.
 
-## Subscribe Keboard Event
+## Subscribe Keyboard Event
 
-> After implemented mouse click speed test, how to implement keyboard click speed test? 
+> After implemented mouse click speed test, how to implement keyboard click speed test?
 
 There is a concept called `Subscription` from dva, which is from [elm 0.17](http://elm-lang.org/blog/farewell-to-frp).
 
@@ -416,6 +416,6 @@ After build success, you can find compiled files in `dist` directory.
 
 ## What's Next
 
-After complete this app, do you have answer of all the questions in the begenning? Do you understand ths concepts in dva, like `model`, `router`, `reducers`, `effects` and `subscriptions` ?
+After complete this app, do you have answer of all the questions in the beginning? Do you understand this concepts in dva, like `model`, `router`, `reducers`, `effects` and `subscriptions` ?
 
-Next, you can view [dva offical library](https://github.com/dvajs/dva) for more infomation.
+Next, you can view [dva official library](https://github.com/dvajs/dva) for more information.