diff mbox series

More consistent help command in wpa_cli

Message ID 87ft8v6t6k.fsf@gmail.com
State Changes Requested
Headers show
Series More consistent help command in wpa_cli | expand

Commit Message

akater Aug. 10, 2020, 4:06 a.m. UTC
I'm writing an interface for wpa_cli that parses its internal help page
during use.  Some docstrings are not separated from corresponding
commands and its arguments with equality sign like others.  This fixes
it.

I also capitalized all docstrings.  Some were capitalized; some were
not.  I found that e.g.

... clear = Clear ...

looks better and more consistent than

... clear = clear ...

I also replaced all “sends”, “reports” with imperative “Send”, “Report”,
...

It is likely that hostapd_cli.c needs very similar patch but I'm not
using it.  I'll likely patch it later if this patch gets merged.

Comments

Jouni Malinen Oct. 11, 2020, 5:21 p.m. UTC | #1
On Mon, Aug 10, 2020 at 04:06:27AM +0000, akater wrote:
> I'm writing an interface for wpa_cli that parses its internal help page
> during use.  Some docstrings are not separated from corresponding
> commands and its arguments with equality sign like others.  This fixes
> it.

I'm not sure I'd consider wpa_cli help output as something that would be
suitable for automatic parsing. That format is subject to change without
notice and may break such uses.

> I also capitalized all docstrings.  Some were capitalized; some were
> not.  I found that e.g.
> 
> ... clear = Clear ...
> 
> looks better and more consistent than
> 
> ... clear = clear ...
> 
> I also replaced all “sends”, “reports” with imperative “Send”, “Report”,
> ...
> 
> It is likely that hostapd_cli.c needs very similar patch but I'm not
> using it.  I'll likely patch it later if this patch gets merged.
> 
> diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c

Even though I'm not promoting automatic parsing of this, the proposed
changes here seem to be reasonable. However, I would need to get a patch
with the Signed-off-by: line in the commit message as described in the
CONTRIBUTIONS file before I can consider applying this.
akater Oct. 13, 2020, 11:21 p.m. UTC | #2
Jouni Malinen <j@w1.fi> writes:

> Even though I'm not promoting automatic parsing of this, the proposed
> changes here seem to be reasonable. However, I would need to get a patch
> with the Signed-off-by: line in the commit message as described in the
> CONTRIBUTIONS file before I can consider applying this.

Thank you.  Done, patch attached.  hostapd_cli is patched similarly if
you want it.

> I'm not sure I'd consider wpa_cli help output as something that would be
> suitable for automatic parsing. That format is subject to change without
> notice and may break such uses.

That is clear.  It looks acceptable for my use case so far.  If anything
happens, I'll need those docstrings and arguments anyway.
diff mbox series

Patch

diff --git a/wpa_supplicant/wpa_cli.c b/wpa_supplicant/wpa_cli.c
index f5b02f662..afdcecca4 100644
--- a/wpa_supplicant/wpa_cli.c
+++ b/wpa_supplicant/wpa_cli.c
@@ -3147,50 +3147,50 @@  struct wpa_cli_cmd {
 static const struct wpa_cli_cmd wpa_cli_commands[] = {
 	{ "status", wpa_cli_cmd_status, NULL,
 	  cli_cmd_flag_none,
-	  "[verbose] = get current WPA/EAPOL/EAP status" },
+	  "[verbose] = Get current WPA/EAPOL/EAP status" },
 	{ "ifname", wpa_cli_cmd_ifname, NULL,
 	  cli_cmd_flag_none,
-	  "= get current interface name" },
+	  "= Get current interface name" },
 	{ "ping", wpa_cli_cmd_ping, NULL,
 	  cli_cmd_flag_none,
-	  "= pings wpa_supplicant" },
+	  "= Ping wpa_supplicant" },
 	{ "relog", wpa_cli_cmd_relog, NULL,
 	  cli_cmd_flag_none,
-	  "= re-open log-file (allow rolling logs)" },
+	  "= Re-open log-file (allow rolling logs)" },
 	{ "note", wpa_cli_cmd_note, NULL,
 	  cli_cmd_flag_none,
-	  "<text> = add a note to wpa_supplicant debug log" },
+	  "<text> = Add a note to wpa_supplicant debug log" },
 	{ "mib", wpa_cli_cmd_mib, NULL,
 	  cli_cmd_flag_none,
-	  "= get MIB variables (dot1x, dot11)" },
+	  "= Get MIB variables (dot1x, dot11)" },
 	{ "help", wpa_cli_cmd_help, wpa_cli_complete_help,
 	  cli_cmd_flag_none,
-	  "[command] = show usage help" },
+	  "[command] = Show usage help" },
 	{ "interface", wpa_cli_cmd_interface, NULL,
 	  cli_cmd_flag_none,
-	  "[ifname] = show interfaces/select interface" },
+	  "[ifname] = Show interfaces/select interface" },
 	{ "level", wpa_cli_cmd_level, NULL,
 	  cli_cmd_flag_none,
-	  "<debug level> = change debug level" },
+	  "<debug level> = Change debug level" },
 	{ "license", wpa_cli_cmd_license, NULL,
 	  cli_cmd_flag_none,
-	  "= show full wpa_cli license" },
+	  "= Show full wpa_cli license" },
 	{ "quit", wpa_cli_cmd_quit, NULL,
 	  cli_cmd_flag_none,
-	  "= exit wpa_cli" },
+	  "= Exit wpa_cli" },
 	{ "set", wpa_cli_cmd_set, wpa_cli_complete_set,
 	  cli_cmd_flag_none,
-	  "= set variables (shows list of variables when run without "
+	  "= Set variables (shows list of variables when run without "
 	  "arguments)" },
 	{ "dump", wpa_cli_cmd_dump, NULL,
 	  cli_cmd_flag_none,
-	  "= dump config variables" },
+	  "= Dump config variables" },
 	{ "get", wpa_cli_cmd_get, wpa_cli_complete_get,
 	  cli_cmd_flag_none,
-	  "<name> = get information" },
+	  "<name> = Get information" },
 	{ "driver_flags", wpa_cli_cmd_driver_flags, NULL,
 	  cli_cmd_flag_none,
-	  "= list driver flags" },
+	  "= List driver flags" },
 	{ "logon", wpa_cli_cmd_logon, NULL,
 	  cli_cmd_flag_none,
 	  "= IEEE 802.1X EAPOL state machine logon" },
