[git commit] make --help texts smaller
Denys Vlasenko
vda.linux at googlemail.com
Sat Jan 21 02:46:57 UTC 2017
commit: https://git.busybox.net/busybox/commit/?id=f3d705f41bf16183f901e5ddb07c89685e384daf
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master
function old new delta
packed_usage 31035 30968 -67
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
miscutils/crond.c | 2 +-
networking/inetd.c | 4 +--
networking/ip.c | 74 +++++++++++++++++++++++++++---------------------------
networking/ping.c | 10 ++++----
procps/nmeter.c | 2 +-
sysklogd/syslogd.c | 6 ++---
6 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/miscutils/crond.c b/miscutils/crond.c
index f96c96e..88e7b47 100644
--- a/miscutils/crond.c
+++ b/miscutils/crond.c
@@ -52,7 +52,7 @@
//usage: " -f Foreground"
//usage: "\n -b Background (default)"
//usage: "\n -S Log to syslog (default)"
-//usage: "\n -l N Set log level. Most verbose:0, default:8"
+//usage: "\n -l N Set log level. Most verbose 0, default 8"
//usage: IF_FEATURE_CROND_D(
//usage: "\n -d N Set log level, log to stderr"
//usage: )
diff --git a/networking/inetd.c b/networking/inetd.c
index 612284e..01e659f 100644
--- a/networking/inetd.c
+++ b/networking/inetd.c
@@ -213,9 +213,9 @@
//usage: "Listen for network connections and launch programs\n"
//usage: "\n -f Run in foreground"
//usage: "\n -e Log to stderr"
-//usage: "\n -q N Socket listen queue (default: 128)"
+//usage: "\n -q N Socket listen queue (default 128)"
//usage: "\n -R N Pause services after N connects/min"
-//usage: "\n (default: 0 - disabled)"
+//usage: "\n (default 0 - disabled)"
#include <syslog.h>
#include <sys/resource.h> /* setrlimit */
diff --git a/networking/ip.c b/networking/ip.c
index 939721e..19b6384 100644
--- a/networking/ip.c
+++ b/networking/ip.c
@@ -142,61 +142,61 @@
/* would need to make the " | " optional depending on more than one selected: */
//usage:#define ip_trivial_usage
-//usage: "[OPTIONS] {"
-//usage: IF_FEATURE_IP_ADDRESS("address | ")
-//usage: IF_FEATURE_IP_ROUTE("route | ")
-//usage: IF_FEATURE_IP_LINK("link | ")
-//usage: IF_FEATURE_IP_TUNNEL("tunnel | ")
-//usage: IF_FEATURE_IP_NEIGH("neigh | ")
+//usage: "[OPTIONS] "
+//usage: IF_FEATURE_IP_ADDRESS("address|")
+//usage: IF_FEATURE_IP_ROUTE("route|")
+//usage: IF_FEATURE_IP_LINK("link|")
+//usage: IF_FEATURE_IP_TUNNEL("tunnel|")
+//usage: IF_FEATURE_IP_NEIGH("neigh|")
//usage: IF_FEATURE_IP_RULE("rule")
-//usage: "} {COMMAND}"
+//usage: " [COMMAND]"
//usage:#define ip_full_usage "\n\n"
-//usage: "ip [OPTIONS] OBJECT {COMMAND}\n"
-//usage: "where OBJECT := {"
-//usage: IF_FEATURE_IP_ADDRESS("address | ")
-//usage: IF_FEATURE_IP_ROUTE("route | ")
-//usage: IF_FEATURE_IP_LINK("link | ")
-//usage: IF_FEATURE_IP_TUNNEL("tunnel | ")
-//usage: IF_FEATURE_IP_NEIGH("neigh | ")
+//usage: "ip [OPTIONS] OBJECT [COMMAND]\n"
+//usage: "where OBJECT := "
+//usage: IF_FEATURE_IP_ADDRESS("address|")
+//usage: IF_FEATURE_IP_ROUTE("route|")
+//usage: IF_FEATURE_IP_LINK("link|")
+//usage: IF_FEATURE_IP_TUNNEL("tunnel|")
+//usage: IF_FEATURE_IP_NEIGH("neigh|")
//usage: IF_FEATURE_IP_RULE("rule")
-//usage: "}\n"
-//usage: "OPTIONS := { -f[amily] { inet | inet6 | link } | -o[neline] }"
+//usage: "\n"
+//usage: "OPTIONS := -f[amily] inet|inet6|link | -o[neline]"
//usage:
//usage:#define ipaddr_trivial_usage
-//usage: "{ {add|del} IFADDR dev STRING | {show|flush}\n"
-//usage: " [dev STRING] [to PREFIX] }"
+//usage: "add|del IFADDR dev STRING | show|flush [dev STRING] [to PREFIX]"
//usage:#define ipaddr_full_usage "\n\n"
-//usage: "ipaddr {add|change|replace|delete} IFADDR dev STRING\n"
-//usage: "ipaddr {show|flush} [dev STRING] [scope SCOPE-ID]\n"
+//usage: "ipaddr add|change|replace|delete IFADDR dev STRING\n"
+//usage: "ipaddr show|flush [dev STRING] [scope SCOPE-ID]\n"
//usage: " [to PREFIX] [label PATTERN]\n"
//usage: " IFADDR := PREFIX | ADDR peer PREFIX\n"
//usage: " [broadcast ADDR] [anycast ADDR]\n"
//usage: " [label STRING] [scope SCOPE-ID]\n"
-//usage: " SCOPE-ID := [host | link | global | NUMBER]"
+//usage: " SCOPE-ID := [host|link|global|NUMBER]"
//usage:
//usage:#define iplink_trivial_usage
-//usage: "{ set DEVICE { up | down | arp { on | off } | show [DEVICE] }"
+//usage: "{ set DEVICE [up|down] [arp on|off] } | show [DEVICE]"
//usage:#define iplink_full_usage "\n\n"
-//usage: "iplink set DEVICE { up | down | arp | multicast { on | off } |\n"
-//usage: " dynamic { on | off } |\n"
-//usage: " mtu MTU }\n"
+//usage: "iplink set DEVICE [up|down]\n"
+//usage: " [arp on|off]\n"
+//usage: " [dynamic on|off]\n"
+//usage: " [multicast on|off]\n"
+//usage: " [mtu MTU]\n"
//usage: "iplink show [DEVICE]"
//usage:
//usage:#define iproute_trivial_usage
-//usage: "{ list | flush | add | del | change | append |\n"
-//usage: " replace | test } ROUTE"
+//usage: "list|flush|add|del|change|append|replace|test ROUTE"
//usage:#define iproute_full_usage "\n\n"
-//usage: "iproute { list | flush } SELECTOR\n"
+//usage: "iproute list|flush SELECTOR\n"
//usage: "iproute get ADDRESS [from ADDRESS iif STRING]\n"
//usage: " [oif STRING] [tos TOS]\n"
-//usage: "iproute { add | del | change | append | replace | test } ROUTE\n"
+//usage: "iproute add|del|change|append|replace|test ROUTE\n"
//usage: " SELECTOR := [root PREFIX] [match PREFIX] [proto RTPROTO]\n"
//usage: " ROUTE := [TYPE] PREFIX [tos TOS] [proto RTPROTO] [metric METRIC]"
//usage:
//usage:#define iprule_trivial_usage
-//usage: "{[list | add | del] RULE}"
+//usage: "[list|add|del] RULE"
//usage:#define iprule_full_usage "\n\n"
-//usage: "iprule [list | add | del] SELECTOR ACTION\n"
+//usage: "iprule [list|add|del] SELECTOR ACTION\n"
//usage: " SELECTOR := [from PREFIX] [to PREFIX] [tos TOS] [fwmark FWMARK]\n"
//usage: " [dev STRING] [pref NUMBER]\n"
//usage: " ACTION := [table TABLE_ID] [nat ADDRESS]\n"
@@ -205,19 +205,19 @@
//usage: " TABLE_ID := [local | main | default | NUMBER]"
//usage:
//usage:#define iptunnel_trivial_usage
-//usage: "{ add | change | del | show } [NAME]\n"
-//usage: " [mode { ipip | gre | sit }]\n"
+//usage: "add|change|del|show [NAME]\n"
+//usage: " [mode ipip|gre|sit]\n"
//usage: " [remote ADDR] [local ADDR] [ttl TTL]"
//usage:#define iptunnel_full_usage "\n\n"
-//usage: "iptunnel { add | change | del | show } [NAME]\n"
-//usage: " [mode { ipip | gre | sit }] [remote ADDR] [local ADDR]\n"
+//usage: "iptunnel add|change|del|show [NAME]\n"
+//usage: " [mode ipip|gre|sit] [remote ADDR] [local ADDR]\n"
//usage: " [[i|o]seq] [[i|o]key KEY] [[i|o]csum]\n"
//usage: " [ttl TTL] [tos TOS] [[no]pmtudisc] [dev PHYS_DEV]"
//usage:
//usage:#define ipneigh_trivial_usage
-//usage: "{ show | flush} [ to PREFIX ] [ dev DEV ] [ nud STATE ]"
+//usage: "show|flush [to PREFIX] [dev DEV] [nud STATE]"
//usage:#define ipneigh_full_usage "\n\n"
-//usage: "ipneigh { show | flush} [ to PREFIX ] [ dev DEV ] [ nud STATE ]"
+//usage: "ipneigh show|flush [to PREFIX] [dev DEV] [nud STATE]"
#include "libbb.h"
diff --git a/networking/ping.c b/networking/ping.c
index d0ef7ba..ef31e00 100644
--- a/networking/ping.c
+++ b/networking/ping.c
@@ -94,10 +94,10 @@
//usage: "\n -4,-6 Force IP or IPv6 name resolution"
//usage: )
//usage: "\n -c CNT Send only CNT pings"
-//usage: "\n -s SIZE Send SIZE data bytes in packets (default:56)"
+//usage: "\n -s SIZE Send SIZE data bytes in packets (default 56)"
//usage: "\n -t TTL Set TTL"
-//usage: "\n -I IFACE/IP Use interface or IP address as source"
-//usage: "\n -W SEC Seconds to wait for the first response (default:10)"
+//usage: "\n -I IFACE/IP Source interface or IP address"
+//usage: "\n -W SEC Seconds to wait for the first response (default 10)"
//usage: "\n (after all -c CNT packets are sent)"
//usage: "\n -w SEC Seconds until ping exits (default:infinite)"
//usage: "\n (can exit earlier with -c CNT)"
@@ -110,8 +110,8 @@
//usage:# define ping6_full_usage "\n\n"
//usage: "Send ICMP ECHO_REQUEST packets to network hosts\n"
//usage: "\n -c CNT Send only CNT pings"
-//usage: "\n -s SIZE Send SIZE data bytes in packets (default:56)"
-//usage: "\n -I IFACE/IP Use interface or IP address as source"
+//usage: "\n -s SIZE Send SIZE data bytes in packets (default 56)"
+//usage: "\n -I IFACE/IP Source interface or IP address"
//usage: "\n -q Quiet, only display output at start"
//usage: "\n and when finished"
//usage: "\n -p Pattern to use for payload"
diff --git a/procps/nmeter.c b/procps/nmeter.c
index 3eac2d3..05bf0a0 100644
--- a/procps/nmeter.c
+++ b/procps/nmeter.c
@@ -24,7 +24,7 @@
//usage: "\n -d MSEC Milliseconds between updates, default:1000, none:-1"
//usage: "\n"
//usage: "\nFormat specifiers:"
-//usage: "\n %Nc or %[cN] CPU. N - bar size (default:10)"
+//usage: "\n %Nc or %[cN] CPU. N - bar size (default 10)"
//usage: "\n (displays: S:system U:user N:niced D:iowait I:irq i:softirq)"
//usage: "\n %[nINTERFACE] Network INTERFACE"
//usage: "\n %m Allocated memory"
diff --git a/sysklogd/syslogd.c b/sysklogd/syslogd.c
index ae0840b..d64ff27 100644
--- a/sysklogd/syslogd.c
+++ b/sysklogd/syslogd.c
@@ -135,8 +135,8 @@
//usage: )
//usage: "\n -O FILE Log to FILE (default: /var/log/messages, stdout if -)"
//usage: IF_FEATURE_ROTATE_LOGFILE(
-//usage: "\n -s SIZE Max size (KB) before rotation (default:200KB, 0=off)"
-//usage: "\n -b N N rotated logs to keep (default:1, max=99, 0=purge)"
+//usage: "\n -s SIZE Max size (KB) before rotation (default 200KB, 0=off)"
+//usage: "\n -b N N rotated logs to keep (default 1, max 99, 0=purge)"
//usage: )
//usage: "\n -l N Log only messages more urgent than prio N (1-8)"
//usage: "\n -S Smaller output"
@@ -146,7 +146,7 @@
//usage: IF_FEATURE_SYSLOGD_CFG(
//usage: "\n -f FILE Use FILE as config (default:/etc/syslog.conf)"
//usage: )
-/* //usage: "\n -m MIN Minutes between MARK lines (default:20, 0=off)" */
+/* //usage: "\n -m MIN Minutes between MARK lines (default 20, 0=off)" */
//usage:
//usage:#define syslogd_example_usage
//usage: "$ syslogd -R masterlog:514\n"
More information about the busybox-cvs
mailing list