Merge branch '2.6' into 2.7

* 2.6:
  [WIP] Made help information of commands more consistent
  [2.6] Added internal annotation on Descriptor classes
  Made CLI help consistent
  Made help information consistent

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
             )
         ;

Command/SetAclCommand.php

@@ -59,20 +59,22 @@ protected function configure()
 The <info>%command.name%</info> command sets ACL.
 The ACL system must have been initialized with the <info>init:acl</info> command.
 
-To set <comment>VIEW</comment> and <comment>EDIT</comment> permissions for the user <comment>kevin</comment> on the instance of <comment>Acme\MyClass</comment> having the identifier <comment>42</comment>:
+To set <comment>VIEW</comment> and <comment>EDIT</comment> permissions for the user <comment>kevin</comment> on the instance of
+<comment>Acme\MyClass</comment> having the identifier <comment>42</comment>:
 
-<info>php %command.full_name% --user=Symfony/Component/Security/Core/User/User:kevin VIEW EDIT Acme/MyClass:42</info>
+  <info>php %command.full_name% --user=Symfony/Component/Security/Core/User/User:kevin VIEW EDIT Acme/MyClass:42</info>
 
 Note that you can use <comment>/</comment> instead of <comment>\\ </comment>for the namespace delimiter to avoid any
 problem.
 
 To set permissions for a role, use the <info>--role</info> option:
 
-<info>php %command.full_name% --role=ROLE_USER VIEW Acme/MyClass:1936</info>
+  <info>php %command.full_name% --role=ROLE_USER VIEW Acme/MyClass:1936</info>
 
 To set permissions at the class scope, use the <info>--class-scope</info> option:
 
-<info>php %command.full_name% --class-scope --user=Symfony/Component/Security/Core/User/User:anne OWNER Acme/MyClass:42</info>
+  <info>php %command.full_name% --class-scope --user=Symfony/Component/Security/Core/User/User:anne OWNER Acme/MyClass:42</info>
+  
 EOF
             )
             ->addArgument('arguments', InputArgument::IS_ARRAY | InputArgument::REQUIRED, 'A list of permissions and object identities (class name and ID separated by a column)')