@@ -3199,272 +3199,272 @@  static const struct wpa_cli_cmd wpa_cli_commands[] = {
 	  "= IEEE 802.1X EAPOL state machine logoff" },
 	{ "pmksa", wpa_cli_cmd_pmksa, NULL,
 	  cli_cmd_flag_none,
-	  "= show PMKSA cache" },
+	  "= Show PMKSA cache" },
 	{ "pmksa_flush", wpa_cli_cmd_pmksa_flush, NULL,
 	  cli_cmd_flag_none,
-	  "= flush PMKSA cache entries" },
+	  "= Flush PMKSA cache entries" },
 #ifdef CONFIG_PMKSA_CACHE_EXTERNAL
 	{ "pmksa_get", wpa_cli_cmd_pmksa_get, NULL,
 	  cli_cmd_flag_none,
-	  "<network_id> = fetch all stored PMKSA cache entries" },
+	  "<network_id> = Fetch all stored PMKSA cache entries" },
 	{ "pmksa_add", wpa_cli_cmd_pmksa_add, NULL,
 	  cli_cmd_flag_sensitive,
-	  "<network_id> <BSSID> <PMKID> <PMK> <reauth_time in seconds> <expiration in seconds> <akmp> <opportunistic> = store PMKSA cache entry from external storage" },
+	  "<network_id> <BSSID> <PMKID> <PMK> <reauth_time in seconds> <expiration in seconds> <akmp> <opportunistic> = Store PMKSA cache entry from external storage" },
 #ifdef CONFIG_MESH
 	{ "mesh_pmksa_get", wpa_cli_mesh_cmd_pmksa_get, NULL,
 	  cli_cmd_flag_none,
-	  "<peer MAC address | any> = fetch all stored mesh PMKSA cache entries" },
+	  "<peer MAC address | any> = Fetch all stored mesh PMKSA cache entries" },
 	{ "mesh_pmksa_add", wpa_cli_mesh_cmd_pmksa_add, NULL,
 	  cli_cmd_flag_sensitive,
-	  "<BSSID> <PMKID> <PMK> <expiration in seconds> = store mesh PMKSA cache entry from external storage" },
+	  "<BSSID> <PMKID> <PMK> <expiration in seconds> = Store mesh PMKSA cache entry from external storage" },
 #endif /* CONFIG_MESH */
 #endif /* CONFIG_PMKSA_CACHE_EXTERNAL */
 	{ "reassociate", wpa_cli_cmd_reassociate, NULL,
 	  cli_cmd_flag_none,
-	  "= force reassociation" },
+	  "= Force reassociation" },
 	{ "reattach", wpa_cli_cmd_reattach, NULL,
 	  cli_cmd_flag_none,
-	  "= force reassociation back to the same BSS" },
+	  "= Force reassociation back to the same BSS" },
 	{ "preauthenticate", wpa_cli_cmd_preauthenticate, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
-	  "<BSSID> = force preauthentication" },
+	  "<BSSID> = Force preauthentication" },
 	{ "identity", wpa_cli_cmd_identity, wpa_cli_complete_network_id,
 	  cli_cmd_flag_none,
-	  "<network id> <identity> = configure identity for an SSID" },
+	  "<network id> <identity> = Configure identity for an SSID" },
 	{ "password", wpa_cli_cmd_password, wpa_cli_complete_network_id,
 	  cli_cmd_flag_sensitive,
-	  "<network id> <password> = configure password for an SSID" },
+	  "<network id> <password> = Configure password for an SSID" },
 	{ "new_password", wpa_cli_cmd_new_password,
 	  wpa_cli_complete_network_id, cli_cmd_flag_sensitive,
-	  "<network id> <password> = change password for an SSID" },
+	  "<network id> <password> = Change password for an SSID" },
 	{ "pin", wpa_cli_cmd_pin, wpa_cli_complete_network_id,
 	  cli_cmd_flag_sensitive,
-	  "<network id> <pin> = configure pin for an SSID" },
+	  "<network id> <pin> = Configure pin for an SSID" },
 	{ "otp", wpa_cli_cmd_otp, wpa_cli_complete_network_id,
 	  cli_cmd_flag_sensitive,
-	  "<network id> <password> = configure one-time-password for an SSID"
+	  "<network id> <password> = Configure one-time-password for an SSID"
 	},
 	{ "psk_passphrase", wpa_cli_cmd_psk_passphrase,
 	  wpa_cli_complete_network_id, cli_cmd_flag_sensitive,
-	  "<network id> <PSK/passphrase> = configure PSK/passphrase for an SSID" },
+	  "<network id> <PSK/passphrase> = Configure PSK/passphrase for an SSID" },
 	{ "passphrase", wpa_cli_cmd_passphrase, wpa_cli_complete_network_id,
 	  cli_cmd_flag_sensitive,
-	  "<network id> <passphrase> = configure private key passphrase\n"
+	  "<network id> <passphrase> = Configure private key passphrase\n"
 	  "  for an SSID" },
 	{ "sim", wpa_cli_cmd_sim, wpa_cli_complete_network_id,
 	  cli_cmd_flag_sensitive,
-	  "<network id> <pin> = report SIM operation result" },
+	  "<network id> <pin> = Report SIM operation result" },
 	{ "bssid", wpa_cli_cmd_bssid, wpa_cli_complete_network_id,
 	  cli_cmd_flag_none,
-	  "<network id> <BSSID> = set preferred BSSID for an SSID" },
+	  "<network id> <BSSID> = Set preferred BSSID for an SSID" },
 	{ "blacklist", wpa_cli_cmd_blacklist, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
-	  "<BSSID> = add a BSSID to the blacklist\n"
-	  "blacklist clear = clear the blacklist\n"
-	  "blacklist = display the blacklist" },
+	  "<BSSID> = Add a BSSID to the blacklist\n"
+	  "blacklist clear = Clear the blacklist\n"
+	  "blacklist = Display the blacklist" },
 	{ "log_level", wpa_cli_cmd_log_level, NULL,
 	  cli_cmd_flag_none,
-	  "<level> [<timestamp>] = update the log level/timestamp\n"
-	  "log_level = display the current log level and log options" },
+	  "<level> [<timestamp>] = Update the log level/timestamp\n"
+	  "log_level = Display the current log level and log options" },
 	{ "list_networks", wpa_cli_cmd_list_networks, NULL,
 	  cli_cmd_flag_none,
-	  "= list configured networks" },
+	  "= List configured networks" },
 	{ "select_network", wpa_cli_cmd_select_network,
 	  wpa_cli_complete_network_id,
 	  cli_cmd_flag_none,
-	  "<network id> = select a network (disable others)" },
+	  "<network id> = Select a network (disable others)" },
 	{ "enable_network", wpa_cli_cmd_enable_network,
 	  wpa_cli_complete_network_id,
 	  cli_cmd_flag_none,
-	  "<network id> = enable a network" },
+	  "<network id> = Enable a network" },
 	{ "disable_network", wpa_cli_cmd_disable_network,
 	  wpa_cli_complete_network_id,
 	  cli_cmd_flag_none,
-	  "<network id> = disable a network" },
+	  "<network id> = Disable a network" },
 	{ "add_network", wpa_cli_cmd_add_network, NULL,
 	  cli_cmd_flag_none,
-	  "= add a network" },
+	  "= Add a network" },
 	{ "remove_network", wpa_cli_cmd_remove_network,
 	  wpa_cli_complete_network_id,
 	  cli_cmd_flag_none,
-	  "<network id> = remove a network" },
+	  "<network id> = Remove a network" },
 	{ "set_network", wpa_cli_cmd_set_network, wpa_cli_complete_network,
 	  cli_cmd_flag_sensitive,
-	  "<network id> <variable> <value> = set network variables (shows\n"
+	  "<network id> <variable> <value> = Set network variables (shows\n"
 	  "  list of variables when run without arguments)" },
 	{ "get_network", wpa_cli_cmd_get_network, wpa_cli_complete_network,
 	  cli_cmd_flag_none,
-	  "<network id> <variable> = get network variables" },
+	  "<network id> <variable> = Get network variables" },
 	{ "dup_network", wpa_cli_cmd_dup_network, wpa_cli_complete_dup_network,
 	  cli_cmd_flag_none,
-	  "<src network id> <dst network id> <variable> = duplicate network variables"
+	  "<src network id> <dst network id> <variable> = Duplicate network variables"
 	},
 	{ "list_creds", wpa_cli_cmd_list_creds, NULL,
 	  cli_cmd_flag_none,
-	  "= list configured credentials" },
+	  "= List configured credentials" },
 	{ "add_cred", wpa_cli_cmd_add_cred, NULL,
 	  cli_cmd_flag_none,
-	  "= add a credential" },
+	  "= Add a credential" },
 	{ "remove_cred", wpa_cli_cmd_remove_cred, NULL,
 	  cli_cmd_flag_none,
-	  "<cred id> = remove a credential" },
+	  "<cred id> = Remove a credential" },
 	{ "set_cred", wpa_cli_cmd_set_cred, wpa_cli_complete_cred,
 	  cli_cmd_flag_sensitive,
-	  "<cred id> <variable> <value> = set credential variables" },
+	  "<cred id> <variable> <value> = Set credential variables" },
 	{ "get_cred", wpa_cli_cmd_get_cred, wpa_cli_complete_cred,
 	  cli_cmd_flag_none,
-	  "<cred id> <variable> = get credential variables" },
+	  "<cred id> <variable> = Get credential variables" },
 	{ "save_config", wpa_cli_cmd_save_config, NULL,
 	  cli_cmd_flag_none,
-	  "= save the current configuration" },
+	  "= Save the current configuration" },
 	{ "disconnect", wpa_cli_cmd_disconnect, NULL,
 	  cli_cmd_flag_none,
-	  "= disconnect and wait for reassociate/reconnect command before\n"
+	  "= Disconnect and wait for reassociate/reconnect command before\n"
 	  "  connecting" },
 	{ "reconnect", wpa_cli_cmd_reconnect, NULL,
 	  cli_cmd_flag_none,
-	  "= like reassociate, but only takes effect if already disconnected"
+	  "= Like reassociate, but only takes effect if already disconnected"
 	},
 	{ "scan", wpa_cli_cmd_scan, NULL,
 	  cli_cmd_flag_none,
-	  "= request new BSS scan" },
+	  "= Request new BSS scan" },
 	{ "scan_results", wpa_cli_cmd_scan_results, NULL,
 	  cli_cmd_flag_none,
-	  "= get latest scan results" },
+	  "= Get latest scan results" },
 	{ "abort_scan", wpa_cli_cmd_abort_scan, NULL,
 	  cli_cmd_flag_none,
-	  "= request ongoing scan to be aborted" },
+	  "= Request ongoing scan to be aborted" },
 	{ "bss", wpa_cli_cmd_bss, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
-	  "<<idx> | <bssid>> = get detailed scan result info" },
+	  "<<idx> | <bssid>> = Get detailed scan result info" },
 	{ "get_capability", wpa_cli_cmd_get_capability,
 	  wpa_cli_complete_get_capability, cli_cmd_flag_none,
 	  "<eap/pairwise/group/key_mgmt/proto/auth_alg/channels/freq/modes> "
-	  "= get capabilities" },
+	  "= Get capabilities" },
 	{ "reconfigure", wpa_cli_cmd_reconfigure, NULL,
 	  cli_cmd_flag_none,
-	  "= force wpa_supplicant to re-read its configuration file" },
+	  "= Force wpa_supplicant to re-read its configuration file" },
 	{ "terminate", wpa_cli_cmd_terminate, NULL,
 	  cli_cmd_flag_none,
-	  "= terminate wpa_supplicant" },
+	  "= Terminate wpa_supplicant" },
 	{ "interface_add", wpa_cli_cmd_interface_add, NULL,
 	  cli_cmd_flag_none,
 	  "<ifname> <confname> <driver> <ctrl_interface> <driver_param>\n"
-	  "  <bridge_name> <create> <type> = adds new interface, all "
+	  "  <bridge_name> <create> <type> = Add new interface, all "
 	  "parameters but\n"
 	  "  <ifname> are optional. Supported types are station ('sta') and "
 	  "AP ('ap')" },
 	{ "interface_remove", wpa_cli_cmd_interface_remove, NULL,
 	  cli_cmd_flag_none,
-	  "<ifname> = removes the interface" },
+	  "<ifname> = Remove the interface" },
 	{ "interface_list", wpa_cli_cmd_interface_list, NULL,
 	  cli_cmd_flag_none,
-	  "= list available interfaces" },
+	  "= List available interfaces" },
 	{ "ap_scan", wpa_cli_cmd_ap_scan, NULL,
 	  cli_cmd_flag_none,
-	  "<value> = set ap_scan parameter" },
+	  "<value> = Set ap_scan parameter" },
 	{ "scan_interval", wpa_cli_cmd_scan_interval, NULL,
 	  cli_cmd_flag_none,
-	  "<value> = set scan_interval parameter (in seconds)" },
+	  "<value> = Set scan_interval parameter (in seconds)" },
 	{ "bss_expire_age", wpa_cli_cmd_bss_expire_age, NULL,
 	  cli_cmd_flag_none,
-	  "<value> = set BSS expiration age parameter" },
+	  "<value> = Set BSS expiration age parameter" },
 	{ "bss_expire_count", wpa_cli_cmd_bss_expire_count, NULL,
 	  cli_cmd_flag_none,
-	  "<value> = set BSS expiration scan count parameter" },
+	  "<value> = Set BSS expiration scan count parameter" },
 	{ "bss_flush", wpa_cli_cmd_bss_flush, NULL,
 	  cli_cmd_flag_none,
-	  "<value> = set BSS flush age (0 by default)" },
+	  "<value> = Set BSS flush age (0 by default)" },
 	{ "ft_ds", wpa_cli_cmd_ft_ds, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
-	  "<addr> = request over-the-DS FT with <addr>" },
+	  "<addr> = Request over-the-DS FT with <addr>" },
 	{ "wps_pbc", wpa_cli_cmd_wps_pbc, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
-	  "[BSSID] = start Wi-Fi Protected Setup: Push Button Configuration" },
+	  "[BSSID] = Start Wi-Fi Protected Setup: Push Button Configuration" },
 	{ "wps_pin", wpa_cli_cmd_wps_pin, wpa_cli_complete_bss,
 	  cli_cmd_flag_sensitive,
-	  "<BSSID> [PIN] = start WPS PIN method (returns PIN, if not "
+	  "<BSSID> [PIN] = Start WPS PIN method (returns PIN, if not "
 	  "hardcoded)" },
 	{ "wps_check_pin", wpa_cli_cmd_wps_check_pin, NULL,
 	  cli_cmd_flag_sensitive,
-	  "<PIN> = verify PIN checksum" },
+	  "<PIN> = Verify PIN checksum" },
 	{ "wps_cancel", wpa_cli_cmd_wps_cancel, NULL, cli_cmd_flag_none,
-	  "Cancels the pending WPS operation" },
+	  "= Cancel the pending WPS operation" },
 #ifdef CONFIG_WPS_NFC
 	{ "wps_nfc", wpa_cli_cmd_wps_nfc, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
-	  "[BSSID] = start Wi-Fi Protected Setup: NFC" },
+	  "[BSSID] = Start Wi-Fi Protected Setup: NFC" },
 	{ "wps_nfc_config_token", wpa_cli_cmd_wps_nfc_config_token, NULL,
 	  cli_cmd_flag_none,
-	  "<WPS|NDEF> = build configuration token" },
+	  "<WPS|NDEF> = Build configuration token" },
 	{ "wps_nfc_token", wpa_cli_cmd_wps_nfc_token, NULL,
 	  cli_cmd_flag_none,
-	  "<WPS|NDEF> = create password token" },
+	  "<WPS|NDEF> = Create password token" },
 	{ "wps_nfc_tag_read", wpa_cli_cmd_wps_nfc_tag_read, NULL,
 	  cli_cmd_flag_sensitive,
-	  "<hexdump of payload> = report read NFC tag with WPS data" },
+	  "<hexdump of payload> = Report read NFC tag with WPS data" },
 	{ "nfc_get_handover_req", wpa_cli_cmd_nfc_get_handover_req, NULL,
 	  cli_cmd_flag_none,
-	  "<NDEF> <WPS> = create NFC handover request" },
+	  "<NDEF> <WPS> = Create NFC handover request" },
 	{ "nfc_get_handover_sel", wpa_cli_cmd_nfc_get_handover_sel, NULL,
 	  cli_cmd_flag_none,
-	  "<NDEF> <WPS> = create NFC handover select" },
+	  "<NDEF> <WPS> = Create NFC handover select" },
 	{ "nfc_report_handover", wpa_cli_cmd_nfc_report_handover, NULL,
 	  cli_cmd_flag_none,
-	  "<role> <type> <hexdump of req> <hexdump of sel> = report completed "
+	  "<role> <type> <hexdump of req> <hexdump of sel> = Report completed "
 	  "NFC handover" },
 #endif /* CONFIG_WPS_NFC */
 	{ "wps_reg", wpa_cli_cmd_wps_reg, wpa_cli_complete_bss,
 	  cli_cmd_flag_sensitive,
-	  "<BSSID> <AP PIN> = start WPS Registrar to configure an AP" },
+	  "<BSSID> <AP PIN> = Start WPS Registrar to configure an AP" },
 	{ "wps_ap_pin", wpa_cli_cmd_wps_ap_pin, NULL,
 	  cli_cmd_flag_sensitive,
-	  "[params..] = enable/disable AP PIN" },
+	  "[params..] = Enable/disable AP PIN" },
 	{ "wps_er_start", wpa_cli_cmd_wps_er_start, NULL,
 	  cli_cmd_flag_none,
-	  "[IP address] = start Wi-Fi Protected Setup External Registrar" },
+	  "[IP address] = Start Wi-Fi Protected Setup External Registrar" },
 	{ "wps_er_stop", wpa_cli_cmd_wps_er_stop, NULL,
 	  cli_cmd_flag_none,
-	  "= stop Wi-Fi Protected Setup External Registrar" },
+	  "= Stop Wi-Fi Protected Setup External Registrar" },
 	{ "wps_er_pin", wpa_cli_cmd_wps_er_pin, NULL,
 	  cli_cmd_flag_sensitive,
-	  "<UUID> <PIN> = add an Enrollee PIN to External Registrar" },
+	  "<UUID> <PIN> = Add an Enrollee PIN to External Registrar" },
 	{ "wps_er_pbc", wpa_cli_cmd_wps_er_pbc, NULL,
 	  cli_cmd_flag_none,
-	  "<UUID> = accept an Enrollee PBC using External Registrar" },
+	  "<UUID> = Accept an Enrollee PBC using External Registrar" },
 	{ "wps_er_learn", wpa_cli_cmd_wps_er_learn, NULL,
 	  cli_cmd_flag_sensitive,
-	  "<UUID> <PIN> = learn AP configuration" },
+	  "<UUID> <PIN> = Learn AP configuration" },
 	{ "wps_er_set_config", wpa_cli_cmd_wps_er_set_config, NULL,
 	  cli_cmd_flag_none,
-	  "<UUID> <network id> = set AP configuration for enrolling" },
+	  "<UUID> <network id> = Set AP configuration for enrolling" },
 	{ "wps_er_config", wpa_cli_cmd_wps_er_config, NULL,
 	  cli_cmd_flag_sensitive,
-	  "<UUID> <PIN> <SSID> <auth> <encr> <key> = configure AP" },
+	  "<UUID> <PIN> <SSID> <auth> <encr> <key> = Configure AP" },
 #ifdef CONFIG_WPS_NFC
 	{ "wps_er_nfc_config_token", wpa_cli_cmd_wps_er_nfc_config_token, NULL,
 	  cli_cmd_flag_none,
-	  "<WPS/NDEF> <UUID> = build NFC configuration token" },
+	  "<WPS/NDEF> <UUID> = Build NFC configuration token" },
 #endif /* CONFIG_WPS_NFC */
 	{ "ibss_rsn", wpa_cli_cmd_ibss_rsn, NULL,
 	  cli_cmd_flag_none,
-	  "<addr> = request RSN authentication with <addr> in IBSS" },
+	  "<addr> = Request RSN authentication with <addr> in IBSS" },
 #ifdef CONFIG_AP
 	{ "sta", wpa_cli_cmd_sta, wpa_cli_complete_sta,
 	  cli_cmd_flag_none,
-	  "<addr> = get information about an associated station (AP)" },
+	  "<addr> = Get information about an associated station (AP)" },
 	{ "all_sta", wpa_cli_cmd_all_sta, NULL,
 	  cli_cmd_flag_none,
-	  "= get information about all associated stations (AP)" },
+	  "= Get information about all associated stations (AP)" },
 	{ "list_sta", wpa_cli_cmd_list_sta, NULL,
 	  cli_cmd_flag_none,
-	  "= list all stations (AP)" },
+	  "= List all stations (AP)" },
 	{ "deauthenticate", wpa_cli_cmd_deauthenticate,
 	  wpa_cli_complete_deauthenticate, cli_cmd_flag_none,
-	  "<addr> = deauthenticate a station" },
+	  "<addr> = Deauthenticate a station" },
 	{ "disassociate", wpa_cli_cmd_disassociate,
 	  wpa_cli_complete_disassociate, cli_cmd_flag_none,
-	  "<addr> = disassociate a station" },
+	  "<addr> = Disassociate a station" },
 	{ "chan_switch", wpa_cli_cmd_chanswitch, NULL,
 	  cli_cmd_flag_none,
 	  "<cs_count> <freq> [sec_channel_offset=] [center_freq1=]"
@@ -3472,23 +3472,23 @@  static const struct wpa_cli_cmd wpa_cli_commands[] = {
 	  " = CSA parameters" },
 #endif /* CONFIG_AP */
 	{ "suspend", wpa_cli_cmd_suspend, NULL, cli_cmd_flag_none,
-	  "= notification of suspend/hibernate" },
+	  "= Notification of suspend/hibernate" },
 	{ "resume", wpa_cli_cmd_resume, NULL, cli_cmd_flag_none,
-	  "= notification of resume/thaw" },
+	  "= Notification of resume/thaw" },
 #ifdef CONFIG_TESTING_OPTIONS
 	{ "drop_sa", wpa_cli_cmd_drop_sa, NULL, cli_cmd_flag_none,
-	  "= drop SA without deauth/disassoc (test command)" },
+	  "= Drop SA without deauth/disassoc (test command)" },
 #endif /* CONFIG_TESTING_OPTIONS */
 	{ "roam", wpa_cli_cmd_roam, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
-	  "<addr> = roam to the specified BSS" },
+	  "<addr> = Roam to the specified BSS" },
 #ifdef CONFIG_MESH
 	{ "mesh_interface_add", wpa_cli_cmd_mesh_interface_add, NULL,
 	  cli_cmd_flag_none,
 	  "[ifname] = Create a new mesh interface" },
 	{ "mesh_group_add", wpa_cli_cmd_mesh_group_add, NULL,
 	  cli_cmd_flag_none,
-	  "<network id> = join a mesh network (disable others)" },
+	  "<network id> = Join a mesh network (disable others)" },
 	{ "mesh_group_remove", wpa_cli_cmd_mesh_group_remove, NULL,
 	  cli_cmd_flag_none,
 	  "<ifname> = Remove mesh group interface" },
