diff --git a/doc/01-basic-usage.md b/doc/01-basic-usage.md index cc5ac5459..e1faa6318 100644 --- a/doc/01-basic-usage.md +++ b/doc/01-basic-usage.md @@ -241,14 +241,14 @@ be in your project root, on the same level as `vendor` directory is. An example filename would be `src/Foo.php` containing an `Acme\Foo` class. After adding the [`autoload`](04-schema.md#autoload) field, you have to re-run -this command : +this command : ```sh php composer.phar dump-autoload ``` This command will re-generate the `vendor/autoload.php` file. -See the [`dump-autoload`](03-cli.md#dump-autoload) section for more informations. +See the [`dump-autoload`](03-cli.md#dump-autoload) section for more information. Including that file will also return the autoloader instance, so you can store the return value of the include call in a variable and add more namespaces. diff --git a/src/Composer/Downloader/SvnDownloader.php b/src/Composer/Downloader/SvnDownloader.php index e23958164..f7e14e6ce 100644 --- a/src/Composer/Downloader/SvnDownloader.php +++ b/src/Composer/Downloader/SvnDownloader.php @@ -130,11 +130,11 @@ class SvnDownloader extends VcsDownloader $this->io->writeError(sprintf(' The package has modified file%s:', $countChanges === 1 ? '' : 's')); $this->io->writeError(array_slice($changes, 0, 10)); if ($countChanges > 10) { - $remaingChanges = $countChanges - 10; + $remainingChanges = $countChanges - 10; $this->io->writeError( sprintf( - ' '.$remaingChanges.' more file%s modified, choose "v" to view the full list', - $remaingChanges === 1 ? '' : 's' + ' '.$remainingChanges.' more file%s modified, choose "v" to view the full list', + $remainingChanges === 1 ? '' : 's' ) ); } diff --git a/src/Composer/Util/Hg.php b/src/Composer/Util/Hg.php index 8cf6241a6..3681ad5c7 100644 --- a/src/Composer/Util/Hg.php +++ b/src/Composer/Util/Hg.php @@ -53,7 +53,7 @@ class Hg return; } - // Try with the authentication informations available + // Try with the authentication information available if (preg_match('{^(https?)://((.+)(?:\:(.+))?@)?([^/]+)(/.*)?}mi', $url, $match) && $this->io->hasAuthentication($match[5])) { $auth = $this->io->getAuthentication($match[5]); $authenticatedUrl = $match[1] . '://' . rawurlencode($auth['username']) . ':' . rawurlencode($auth['password']) . '@' . $match[5] . (!empty($match[6]) ? $match[6] : null);