Merge branch 'master' of github.com:vuejs/vuejs.org

Author: yyx990803

src/api/index.md

@@ -371,6 +371,8 @@ type: api
 
   Properties that start with `_` or `$` will **not** be proxied on the Vue instance because they may conflict with Vue's internal properties and API methods. You will have to access them as `vm.$data._property`.
 
+  If required, a deep clone of the original object can be obtained by passing `vm.$data` through `JSON.parse(JSON.stringify(...))`.
+
 - **Example:**
 
   ``` js

src/guide/components.md

@@ -765,7 +765,7 @@ The API for a Vue.js component essentially comes in three parts - props, events
 
 - **Slots** allow the external environment to insert content into the component's view structure.
 
-With the dedicate shorthand syntax for `v-bind` and `v-on`, the intents can be clearly and succinctly conveyed in the template:
+With the dedicated shorthand syntax for `v-bind` and `v-on`, the intents can be clearly and succinctly conveyed in the template:
 
 ``` html
 <my-component

src/guide/syntax.md

@@ -148,8 +148,17 @@ The `v-` prefix serves as a visual cue for identifying Vue-specific attributes i
 
 <!-- shorthand -->
 <a :href="url"></a>
+
+or
+
+<!-- full syntax -->
+<button v-bind:disabled="someDynamicCondition">Button</button>
+
+<!-- shorthand -->
+<button :disabled="someDynamicCondition">Button</button>
 ```
 
+
 ### `v-on` Shorthand
 
 ``` html