@@ -3505,135 +3505,135 @@  static const struct wpa_cli_cmd wpa_cli_commands[] = {
 #ifdef CONFIG_P2P
 	{ "p2p_find", wpa_cli_cmd_p2p_find, wpa_cli_complete_p2p_find,
 	  cli_cmd_flag_none,
-	  "[timeout] [type=*] = find P2P Devices for up-to timeout seconds" },
+	  "[timeout] [type=*] = Find P2P Devices for up-to timeout seconds" },
 	{ "p2p_stop_find", wpa_cli_cmd_p2p_stop_find, NULL, cli_cmd_flag_none,
-	  "= stop P2P Devices search" },
+	  "= Stop P2P Devices search" },
 	{ "p2p_asp_provision", wpa_cli_cmd_p2p_asp_provision, NULL,
 	  cli_cmd_flag_none,
-	  "<addr> adv_id=<adv_id> conncap=<conncap> [info=<infodata>] = provision with a P2P ASP Device" },
+	  "<addr> adv_id=<adv_id> conncap=<conncap> [info=<infodata>] = Provision with a P2P ASP Device" },
 	{ "p2p_asp_provision_resp", wpa_cli_cmd_p2p_asp_provision_resp, NULL,
 	  cli_cmd_flag_none,
-	  "<addr> adv_id=<adv_id> [role<conncap>] [info=<infodata>] = provision with a P2P ASP Device" },
+	  "<addr> adv_id=<adv_id> [role<conncap>] [info=<infodata>] = Provision with a P2P ASP Device" },
 	{ "p2p_connect", wpa_cli_cmd_p2p_connect, wpa_cli_complete_p2p_connect,
 	  cli_cmd_flag_none,
-	  "<addr> <\"pbc\"|PIN> [ht40] = connect to a P2P Device" },
+	  "<addr> <\"pbc\"|PIN> [ht40] = Connect to a P2P Device" },
 	{ "p2p_listen", wpa_cli_cmd_p2p_listen, NULL, cli_cmd_flag_none,
-	  "[timeout] = listen for P2P Devices for up-to timeout seconds" },
+	  "[timeout] = Listen for P2P Devices for up-to timeout seconds" },
 	{ "p2p_group_remove", wpa_cli_cmd_p2p_group_remove,
 	  wpa_cli_complete_p2p_group_remove, cli_cmd_flag_none,
-	  "<ifname> = remove P2P group interface (terminate group if GO)" },
+	  "<ifname> = Remove P2P group interface (terminate group if GO)" },
 	{ "p2p_group_add", wpa_cli_cmd_p2p_group_add, NULL, cli_cmd_flag_none,
-	  "[ht40] = add a new P2P group (local end as GO)" },
+	  "[ht40] = Add a new P2P group (local end as GO)" },
 	{ "p2p_group_member", wpa_cli_cmd_p2p_group_member, NULL,
 	  cli_cmd_flag_none,
 	  "<dev_addr> = Get peer interface address on local GO using peer Device Address" },
 	{ "p2p_prov_disc", wpa_cli_cmd_p2p_prov_disc,
 	  wpa_cli_complete_p2p_peer, cli_cmd_flag_none,
-	  "<addr> <method> = request provisioning discovery" },
+	  "<addr> <method> = Request provisioning discovery" },
 	{ "p2p_get_passphrase", wpa_cli_cmd_p2p_get_passphrase, NULL,
 	  cli_cmd_flag_none,
-	  "= get the passphrase for a group (GO only)" },
+	  "= Get the passphrase for a group (GO only)" },
 	{ "p2p_serv_disc_req", wpa_cli_cmd_p2p_serv_disc_req,
 	  wpa_cli_complete_p2p_peer, cli_cmd_flag_none,
-	  "<addr> <TLVs> = schedule service discovery request" },
+	  "<addr> <TLVs> = Schedule service discovery request" },
 	{ "p2p_serv_disc_cancel_req", wpa_cli_cmd_p2p_serv_disc_cancel_req,
 	  NULL, cli_cmd_flag_none,
-	  "<id> = cancel pending service discovery request" },
+	  "<id> = Cancel pending service discovery request" },
 	{ "p2p_serv_disc_resp", wpa_cli_cmd_p2p_serv_disc_resp, NULL,
 	  cli_cmd_flag_none,
-	  "<freq> <addr> <dialog token> <TLVs> = service discovery response" },
+	  "<freq> <addr> <dialog token> <TLVs> = Service discovery response" },
 	{ "p2p_service_update", wpa_cli_cmd_p2p_service_update, NULL,
 	  cli_cmd_flag_none,
-	  "= indicate change in local services" },
+	  "= Indicate change in local services" },
 	{ "p2p_serv_disc_external", wpa_cli_cmd_p2p_serv_disc_external, NULL,
 	  cli_cmd_flag_none,
-	  "<external> = set external processing of service discovery" },
+	  "<external> = Set external processing of service discovery" },
 	{ "p2p_service_flush", wpa_cli_cmd_p2p_service_flush, NULL,
 	  cli_cmd_flag_none,
-	  "= remove all stored service entries" },
+	  "= Remove all stored service entries" },
 	{ "p2p_service_add", wpa_cli_cmd_p2p_service_add, NULL,
 	  cli_cmd_flag_none,
-	  "<bonjour|upnp|asp> <query|version> <response|service> = add a local "
+	  "<bonjour|upnp|asp> <query|version> <response|service> = Add a local "
 	  "service" },
 	{ "p2p_service_rep", wpa_cli_cmd_p2p_service_rep, NULL,
 	  cli_cmd_flag_none,
-	  "asp <auto> <adv_id> <svc_state> <svc_string> [<svc_info>] = replace "
+	  "asp <auto> <adv_id> <svc_state> <svc_string> [<svc_info>] = Replace "
 	  "local ASP service" },
 	{ "p2p_service_del", wpa_cli_cmd_p2p_service_del, NULL,
 	  cli_cmd_flag_none,
-	  "<bonjour|upnp> <query|version> [|service] = remove a local "
+	  "<bonjour|upnp> <query|version> [|service] = Remove a local "
 	  "service" },
 	{ "p2p_reject", wpa_cli_cmd_p2p_reject, wpa_cli_complete_p2p_peer,
 	  cli_cmd_flag_none,
-	  "<addr> = reject connection attempts from a specific peer" },
+	  "<addr> = Reject connection attempts from a specific peer" },
 	{ "p2p_invite", wpa_cli_cmd_p2p_invite, NULL,
 	  cli_cmd_flag_none,
-	  "<cmd> [peer=addr] = invite peer" },
+	  "<cmd> [peer=addr] = Invite peer" },
 	{ "p2p_peers", wpa_cli_cmd_p2p_peers, NULL, cli_cmd_flag_none,
-	  "[discovered] = list known (optionally, only fully discovered) P2P "
+	  "[discovered] = List known (optionally, only fully discovered) P2P "
 	  "peers" },
 	{ "p2p_peer", wpa_cli_cmd_p2p_peer, wpa_cli_complete_p2p_peer,
 	  cli_cmd_flag_none,
-	  "<address> = show information about known P2P peer" },
+	  "<address> = Show information about known P2P peer" },
 	{ "p2p_set", wpa_cli_cmd_p2p_set, wpa_cli_complete_p2p_set,
 	  cli_cmd_flag_none,
-	  "<field> <value> = set a P2P parameter" },
+	  "<field> <value> = Set a P2P parameter" },
 	{ "p2p_flush", wpa_cli_cmd_p2p_flush, NULL, cli_cmd_flag_none,
-	  "= flush P2P state" },
+	  "= Flush P2P state" },
 	{ "p2p_cancel", wpa_cli_cmd_p2p_cancel, NULL, cli_cmd_flag_none,
-	  "= cancel P2P group formation" },
+	  "= Cancel P2P group formation" },
 	{ "p2p_unauthorize", wpa_cli_cmd_p2p_unauthorize,
 	  wpa_cli_complete_p2p_peer, cli_cmd_flag_none,
-	  "<address> = unauthorize a peer" },
+	  "<address> = Unauthorize a peer" },
 	{ "p2p_presence_req", wpa_cli_cmd_p2p_presence_req, NULL,
 	  cli_cmd_flag_none,
-	  "[<duration> <interval>] [<duration> <interval>] = request GO "
+	  "[<duration> <interval>] [<duration> <interval>] = Request GO "
 	  "presence" },
 	{ "p2p_ext_listen", wpa_cli_cmd_p2p_ext_listen, NULL,
 	  cli_cmd_flag_none,
-	  "[<period> <interval>] = set extended listen timing" },
+	  "[<period> <interval>] = Set extended listen timing" },
 	{ "p2p_remove_client", wpa_cli_cmd_p2p_remove_client,
 	  wpa_cli_complete_p2p_peer, cli_cmd_flag_none,
-	  "<address|iface=address> = remove a peer from all groups" },
+	  "<address|iface=address> = Remove a peer from all groups" },
 #endif /* CONFIG_P2P */
 	{ "vendor_elem_add", wpa_cli_cmd_vendor_elem_add, NULL,
 	  cli_cmd_flag_none,
-	  "<frame id> <hexdump of elem(s)> = add vendor specific IEs to frame(s)\n"
+	  "<frame id> <hexdump of elem(s)> = Add vendor specific IEs to frame(s)\n"
 	  VENDOR_ELEM_FRAME_ID },
 	{ "vendor_elem_get", wpa_cli_cmd_vendor_elem_get, NULL,
 	  cli_cmd_flag_none,
-	  "<frame id> = get vendor specific IE(s) to frame(s)\n"
+	  "<frame id> = Get vendor specific IE(s) to frame(s)\n"
 	  VENDOR_ELEM_FRAME_ID },
 	{ "vendor_elem_remove", wpa_cli_cmd_vendor_elem_remove, NULL,
 	  cli_cmd_flag_none,
-	  "<frame id> <hexdump of elem(s)> = remove vendor specific IE(s) in frame(s)\n"
+	  "<frame id> <hexdump of elem(s)> = Remove vendor specific IE(s) in frame(s)\n"
 	  VENDOR_ELEM_FRAME_ID },
 #ifdef CONFIG_WIFI_DISPLAY
 	{ "wfd_subelem_set", wpa_cli_cmd_wfd_subelem_set, NULL,
 	  cli_cmd_flag_none,
-	  "<subelem> [contents] = set Wi-Fi Display subelement" },
+	  "<subelem> [contents] = Set Wi-Fi Display subelement" },
 	{ "wfd_subelem_get", wpa_cli_cmd_wfd_subelem_get, NULL,
 	  cli_cmd_flag_none,
-	  "<subelem> = get Wi-Fi Display subelement" },
+	  "<subelem> = Get Wi-Fi Display subelement" },
 #endif /* CONFIG_WIFI_DISPLAY */
 #ifdef CONFIG_INTERWORKING
 	{ "fetch_anqp", wpa_cli_cmd_fetch_anqp, NULL, cli_cmd_flag_none,
-	  "= fetch ANQP information for all APs" },
+	  "= Fetch ANQP information for all APs" },
 	{ "stop_fetch_anqp", wpa_cli_cmd_stop_fetch_anqp, NULL,
 	  cli_cmd_flag_none,
-	  "= stop fetch_anqp operation" },
+	  "= Stop fetch_anqp operation" },
 	{ "interworking_select", wpa_cli_cmd_interworking_select, NULL,
 	  cli_cmd_flag_none,
-	  "[auto] = perform Interworking network selection" },
+	  "[auto] = Perform Interworking network selection" },
 	{ "interworking_connect", wpa_cli_cmd_interworking_connect,
 	  wpa_cli_complete_bss, cli_cmd_flag_none,
-	  "<BSSID> = connect using Interworking credentials" },
+	  "<BSSID> = Connect using Interworking credentials" },
 	{ "interworking_add_network", wpa_cli_cmd_interworking_add_network,
 	  wpa_cli_complete_bss, cli_cmd_flag_none,
-	  "<BSSID> = connect using Interworking credentials" },
+	  "<BSSID> = Connect using Interworking credentials" },
 	{ "anqp_get", wpa_cli_cmd_anqp_get, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
-	  "<addr> <info id>[,<info id>]... = request ANQP information" },
+	  "<addr> <info id>[,<info id>]... = Request ANQP information" },
 	{ "gas_request", wpa_cli_cmd_gas_request, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
 	  "<addr> <AdvProtoID> [QueryReq] = GAS request" },
