Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/v2/guide/list.md

Author: MachinisteWeb

src/v2/api/index.md

@@ -948,6 +948,34 @@ All lifecycle hooks automatically have their `this` context bound to the instanc
   }
   ```
 
+  > The next 2 examples only work with Vue > 2.2.1. Below that version, injected values were resolved after the `props` and the `data` initialization.
+
+  Using an injected value as the default for a prop:
+  ```js
+  const Child = {
+    inject: ['foo'],
+    props: {
+      bar: {
+        default () {
+          return this.foo
+        }
+      }
+    }
+  }
+  ```
+
+  Using an injected value as data entry:
+  ```js
+  const Child = {
+    inject: ['foo'],
+    data () {
+      return {
+        bar: this.foo
+      }
+    }
+  }
+  ```
+
 ## Options / Misc
 
 ### name

src/v2/guide/components.md

@@ -327,7 +327,7 @@ new Vue({
 </script>
 {% endraw %}
 
-### Literal vs Dynamic
+### Literal vs. Dynamic
 
 A common mistake beginners tend to make is attempting to pass down a number using the literal syntax:
 
@@ -508,7 +508,7 @@ Vue.component('button-counter', {
       this.counter += 1
       this.$emit('increment')
     }
-  },
+  }
 })
 new Vue({
   el: '#counter-event-example',

src/v2/guide/list.md

@@ -229,7 +229,8 @@ Cependant, cela ne passera pas automatiquement les données au composant parce q
 <my-component
   v-for="(item, index) in items"
   v-bind:item="item"
-  v-bind:index="index">
+  v-bind:index="index"
+  v-bind:key="item.id">
 </my-component>
 ```