Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	src/v2/api/index.md
#	src/v2/guide/installation.md

Author: MachinisteWeb

src/v2/api/index.md

@@ -329,6 +329,24 @@ type: api
   ```
 
 - **Voir aussi :** [Fonctions de rendu](../guide/render-function.html)
+ 
+<h3 id="Vue-version">Vue.version</h3>
+
+- **Details**: Provides the installed version of Vue as a string. This is especially useful for community plugins and components, where you might use different strategies for different versions.
+
+- **Usage**:
+
+```js
+var version = Number(Vue.version.split('.')[0])
+
+if (version === 2) {
+  // Vue v2.x.x
+} else if (version === 1) {
+  // Vue v1.x.x
+} else {
+  // Unsupported versions of Vue
+}
+```
 
 ## Options / Data
 

src/v2/cookbook/adding-instance-properties.md

@@ -113,7 +113,7 @@ Vue.prototype.$reverseText = function (propertyName) {
 
 new Vue({
   data: {
-    message: 'Hello '
+    message: 'Hello'
   },
   created: function () {
     console.log(this.message)    // => "Hello"

src/v2/guide/custom-directive.md

@@ -89,7 +89,7 @@ Directive hooks are passed these arguments:
 An example of a custom directive using some of these properties:
 
 ``` html
-<div id="hook-arguments-example" v-demo:hello.a.b="message"></div>
+<div id="hook-arguments-example" v-demo:foo.a.b="message"></div>
 ```
 
 ``` js
@@ -115,7 +115,7 @@ new Vue({
 ```
 
 {% raw %}
-<div id="hook-arguments-example" v-demo:hello.a.b="message" class="demo"></div>
+<div id="hook-arguments-example" v-demo:foo.a.b="message" class="demo"></div>
 <script>
 Vue.directive('demo', {
   bind: function (el, binding, vnode) {

src/v2/guide/render-function.md

@@ -546,6 +546,7 @@ You may be interested to know that Vue's templates actually compile to render fu
     <pre><code>{{ result.render }}</code></pre>
     <label>staticRenderFns:</label>
     <pre v-for="(fn, index) in result.staticRenderFns"><code>_m({{ index }}): {{ fn }}</code></pre>
+    <pre v-if="!result.staticRenderFns.length"><code>{{ result.staticRenderFns }}</code></pre>
   </div>
   <div v-else>
     <label>Compilation Error:</label>
@@ -558,7 +559,9 @@ new Vue({
   data: {
     templateText: '\
 <div>\n\
-  <h1>I\'m a template!</h1>\n\
+  <header>\n\
+    <h1>I\'m a template!</h1>\n\
+  </header>\n\
   <p v-if="message">\n\
     {{ message }}\n\
   </p>\n\
@@ -605,7 +608,7 @@ console.error = function (error) {
 }
 #vue-compile-demo textarea {
   width: 100%;
-
+  font-family: monospace;
 }
 </style>
 {% endraw %}

themes/vue/source/css/_migration.styl

@@ -4,11 +4,12 @@
             margin-left: .3em
             color: #b9465c
     .upgrade-path
+        margin-top: 2em
         padding: 2em
         background: rgba(73, 195, 140, .1)
         border-radius: 2px
         > h4
             margin-top: 0
         > p:last-child
             margin-bottom: 0
-
+            padding-bottom: 0