Big cleanup in config help and description

Redundant help texts (one which only repeats the description)
are deleted.

Descriptions and help texts are trimmed.

Some config options are moved, even across menus.

No config option _names_ are changed.

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

10 files changed, 25 insertions, 37 deletions

diff --git a/networking/ftpd.c b/networking/ftpd.c
index bcd60a2ad..a4626c0b5 100644
--- a/networking/ftpd.c
+++ b/networking/ftpd.c
@@ -15,7 +15,7 @@
 //config:       bool "ftpd"
 //config:       default y
 //config:       help
-//config:         simple FTP daemon. You have to run it via inetd.
+//config:         Simple FTP daemon. You have to run it via inetd.
 //config:
 //config:config FEATURE_FTPD_WRITE
 //config:       bool "Enable upload commands"
diff --git a/networking/ftpgetput.c b/networking/ftpgetput.c
index 40a3271ab..35b4e4b64 100644
--- a/networking/ftpgetput.c
+++ b/networking/ftpgetput.c
@@ -28,8 +28,6 @@
 //config:       bool "Enable long options in ftpget/ftpput"
 //config:       default y
 //config:       depends on LONG_OPTS && (FTPGET || FTPPUT)
-//config:       help
-//config:         Support long options for the ftpget/ftpput applet.
 
 //applet:IF_FTPGET(APPLET_ODDNAME(ftpget, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpget))
 //applet:IF_FTPPUT(APPLET_ODDNAME(ftpput, ftpgetput, BB_DIR_USR_BIN, BB_SUID_DROP, ftpput))
diff --git a/networking/httpd.c b/networking/httpd.c
index cfcd2a06e..39aad90a8 100644
--- a/networking/httpd.c
+++ b/networking/httpd.c
@@ -102,7 +102,7 @@
 //config:       bool "httpd"
 //config:       default y
 //config:       help
-//config:         Serve web pages via an HTTP server.
+//config:         HTTP server.
 //config:
 //config:config FEATURE_HTTPD_RANGES
 //config:       bool "Support 'Ranges:' header"
@@ -156,7 +156,7 @@
 //config:         when specific URLs are requested.
 //config:
 //config:config FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-//config:       bool "Support for running scripts through an interpreter"
+//config:       bool "Support running scripts through an interpreter"
 //config:       default y
 //config:       depends on FEATURE_HTTPD_CGI
 //config:       help
@@ -185,7 +185,7 @@
 //config:         "&#60Hello&#32World&#62".
 //config:
 //config:config FEATURE_HTTPD_ERROR_PAGES
-//config:       bool "Support for custom error pages"
+//config:       bool "Support custom error pages"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
@@ -198,7 +198,7 @@
 //config:         message.
 //config:
 //config:config FEATURE_HTTPD_PROXY
-//config:       bool "Support for reverse proxy"
+//config:       bool "Support reverse proxy"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
@@ -210,7 +210,7 @@
 //config:         http://hostname[:port]/new/path/myfile.
 //config:
 //config:config FEATURE_HTTPD_GZIP
-//config:       bool "Support for GZIP content encoding"
+//config:       bool "Support GZIP content encoding"
 //config:       default y
 //config:       depends on HTTPD
 //config:       help
diff --git a/networking/ifupdown.c b/networking/ifupdown.c
index 1806a6ccc..78baa6690 100644
--- a/networking/ifupdown.c
+++ b/networking/ifupdown.c
@@ -66,14 +66,14 @@
 //config:         utilities, or enable these applets in Busybox.
 //config:
 //config:config FEATURE_IFUPDOWN_IPV4
-//config:       bool "Support for IPv4"
+//config:       bool "Support IPv4"
 //config:       default y
 //config:       depends on IFUP || IFDOWN
 //config:       help
 //config:         If you want ifup/ifdown to talk IPv4, leave this on.
 //config:
 //config:config FEATURE_IFUPDOWN_IPV6
-//config:       bool "Support for IPv6"
+//config:       bool "Support IPv6"
 //config:       default y
 //config:       depends on (IFUP || IFDOWN) && FEATURE_IPV6
 //config:       help
@@ -81,7 +81,7 @@
 //config:
 //UNUSED:
 ////////:config FEATURE_IFUPDOWN_IPX
-////////:       bool "Support for IPX"
+////////:       bool "Support IPX"
 ////////:       default y
 ////////:       depends on IFUP || IFDOWN
 ////////:       help
@@ -97,7 +97,7 @@
 //config:         a weird network setup you don't need it.
 //config:
 //config:config FEATURE_IFUPDOWN_EXTERNAL_DHCP
-//config:       bool "Support for external dhcp clients"
+//config:       bool "Support external DHCP clients"
 //config:       default n
 //config:       depends on IFUP || IFDOWN
 //config:       help
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 21219424f..9359f9016 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -18,6 +18,11 @@
 //config:         ipcalc takes an IP address and netmask and calculates the
 //config:         resulting broadcast, network, and host range.
 //config:
