diff --git a/CHANGELOG.md b/CHANGELOG.md index c524336..4643ee2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -124,7 +124,7 @@ ChangeLog ------------------ * hhvm compatible! -* Fixed: Issue #4. Compatiblitiy for PHP < 5.4.14. +* Fixed: Issue #4. Compatibility for PHP < 5.4.14. 1.0.0 (2013-07-19) diff --git a/examples/curl.php b/examples/curl.php index e27adfa..90270ca 100644 --- a/examples/curl.php +++ b/examples/curl.php @@ -77,7 +77,7 @@ function curl_multi_loop_scheduler($mh, callable $done) $mrc = curl_multi_exec($mh, $active); switch ($mrc) { /* - * From the curl docs. If CURM_CALL_MULTI_PERFORM is returned, simply + * From the curl docs. If CURLM_CALL_MULTI_PERFORM is returned, simply * call curl_multi_perform immediately again. In PHP this means we * actually call curl_multi_exec immediately again. * diff --git a/lib/EventEmitter.php b/lib/EventEmitter.php index 18971e3..865c99b 100644 --- a/lib/EventEmitter.php +++ b/lib/EventEmitter.php @@ -7,7 +7,7 @@ /** * This is the old name for the Emitter class. * - * Instead of of using EventEmitter, please use Emitter. They are identical + * Instead of using EventEmitter, please use Emitter. They are identical * otherwise. * * @copyright Copyright (C) fruux GmbH (https://fruux.com/) diff --git a/lib/Promise.php b/lib/Promise.php index 1228561..42969a5 100644 --- a/lib/Promise.php +++ b/lib/Promise.php @@ -144,7 +144,7 @@ public function fulfill($value = null) } /** - * Marks this promise as rejected, and set it's rejection reason. + * Marks this promise as rejected, and set its rejection reason. */ public function reject(Throwable $reason) { diff --git a/lib/Promise/functions.php b/lib/Promise/functions.php index 986fe2b..fbed634 100644 --- a/lib/Promise/functions.php +++ b/lib/Promise/functions.php @@ -18,7 +18,7 @@ /** * This function takes an array of Promises, and returns a Promise that - * resolves when all of the given arguments have resolved. + * resolves when all the given arguments have resolved. * * The returned Promise will resolve with a value that's an array of all the * values the given promises have been resolved with. diff --git a/lib/WildcardEmitter.php b/lib/WildcardEmitter.php index 1b7c248..997709e 100644 --- a/lib/WildcardEmitter.php +++ b/lib/WildcardEmitter.php @@ -22,9 +22,9 @@ * - Using ":" as a separator is optional, but it's highly recommended to use * some kind of separator. * - * The WilcardEmitter is a bit slower than the regular Emitter. If you code + * The WildcardEmitter is a bit slower than the regular Emitter. If your code * must be very high performance, it might be better to try to use the other - * emitter. For must usage the difference is negligible though. + * emitter. For most usage the difference is negligible though. * * @copyright Copyright (C) fruux GmbH (https://fruux.com/) * @author Evert Pot (http://evertpot.com/)