diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:27 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-08-07 06:14:27 +0200 |
| commit | 8b464dc6eec4d1fd58875451671456393181e980 (patch) | |
| tree | e97f998a24620c545711a3692be509768407b75d /commands | |
| parent | 90118343e46fecac78b6351ce25bb610b15fc077 (diff) | |
| parent | 8df8a3d7a9d3356183df0a45c97f32dac878b65b (diff) | |
| download | barebox-8b464dc6eec4d1fd58875451671456393181e980.tar.gz barebox-8b464dc6eec4d1fd58875451671456393181e980.tar.xz | |
Merge branch 'for-next/doc'
Conflicts:
Makefile
Diffstat (limited to 'commands')
| -rw-r--r-- | commands/Kconfig | 4 | ||||
| -rw-r--r-- | commands/dfu.c | 15 | ||||
| -rw-r--r-- | commands/help.c | 2 | ||||
| -rw-r--r-- | commands/lspci.c | 2 |
4 files changed, 13 insertions, 10 deletions
diff --git a/commands/Kconfig b/commands/Kconfig index 61816f5115..b03f74a82b 100644 --- a/commands/Kconfig +++ b/commands/Kconfig @@ -1859,7 +1859,7 @@ endmenu -menu "Miscelleanous" +menu "Miscellaneous" config CMD_2048 tristate @@ -1976,7 +1976,7 @@ config CMD_TIME Note: This command depends on COMMAND being interruptible, otherwise the timer may overrun resulting in incorrect results -# end Miscelleanous commands +# end Miscellaneous commands endmenu diff --git a/commands/dfu.c b/commands/dfu.c index 354625260d..7f78f3bbc2 100644 --- a/commands/dfu.c +++ b/commands/dfu.c @@ -172,12 +172,15 @@ out: BAREBOX_CMD_HELP_START(dfu) BAREBOX_CMD_HELP_TEXT("Turn's the USB host into DFU mode (Device Firmware Mode) and accepts") -BAREBOX_CMD_HELP_TEXT("a new firmware. The destination is described by DESC in the this format:") -BAREBOX_CMD_HELP_TEXT(" DEVICE(NAME)[src]...") -BAREBOX_CMD_HELP_TEXT("Specify the '(') and ')' literal, the [] however denote this optional modes:") -BAREBOX_CMD_HELP_TEXT("- 's' safe mode (download the complete image before flashing)") -BAREBOX_CMD_HELP_TEXT("- 'r' readback of the firmware is allowed") -BAREBOX_CMD_HELP_TEXT("- 'c' the file will be created (for use with regular files)") +BAREBOX_CMD_HELP_TEXT("a new firmware. The destination is described by DESC in the format") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("\tDEVICE(NAME)[src]...") +BAREBOX_CMD_HELP_TEXT("") +BAREBOX_CMD_HELP_TEXT("Here '(' and ')' are literal characters. The '[' and ']' however denote") +BAREBOX_CMD_HELP_TEXT("one of the following optional modes:") +BAREBOX_CMD_HELP_TEXT("'s': safe mode (download the complete image before flashing); ") +BAREBOX_CMD_HELP_TEXT("'r': readback of the firmware is allowed; ") +BAREBOX_CMD_HELP_TEXT("'c': the file will be created (for use with regular files).") BAREBOX_CMD_HELP_TEXT("") BAREBOX_CMD_HELP_TEXT("Options:") BAREBOX_CMD_HELP_OPT ("-m STR", "Manufacturer string (barebox)") diff --git a/commands/help.c b/commands/help.c index 9c33807fad..898533594f 100644 --- a/commands/help.c +++ b/commands/help.c @@ -128,7 +128,7 @@ static int do_help(int argc, char *argv[]) BAREBOX_CMD_HELP_START(help) -BAREBOX_CMD_HELP_TEXT("Without arguments, lists all all commands. With an argument, print help") +BAREBOX_CMD_HELP_TEXT("Without arguments, lists all commands. With an argument, print help") BAREBOX_CMD_HELP_TEXT("about the specified command. If the argument is 'all', then output help") BAREBOX_CMD_HELP_TEXT("for all commands.") BAREBOX_CMD_HELP_TEXT("") diff --git a/commands/lspci.c b/commands/lspci.c index c00b57f894..fdf02691b5 100644 --- a/commands/lspci.c +++ b/commands/lspci.c @@ -46,7 +46,7 @@ static int do_lspci(int argc, char *argv[]) BAREBOX_CMD_START(lspci) .cmd = do_lspci, - BAREBOX_CMD_DESC("Show PCI info") + BAREBOX_CMD_DESC("show PCI info") BAREBOX_CMD_GROUP(CMD_GRP_INFO) BAREBOX_CMD_COMPLETE(empty_complete) BAREBOX_CMD_END |