help text tweaks

function                                             old     new   delta
packed_usage                                       33570   33502     -68

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

4 files changed, 20 insertions, 25 deletions

diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index fedf05aaf..737113dd4 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -113,30 +113,30 @@
 //kbuild:lib-$(CONFIG_IFDOWN) += ifupdown.o
 
 //usage:#define ifup_trivial_usage
-//usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+//usage:       "[-n"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] -a | IFACE..."
 //usage:#define ifup_full_usage "\n\n"
 //usage:       "        -a      Configure all interfaces"
 //usage:     "\n        -i FILE Use FILE instead of /etc/network/interfaces"
-//usage:     "\n        -n      Print out what would happen, but don't do it"
+//usage:     "\n        -n      Dry run"
 //usage:        IF_FEATURE_IFUPDOWN_MAPPING(
 //usage:     "\n                (note: doesn't disable mappings)"
 //usage:     "\n        -m      Don't run any mappings"
 //usage:        )
 //usage:     "\n        -v      Print out what would happen before doing it"
-//usage:     "\n        -f      Force configuration"
+//usage:     "\n        -f      Force"
 //usage:
 //usage:#define ifdown_trivial_usage
-//usage:       "[-an"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] IFACE..."
+//usage:       "[-n"IF_FEATURE_IFUPDOWN_MAPPING("m")"vf] [-i FILE] -a | IFACE..."
 //usage:#define ifdown_full_usage "\n\n"
 //usage:       "        -a      Deconfigure all interfaces"
-//usage:     "\n        -i FILE Use FILE for interface definitions"
-//usage:     "\n        -n      Print out what would happen, but don't do it"
+//usage:     "\n        -i FILE Use FILE instead of /etc/network/interfaces"
+//usage:     "\n        -n      Dry run"
 //usage:        IF_FEATURE_IFUPDOWN_MAPPING(
 //usage:     "\n                (note: doesn't disable mappings)"
 //usage:     "\n        -m      Don't run any mappings"
 //usage:        )
 //usage:     "\n        -v      Print out what would happen before doing it"
-//usage:     "\n        -f      Force deconfiguration"
+//usage:     "\n        -f      Force"
 
 #include <net/if.h>
 #include "libbb.h"
diff --git a/networking/ntpd.c b/networking/ntpd.c
index 06f6017d0..5a540a391 100644
--- a/networking/ntpd.c
+++ b/networking/ntpd.c
@@ -77,7 +77,7 @@
 //usage:        IF_FEATURE_NTP_AUTH(" [-k KEYFILE] [-p [keyno:N:]PEER]...")
 //usage:#define ntpd_full_usage "\n\n"
 //usage:       "NTP client/server\n"
-//usage:     "\n        -d      Verbose (may be repeated)"
+//usage:     "\n        -d[d]   Verbose"
 //usage:     "\n        -n      Do not daemonize"
 //usage:     "\n        -q      Quit after clock is set"
 //usage:     "\n        -N      Run at high priority"
diff --git a/networking/tunctl.c b/networking/tunctl.c
index 0f010e196..97e6917aa 100644
--- a/networking/tunctl.c
+++ b/networking/tunctl.c
@@ -28,16 +28,16 @@
 //kbuild:lib-$(CONFIG_TUNCTL) += tunctl.o
 
 //usage:#define tunctl_trivial_usage
-//usage:       "[-f device] ([-t name] | -d name)" IF_FEATURE_TUNCTL_UG(" [-u owner] [-g group] [-b]")
+//usage:       "[-f DEVICE] [-t NAME | -d NAME]" IF_FEATURE_TUNCTL_UG(" [-u USER] [-g GRP] [-b]")
 //usage:#define tunctl_full_usage "\n\n"
-//usage:       "Create or delete tun interfaces\n"
-//usage:     "\n        -f name         tun device (/dev/net/tun)"
-//usage:     "\n        -t name         Create iface 'name'"
-//usage:     "\n        -d name         Delete iface 'name'"
+//usage:       "Create or delete TUN/TAP interfaces\n"
+//usage:     "\n        -f DEV  TUN device (default /dev/net/tun)"
+//usage:     "\n        -t NAME Create iface (default: tapN)"
+//usage:     "\n        -d NAME Delete iface"
 //usage:        IF_FEATURE_TUNCTL_UG(
-//usage:     "\n        -u owner        Set iface owner"
-//usage:     "\n        -g group        Set iface group"
-//usage:     "\n        -b              Brief output"
+//usage:     "\n        -u USER Set iface owner"
+//usage:     "\n        -g GRP  Set iface group"
+//usage:     "\n        -b      Brief output"
 //usage:        )
 //usage:
 //usage:#define tunctl_example_usage
diff --git a/networking/wget.c b/networking/wget.c
index ff0df4ca0..e660c279c 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -128,19 +128,14 @@
 
 //usage:#define wget_trivial_usage
 //usage:        IF_FEATURE_WGET_LONG_OPTIONS(
-//usage:       "[-c|--continue] [--spider] [-q|--quiet] [-O|--output-document FILE]\n"
-//usage:       "        [-o|--output-file FILE] [--header 'header: value'] [-Y|--proxy on/off]\n"
-//usage:        IF_FEATURE_WGET_OPENSSL(
-//usage:       "        [--no-check-certificate]\n"
-//usage:        )
+//usage:       "[-cqS] [--spider] [-O FILE] [-o LOGFILE] [--header 'HEADER: VALUE'] [-Y on/off]\n"
 /* Since we ignore these opts, we don't show them in --help */
 /* //usage:    "        [--no-cache] [--passive-ftp] [-t TRIES]" */
 /* //usage:    "        [-nv] [-nc] [-nH] [-np]" */
-//usage:       "        [-P DIR] [-S|--server-response] [-U|--user-agent AGENT]" IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:       "        "IF_FEATURE_WGET_OPENSSL("[--no-check-certificate] ")"[-P DIR] [-U AGENT]"IF_FEATURE_WGET_TIMEOUT(" [-T SEC]")" URL..."
 //usage:        )
 //usage:        IF_NOT_FEATURE_WGET_LONG_OPTIONS(
-//usage:       "[-cq] [-O FILE] [-o FILE] [-Y on/off] [-P DIR] [-S] [-U AGENT]"
-//usage:                        IF_FEATURE_WGET_TIMEOUT(" [-T SEC]") " URL..."
+//usage:       "[-cqS] [-O FILE] [-o LOGFILE] [-Y on/off] [-P DIR] [-U AGENT]"IF_FEATURE_WGET_TIMEOUT(" [-T SEC]")" URL..."
 //usage:        )
 //usage:#define wget_full_usage "\n\n"
 //usage:       "Retrieve files via HTTP or FTP\n"
@@ -158,7 +153,7 @@
 //usage:     "\n        -T SEC          Network read timeout is SEC seconds"
 //usage:        )
 //usage:     "\n        -O FILE         Save to FILE ('-' for stdout)"
-//usage:     "\n        -o FILE         Log messages to FILE"
+//usage:     "\n        -o LOGFILE      Log messages to FILE"
 //usage:     "\n        -U STR          Use STR for User-Agent header"
 //usage:     "\n        -Y on/off       Use proxy"