udhcpc: tweak help text more

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

diff --git a/networking/udhcp/dhcpc.c b/networking/udhcp/dhcpc.c
index ca31e1cb82e0e3d4e2a9841070efa2a12a40539e..53d8a5e0867ed74e199ff98074419397fd51130f 100644 (file)
--- a/networking/udhcp/dhcpc.c
+++ b/networking/udhcp/dhcpc.c
@@ -1135,18 +1135,21 @@ static void client_background(void)
 //usage:# define IF_UDHCP_VERBOSE(...)
 //usage:#endif
 //usage:#define udhcpc_trivial_usage
-//usage:       "[-fbq"IF_UDHCP_VERBOSE("v")IF_FEATURE_UDHCPC_ARPING("a")"oCRB] [-t N] [-T SEC] [-A SEC/-n]\n"
-//usage:       "       [-i IFACE]"IF_FEATURE_UDHCP_PORT(" [-P PORT]")" [-r IP] [-s PROG] [-p PIDFILE]\n"
-//usage:       "       [-V VENDOR] [-x OPT:VAL]... [-O OPT]..."
+//usage:       "[-fbq"IF_UDHCP_VERBOSE("v")IF_FEATURE_UDHCPC_ARPING("a")"RB] [-t N] [-T SEC] [-A SEC/-n]\n"
+//usage:       "       [-i IFACE]"IF_FEATURE_UDHCP_PORT(" [-P PORT]")" [-s PROG] [-p PIDFILE]\n"
+//usage:       "       [-oC] [-r IP] [-V VENDOR] [-F NAME] [-x OPT:VAL]... [-O OPT]..."
 //usage:#define udhcpc_full_usage "\n"
 //usage:       IF_LONG_OPTS(
 //usage:     "\n       -i,--interface IFACE    Interface to use (default eth0)"
-//usage:     "\n       -p,--pidfile FILE       Create pidfile"
+//usage:       IF_FEATURE_UDHCP_PORT(
+//usage:     "\n       -P,--client-port PORT   Use PORT (default 68)"
+//usage:       )
 //usage:     "\n       -s,--script PROG        Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n       -p,--pidfile FILE       Create pidfile"
 //usage:     "\n       -B,--broadcast          Request broadcast replies"
 //usage:     "\n       -t,--retries N          Send up to N discover packets (default 3)"
 //usage:     "\n       -T,--timeout SEC        Pause between packets (default 3)"
-//usage:     "\n       -A,--tryagain SEC       Wait after failure (default 20)"
+//usage:     "\n       -A,--tryagain SEC       Wait if lease is not obtained (default 20)"
 //usage:     "\n       -n,--now                Exit if lease is not obtained"
 //usage:     "\n       -q,--quit               Exit after obtaining lease"
 //usage:     "\n       -R,--release            Release IP on exit"
@@ -1155,15 +1158,12 @@ static void client_background(void)
 //usage:     "\n       -b,--background         Background if lease is not obtained"
 //usage:       )
 //usage:     "\n       -S,--syslog             Log to syslog too"
-//usage:       IF_FEATURE_UDHCP_PORT(
-//usage:     "\n       -P,--client-port PORT   Use PORT (default 68)"
-//usage:       )
 //usage:       IF_FEATURE_UDHCPC_ARPING(
 //usage:     "\n       -a,--arping             Use arping to validate offered address"
 //usage:       )
-//usage:     "\n       -O,--request-option OPT Request option OPT from server (cumulative)"
-//usage:     "\n       -o,--no-default-options Don't request any options (unless -O is given)"
 //usage:     "\n       -r,--request IP         Request this IP address"
+//usage:     "\n       -o,--no-default-options Don't request any options (unless -O is given)"
+//usage:     "\n       -O,--request-option OPT Request option OPT from server (cumulative)"
 //usage:     "\n       -x OPT:VAL              Include option OPT in sent packets (cumulative)"
 //usage:     "\n                               Examples of string, numeric, and hex byte opts:"
 //usage:     "\n                               -x hostname:bbox - option 12"
@@ -1178,12 +1178,15 @@ static void client_background(void)
 //usage:       )
 //usage:       IF_NOT_LONG_OPTS(
 //usage:     "\n       -i IFACE        Interface to use (default eth0)"
-//usage:     "\n       -p FILE         Create pidfile"
+//usage:       IF_FEATURE_UDHCP_PORT(
+//usage:     "\n       -P PORT         Use PORT (default 68)"
+//usage:       )
 //usage:     "\n       -s PROG         Run PROG at DHCP events (default "CONFIG_UDHCPC_DEFAULT_SCRIPT")"
+//usage:     "\n       -p FILE         Create pidfile"
 //usage:     "\n       -B              Request broadcast replies"
 //usage:     "\n       -t N            Send up to N discover packets (default 3)"
 //usage:     "\n       -T SEC          Pause between packets (default 3)"
-//usage:     "\n       -A SEC          Wait after failure (default 20)"
+//usage:     "\n       -A SEC          Wait if lease is not obtained (default 20)"
 //usage:     "\n       -n              Exit if lease is not obtained"
 //usage:     "\n       -q              Exit after obtaining lease"
 //usage:     "\n       -R              Release IP on exit"
@@ -1192,15 +1195,12 @@ static void client_background(void)
 //usage:     "\n       -b              Background if lease is not obtained"
 //usage:       )
 //usage:     "\n       -S              Log to syslog too"
-//usage:       IF_FEATURE_UDHCP_PORT(
-//usage:     "\n       -P PORT         Use PORT (default 68)"
-//usage:       )
 //usage:       IF_FEATURE_UDHCPC_ARPING(
 //usage:     "\n       -a              Use arping to validate offered address"
 //usage:       )
-//usage:     "\n       -O OPT          Request option OPT from server (cumulative)"
-//usage:     "\n       -o              Don't request any options (unless -O is given)"
 //usage:     "\n       -r IP           Request this IP address"
+//usage:     "\n       -o              Don't request any options (unless -O is given)"
+//usage:     "\n       -O OPT          Request option OPT from server (cumulative)"
 //usage:     "\n       -x OPT:VAL      Include option OPT in sent packets (cumulative)"
 //usage:     "\n                       Examples of string, numeric, and hex byte opts:"
 //usage:     "\n                       -x hostname:bbox - option 12"