Merge pull request #313 from webpack/feature/text-fixes

minor text changes

Author: sokra

content/concepts/module-resolution.md

@@ -37,7 +37,7 @@ require("../src/file");
 require("./file");
 ```
 
-In this case, the directory of the resource file is taken to be the context directory. The given relative path is joined to the context path to produce the absolute path to the file.
+In this case, the directory of the resource file is taken to be the context directory (the directory of the currently processed file). The given relative path is joined to the context path to produce the absolute path to the file.
 
 * Module path
 
@@ -47,7 +47,7 @@ require("module/lib/file");
 ```
 
 Modules are searched for inside directories which are specified using `resolve.modules`, which is can be an array comprising of different paths.
-Aliasing, ie setting `resolve.alias` to an existing module path, allows you to replace the module path with an alias name during `require/import`.
+Aliasing, i. e. setting `resolve.alias` to an existing module path, allows you to replace the module path with an alias name during `require/import`.
 
 Once the path is resolved based on the above rule, the resolver checks if the path points to a file or to a directory. If the path points to a file then it is bundled straightaway.
 But if the path points to a folder, then the following steps are taken to find the right file with the right extension.

content/concepts/modules.md

@@ -22,7 +22,7 @@ In contrast to Node.js modules, webpack _modules_ can express their _dependencie
 * An ECMAScript2015 `import` statement
 * An AMD `define` and `require` statement
 * An `@import` statement inside of a css/sass/less file.
-* An image url in a stylesheet or html file.
+* An image url in a stylesheet (`url(...)`) or html (`<img src=...>`) file.
 
 T> webpack 1 requires a specific loader to convert ECMAScript2015 `import`, however this is possible out of the box via webpack 2
 

content/concepts/targets.md

@@ -28,7 +28,7 @@ The following is a list of values you can pass to the `target` property.
 
 * `"async-node"` Compile for usage in a node.js-like environment (use `fs` and `vm` to load chunks async)
 * `"electron-main"` Compile for electron renderer process, provide a target using `JsonpTemplatePlugin`, `FunctionModulePlugin` for browser environment and `NodeTargetPlugin` and `ExternalsPlugin` for commonjs and electron bulit-in modules. *Note: need `webpack` >= 1.12.15.
-* `"node"` Compile for usage in a node.js-like environment (use `require` to load chunks)
+* `"node"` Compile for usage in a node.js-like environment (uses node.js `require` to load chunks)
 * `"node-webkit"` Compile for usage in webkit, uses jsonp chunk loading but also supports build in node.js modules plus require("nw.gui") (experimental)
 * `"web"` Compile for usage in a browser-like environment (default)
 * `"webworker"` Compile as WebWorker

content/how-to/upgrade-from-webpack-1.md

@@ -263,7 +263,7 @@ function onClick() {
 
 Good news: Failure to load a chunk can be handled now because they are `Promise` based.
 
-Caveat: `require.ensure` allows for easy chunk naming with the optional third argument, but `System.import` API doesn't offer that capability. If you want to keep that functionality, you can continue using `require.ensure`.
+Caveat: `require.ensure` allows for easy chunk naming with the optional third argument, but `System.import` API doesn't offer that capability yet. If you want to keep that functionality, you can continue using `require.ensure`.
 
 ```javascript
 require.ensure([], function(require) {