Merge pull request #1 from gregdeane/master

mattdesl · mattdesl · commit 6070721c9e05 · 2015-09-09T10:49:35.000-04:00
Fixing typo
diff --git a/README.md b/README.md
@@ -141,7 +141,7 @@ function loadImageAsync(url) {
 }
 ```
 
-The funtion returns a new instance of `Promise` which is *resolved* to `image` if the load succeeds, or *rejected* with a new `Error` if it fails. In our case, we `require('bluebird')` for the Promise implementation.
+The function returns a new instance of `Promise` which is *resolved* to `image` if the load succeeds, or *rejected* with a new `Error` if it fails. In our case, we `require('bluebird')` for the Promise implementation.
 
 The `Promise` constructor is typically only needed for edge cases like this, where we are converting a callback-style API into a promise-style API. In many cases it is preferable to use a `promisify` or `denodeify` utility which converts Node style (error-first) functions into their `Promise` counterpart.
 

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,7 @@ function loadImageAsync(url) {`
`141`	`141`	`}`
`142`	`142`	```
`143`	`143`
`144`		-The funtion returns a new instance of `Promise` which is resolved to `image` if the load succeeds, or rejected with a new `Error` if it fails. In our case, we `require('bluebird')` for the Promise implementation.
	`144`	+The function returns a new instance of `Promise` which is resolved to `image` if the load succeeds, or rejected with a new `Error` if it fails. In our case, we `require('bluebird')` for the Promise implementation.
`145`	`145`
`146`	`146`	The `Promise` constructor is typically only needed for edge cases like this, where we are converting a callback-style API into a promise-style API. In many cases it is preferable to use a `promisify` or `denodeify` utility which converts Node style (error-first) functions into their `Promise` counterpart.
`147`	`147`