From d359527b044aad41f16e3450a1db85f778bf4c65 Mon Sep 17 00:00:00 2001
From: Jinjiang <zhaojinjiang@me.com>
Date: Sun, 29 Apr 2018 23:51:39 +0800
Subject: [PATCH 1/2] [docs] removed an unnecessary sentence

---
 docs/options.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/options.md b/docs/options.md
index 541cffd7e..4aaa857f0 100644
--- a/docs/options.md
+++ b/docs/options.md
@@ -43,7 +43,7 @@ sidebar: auto
 
   Configure ES2015+ to ES5 transpiling options for the generated render function code. The [transpiler](https://github.com/vuejs/vue-template-es2015-compiler) is a fork of [Buble](https://github.com/Rich-Harris/buble), so consult the available options [here](https://buble.surge.sh/guide/#using-the-javascript-api).
 
-  The template render functions compilation supports a special transform `stripWith` (enabled by default), which removes the `with` usage in generated render functions to make them strict-mode compliant. This is enabled by default.
+  The template render functions compilation supports a special transform `stripWith` (enabled by default), which removes the `with` usage in generated render functions to make them strict-mode compliant.
 
 ## optimizeSSR
 

From 40484c39ce1cdadde9b7ee7541008e22c187307d Mon Sep 17 00:00:00 2001
From: Jinjiang <zhaojinjiang@me.com>
Date: Tue, 1 May 2018 23:46:11 +0800
Subject: [PATCH 2/2] [docs] typos

---
 docs/guide/README.md         |  8 ++++----
 docs/guide/asset-url.md      |  9 +++++++++
 docs/guide/css-modules.md    |  6 +++---
 docs/guide/extract-css.md    |  8 ++++----
 docs/guide/pre-processors.md | 14 +++++++-------
 docs/migrating.md            | 22 +++++++++++-----------
 6 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/docs/guide/README.md b/docs/guide/README.md
index bce34be4f..5b1e7ff30 100644
--- a/docs/guide/README.md
+++ b/docs/guide/README.md
@@ -48,14 +48,14 @@ module.exports = {
         test: /\.vue$/,
         loader: 'vue-loader'
       },
-      // this will apply to both plain .js files
-      // AND <script> blocks in vue files
+      // this will apply to both plain `.js` files
+      // AND `<script>` blocks in `.vue` files
       {
         test: /\.js$/,
         loader: 'babel-loader'
       },
-      // this will apply to both plain .css files
-      // AND <style> blocks in vue files
+      // this will apply to both plain `.css` files
+      // AND `<style>` blocks in `.vue` files
       {
         test: /\.css$/,
         use: [
diff --git a/docs/guide/asset-url.md b/docs/guide/asset-url.md
index 366d7f468..6f110f81e 100644
--- a/docs/guide/asset-url.md
+++ b/docs/guide/asset-url.md
@@ -20,6 +20,15 @@ createElement('img', {
 
 By default the following tag/attribute combinations are transformed, and can be configured using the [transformAssetUrls](../options.md#transformasseturls) option.
 
+``` js
+{
+  video: ['src', 'poster'],
+  source: 'src',
+  img: 'src',
+  image: 'xlink:href'
+}
+```
+
 In addition, if you have configured to use [css-loader](https://github.com/webpack-contrib/css-loader) for the `<style>` blocks, asset URLs in your CSS will also be processed in a similar fashion.
 
 ## Transform Rules
diff --git a/docs/guide/css-modules.md b/docs/guide/css-modules.md
index 57c245c8b..d6c8d8324 100644
--- a/docs/guide/css-modules.md
+++ b/docs/guide/css-modules.md
@@ -88,14 +88,14 @@ Refer to the [CSS Modules spec](https://github.com/css-modules/css-modules) for
 
 ## Opt-in Usage
 
-If you only want to use CSS Modules in some of your Vue components, you can use a `oneOf` rule and check for the `module` string in resourceQuery:
+If you only want to use CSS Modules in some of your Vue components, you can use a `oneOf` rule and check for the `module` string in `resourceQuery`:
 
 ``` js
 // webpack.config.js -> module.rules
 {
   test: /\.css$/,
   oneOf: [
-    // this matches <style module>
+    // this matches `<style module>`
     {
       resourceQuery: /module/,
       use: [
@@ -109,7 +109,7 @@ If you only want to use CSS Modules in some of your Vue components, you can use
         }
       ]
     },
-    // this matches plain <style> or <style scoped>
+    // this matches plain `<style>` or `<style scoped>`
     {
       use: [
         'vue-style-loader',
diff --git a/docs/guide/extract-css.md b/docs/guide/extract-css.md
index cffd0a6d2..109e51923 100644
--- a/docs/guide/extract-css.md
+++ b/docs/guide/extract-css.md
@@ -18,7 +18,7 @@ module.exports = {
   // other options...
   module: {
     rules: [
-      // ...other rules omitted
+      // ... other rules omitted
       {
         test: /\.css$/,
         use: [
@@ -31,7 +31,7 @@ module.exports = {
     ]
   },
   plugins: [
-    // ...vue-loader plugin omitted
+    // ... Vue Loader plugin omitted
     new MiniCssExtractPlugin({
       filename: style.css
     })
@@ -55,7 +55,7 @@ module.exports = {
   // other options...
   module: {
     rules: [
-      // ...other rules omitted
+      // ... other rules omitted
       {
         test: /\.css$/,
         loader: ExtractTextPlugin.extract({
@@ -66,7 +66,7 @@ module.exports = {
     ]
   },
   plugins: [
-    // ...vue-loader plugin omitted
+    // ... Vue Loader plugin omitted
     new ExtractTextPlugin("style.css")
   ]
 }
diff --git a/docs/guide/pre-processors.md b/docs/guide/pre-processors.md
index 21dee0f29..62e5a676f 100644
--- a/docs/guide/pre-processors.md
+++ b/docs/guide/pre-processors.md
@@ -20,10 +20,10 @@ In your webpack config:
 module.exports = {
   module: {
     rules: [
-      // ...other rules omitted
+      // ... other rules omitted
 
-      // this will apply to both plain .scss files
-      // AND <style lang="scss"> blocks in vue files
+      // this will apply to both plain `.scss` files
+      // AND `<style lang="scss">` blocks in `.vue` files
       {
         test: /\.scss$/,
         use: [
@@ -187,7 +187,7 @@ module.exports = {
   },
   module: {
     rules: [
-      // ...other rules omitted
+      // ... other rules omitted
       {
         test: /\.ts$/,
         loader: 'ts-loader',
@@ -195,7 +195,7 @@ module.exports = {
       }
     ]
   },
-  // ...plugin omitted
+  // ... plugin omitted
 }
 ```
 
@@ -203,7 +203,7 @@ Configuration of TypeScipt can be done via `tsconfig.json`. Also see docs for [t
 
 ## Pug
 
-Processing templates is a little different, because most webpack template loaders such as `pug-loader` return a template function instead of a compiled HTML string. Instead of using `pug-loader`, we need to use a loader that returns the raw HTML string instead, e.g. `pug-plain-loader`:
+Processing templates is a little different, because most webpack template loaders such as `pug-loader` return a template function instead of a compiled HTML string. Instead of using `pug-loader`, we need to use a loader that returns the raw HTML string, e.g. `pug-plain-loader`:
 
 ``` bash
 npm install -D pug pug-plain-loader
@@ -233,7 +233,7 @@ If you also intend to use it to import `.pug` files as HTML strings in JavaScrip
 {
   test: /\.pug$/,
   oneOf: [
-    // this applies to <template lang="pug"> in Vue components
+    // this applies to `<template lang="pug">` in Vue components
     {
       resourceQuery: /^\?vue/,
       use: ['pug-plain-loader']
diff --git a/docs/migrating.md b/docs/migrating.md
index 09919c637..dfde25a94 100644
--- a/docs/migrating.md
+++ b/docs/migrating.md
@@ -6,14 +6,14 @@ sidebarDepth: 2
 # Migrating from v14
 
 ::: tip Heads Up
-We are in the process of upgrading Vue CLI 3 beta to use webpack 4 + Vue Loader 15, so you might want to wait if you are planning to upgrade to Vue CLI 3.
+We are in the process of upgrading Vue CLI 3 beta to use webpack 4 + Vue Loader v15, so you might want to wait if you are planning to upgrade to Vue CLI 3.
 :::
 
 ## Notable Breaking Changes
 
 ### A Plugin is Now Required
 
-Vue Loader 15 now requires an accompanying webpack plugin to function properly:
+Vue Loader v15 now requires an accompanying webpack plugin to function properly:
 
 ``` js
 // webpack.config.js
@@ -29,7 +29,7 @@ module.exports = {
 
 ### Loader Inference
 
-Vue Loader 15 now uses a different strategy to infer loaders to use for language blocks.
+Vue Loader v15 now uses a different strategy to infer loaders to use for language blocks.
 
 Take `<style lang="less">` as an example: in v14 and below, it will attempt to load the block with `less-loader`, and implicitly chains `css-loader` and `vue-style-loader` after it, all using inline loader strings.
 
@@ -39,7 +39,7 @@ In v15, `<style lang="less">` will behave as if it's an actual `*.less` file bei
 {
   module: {
     rules: [
-      // ...other rules
+      // ... other rules
       {
         test: /\.less$/,
         use: [
@@ -85,7 +85,7 @@ If you also intend to use it to import `.pug` files as HTML strings in JavaScrip
       {
         test: /\.pug$/,
         oneOf: [
-          // this applies to <template lang="pug"> in Vue components
+          // this applies to `<template lang="pug">` in Vue components
           {
             resourceQuery: /^\?vue/,
             use: ['pug-plain-loader']
@@ -141,13 +141,13 @@ The good news is that you can now configure `localIdentName` in one place:
 }
 ```
 
-If you only want to use CSS Modules in some of your Vue components, you can use a `oneOf` rule and check for the `module` string in resourceQuery:
+If you only want to use CSS Modules in some of your Vue components, you can use a `oneOf` rule and check for the `module` string in `resourceQuery`:
 
 ``` js
 {
   test: /\.css$/,
   oneOf: [
-    // this matches <style module>
+    // this matches `<style module>`
     {
       resourceQuery: /module/,
       use: [
@@ -161,7 +161,7 @@ If you only want to use CSS Modules in some of your Vue components, you can use
         }
       ]
     },
-    // this matches plain <style> or <style scoped>
+    // this matches plain `<style>` or `<style scoped>`
     {
       use: [
         'vue-style-loader',
@@ -186,7 +186,7 @@ Works the same way as you'd configure it for normal CSS. Example usage with [min
       },
       {
         test: /\.css$/,
-        // or ExtractTextWebpackPlugin.extract(...)
+        // or `ExtractTextWebpackPlugin.extract(...)`
         use: [
           MiniCssExtractPlugin.loader,
           'css-loader'
@@ -213,7 +213,7 @@ externals: nodeExternals({
 })
 ```
 
-With v15, imports for `<style src="dep/foo.css">` now has resourceQuery strings appended at the end of the request, so you need to update the above to:
+With v15, imports for `<style src="dep/foo.css">` now has `resourceQuery` strings appended at the end of the request, so you need to update the above to:
 
 ``` js
 externals: nodeExternals({
@@ -244,7 +244,7 @@ The following option has been renamed:
 
 - `transformToRequire` (now renamed to `transformAssetUrls`)
 
-The following option has been changed to resourceQuery:
+The following option has been changed to `resourceQuery`:
 
 - `shadowMode` (now use inline resource queries, e.g. `foo.vue?shadow`)