Updates from both Vladimir and Larry

[oweals/busybox.git] / usage.h

diff --git a/usage.h b/usage.h
index b10d927af965f9f846de72d42556a483f026eb23..63c00c674e80df7618c2d6921e29264f154e4546 100644 (file)
--- a/usage.h
+++ b/usage.h
@@ -1166,7 +1166,7 @@
        "Name:       debian\n" \
        "Address:    127.0.0.1\n" 
 
-#ifdef BB_FEATURE_SIMPLE_PING
+#ifndef BB_FEATURE_FANCY_PING
 #define ping_trivial_usage "host"
 #define ping_full_usage    "Send ICMP ECHO_REQUEST packets to network hosts"
 #else
@@ -1271,7 +1271,7 @@
        "Remove (unlink) the FILE(s).  You may use '--' to\n" \
        "indicate that all following arguments are non-options.\n\n" \
        "Options:\n" \
-       "\t-i\t\talways prompt before removing each destinations\n" \
+       "\t-i\t\talways prompt before removing each destination" \
        "\t-f\t\tremove existing destinations, never prompt\n" \
        "\t-r or -R\tremove the contents of directories recursively"
 #define rm_example_usage \
@@ -1389,7 +1389,7 @@
        "\n\t-F DEVICE\topen device instead of stdin" \
        "\n\t-a\t\tprint all current settings in human-readable form" \
        "\n\t-g\t\tprint in stty-readable form" \
-       "\n\t[SETTING]\tsee documentation"
+       "\n\t[SETTING]\tsee manpage"
 
 #define swapoff_trivial_usage \
        "[OPTION] [DEVICE]"
@@ -1433,7 +1433,7 @@
        "$ syslogd -R 192.168.1.1:601\n"
 
 
-#ifdef BB_FEATURE_SIMPLE_TAIL
+#ifndef BB_FEATURE_FANCY_TAIL
   #define USAGE_UNSIMPLE_TAIL(a)
 #else
   #define USAGE_UNSIMPLE_TAIL(a) a
@@ -1695,7 +1695,7 @@
 #define uuencode_full_usage \
        "Uuencode a file.\n\n" \
        "Options:\n" \
-       "\t-m\tuse base64 encoding as of RFC1521"
+       "\t-m\tuse base64 encoding per RFC1521"
 #define uuencode_example_usage \
        "$ uuencode busybox busybox\n" \
        "begin 755 busybox\n" \