+//config:config FEATURE_IPCALC_LONG_OPTIONS
+//config:       bool "Enable long options"
+//config:       default y
+//config:       depends on IPCALC && LONG_OPTS
+//config:
 //config:config FEATURE_IPCALC_FANCY
 //config:       bool "Fancy IPCALC, more options, adds 1 kbyte"
 //config:       default y
@@ -25,13 +30,6 @@
 //config:       help
 //config:         Adds the options hostname, prefix and silent to the output of
 //config:         "ipcalc".
-//config:
-//config:config FEATURE_IPCALC_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on IPCALC && LONG_OPTS
-//config:       help
-//config:         Support long options for the ipcalc applet.
 
 //applet:IF_IPCALC(APPLET(ipcalc, BB_DIR_BIN, BB_SUID_DROP))
 
diff --git a/networking/netstat.c b/networking/netstat.c
index 90da6cdb8..68e0c1a04 100644
--- a/networking/netstat.c
+++ b/networking/netstat.c
@@ -21,7 +21,7 @@
 //config:         netstat prints information about the Linux networking subsystem.
 //config:
 //config:config FEATURE_NETSTAT_WIDE
-//config:       bool "Enable wide netstat output"
+//config:       bool "Enable wide output"
 //config:       default y
 //config:       depends on NETSTAT
 //config:       help
diff --git a/networking/tftp.c b/networking/tftp.c
index ed8672025..189364f0c 100644
--- a/networking/tftp.c
+++ b/networking/tftp.c
@@ -69,11 +69,9 @@
 //config:         "blksize" and "tsize" options.
 //config:
 //config:config FEATURE_TFTP_PROGRESS_BAR
-//config:       bool "Enable tftp progress meter"
+//config:       bool "Enable progress bar"
 //config:       default y
 //config:       depends on TFTP && FEATURE_TFTP_BLOCKSIZE
-//config:       help
-//config:         Show progress bar.
 //config:
 //config:config TFTP_DEBUG
 //config:       bool "Enable debug"
diff --git a/networking/traceroute.c b/networking/traceroute.c
index a463b0faa..6817861ef 100644
--- a/networking/traceroute.c
+++ b/networking/traceroute.c
@@ -235,8 +235,6 @@
 //config:       bool "Enable -I option (use ICMP instead of UDP)"
 //config:       default y
 //config:       depends on TRACEROUTE || TRACEROUTE6
-//config:       help
-//config:         Add option -I to use ICMP ECHO instead of UDP datagrams.
 
 /* Needs socket(AF_INET, SOCK_RAW, IPPROTO_ICMP), therefore BB_SUID_MAYBE: */
 //applet:IF_TRACEROUTE(APPLET(traceroute, BB_DIR_USR_BIN, BB_SUID_MAYBE))
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index 7bc13a719..5c068441a 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -123,7 +123,7 @@ config UDHCP_DEBUG
           are very verbose and useful for debugging only.
 
 config FEATURE_UDHCP_RFC3397
-        bool "Support for RFC3397 domain search (experimental)"
+        bool "Support RFC3397 domain search (experimental)"
         default y
         depends on UDHCPD || UDHCPC
         help
@@ -132,7 +132,7 @@ config FEATURE_UDHCP_RFC3397
           and SIP servers option 120, specified in RFC 3361.
 
 config FEATURE_UDHCP_8021Q
-        bool "Support for 802.1Q VLAN parameters"
+        bool "Support 802.1Q VLAN parameters"
         default y
         depends on UDHCPD || UDHCPC
         help
diff --git a/networking/wget.c b/networking/wget.c
index b082a0f59..c82086878 100644
--- a/networking/wget.c
+++ b/networking/wget.c
@@ -16,12 +16,15 @@
 //config:         wget is a utility for non-interactive download of files from HTTP
 //config:         and FTP servers.
 //config:
+//config:config FEATURE_WGET_LONG_OPTIONS
+//config:       bool "Enable long options"
+//config:       default y
+//config:       depends on WGET && LONG_OPTS
+//config:
 //config:config FEATURE_WGET_STATUSBAR
-//config:       bool "Enable a nifty process meter (+2k)"
+//config:       bool "Enable progress bar (+2k)"
 //config:       default y
 //config:       depends on WGET
-//config:       help
-//config:         Enable the transfer progress bar for wget transfers.
 //config:
 //config:config FEATURE_WGET_AUTHENTICATION
 //config:       bool "Enable HTTP authentication"
@@ -30,13 +33,6 @@
 //config:       help
 //config:         Support authenticated HTTP transfers.
 //config:
-//config:config FEATURE_WGET_LONG_OPTIONS
-//config:       bool "Enable long options"
-//config:       default y
-//config:       depends on WGET && LONG_OPTS
-//config:       help
-//config:         Support long options for the wget applet.
-//config:
 //config:config FEATURE_WGET_TIMEOUT
 //config:       bool "Enable timeout option -T SEC"
 //config:       default y