Merge branch 'master' into cn

# Conflicts: # src/content/configuration/module.md # src/content/configuration/node.md # src/content/guides/production.md # src/content/guides/tree-shaking.md # src/content/guides/typescript.md # src/content/plugins/context-replacement-plugin.md
rewbilldou · Aug 30, 2017 · bea97fd · bea97fd
2 parents 77e7f8f + b5fd614
commit bea97fd
Show file tree

Hide file tree

Showing 13 changed files with 382 additions and 331 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,8 +2,8 @@ node_modules
 npm-debug.log
 build
 generated
-src/components/Support/support-backers.json
-src/components/Support/support-sponsors.json
-src/components/StarterKits/starter-kits-data.json
+support-backers.json
+support-sponsors.json
+starter-kits-data.json
 .antwar
 .idea
diff --git a/src/components/StarterKits/starter-kits-data.json b/src/components/StarterKits/starter-kits-data.json
diff --git a/src/components/Support/support-backers.json b/src/components/Support/support-backers.json
diff --git a/src/components/Support/support-sponsors.json b/src/components/Support/support-sponsors.json
diff --git a/src/content/api/module-methods.md b/src/content/api/module-methods.md
@@ -305,7 +305,7 @@ Aside from the module syntaxes described above, webpack also allows a few custom
 require.context(directory:String, includeSubdirs:Boolean /* optional, default true */, filter:RegExp /* optional */)
 ```
 
-Specify a whole group of dependencies using a path to the `directory`, an option to `includeSubdirs`, and a `filter` for more fine grained control of the mdoules included. These can then be easily `resolve`d later on.
+Specify a whole group of dependencies using a path to the `directory`, an option to `includeSubdirs`, and a `filter` for more fine grained control of the modules included. These can then be easily resolved later on:
 
 ```javascript
 var context = require.context('components', true, /\.html$/);

diff --git a/src/content/configuration/dev-server.md b/src/content/configuration/dev-server.md
@@ -34,8 +34,8 @@ devServer: {
 
 ```bash
 http://localhost:9000/
-webpack result is served from /build/
-content is served from dist/
+webpack output is served from /build/
+Content not from webpack is served from /path/to/dist/
 ```
 
 这将给出一些背景知识，就能知道服务器的访问位置，并且知道服务已启动。

diff --git a/src/content/configuration/module.md b/src/content/configuration/module.md
@@ -6,6 +6,7 @@ contributors:
   - skipjack
   - jouni-kantola
   - jhnns
+  - dylanonelson
 ---
 
 这些选项决定了如何处理项目中的[不同类型的模块](/concepts/modules)。
@@ -104,12 +105,12 @@ W> 小心！resource 是文件的_解析_路径，这意味着符号链接的资
 
 ## `Rule.exclude`
 
-`Rule.exclude` 是 `Rule.resource.exclude` 的简写。详细请查看 [`Rule.resource`](#rule-resource) 和 [`Condition.exclude`](#condition)。
+`Rule.exclude` 是 `Rule.resource.exclude` 的简写。如果你提供了 `Rule.exclude` 选项，就不能再提供 `Rule.resource`。详细请查看 [`Rule.resource`](#rule-resource) 和 [`Condition.exclude`](#condition)。
 
 
 ## `Rule.include`
 
-`Rule.include` 是 `Rule.resource.include` 的简写。详细请查看 [`Rule.resource`](#rule-resource) 和 [`Condition.include`](#condition)。
+`Rule.include` 是 `Rule.resource.include` 的简写。如果你提供了 `Rule.include` 选项，就不能再提供 `Rule.resource`。详细请查看 [`Rule.resource`](#rule-resource) 和 [`Condition.include`](#condition)。
 
 
 ## `Rule.issuer`
@@ -188,7 +189,7 @@ parser: {
 
 ## `Rule.resource`
 
-[`条件`](#condition)会匹配 resource。在 [`Rule` 条件](#rule-conditions) 中查看详细。
+[`条件`](#condition)会匹配 resource。既可以提供 `Rule.resource` 选项，也可以使用快捷选项 `Rule.test`，`Rule.exclude` 和 `Rule.include`。在 [`Rule` 条件](#rule-conditions) 中查看详细。
 
 
 ## `Rule.resourceQuery`
@@ -210,7 +211,7 @@ A [`Condition`](#condition) matched with the resource query. The condition match
 
 ## `Rule.test`
 
-`Rule.test` 是 `Rule.resource.test` 的简写。详细请查看 [`Rule.resource`](#rule-resource) 和 [`Condition.test`](#condition)。
+`Rule.test` 是 `Rule.resource.test` 的简写。如果你提供了一个 `Rule.test` 选项，就不能再提供 `Rule.resource`。详细请查看 [`Rule.resource`](#rule-resource) 和 [`Condition.test`](#condition)。
 
 
 ## `Rule.use`

diff --git a/src/content/configuration/node.md b/src/content/configuration/node.md
@@ -74,7 +74,7 @@ node: {
 
 `boolean | "mock"`
 
-默认值：`true`
+默认值：`"mock"`
 
 选项：
 
@@ -87,7 +87,7 @@ node: {
 
 `boolean | "mock"`
 
-默认值：`true`
+默认值：`"mock"`
 
 选项：
 

diff --git a/src/content/guides/development.md b/src/content/guides/development.md
@@ -267,8 +267,7 @@ __webpack.config.js__
       new CleanWebpackPlugin(['dist']),
       new HtmlWebpackPlugin({
         title: 'Output Management'
-      }),
-      new webpack.HotModuleReplacementPlugin()
+      })
     ],
     output: {
       filename: '[name].bundle.js',