@@ -3644,32 +3644,32 @@  static const struct wpa_cli_cmd wpa_cli_commands[] = {
 #ifdef CONFIG_HS20
 	{ "hs20_anqp_get", wpa_cli_cmd_hs20_anqp_get, wpa_cli_complete_bss,
 	  cli_cmd_flag_none,
-	  "<addr> <subtype>[,<subtype>]... = request HS 2.0 ANQP information"
+	  "<addr> <subtype>[,<subtype>]... = Request HS 2.0 ANQP information"
 	},
 	{ "nai_home_realm_list", wpa_cli_cmd_get_nai_home_realm_list,
 	  wpa_cli_complete_bss, cli_cmd_flag_none,
-	  "<addr> <home realm> = get HS20 nai home realm list" },
+	  "<addr> <home realm> = Get HS20 nai home realm list" },
 	{ "hs20_icon_request", wpa_cli_cmd_hs20_icon_request,
 	  wpa_cli_complete_bss, cli_cmd_flag_none,
-	  "<addr> <icon name> = get Hotspot 2.0 OSU icon" },
+	  "<addr> <icon name> = Get Hotspot 2.0 OSU icon" },
 	{ "fetch_osu", wpa_cli_cmd_fetch_osu, NULL, cli_cmd_flag_none,
-	  "= fetch OSU provider information from all APs" },
+	  "= Fetch OSU provider information from all APs" },
 	{ "cancel_fetch_osu", wpa_cli_cmd_cancel_fetch_osu, NULL,
 	  cli_cmd_flag_none,
-	  "= cancel fetch_osu command" },
+	  "= Cancel fetch_osu command" },
 #endif /* CONFIG_HS20 */
 	{ "sta_autoconnect", wpa_cli_cmd_sta_autoconnect, NULL,
 	  cli_cmd_flag_none,
-	  "<0/1> = disable/enable automatic reconnection" },
+	  "<0/1> = Disable/enable automatic reconnection" },
 	{ "tdls_discover", wpa_cli_cmd_tdls_discover, NULL,
 	  cli_cmd_flag_none,
-	  "<addr> = request TDLS discovery with <addr>" },
+	  "<addr> = Request TDLS discovery with <addr>" },
 	{ "tdls_setup", wpa_cli_cmd_tdls_setup, NULL,
 	  cli_cmd_flag_none,
-	  "<addr> = request TDLS setup with <addr>" },
+	  "<addr> = Request TDLS setup with <addr>" },
 	{ "tdls_teardown", wpa_cli_cmd_tdls_teardown, NULL,
 	  cli_cmd_flag_none,
-	  "<addr> = tear down TDLS with <addr>" },
+	  "<addr> = Tear down TDLS with <addr>" },
 	{ "tdls_link_status", wpa_cli_cmd_tdls_link_status, NULL,
 	  cli_cmd_flag_none,
 	  "<addr> = TDLS link status with <addr>" },
