Merge commit 'upstream/master'

* commit 'upstream/master':
  [Console] fixed typo
  [Console] added a Shell
  [Foundation] updated the autoloader, added a new one

Conflicts:
	src/Symfony/Components/Console/Shell.php
This commit is contained in:
Fabien Potencier 2010-01-14 11:02:54 +01:00
commit b6ff29a2af
1 changed files with 1 additions and 1 deletions

View File

@ -139,7 +139,7 @@ Welcome to the <info>{$this->application->getName()}</info> shell.
At the prompt, type <comment>help</comment> for some help,
or <comment>list</comment> to get a list available commands.
To exist the shell, type <comment>^D</comment>.
To exit the shell, type <comment>^D</comment>.
EOF;
}