Merge branch '3.1' into 3.2
* 3.1: Fix merge
This commit is contained in:
commit
061b4b4ece
@ -14,7 +14,7 @@ help
|
|||||||
* Description: Displays help for a command
|
* Description: Displays help for a command
|
||||||
* Usage:
|
* 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:
|
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:
|
### 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:**
|
**format:**
|
||||||
|
|
||||||
* Name: `--format`
|
* Name: `--format`
|
||||||
@ -144,7 +134,7 @@ list
|
|||||||
* Description: Lists commands
|
* Description: Lists commands
|
||||||
* Usage:
|
* Usage:
|
||||||
|
|
||||||
* `list [--xml] [--raw] [--format FORMAT] [--] [<namespace>]`
|
* `list [--raw] [--format FORMAT] [--] [<namespace>]`
|
||||||
|
|
||||||
The <info>list</info> command lists all commands:
|
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:
|
### 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:**
|
**raw:**
|
||||||
|
|
||||||
* Name: `--raw`
|
* Name: `--raw`
|
||||||
|
Reference in New Issue
Block a user