Author: fabien
Date: 2010-01-15 12:13:50 +0100 (Fri, 15 Jan 2010)
New Revision: 26671
Modified:
branches/2.0/src/Symfony/Components/Console/Command/HelpCommand.php
branches/2.0/src/Symfony/Components/Console/Shell.php
Log:
Merge branch 'master' of git://github.com/symfony/symfony
Modified: branches/2.0/src/Symfony/Components/Console/Command/HelpCommand.php
===================================================================
--- branches/2.0/src/Symfony/Components/Console/Command/HelpCommand.php
2010-01-15 09:27:25 UTC (rev 26670)
+++ branches/2.0/src/Symfony/Components/Console/Command/HelpCommand.php
2010-01-15 11:13:50 UTC (rev 26671)
@@ -42,6 +42,7 @@
new InputOption('xml', null, InputOption::PARAMETER_NONE, 'To output
help as XML'),
))
->setName('help')
+ ->setAliases(array('?'))
->setDescription('Displays help for a command')
->setHelp(<<<EOF
The <info>help</info> command displays help for a given command:
Modified: branches/2.0/src/Symfony/Components/Console/Shell.php
===================================================================
--- branches/2.0/src/Symfony/Components/Console/Shell.php 2010-01-15
09:27:25 UTC (rev 26670)
+++ branches/2.0/src/Symfony/Components/Console/Shell.php 2010-01-15
11:13:50 UTC (rev 26671)
@@ -134,7 +134,7 @@
{
return <<<EOF
-Welcome to the <info>{$this->application->getName()}</info> shell.
+Welcome to the <info>{$this->application->getName()}</info> shell
(<comment>{$this->application->getVersion()}</comment>).
At the prompt, type <comment>help</comment> for some help,
or <comment>list</comment> to get a list available commands.
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