@@ -3677,40 +3677,40 @@  static const struct wpa_cli_cmd wpa_cli_commands[] = {
 	  cli_cmd_flag_none,
 	  "<uplink/downlink/bidi> <tsid=0..7> <up=0..7> [nominal_msdu_size=#] "
 	  "[mean_data_rate=#] [min_phy_rate=#] [sba=#] [fixed_nominal_msdu] "
-	  "= add WMM-AC traffic stream" },
+	  "= Add WMM-AC traffic stream" },
 	{ "wmm_ac_delts", wpa_cli_cmd_wmm_ac_delts, NULL,
 	  cli_cmd_flag_none,
-	  "<tsid> = delete WMM-AC traffic stream" },
+	  "<tsid> = Delete WMM-AC traffic stream" },
 	{ "wmm_ac_status", wpa_cli_cmd_wmm_ac_status, NULL,
 	  cli_cmd_flag_none,
-	  "= show status for Wireless Multi-Media Admission-Control" },
+	  "= Show status for Wireless Multi-Media Admission-Control" },
 	{ "tdls_chan_switch", wpa_cli_cmd_tdls_chan_switch, NULL,
 	  cli_cmd_flag_none,
 	  "<addr> <oper class> <freq> [sec_channel_offset=] [center_freq1=] "
-	  "[center_freq2=] [bandwidth=] [ht|vht] = enable channel switching "
+	  "[center_freq2=] [bandwidth=] [ht|vht] = Enable channel switching "
 	  "with TDLS peer" },
 	{ "tdls_cancel_chan_switch", wpa_cli_cmd_tdls_cancel_chan_switch, NULL,
 	  cli_cmd_flag_none,
-	  "<addr> = disable channel switching with TDLS peer <addr>" },
+	  "<addr> = Disable channel switching with TDLS peer <addr>" },
 	{ "signal_poll", wpa_cli_cmd_signal_poll, NULL,
 	  cli_cmd_flag_none,
-	  "= get signal parameters" },
+	  "= Get signal parameters" },
 	{ "signal_monitor", wpa_cli_cmd_signal_monitor, NULL,
 	  cli_cmd_flag_none,
-	  "= set signal monitor parameters" },
+	  "= Set signal monitor parameters" },
 	{ "pktcnt_poll", wpa_cli_cmd_pktcnt_poll, NULL,
 	  cli_cmd_flag_none,
-	  "= get TX/RX packet counters" },
+	  "= Get TX/RX packet counters" },
 	{ "reauthenticate", wpa_cli_cmd_reauthenticate, NULL,
 	  cli_cmd_flag_none,
-	  "= trigger IEEE 802.1X/EAPOL reauthentication" },
+	  "= Trigger IEEE 802.1X/EAPOL reauthentication" },
 #ifdef CONFIG_AUTOSCAN
 	{ "autoscan", wpa_cli_cmd_autoscan, NULL, cli_cmd_flag_none,
 	  "[params] = Set or unset (if none) autoscan parameters" },
 #endif /* CONFIG_AUTOSCAN */
 #ifdef CONFIG_WNM
 	{ "wnm_sleep", wpa_cli_cmd_wnm_sleep, NULL, cli_cmd_flag_none,
-	  "<enter/exit> [interval=#] = enter/exit WNM-Sleep mode" },
+	  "<enter/exit> [interval=#] = Enter/exit WNM-Sleep mode" },
 	{ "wnm_bss_query", wpa_cli_cmd_wnm_bss_query, NULL, cli_cmd_flag_none,
 	  "<query reason> [list]"
 	  " [neighbor=<BSSID>,<BSSID information>,<operating class>,<channel number>,<PHY type>[,<hexdump of optional subelements>]"
@@ -3719,13 +3719,13 @@  static const struct wpa_cli_cmd wpa_cli_commands[] = {
 	{ "raw", wpa_cli_cmd_raw, NULL, cli_cmd_flag_sensitive,
 	  "<params..> = Sent unprocessed command" },
 	{ "flush", wpa_cli_cmd_flush, NULL, cli_cmd_flag_none,
-	  "= flush wpa_supplicant state" },
+	  "= Flush wpa_supplicant state" },
 #ifdef ANDROID
 	{ "driver", wpa_cli_cmd_driver, NULL, cli_cmd_flag_none,
-	  "<command> = driver private commands" },
+	  "<command> = Driver private commands" },
 #endif /* ANDROID */
 	{ "radio_work", wpa_cli_cmd_radio_work, NULL, cli_cmd_flag_none,
-	  "= radio_work <show/add/done>" },
+	  "= Radio_work <show/add/done>" },
 	{ "vendor", wpa_cli_cmd_vendor, NULL, cli_cmd_flag_none,
 	  "<vendor id> <command id> [<hex formatted command argument>] = Send vendor command"
 	},
