Merge branch 'master' into cn

# Conflicts:
#	content/configuration/target.md
#	content/guides/production-build.md

Author: dear-lizhihua

content/configuration/target.md

@@ -20,9 +20,9 @@ webpack 能够为多种环境或 _target_ 构建编译。想要理解什么是 t
 | `target`      | 描述            |
 | ------------- |------------------------|
 | `async-node`| 编译为类 Node.js 环境可用（使用 fs 和 vm 异步加载分块）    |
-| `electron`      | 编译为 [Electron](http://electron.atom.io/) 渲染进程，使用 `JsonpTemplatePlugin`, `FunctionModulePlugin` 来为浏览器环境提供目标，使用 `NodeTargetPlugin` 和 `ExternalsPlugin` 为 CommonJS 和 Electron 内置模块提供目标。 |
-| `electron-renderer` | 为 [Electron](http://electron.atom.io/) 的 `renderer-process` 编译。  |
-| `"node"` | 编译为类 Node.js 环境可用（使用 Node.js `require` 加载分块） |
+| `electron`      | `electron-main` 的别名 |
+| `electron-main`      | 编译为 [Electron](http://electron.atom.io/) 渲染进程，使用 `JsonpTemplatePlugin`, `FunctionModulePlugin` 来为浏览器环境提供目标，使用 `NodeTargetPlugin` 和 `ExternalsPlugin` 为 CommonJS 和 Electron 内置模块提供目标。 |
+| `node` | 编译为类 Node.js 环境可用（使用 Node.js `require` 加载 chunk） |
 |`node-webkit`|  编译为 Webkit 可用，并且使用 jsonp 去加载分块。支持 Node.js 内置模块和 [`nw.gui`](http://docs.nwjs.io/en/latest/) 导入（实验性质） |
 |`web`| 编译为类浏览器环境里可用**（默认）** |
 |`webworker`| 编译成一个 WebWorker |

content/plugins/index.md

@@ -2,6 +2,7 @@
 title: Plugins
 contributors:
   - simon04
+  - gonzoyumo
 ---
 
 webpack has a rich plugin interface. Most of the features within webpack itself use this plugin interface. This makes webpack **flexible**.
@@ -14,6 +15,7 @@ webpack has a rich plugin interface. Most of the features within webpack itself
 |[`CompressionWebpackPlugin`](/plugins/compression-webpack-plugin)|Prepare compressed versions of assets to serve them with Content-Encoding|
 |[`I18nWebpackPlugin`](/plugins/i18n-webpack-plugin)|Adds i18n support to your bundles|
 |[`HtmlWebpackPlugin`](/plugins/html-webpack-plugin)| Simplifies creation of HTML files (`index.html`) to serve your bundles|
+|[`NormalModuleReplacementPlugin`](/plugins/normal-module-replacement-plugin)|Replaces resource that matches a regexp|
 
 
 ![Awesome](../assets/awesome-badge.svg)

content/plugins/normal-module-replacement-plugin.md

@@ -0,0 +1,87 @@
+---
+title: NormalModuleReplacementPlugin
+contributors:
+  - gonzoyumo
+---
+## Install
+
+The `NormalModuleReplacementPlugin` is a built-in webpack plugin.
+
+
+## Usage
+
+``` javascript
+new webpack.NormalModuleReplacementPlugin(resourceRegExp, newResource)
+```
+
+The `NormalModuleReplacementPlugin` allows you to replace resources that match `resourceRegExp` with `newResource`. If `newResource` is relative, it is resolved relative to the previous resource. If `newResource` is a function, it is expected to overwrite the request attribute of the supplied resource.
+
+This can be useful for allowing different behaviour between builds.
+
+## Basic example
+
+Replace a specific module when building for development environment ([read more](/configuration/environment)).
+
+
+Say you have a config file `some/path/config.development.module.js` and a special version for production in `some/path/config.production.module.js`
+
+Just add the following plugin when building for production:
+
+``` javascript
+new webpack.NormalModuleReplacementPlugin(
+  /some\/path\/config\.development\.js/,
+  './config.production.js'
+);
+```
+
+## Advanced example
+
+Conditional build depending on an environment var ([read more](/configuration/environment)).
+
+Say you want a configuration with specific values for different build targets.
+
+``` javascript
+module.exports = function(env) {
+  var appTarget = env.APP_TARGET || 'VERSION_A';
+  return {
+    plugins: [
+      new webpack.NormalModuleReplacementPlugin(/(.*)-APP_TARGET(\.*)/, function(resource) {
+        resource.request = resource.request.replace(/-APP_TARGET/, `-${appTarget}`);
+      })
+    ]
+  }
+  
+}
+```
+
+Create the two config files:
+
+**app/config-VERSION_A.js:**
+``` javascript
+export default {
+  title : 'I am version A'
+}
+```
+**app/config-VERSION_B.js:**
+``` javascript
+export default {
+  title : 'I am version B'
+}
+```
+Then import that config using the keyword you're looking for in the regexp:
+
+``` javascript
+import config from 'app/config-APP_TARGET';
+console.log(config.title);
+```
+
+And now you just get the right config imported depending on which target you're building for:
+
+``` shell
+webpack --env.APP_TARGET VERSION_A
+=> 'I am version A'
+
+webpack --env.APP_TARGET VERSION_B
+=> 'I am version B'
+
+```