Merge branch '1.5'

doc/03-cli.md

@@ -118,7 +118,9 @@ resolution.
 ## update
 
 In order to get the latest versions of the dependencies and to update the
-`composer.lock` file, you should use the `update` command.
+`composer.lock` file, you should use the `update` command. This command is also
+aliased as `upgrade` as it does the same as `upgrade` does if you are thinking
+of `apt-get` or similar package managers.
 
 ```sh
 php composer.phar update

src/Composer/Command/UpdateCommand.php

@@ -34,7 +34,8 @@ class UpdateCommand extends BaseCommand
     {
         $this
             ->setName('update')
-            ->setDescription('Updates your dependencies to the latest version according to composer.json, and updates the composer.lock file.')
+            ->setAliases(array('upgrade'))
+            ->setDescription('Upgrades your dependencies to the latest version according to composer.json, and updates the composer.lock file.')
             ->setDefinition(array(
                 new InputArgument('packages', InputArgument::IS_ARRAY | InputArgument::OPTIONAL, 'Packages that should be updated, if not provided all packages are.'),
                 new InputOption('prefer-source', null, InputOption::VALUE_NONE, 'Forces installation from package sources when possible, including VCS information.'),