nmeter: deprecate %NNNd specified, use -d MSEC instead

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

2 files changed, 2 insertions, 28 deletions

diff --git a/include/applets.src.h b/include/applets.src.h
index 5058feb3a..c2f90eac0 100644
--- a/include/applets.src.h
+++ b/include/applets.src.h
@@ -258,7 +258,6 @@ IF_NAMEIF(APPLET(nameif, _BB_DIR_SBIN, _BB_SUID_DROP))
 IF_NC(APPLET(nc, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_NETSTAT(APPLET(netstat, _BB_DIR_BIN, _BB_SUID_DROP))
 IF_NICE(APPLET(nice, _BB_DIR_BIN, _BB_SUID_DROP))
-IF_NMETER(APPLET(nmeter, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_NOHUP(APPLET(nohup, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_NSLOOKUP(APPLET(nslookup, _BB_DIR_USR_BIN, _BB_SUID_DROP))
 IF_NTPD(APPLET(ntpd, _BB_DIR_USR_SBIN, _BB_SUID_DROP))
diff --git a/include/usage.src.h b/include/usage.src.h
index c413fbb91..64f2c909f 100644
--- a/include/usage.src.h
+++ b/include/usage.src.h
@@ -1577,8 +1577,8 @@ INSERT
      "\n        -c              One-byte character display" \
      "\n        -C              Canonical hex+ASCII, 16 bytes per line" \
      "\n        -d              Two-byte decimal display" \
-     "\n        -e FORMAT STRING" \
-     "\n        -f FORMAT FILE" \
+     "\n        -e FORMAT_STRING" \
+     "\n        -f FORMAT_FILE" \
      "\n        -n LENGTH       Interpret only LENGTH bytes of input" \
      "\n        -o              Two-byte octal display" \
      "\n        -s OFFSET       Skip OFFSET bytes" \
@@ -2706,31 +2706,6 @@ INSERT
        " or\n" \
        "$ nameif -c /etc/my_mactab_file\n" \
 
-#define nmeter_trivial_usage \
-       "format_string"
-#define nmeter_full_usage "\n\n" \
-       "Monitor system in real time\n\n" \
-       "Format specifiers:\n" \
-       " %Nc or %[cN]   Monitor CPU. N - bar size, default 10\n" \
-       "                (displays: S:system U:user N:niced D:iowait I:irq i:softirq)\n" \
-       " %[niface]      Monitor network interface 'iface'\n" \
-       " %m             Monitor allocated memory\n" \
-       " %[mf]          Monitor free memory\n" \
-       " %[mt]          Monitor total memory\n" \
-       " %s             Monitor allocated swap\n" \
-       " %f             Monitor number of used file descriptors\n" \
-       " %Ni            Monitor total/specific IRQ rate\n" \
-       " %x             Monitor context switch rate\n" \
-       " %p             Monitor forks\n" \
-       " %[pn]          Monitor # of processes\n" \
-       " %b             Monitor block io\n" \
-       " %Nt            Show time (with N decimal points)\n" \
-       " %Nd            Milliseconds between updates (default:1000)\n" \
-       " %r             Print <cr> instead of <lf> at EOL" \
-
-#define nmeter_example_usage \
-       "nmeter '%250d%t %20c int %i bio %b mem %m forks%p'"
-
 #define nohup_trivial_usage \
        "PROG ARGS"
 #define nohup_full_usage "\n\n" \