Merge pull request webpack#1102 from kennyt/typo-fix

sokra · sokra · commit c11caf8255cc · 2015-05-23T12:34:07.000+02:00
Fix typos in convert-argv.js and CONTRIBUTING.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -9,7 +9,7 @@ that include your webpack.config.js and relevant files are more likely to receiv
 
 **If you have discovered a bug or have a feature suggestion, feel free to create an issue on Github.**
 
-If you have created your own loader/plugin please incude it on the relevant
+If you have created your own loader/plugin please include it on the relevant
 documentation pages:
 
 [List of loaders](http://webpack.github.io/docs/list-of-loaders.html)
diff --git a/bin/convert-argv.js b/bin/convert-argv.js
@@ -57,7 +57,7 @@ module.exports = function(optimist, argv, convertOptions) {
 	}
 
 	if(typeof options !== "object" || options === null) {
-		console.log("Config did not export a object.");
+		console.log("Config did not export an object.");
 		process.exit(-1);
 	}
 
@@ -77,7 +77,7 @@ module.exports = function(optimist, argv, convertOptions) {
 	if(argv["watch"]) {
 		// TODO remove this in next major version
 		if(options.watch && typeof options.watch === "object") {
-			console.warn("options.watch is deprecated: use options.watchOptions instead");
+			console.warn("options.watch is deprecated: Use 'options.watchOptions' instead");
 			options.watchOptions = options.watch;
 		}
 		// TODO remove this in next major version

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ module.exports = function(optimist, argv, convertOptions) {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`if(typeof options !== "object" \|\| options === null) {`
`60`		`- console.log("Config did not export a object.");`
	`60`	`+ console.log("Config did not export an object.");`
`61`	`61`	`process.exit(-1);`
`62`	`62`	`}`
`63`	`63`
`@@ -77,7 +77,7 @@ module.exports = function(optimist, argv, convertOptions) {`
`77`	`77`	`if(argv["watch"]) {`
`78`	`78`	`// TODO remove this in next major version`
`79`	`79`	`if(options.watch && typeof options.watch === "object") {`
`80`		`- console.warn("options.watch is deprecated: use options.watchOptions instead");`
	`80`	`+ console.warn("options.watch is deprecated: Use 'options.watchOptions' instead");`
`81`	`81`	`options.watchOptions = options.watch;`
`82`	`82`	`}`
`83`	`83`	`// TODO remove this in next major version`