Merge branch '3.1' into 3.2

* 3.1:
  Fix merge

src/Symfony/Component/Console/Tests/Fixtures/application_mbstring.md

@@ -14,7 +14,7 @@ help
 * Description: Displays help for a command
 * Usage:
 
-  * `help [--xml] [--format FORMAT] [--raw] [--] [<command_name>]`
+  * `help [--format FORMAT] [--raw] [--] [<command_name>]`
 
 The <info>help</info> command displays help for a given command:
 
@@ -38,16 +38,6 @@ To display the list of available commands, please use the <info>list</info> comm
 
 ### Options:
 
-**xml:**
-
-* Name: `--xml`
-* Shortcut: <none>
-* Accept value: no
-* Is value required: no
-* Is multiple: no
-* Description: To output help as XML
-* Default: `false`
-
 **format:**
 
 * Name: `--format`
@@ -144,7 +134,7 @@ list
 * Description: Lists commands
 * Usage:
 
-  * `list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]`
+  * `list [--raw] [--format FORMAT] [--] [<namespace>]`
 
 The <info>list</info> command lists all commands:
 
@@ -174,16 +164,6 @@ It's also possible to get raw list of commands (useful for embedding command run
 
 ### Options:
 
-**xml:**
-
-* Name: `--xml`
-* Shortcut: <none>
-* Accept value: no
-* Is value required: no
-* Is multiple: no
-* Description: To output list as XML
-* Default: `false`
-
 **raw:**
 
 * Name: `--raw`