Merge branch '2.5' into 2.6

* 2.5:
  [WIP] Made help information of commands more consistent
  Made help information consistent

Conflicts:
	src/Symfony/Bundle/FrameworkBundle/Command/TranslationUpdateCommand.php
	src/Symfony/Component/Console/Tests/Fixtures/application_1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext1.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_astext2.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_gethelp.txt
	src/Symfony/Component/Console/Tests/Fixtures/application_run1.txt

Author: fabpot

Command/InitAclCommand.php

@@ -34,13 +34,13 @@ protected function configure()
             ->setHelp(<<<EOF
 The <info>%command.name%</info> command mounts ACL tables in the database.
 
-<info>php %command.full_name%</info>
+  <info>php %command.full_name%</info>
 
 The name of the DBAL connection must be configured in your <info>app/config/security.yml</info> configuration file in the <info>security.acl.connection</info> variable.
 
-<info>security:
-    acl:
-        connection: default</info>
+  <info>security:
+      acl:
+          connection: default</info>
 EOF
             )
         ;