Merge pull request vuejs#222 from vuejs/master

dingyiming · web-flow · commit 01ea4b907247 · 2016-10-24T10:45:02.000+08:00
获取官方更新
diff --git a/src/api/index.md b/src/api/index.md
@@ -44,7 +44,7 @@ type: api
 
   The merge strategy receives the value of that option defined on the parent and child instances as the first and second arguments, respectively. The context Vue instance is passed as the third argument.
 
-- **See also**: [Custom Option Merging Strategies](/guide/mixins.html#Custom-Option-Merge-Strategies)
+- **See also:** [Custom Option Merging Strategies](/guide/mixins.html#Custom-Option-Merge-Strategies)
 
 ### devtools
 
diff --git a/src/guide/forms.md b/src/guide/forms.md
@@ -43,8 +43,9 @@ new Vue({
 
 {% raw %}
 <div id="example-textarea" class="demo">
-  <span>Message is:</span>
-  <p style="white-space: pre">{{ message }}</p><br>
+  <span>Multiline message is:</span>
+  <p style="white-space: pre">{{ message }}</p>
+  <br>
   <textarea v-model="message" placeholder="add multiple lines"></textarea>
 </div>
 <script>
diff --git a/src/guide/index.md b/src/guide/index.md
@@ -296,6 +296,10 @@ Now we can pass the todo into each repeated component using `v-bind`:
 </div>
 ```
 ``` js
+Vue.component('todo-item', {
+  props: ['todo'],
+  template: '<li>{{ todo.text }}</li>'
+})
 var app7 = new Vue({
   el: '#app-7',
   data: {
diff --git a/src/guide/migration-vuex.md b/src/guide/migration-vuex.md
@@ -17,8 +17,6 @@ __Vuex 2.0__ is a radical redesign and simplification of the API, for those who
 
 __Vuex 1.0__ is mostly backwards-compatible, so requires very few changes to upgrade. It is recommended for those with large existing codebases or who just want the smoothest possible upgrade path to Vue 2.0. This guide is dedicated to facilitating that process, but only includes migration notes. For the complete usage guide, see [the Vuex 1.0 docs](https://github.com/vuejs/vuex/tree/1.0/docs/en).
 
-<p class="tip">The list of deprecations below should be relatively complete, but the migration helper is still being updated to catch them.</p>
-
 ## `store.watch` with String Property Path <sup>deprecated</sup>
 
 `store.watch` now only accept functions. So for example, you would have to replace:
diff --git a/src/guide/reactivity.md b/src/guide/reactivity.md
@@ -1,7 +1,7 @@
 ---
 title: Reactivity in Depth
 type: guide
-order: 15
+order: 12
 ---
 
 We've covered most of the basics - now it's time to take a deep dive! One of Vue's most distinct features is the unobtrusive reactivity system. Models are just plain JavaScript objects. When you modify them, the view updates. It makes state management very simple and intuitive, but it's also important to understand how it works to avoid some common gotchas. In this section, we are going to dig into some of the lower-level details of Vue's reactivity system.
@@ -55,7 +55,7 @@ There are also a few array-related caveats, which were discussed earlier in the
 
 ## Declaring Reactive Properties
 
-Since Vue doesn't allow dynamically adding root-level reactive properties, this means you have to initialize you instances by declaring all root-level reactive data properties upfront, even just with an empty value:
+Since Vue doesn't allow dynamically adding root-level reactive properties, you have to initialize Vue instances by declaring all root-level reactive data properties upfront, even just with an empty value:
 
 ``` js
 var vm = new Vue({
diff --git a/src/guide/render-function.md b/src/guide/render-function.md
@@ -1,7 +1,7 @@
 ---
 title: Render Functions
 type: guide
-order: 14
+order: 15
 ---
 
 ## Basics
@@ -160,12 +160,12 @@ One thing to note: similar to how `v-bind:class` and `v-bind:style` have special
   nativeOn: {
     click: this.nativeClickHandler
   },
-  // Custom directives. Note that the binding's 
+  // Custom directives. Note that the binding's
   // oldValue cannot be set, as Vue keeps track
   // of it for you.
   directives: [
     {
-      name: 'my-custom-directive', 
+      name: 'my-custom-directive',
       value: '2'
       expression: '1 + 1',
       arg: 'foo',
diff --git a/src/guide/transitioning-state.md b/src/guide/transitioning-state.md
@@ -1,7 +1,7 @@
 ---
 title: Transitioning State
 type: guide
-order: 13
+order: 14
 ---
 
 Vue's transition system offers many simple ways to animate entering, leaving, and lists, but what about animating your data itself? For example:
diff --git a/src/guide/transitions.md b/src/guide/transitions.md
@@ -1,7 +1,7 @@
 ---
 title: 'Transition Effects'
 type: guide
-order: 12
+order: 13
 ---
 
 ## Overview
diff --git a/src/guide/unit-testing.md b/src/guide/unit-testing.md
@@ -6,7 +6,7 @@ order: 23
 
 ## Setup and Tooling
 
-Anything compatible with a module-based build system will work, but if you're looking for a specific recommendation, try the [Karma](http://karma-runner.github.io) test runner. It has a lot of community plugins, including support for [Webpack](https://github.com/webpack/karma-webpack) and [Browserify](https://github.com/Nikku/karma-browserify). For detailed setup, please refer to each project's respective documentation, though these example Karma configurations for [Webpack](https://github.com/vuejs/vue-loader-example/blob/master/build/karma.conf.js) and [Browserify](https://github.com/vuejs/vueify-example/blob/master/karma.conf.js) may help you get started.
+Anything compatible with a module-based build system will work, but if you're looking for a specific recommendation, try the [Karma](http://karma-runner.github.io) test runner. It has a lot of community plugins, including support for [Webpack](https://github.com/webpack/karma-webpack) and [Browserify](https://github.com/Nikku/karma-browserify). For detailed setup, please refer to each project's respective documentation, though these example Karma configurations for [Webpack](https://github.com/vuejs-templates/webpack/blob/master/template/test/unit/karma.conf.js) and [Browserify](https://github.com/vuejs-templates/browserify/blob/master/template/karma.conf.js) may help you get started.
 
 ## Simple Assertions
 
diff --git a/themes/vue/layout/partials/sidebar.ejs b/themes/vue/layout/partials/sidebar.ejs
@@ -24,7 +24,7 @@
                 <% if (fileName === 'installation') { %>
                   <li><h3>Essentials</h3></li>
                 <% } %>
-                <% if (fileName === 'transitions') { %>
+                <% if (fileName === 'reactivity') { %>
                   <li><h3>Advanced</h3></li>
                 <% } %>
                 <% if (fileName === 'migration') { %>
