Merge remote-tracking branch 'upstream/master' into mercurial-support

src/Composer/Command/AboutCommand.php

@@ -18,15 +18,15 @@ use Symfony\Component\Console\Output\OutputInterface;
 /**
  * @author Jordi Boggiano <j.boggiano@seld.be>
  */
-class HelpCommand extends Command
+class AboutCommand extends Command
 {
     protected function configure()
     {
         $this
-            ->setName('help')
-            ->setDescription('')
+            ->setName('about')
+            ->setDescription('Short information about Composer')
             ->setHelp(<<<EOT
-<info>php composer.phar help</info>
+<info>php composer.phar about</info>
 EOT
             )
         ;

src/Composer/Console/Application.php

@@ -63,7 +63,7 @@ class Application extends BaseApplication
      */
     protected function registerCommands()
     {
-        $this->add(new Command\HelpCommand());
+        $this->add(new Command\AboutCommand());
         $this->add(new Command\InstallCommand());
         $this->add(new Command\UpdateCommand());
         $this->add(new Command\DebugPackagesCommand());