Merge pull request #94 from vuejs/master

更新官方文档

Author: dingyiming

src/guide/comparison.md

@@ -224,7 +224,7 @@ Since you don't need to know about JSX, ES2015, or build systems to get started
 
 ReactNative enables you to write native-rendered apps for iOS and Android using the same React component model. This is great in that as a developer, you can apply your knowledge of a framework across multiple platforms. On this front, Vue has an official collaboration with [Weex](https://alibaba.github.io/weex/), a cross-platform UI framework developed by Alibaba Group, which uses Vue as its JavaScript framework runtime. This means with Weex, you can use the same Vue component syntax to author components that can not only be rendered in the Browser, but also natively on iOS and Android!
 
-At this moment, Weex is still in active development and is not as mature and battle-tested as ReactNative, but its development is driven by the production needs of the largest e-commmerce business in the world, and the Vue team will also actively collaborate with the Weex team to ensure a smooth experience for Vue developers.
+At this moment, Weex is still in active development and is not as mature and battle-tested as ReactNative, but its development is driven by the production needs of the largest e-commerce business in the world, and the Vue team will also actively collaborate with the Weex team to ensure a smooth experience for Vue developers.
 
 ### With MobX
 
@@ -316,7 +316,7 @@ Polymer custom elements are authored in HTML files, which limits you to plain Ja
 
 When deploying to production, Polymer recommends loading everything on-the-fly with HTML Imports, which assumes browsers implementing the spec, and HTTP/2 support on both server and client. This may or may not be feasible depending on your target audience and deployment environment. In cases where this is not desirable, you will have to use a special tool called Vulcanizer to bundle your Polymer elements. On this front, Vue can combine its async component feature with Webpack's code-splitting feature to easily split out parts of the application bundle to be lazy-loaded. This ensures compatibility with older browsers while retaining great app loading performance.
 
-It is also totally feasible to offer deeper integration between Vue with Web Component specs such as Custom Elements and Shadow DOM style encapsulation - however at this moment we are still waiting for the specs to mature and be widely implemented in all mainstream browsers before making any serious committments.
+It is also totally feasible to offer deeper integration between Vue with Web Component specs such as Custom Elements and Shadow DOM style encapsulation - however at this moment we are still waiting for the specs to mature and be widely implemented in all mainstream browsers before making any serious commitments.
 
 ## Riot
 

src/guide/forms.md

@@ -85,7 +85,7 @@ new Vue({
 </script>
 {% endraw %}
 
-Mutiple checkboxes, bound to the same Array:
+Multiple checkboxes, bound to the same Array:
 
 ``` html
 <input type="checkbox" id="jack" value="Jack" v-model="checkedNames">

src/guide/list.md

@@ -259,7 +259,7 @@ Vue.component('todo-item', {
     <li>\
       {{ title }}\
       <button v-on:click="$emit(\'remove\')">X</button>\
-    <\li>\
+    </li>\
   ',
   props: ['title']
 })

src/guide/migration-vue-router.md

@@ -351,7 +351,7 @@ This option is no longer necessary now that Vue's transition system has explicit
 
 ### `suppressTransitionError` <sup>deprecated</sup>
 
-Removed due to hooks simplification. If you really must supress transition errors, you can use [`try`...`catch`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/try...catch) instead.
+Removed due to hooks simplification. If you really must suppress transition errors, you can use [`try`...`catch`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/try...catch) instead.
 
 {% raw %}
 <div class="upgrade-path">
@@ -465,7 +465,7 @@ methods: {
       .then(function (response) {
         this.posts = response.data.posts
       })
-      .catch(funciton (error) {
+      .catch(function (error) {
         this.fetchError = error
       })
   }

src/guide/migration.md

@@ -290,7 +290,7 @@ Props are now always one-way down. To produce side effects in the parent scope,
 
 - [Custom component events](components.html#Custom-Events)
 - [Custom input components](components.html#Form-Input-Components-using-Custom-Events) (using component events)
-- [Global state managment](state-management.html)
+- [Global state management](state-management.html)
 
 {% raw %}
 <div class="upgrade-path">
@@ -305,7 +305,7 @@ Props are now always one-way down. To produce side effects in the parent scope,
 
 - [Custom component events](components.html#Custom-Events)
 - [Custom input components](components.html#Form-Input-Components-using-Custom-Events) (using component events)
-- [Global state managment](state-management.html)
+- [Global state management](state-management.html)
 
 {% raw %}
 <div class="upgrade-path">

src/guide/mixins.md

@@ -126,7 +126,7 @@ var strategies = Vue.config.optionMergeStrategies
 strategies.myOption = strategies.methods
 ```
 
-A more advanced example can be found on [Vuex](https://github.com/vuejs/vuex)'s merging strategy:
+A more advanced example can be found on [Vuex](https://github.com/vuejs/vuex)'s 1.x merging strategy:
 
 ``` js
 const merge = Vue.config.optionMergeStrategies.computed

src/guide/reactivity.md

@@ -75,7 +75,7 @@ There are technical reasons behind this restriction - it eliminates a class of e
 
 ## Async Update Queue
 
-In case you haven't noticed yet, Vue performs DOM updates **asynchronously**. Whenever a data change is observed, it will open a queue and buffer all the data changes that happen in the same event loop. If the same watcher is triggered multiple times, it will be pushed into the queue only once. This buffered de-duplication is important in avoiding unnecessary calculations and DOM manipulations. Then, in the next event loop "tick", Vue flushes the queue and performs the actual (already de-duped) work. Internally Vue uses `MutationObserver` if available for the asynchronous queuing and falls back to `setTimeout(fn, 0)`.
+In case you haven't noticed yet, Vue performs DOM updates **asynchronously**. Whenever a data change is observed, it will open a queue and buffer all the data changes that happen in the same event loop. If the same watcher is triggered multiple times, it will be pushed into the queue only once. This buffered de-duplication is important in avoiding unnecessary calculations and DOM manipulations. Then, in the next event loop "tick", Vue flushes the queue and performs the actual (already de-duped) work. Internally Vue tries native `Promise.then` and `MutationObserver` for the asynchronous queuing and falls back to `setTimeout(fn, 0)`.
 
 For example, when you set `vm.someData = 'new value'`, the component will not re-render immediately. It will update in the next "tick", when the queue is flushed. Most of the time we don't need to care about this, but it can be tricky when you want to do something that depends on the post-update DOM state. Although Vue.js generally encourages developers to think in a "data-driven" fashion and avoid touching the DOM directly, sometimes it might be necessary to get your hands dirty. In order to wait until Vue.js has finished updating the DOM after a data change, you can use `Vue.nextTick(callback)` immediately after the data is changed. The callback will be called after the DOM has been updated. For example:
 

src/guide/render-function.md

@@ -108,7 +108,7 @@ createElement(
   // {String | Array}
   // Children VNodes. Optional.
   [
-    createElement('h1', 'hello world')
+    createElement('h1', 'hello world'),
     createElement(MyComponent, {
       props: {
         someProp: 'foo'

src/guide/state-management.md

@@ -51,7 +51,7 @@ var store = {
 
 Notice all actions that mutate the store's state are put inside the store itself. This type of centralized state management makes it easier to understand what type of mutations could happen and how are they triggered. When something goes wrong, we'll also now have a log of what happened leading up to the bug.
 
-In additon, each instance/component can still own and manage its own private state:
+In addition, each instance/component can still own and manage its own private state:
 
 ``` js
 var vmA = new Vue({

src/guide/transitions.md

@@ -1468,7 +1468,7 @@ Vue.component('my-special-transition', {
     <transition\
       name="very-special-transition"\
       mode="out-in"\
-      v-on:before-enter="beforEnter"\
+      v-on:before-enter="beforeEnter"\
       v-on:after-enter="afterEnter"\
     >\
       <slot></slot>\