@@ -3734,64 +3734,64 @@  static const struct wpa_cli_cmd wpa_cli_commands[] = {
 	  "[ssid=<SSID>] [lci] [civic] = Trigger request to AP for neighboring AP report (with optional given SSID in hex or enclosed in double quotes, default: current SSID; with optional LCI and location civic request)"
 	},
 	{ "erp_flush", wpa_cli_cmd_erp_flush, NULL, cli_cmd_flag_none,
-	  "= flush ERP keys" },
+	  "= Flush ERP keys" },
 	{ "mac_rand_scan",
 	  wpa_cli_cmd_mac_rand_scan, NULL, cli_cmd_flag_none,
 	  "<scan|sched|pno|all> enable=<0/1> [addr=mac-address "
-	  "mask=mac-address-mask] = scan MAC randomization"
+	  "mask=mac-address-mask] = Scan MAC randomization"
 	},
 	{ "get_pref_freq_list", wpa_cli_cmd_get_pref_freq_list, NULL,
 	  cli_cmd_flag_none,
-	  "<interface type> = retrieve preferred freq list for the specified interface type" },
+	  "<interface type> = Retrieve preferred freq list for the specified interface type" },
 	{ "p2p_lo_start", wpa_cli_cmd_p2p_lo_start, NULL,
 	  cli_cmd_flag_none,
-	  "<freq> <period> <interval> <count> = start P2P listen offload" },
+	  "<freq> <period> <interval> <count> = Start P2P listen offload" },
 	{ "p2p_lo_stop", wpa_cli_cmd_p2p_lo_stop, NULL,
 	  cli_cmd_flag_none,
-	  "= stop P2P listen offload" },
+	  "= Stop P2P listen offload" },
 #ifdef CONFIG_DPP
 	{ "dpp_qr_code", wpa_cli_cmd_dpp_qr_code, NULL, cli_cmd_flag_none,
-	  "report a scanned DPP URI from a QR Code" },
+	  "= Report a scanned DPP URI from a QR Code" },
 	{ "dpp_bootstrap_gen", wpa_cli_cmd_dpp_bootstrap_gen, NULL,
 	  cli_cmd_flag_sensitive,
-	  "type=<qrcode> [chan=..] [mac=..] [info=..] [curve=..] [key=..] = generate DPP bootstrap information" },
+	  "type=<qrcode> [chan=..] [mac=..] [info=..] [curve=..] [key=..] = Generate DPP bootstrap information" },
 	{ "dpp_bootstrap_remove", wpa_cli_cmd_dpp_bootstrap_remove, NULL,
 	  cli_cmd_flag_none,
-	  "*|<id> = remove DPP bootstrap information" },
+	  "*|<id> = Remove DPP bootstrap information" },
 	{ "dpp_bootstrap_get_uri", wpa_cli_cmd_dpp_bootstrap_get_uri, NULL,
 	  cli_cmd_flag_none,
-	  "<id> = get DPP bootstrap URI" },
+	  "<id> = Get DPP bootstrap URI" },
 	{ "dpp_bootstrap_info", wpa_cli_cmd_dpp_bootstrap_info, NULL,
 	  cli_cmd_flag_none,
-	  "<id> = show DPP bootstrap information" },
+	  "<id> = Show DPP bootstrap information" },
 	{ "dpp_auth_init", wpa_cli_cmd_dpp_auth_init, NULL, cli_cmd_flag_none,
-	  "peer=<id> [own=<id>] = initiate DPP bootstrapping" },
+	  "peer=<id> [own=<id>] = Initiate DPP bootstrapping" },
 	{ "dpp_listen", wpa_cli_cmd_dpp_listen, NULL, cli_cmd_flag_none,
-	  "<freq in MHz> = start DPP listen" },
+	  "<freq in MHz> = Start DPP listen" },
 	{ "dpp_stop_listen", wpa_cli_cmd_dpp_stop_listen, NULL,
 	  cli_cmd_flag_none,
-	  "= stop DPP listen" },
+	  "= Stop DPP listen" },
 	{ "dpp_configurator_add", wpa_cli_cmd_dpp_configurator_add, NULL,
 	  cli_cmd_flag_sensitive,
-	  "[curve=..] [key=..] = add DPP configurator" },
+	  "[curve=..] [key=..] = Add DPP configurator" },
 	{ "dpp_configurator_remove", wpa_cli_cmd_dpp_configurator_remove, NULL,
 	  cli_cmd_flag_none,
-	  "*|<id> = remove DPP configurator" },
+	  "*|<id> = Remove DPP configurator" },
 	{ "dpp_configurator_get_key", wpa_cli_cmd_dpp_configurator_get_key,
 	  NULL, cli_cmd_flag_none,
 	  "<id> = Get DPP configurator's private key" },
 	{ "dpp_configurator_sign", wpa_cli_cmd_dpp_configurator_sign, NULL,
 	  cli_cmd_flag_none,
-	  "conf=<role> configurator=<id> = generate self DPP configuration" },
+	  "conf=<role> configurator=<id> = Generate self DPP configuration" },
 	{ "dpp_pkex_add", wpa_cli_cmd_dpp_pkex_add, NULL,
 	  cli_cmd_flag_sensitive,
-	  "add PKEX code" },
+	  "= Add PKEX code" },
 	{ "dpp_pkex_remove", wpa_cli_cmd_dpp_pkex_remove, NULL,
 	  cli_cmd_flag_none,
-	  "*|<id> = remove DPP pkex information" },
+	  "*|<id> = Remove DPP pkex information" },
 #endif /* CONFIG_DPP */
 	{ "all_bss", wpa_cli_cmd_all_bss, NULL, cli_cmd_flag_none,
-	  "= list all BSS entries (scan results)" },
+	  "= List all BSS entries (scan results)" },
 	{ NULL, NULL, NULL, cli_cmd_flag_none, NULL }
 };