Merge remote-tracking branch 'upstream/dev' into working

# Conflicts:
#	docs/en/essentials/nested-routes.md
#	docs/en/installation.md

Author: MachinisteWeb

docs/en/essentials/history-mode.md

@@ -15,7 +15,7 @@ When using history mode, the URL will look "normal," e.g. `http://oursite.com/us
 
 Here comes a problem, though: Since our app is a single page client side app, without a proper server configuration, the users will get a 404 error if they access `http://oursite.com/user/id` directly in their browser. Now that's ugly.
 
-Not to worry: To fix the issue, all you need to do is add a simple catch-all fallback route to your server. If the URL doesn't match any static assets, it should serve the same `index.html` page that your app lives in. Beautiful, again! 
+Not to worry: To fix the issue, all you need to do is add a simple catch-all fallback route to your server. If the URL doesn't match any static assets, it should serve the same `index.html` page that your app lives in. Beautiful, again!
 
 ## Example Server Configurations
 
@@ -45,6 +45,7 @@ location / {
 For Node.js/Express, consider using [connect-history-api-fallback middleware](https://github.com/bripkens/connect-history-api-fallback).
 
 #### Internet Information Services (IIS)
+
 ```xml
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
@@ -61,10 +62,10 @@ For Node.js/Express, consider using [connect-history-api-fallback middleware](ht
         </rule>
       </rules>
     </rewrite>
-      <httpErrors>     
-          <remove statusCode="404" subStatusCode="-1" />                
+      <httpErrors>
+          <remove statusCode="404" subStatusCode="-1" />
           <remove statusCode="500" subStatusCode="-1" />
-          <error statusCode="404" path="/survey/notfound" responseMode="ExecuteURL" />                
+          <error statusCode="404" path="/survey/notfound" responseMode="ExecuteURL" />
           <error statusCode="500" path="/survey/error" responseMode="ExecuteURL" />
       </httpErrors>
       <modules runAllManagedModulesForAllRequests="true"/>
@@ -73,6 +74,7 @@ For Node.js/Express, consider using [connect-history-api-fallback middleware](ht
 ```
 
 #### Caddy
+
 ```
 rewrite {
     regexp .*

docs/en/essentials/passing-props.md

@@ -27,10 +27,10 @@ const User = {
 const router = new VueRouter({
   routes: [
     { path: '/user/:id', component: User, props: true }
-    
+
     // for routes with named views, you have to define the props option for each named view:
     {
-      path: '/user/:id', 
+      path: '/user/:id',
       components: { default: User, sidebar: Sidebar },
       props: { default: true, sidebar: false }
     }
@@ -59,8 +59,7 @@ const router = new VueRouter({
 
 ### Function mode
 
-You can create a function that returns props.
-This allows you to cast the parameter to another type, combine static values with route-based values, etc.
+You can create a function that returns props. This allows you to cast the parameter to another type, combine static values with route-based values, etc.
 
 ``` js
 const router = new VueRouter({
@@ -72,8 +71,6 @@ const router = new VueRouter({
 
 The url: `/search?q=vue` would pass `{query: "vue"}` as props to the SearchUser component.
 
-Try to keep the props function stateless, as it's only evaluated on route changes.
-Use a wrapper component if you need state to define the props, that way vue can react to state changes.
-
+Try to keep the props function stateless, as it's only evaluated on route changes. Use a wrapper component if you need state to define the props, that way vue can react to state changes.
 
 For advanced usage, checkout the [example](https://github.com/vuejs/vue-router/blob/dev/examples/route-props/app.js).

docs/en/installation.md

@@ -5,7 +5,7 @@
 [https://unpkg.com/vue-router/dist/vue-router.js](https://unpkg.com/vue-router/dist/vue-router.js)
 
 <!--email_off-->
-[Unpkg.com](https://unpkg.com) fournit des liens CDN basés sur NPM. Le lien ci-dessus pointera toujours vers la dernière release sur NPM. Vous pouvez aussi utiliser un tag ou une version spécifique via une URL comme `https://unpkg.com/[email protected]/dist/vue-router.js`.
+[Unpkg.com](https://unpkg.com) fournit des liens CDN basés sur npm. Le lien ci-dessus pointera toujours vers la dernière version sur npm. Vous pouvez aussi utiliser un tag ou une version spécifique via une URL comme `https://unpkg.com/[email protected]/dist/vue-router.js`.
 <!--/email_off-->
 
 Incluez `vue-router` après Vue et l'installation sera automatique :
@@ -15,7 +15,7 @@ Incluez `vue-router` après Vue et l'installation sera automatique :
 <script src="/path/to/vue-router.js"></script>
 ```
 
-### NPM
+### npm
 
 ``` bash
 npm install vue-router