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>
2024-11-23 13:43:28 +08:00 · 2017-01-10 14:58:54 +01:00 · 2017-01-10 14:58:54 +01:00 · f560422fa0
commit f560422fa0
parent f10f7a21d4
105 changed files with 205 additions and 514 deletions
--- a/Config.in
+++ b/Config.in
@ -22,7 +22,7 @@ config DESKTOP

 	  If you are preparing your build to be used on an embedded box
 	  where you have tighter control over the entire set of userspace
-	  tools, you can unselect this option for smaller code size. 
+	  tools, you can unselect this option for smaller code size.

 config EXTRA_COMPAT
 	bool "Provide compatible behavior for rare corner cases (bigger code)"
@ -50,6 +50,26 @@ config USE_PORTABLE_CODE
 	  compiler other than gcc.
 	  If you do use gcc, this option may needlessly increase code size.

+#fixme: delete, create suboptions for applets which use this
+config FEATURE_AUTOWIDTH
+	bool "Calculate terminal & column widths"
+	default y
+	help
+	  This option allows utilities such as 'ls', 'telnet' etc
+	  to determine the width of the screen, which can allow them to
+	  display additional text or avoid wrapping text onto the next line.
+	  If you leave this disabled, your utilities will be especially
+	  primitive and will be unable to determine the current screen width.
+
+#fixme: delete, create suboptions for applets which use this
+config FEATURE_USE_TERMIOS
+	bool "Use termios for one-stroke input"
+	default y
+	help
+	  This option allows utilities such as 'top' to accept keyboard
+	  commands. Without this option, they simply refresh display
+	  after a fixed period.
+
 config SHOW_USAGE
 	bool "Show applet usage messages"
 	default y
@ -113,14 +133,14 @@ config INSTALL_NO_USR
 	  never to /usr/bin or /usr/sbin.

 config PAM
-	bool "Support for PAM (Pluggable Authentication Modules)"
+	bool "Support PAM (Pluggable Authentication Modules)"
 	default n
 	help
 	  Use PAM in some busybox applets (currently login and httpd) instead
 	  of direct access to password database.

 config LONG_OPTS
-	bool "Support for --long-options"
+	bool "Support --long-options"
 	default y
 	help
 	  Enable this if you want busybox applets to use the gnu --long-option
@ -187,7 +207,7 @@ config PID_FILE_PATH
 	  specify a pidfile path.

 config FEATURE_SUID
-	bool "Support for SUID/SGID handling"
+	bool "Support SUID/SGID handling"
 	default y
 	help
 	  With this option you can install the busybox binary belonging
@ -611,6 +631,8 @@ config DEBUG_SANITIZE
 	  catch bad memory accesses (e.g. buffer overflows), but will make
 	  the executable larger and slow down runtime a bit.

+	  This adds -fsanitize=foo options to gcc command line.
+
 	  If you aren't developing/testing busybox, say N here.

 config UNIT_TEST
@ -625,7 +647,7 @@ config WERROR
 	bool "Abort compilation on any warning"
 	default n
 	help
-	  Selecting this will add -Werror to gcc command line.
+	  This adds -Werror to gcc command line.

 	  Most people should answer N.

--- a/archival/Config.src
+++ b/archival/Config.src
@ -8,32 +8,22 @@ menu "Archival Utilities"
 config FEATURE_SEAMLESS_XZ
 	bool "Make tar, rpm, modprobe etc understand .xz data"
 	default y
-	help
-	  Make tar, rpm, modprobe etc understand .xz data.

 config FEATURE_SEAMLESS_LZMA
 	bool "Make tar, rpm, modprobe etc understand .lzma data"
 	default y
-	help
-	  Make tar, rpm, modprobe etc understand .lzma data.

 config FEATURE_SEAMLESS_BZ2
 	bool "Make tar, rpm, modprobe etc understand .bz2 data"
 	default y
-	help
-	  Make tar, rpm, modprobe etc understand .bz2 data.

 config FEATURE_SEAMLESS_GZ
 	bool "Make tar, rpm, modprobe etc understand .gz data"
 	default y
-	help
-	  Make tar, rpm, modprobe etc understand .gz data.

 config FEATURE_SEAMLESS_Z
 	bool "Make tar, rpm, modprobe etc understand .Z data"
 	default n  # it is ancient
-	help
-	  Make tar, rpm, modprobe etc understand .Z data.

 INSERT

--- a/archival/ar.c
+++ b/archival/ar.c
@ -31,7 +31,7 @@
 //config:	  probably say N here: most compilers come with their own ar utility.
 //config:
 //config:config FEATURE_AR_LONG_FILENAMES
-//config:	bool "Support for long filenames (not needed for debs)"
+//config:	bool "Support long filenames (not needed for debs)"
 //config:	default y
 //config:	depends on AR
 //config:	help
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@ -312,8 +312,6 @@ int uncompress_main(int argc UNUSED_PARAM, char **argv)
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on (GUNZIP || ZCAT) && LONG_OPTS
-//config:	help
-//config:	  Enable use of long options.

 //applet:IF_GUNZIP(APPLET(gunzip, BB_DIR_BIN, BB_SUID_DROP))
 //applet:IF_ZCAT(APPLET_ODDNAME(zcat, gunzip, BB_DIR_BIN, BB_SUID_DROP, zcat))
@ -522,7 +520,7 @@ int bunzip2_main(int argc UNUSED_PARAM, char **argv)
 //config:	  IOW: you'll get lzma applet, but it will always require -d option.
 //config:
 //config:config FEATURE_LZMA_FAST
-//config:	bool "Optimize unlzma for speed"
+//config:	bool "Optimize for speed"
 //config:	default n
 //config:	depends on UNLZMA || LZCAT || LZMA
 //config:	help
--- a/archival/cpio.c
+++ b/archival/cpio.c
@ -29,7 +29,7 @@
 //config:	  should probably say N here.
 //config:
 //config:config FEATURE_CPIO_O
-//config:	bool "Support for archive creation"
+//config:	bool "Support archive creation"
 //config:	default y
 //config:	depends on CPIO
 //config:	help
@ -37,7 +37,7 @@
 //config:	  format only.
 //config:
 //config:config FEATURE_CPIO_P
-//config:	bool "Support for passthrough mode"
+//config:	bool "Support passthrough mode"
 //config:	default y
 //config:	depends on FEATURE_CPIO_O
 //config:	help
--- a/archival/gzip.c
+++ b/archival/gzip.c
@ -48,11 +48,9 @@ aa:      85.1% -- replaced with aa.gz
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on GZIP && LONG_OPTS
-//config:	help
-//config:	  Enable use of long options, increases size by about 106 Bytes
 //config:
 //config:config GZIP_FAST
-//config:	int "Trade memory for gzip speed (0:small,slow - 2:fast,big)"
+//config:	int "Trade memory for speed (0:small,slow - 2:fast,big)"
 //config:	default 0
 //config:	range 0 2
 //config:	depends on GZIP
--- a/archival/tar.c
+++ b/archival/tar.c
@ -49,13 +49,15 @@
 //config:	  create compressed archives. It's probably the most widely used
 //config:	  UNIX archive program.
 //config:
+//config:config FEATURE_TAR_LONG_OPTIONS
+//config:	bool "Enable long options"
+//config:	default y
+//config:	depends on TAR && LONG_OPTS
+//config:
 //config:config FEATURE_TAR_CREATE
-//config:	bool "Enable archive creation"
+//config:	bool "Enable -c (archive creation)"
 //config:	default y
 //config:	depends on TAR
-//config:	help
-//config:	  If you enable this option you'll be able to create
-//config:	  tar archives using the `-c' option.
 //config:
 //config:config FEATURE_TAR_AUTODETECT
 //config:	bool "Autodetect compressed tarballs"
@ -74,7 +76,7 @@
 //config:	  a list of files to include or exclude from an archive.
 //config:
 //config:config FEATURE_TAR_OLDGNU_COMPATIBILITY
-//config:	bool "Support for old tar header format"
+//config:	bool "Support old tar header format"
 //config:	default y
 //config:	depends on TAR || DPKG
 //config:	help
@ -93,22 +95,12 @@
 //config:	  tarballs still exist.
 //config:
 //config:config FEATURE_TAR_GNU_EXTENSIONS
-//config:	bool "Support for GNU tar extensions (long filenames)"
+//config:	bool "Support GNU tar extensions (long filenames)"
 //config:	default y
 //config:	depends on TAR || DPKG
-//config:	help
-//config:	  With this option busybox supports GNU long filenames and
-//config:	  linknames.
-//config:
-//config:config FEATURE_TAR_LONG_OPTIONS
-//config:	bool "Enable long options"
-//config:	default y
-//config:	depends on TAR && LONG_OPTS
-//config:	help
-//config:	  Enable use of long options, increases size by about 400 Bytes
 //config:
 //config:config FEATURE_TAR_TO_COMMAND
-//config:	bool "Support for writing to an external program"
+//config:	bool "Support writing to an external program (--to-command)"
 //config:	default y
 //config:	depends on TAR && FEATURE_TAR_LONG_OPTIONS
 //config:	help
@ -121,20 +113,17 @@
 //config:	default y
 //config:	depends on TAR
 //config:	help
-//config:	  Enables use of user and group names in tar. This affects contents
+//config:	  Enable use of user and group names in tar. This affects contents
 //config:	  listings (-t) and preserving permissions when unpacking (-p).
 //config:	  +200 bytes.
 //config:
 //config:config FEATURE_TAR_NOPRESERVE_TIME
-//config:	bool "Enable -m (do not preserve time) option"
+//config:	bool "Enable -m (do not preserve time) GNU option"
 //config:	default y
 //config:	depends on TAR
-//config:	help
-//config:	  With this option busybox supports GNU tar -m
-//config:	  (do not preserve time) option.
 //config:
 //config:config FEATURE_TAR_SELINUX
-//config:	bool "Support for extracting SELinux labels"
+//config:	bool "Support extracting SELinux labels"
 //config:	default n
 //config:	depends on TAR && SELINUX
 //config:	help
--- a/console-tools/loadfont.c
+++ b/console-tools/loadfont.c
@ -42,18 +42,14 @@
 //config:	depends on LOADFONT || SETFONT
 //config:
 //config:config FEATURE_LOADFONT_PSF2
-//config:	bool "Support for PSF2 console fonts"
+//config:	bool "Support PSF2 console fonts"
 //config:	default y
 //config:	depends on LOADFONT || SETFONT
-//config:	help
-//config:	  Support PSF2 console fonts.
 //config:
 //config:config FEATURE_LOADFONT_RAW
-//config:	bool "Support for old (raw) console fonts"
+//config:	bool "Support old (raw) console fonts"
 //config:	default y
 //config:	depends on LOADFONT || SETFONT
-//config:	help
-//config:	  Support old (raw) console fonts.

 //applet:IF_LOADFONT(APPLET(loadfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
 //applet:IF_SETFONT(APPLET(setfont, BB_DIR_USR_SBIN, BB_SUID_DROP))
--- a/console-tools/setconsole.c
+++ b/console-tools/setconsole.c
@ -19,8 +19,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on SETCONSOLE && LONG_OPTS
-//config:	help
-//config:	  Support long options for the setconsole applet.

 //applet:IF_SETCONSOLE(APPLET(setconsole, BB_DIR_SBIN, BB_SUID_DROP))

--- a/coreutils/Config.src
+++ b/coreutils/Config.src
@ -27,25 +27,11 @@ config FEATURE_PRESERVE_HARDLINKS
 	help
 	  Allow cp and mv to preserve hard links.

-comment "Common options for ls, more and telnet"
-	depends on LS || MORE || TELNET
-
-config FEATURE_AUTOWIDTH
-	bool "Calculate terminal & column widths"
-	default y
-	depends on LS || MORE || TELNET
-	help
-	  This option allows utilities such as 'ls', 'more' and 'telnet'
-	  to determine the width of the screen, which can allow them to
-	  display additional text or avoid wrapping text onto the next line.
-	  If you leave this disabled, your utilities will be especially
-	  primitive and will be unable to determine the current screen width.
-
 comment "Common options for df, du, ls"
 	depends on DF || DU || LS

 config FEATURE_HUMAN_READABLE
-	bool "Support for human readable output (example 13k, 23M, 235G)"
+	bool "Support human readable output (example 13k, 23M, 235G)"
 	default y
 	depends on DF || DU || LS
 	help
--- a/coreutils/chown.c
+++ b/coreutils/chown.c
@ -17,8 +17,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on CHOWN && LONG_OPTS
-//config:	help
-//config:	  Enable use of long options

 //applet:IF_CHOWN(APPLET_NOEXEC(chown, chown, BB_DIR_BIN, BB_SUID_DROP, chown))

--- a/coreutils/cp.c
+++ b/coreutils/cp.c
@ -18,11 +18,11 @@
 //config:	  cp is used to copy files and directories.
 //config:
 //config:config FEATURE_CP_LONG_OPTIONS
-//config:	bool "Enable long options for cp"
+//config:	bool "Enable long options"
 //config:	default y
 //config:	depends on CP && LONG_OPTS
 //config:	help
-//config:	  Enable long options for cp.
+//config:	  Enable long options.
 //config:	  Also add support for --parents option.

 //applet:IF_CP(APPLET_NOEXEC(cp, cp, BB_DIR_BIN, BB_SUID_DROP, cp))
--- a/coreutils/dd.c
+++ b/coreutils/dd.c
@ -41,7 +41,7 @@
 //config:	default y
 //config:	depends on DD
 //config:	help
-//config:	  Enables support for writing a certain number of bytes in and out,
+//config:	  Enable support for writing a certain number of bytes in and out,
 //config:	  at a time, and performing conversions on the data stream.
 //config:
 //config:config FEATURE_DD_STATUS
@ -49,7 +49,7 @@
 //config:	default y
 //config:	depends on DD
 //config:	help
-//config:	  Enables support for status=noxfer/none option.
+//config:	  Enable support for status=noxfer/none option.

 //applet:IF_DD(APPLET_NOEXEC(dd, dd, BB_DIR_BIN, BB_SUID_DROP, dd))

--- a/coreutils/df.c
+++ b/coreutils/df.c
@ -29,11 +29,9 @@
 //config:	default y
 //config:	depends on DF
 //config:	help
-//config:	  This option enables -a, -i and -B.
-//config:
-//config:	    -a Show all filesystems
-//config:	    -i Inodes
-//config:	    -B <SIZE> Blocksize
+//config:	  -a Show all filesystems
+//config:	  -i Inodes
+//config:	  -B <SIZE> Blocksize

 //applet:IF_DF(APPLET(df, BB_DIR_BIN, BB_SUID_DROP))

--- a/coreutils/echo.c
+++ b/coreutils/echo.c
@ -26,11 +26,9 @@
 //config:
 //config:# this entry also appears in shell/Config.in, next to the echo builtin
 //config:config FEATURE_FANCY_ECHO
-//config:	bool "Enable echo options (-n and -e)"
+//config:	bool "Enable -n and -e options"
 //config:	default y
-//config:	depends on ECHO || ASH_BUILTIN_ECHO || HUSH
-//config:	help
-//config:	  This adds options (-n and -e) to echo.
+//config:	depends on ECHO || ASH_BUILTIN_ECHO || HUSH_ECHO

 //applet:IF_ECHO(APPLET_NOFORK(echo, echo, BB_DIR_BIN, BB_SUID_DROP, echo))

--- a/coreutils/env.c
+++ b/coreutils/env.c
@ -35,8 +35,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on ENV && LONG_OPTS
-//config:	help
-//config:	  Support long options for the env applet.

 //applet:IF_ENV(APPLET_NOEXEC(env, env, BB_DIR_USR_BIN, BB_SUID_DROP, env))

--- a/coreutils/expand.c
+++ b/coreutils/expand.c
@ -30,8 +30,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on EXPAND && LONG_OPTS
-//config:	help
-//config:	  Support long options for the expand applet.
 //config:
 //config:config UNEXPAND
 //config:	bool "unexpand"
@ -43,8 +41,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on UNEXPAND && LONG_OPTS
-//config:	help
-//config:	  Support long options for the unexpand applet.

 //applet:IF_EXPAND(APPLET(expand, BB_DIR_USR_BIN, BB_SUID_DROP))
 //applet:IF_UNEXPAND(APPLET_ODDNAME(unexpand, expand, BB_DIR_USR_BIN, BB_SUID_DROP, unexpand))
--- a/coreutils/head.c
+++ b/coreutils/head.c
@ -14,11 +14,9 @@
 //config:	  from files.
 //config:
 //config:config FEATURE_FANCY_HEAD
-//config:	bool "Enable head options (-c, -q, and -v)"
+//config:	bool "Enable -c, -q, and -v"
 //config:	default y
 //config:	depends on HEAD
-//config:	help
-//config:	  This enables the head options (-c, -q, and -v).

 //applet:IF_HEAD(APPLET_NOEXEC(head, head, BB_DIR_USR_BIN, BB_SUID_DROP, head))

--- a/coreutils/install.c
+++ b/coreutils/install.c
@ -15,8 +15,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on INSTALL && LONG_OPTS
-//config:	help
-//config:	  Support long options for the install applet.

 //applet:IF_INSTALL(APPLET(install, BB_DIR_USR_BIN, BB_SUID_DROP))

--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@ -37,22 +37,16 @@
 //config:	bool "Enable filetyping options (-p and -F)"
 //config:	default y
 //config:	depends on LS
-//config:	help
-//config:	  Enable the ls options (-p and -F).
 //config:
 //config:config FEATURE_LS_FOLLOWLINKS
 //config:	bool "Enable symlinks dereferencing (-L)"
 //config:	default y
 //config:	depends on LS
-//config:	help
-//config:	  Enable the ls option (-L).
 //config:
 //config:config FEATURE_LS_RECURSIVE
 //config:	bool "Enable recursion (-R)"
 //config:	default y
 //config:	depends on LS
-//config:	help
-//config:	  Enable the ls option (-R).
 //config:
 //config:config FEATURE_LS_SORTFILES
 //config:	bool "Sort the file names"
--- a/coreutils/md5_sha1_sum.c
+++ b/coreutils/md5_sha1_sum.c
@ -45,7 +45,6 @@
 //config:	help
 //config:	  Enabling the -c options allows files to be checked
 //config:	  against pre-calculated hash values.
-//config:
 //config:	  -s and -w are useful options when verifying checksums.

 //applet:IF_MD5SUM(APPLET_NOEXEC(md5sum, md5_sha1_sum, BB_DIR_USR_BIN, BB_SUID_DROP, md5sum))
--- a/coreutils/mkdir.c
+++ b/coreutils/mkdir.c
@ -23,8 +23,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on MKDIR && LONG_OPTS
-//config:	help
-//config:	  Support long options for the mkdir applet.

 //applet:IF_MKDIR(APPLET_NOFORK(mkdir, mkdir, BB_DIR_BIN, BB_SUID_DROP, mkdir))

--- a/coreutils/mv.c
+++ b/coreutils/mv.c
@ -21,8 +21,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on MV && LONG_OPTS
-//config:	help
-//config:	  Support long options for the mv applet.

 //applet:IF_MV(APPLET(mv, BB_DIR_BIN, BB_SUID_DROP))

--- a/coreutils/split.c
+++ b/coreutils/split.c
@ -9,7 +9,7 @@
 //config:	bool "split"
 //config:	default y
 //config:	help
-//config:	  split a file into pieces.
+//config:	  Split a file into pieces.
 //config:
 //config:config FEATURE_SPLIT_FANCY
 //config:	bool "Fancy extensions"
--- a/coreutils/tail.c
+++ b/coreutils/tail.c
@ -26,13 +26,12 @@
 //config:	  from files.
 //config:
 //config:config FEATURE_FANCY_TAIL
-//config:	bool "Enable extra tail options (-q, -s, -v, and -F)"
+//config:	bool "Enable -q, -s, -v, and -F options"
 //config:	default y
 //config:	depends on TAIL
 //config:	help
-//config:	  The options (-q, -s, -v and -F) are provided by GNU tail, but
-//config:	  are not specific in the SUSv3 standard.
-//config:
+//config:	  These options are provided by GNU tail, but
+//config:	  are not specific in the SUSv3 standard:
 //config:	    -q      Never output headers giving file names
 //config:	    -s SEC  Wait SEC seconds between reads with -f
 //config:	    -v      Always output headers giving file names
--- a/coreutils/wc.c
+++ b/coreutils/wc.c
@ -40,11 +40,11 @@
 //config:	  in specified files.
 //config:
 //config:config FEATURE_WC_LARGE
-//config:	bool "Support very large files in wc"
+//config:	bool "Support very large counts"
 //config:	default y
 //config:	depends on WC
 //config:	help
-//config:	  Use "unsigned long long" in wc for counter variables.
+//config:	  Use "unsigned long long" for counter variables.

 //applet:IF_WC(APPLET(wc, BB_DIR_USR_BIN, BB_SUID_DROP))

--- a/debianutils/run_parts.c
+++ b/debianutils/run_parts.c
@ -41,8 +41,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on RUN_PARTS && LONG_OPTS
-//config:	help
-//config:	  Support long options for the run-parts applet.
 //config:
 //config:config FEATURE_RUN_PARTS_FANCY
 //config:	bool "Support additional arguments"
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@ -64,22 +64,19 @@ Misc options:
 //config:	  termination of system-level processes, usually the ones
 //config:	  started during the startup of the system.
 //config:
+//config:config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
+//config:	bool "Enable long options"
+//config:	default y
+//config:	depends on START_STOP_DAEMON && LONG_OPTS
+//config:
 //config:config FEATURE_START_STOP_DAEMON_FANCY
 //config:	bool "Support additional arguments"
 //config:	default y
 //config:	depends on START_STOP_DAEMON
 //config:	help
-//config:	  Support additional arguments.
 //config:	  -o|--oknodo ignored since we exit with 0 anyway
 //config:	  -v|--verbose
 //config:	  -N|--nicelevel N
-//config:
-//config:config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
-//config:	bool "Enable long options"
-//config:	default y
-//config:	depends on START_STOP_DAEMON && LONG_OPTS
-//config:	help
-//config:	  Support long options for the start-stop-daemon applet.

 //applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon))

--- a/editors/Config.src
+++ b/editors/Config.src
@ -12,7 +12,7 @@ config FEATURE_ALLOW_EXEC
 	default y
 	depends on VI || AWK
 	help
-	  Enables vi and awk features which allows user to execute
+	  Enables vi and awk features which allow user to execute
 	  shell commands (using system() C call).

 endmenu
--- a/editors/diff.c
+++ b/editors/diff.c
@ -88,8 +88,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on DIFF && LONG_OPTS
-//config:	help
-//config:	  Enable use of long options.
 //config:
 //config:config FEATURE_DIFF_DIR
 //config:	bool "Enable directory support"
--- a/editors/vi.c
+++ b/editors/vi.c
@ -30,7 +30,7 @@
 //config:	  you may wish to use something else.
 //config:
 //config:config FEATURE_VI_MAX_LEN
-//config:	int "Maximum screen width in vi"
+//config:	int "Maximum screen width"
 //config:	range 256 16384
 //config:	default 4096
 //config:	depends on VI
@ -39,7 +39,7 @@
 //config:	  Make it smaller than 4k only if you are very limited on memory.
 //config:
 //config:config FEATURE_VI_8BIT
-//config:	bool "Allow vi to display 8-bit chars (otherwise shows dots)"
+//config:	bool "Allow to display 8-bit chars (otherwise shows dots)"
 //config:	default n
 //config:	depends on VI
 //config:	help
@ -53,7 +53,7 @@
 //config:	default y
 //config:	depends on VI
 //config:	help
-//config:	  Enable a limited set of colon commands for vi. This does not
+//config:	  Enable a limited set of colon commands. This does not
 //config:	  provide an "ex" mode.
 //config:
 //config:config FEATURE_VI_YANKMARK
@ -61,16 +61,14 @@
 //config:	default y
 //config:	depends on VI
 //config:	help
-//config:	  This will enable you to use yank and put, as well as mark in
-//config:	  busybox vi.
+//config:	  This will enable you to use yank and put, as well as mark.
 //config:
 //config:config FEATURE_VI_SEARCH
 //config:	bool "Enable search and replace cmds"
 //config:	default y
 //config:	depends on VI
 //config:	help
-//config:	  Select this if you wish to be able to do search and replace in
-//config:	  busybox vi.
+//config:	  Select this if you wish to be able to do search and replace.
 //config:
 //config:config FEATURE_VI_REGEX_SEARCH
 //config:	bool "Enable regex in search and replace"
@ -84,16 +82,15 @@
 //config:	default y
 //config:	depends on VI
 //config:	help
-//config:	  Selecting this option will make busybox vi signal aware. This will
-//config:	  make busybox vi support SIGWINCH to deal with Window Changes, catch
-//config:	  Ctrl-Z and Ctrl-C and alarms.
+//config:	  Selecting this option will make vi signal aware. This will support
+//config:	  SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms.
 //config:
 //config:config FEATURE_VI_DOT_CMD
 //config:	bool "Remember previous cmd and \".\" cmd"
 //config:	default y
 //config:	depends on VI
 //config:	help
-//config:	  Make busybox vi remember the last command and be able to repeat it.
+//config:	  Make vi remember the last command and be able to repeat it.
 //config:
 //config:config FEATURE_VI_READONLY
 //config:	bool "Enable -R option and \"view\" mode"
@ -104,25 +101,23 @@
 //config:	  open a file in read-only mode.
 //config:
 //config:config FEATURE_VI_SETOPTS
-//config:	bool "Enable set-able options, ai ic showmatch"
+//config:	bool "Enable settable options, ai ic showmatch"
 //config:	default y
 //config:	depends on VI
 //config:	help
 //config:	  Enable the editor to set some (ai, ic, showmatch) options.
 //config:
 //config:config FEATURE_VI_SET
-//config:	bool "Support for :set"
+//config:	bool "Support :set"
 //config:	default y
 //config:	depends on VI
-//config:	help
-//config:	  Support for ":set".
 //config:
 //config:config FEATURE_VI_WIN_RESIZE
 //config:	bool "Handle window resize"
 //config:	default y
 //config:	depends on VI
 //config:	help
-//config:	  Make busybox vi behave nicely with terminals that get resized.
+//config:	  Behave nicely with terminals that get resized.
 //config:
 //config:config FEATURE_VI_ASK_TERMINAL
 //config:	bool "Use 'tell me cursor position' ESC sequence to measure window"
@ -133,15 +128,16 @@
 //config:	  this option makes vi perform a last-ditch effort to find it:
 //config:	  position cursor to 999,999 and ask terminal to report real
 //config:	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
-//config:
 //config:	  This is not clean but helps a lot on serial lines and such.
+//config:
 //config:config FEATURE_VI_UNDO
-//config:	bool "Support undo command 'u'"
+//config:	bool "Support undo command \"u\""
 //config:	default y
 //config:	depends on VI
 //config:	help
 //config:	  Support the 'u' command to undo insertion, deletion, and replacement
 //config:	  of text.
+//config:
 //config:config FEATURE_VI_UNDO_QUEUE
 //config:	bool "Enable undo operation queuing"
 //config:	default y
@ -152,6 +148,7 @@
 //config:	  reached, the contents of the queue are committed to the undo stack.
 //config:	  This increases the size of the undo code and allows some undo
 //config:	  operations (especially un-typing/backspacing) to be far more useful.
+//config:
 //config:config FEATURE_VI_UNDO_QUEUE_MAX
 //config:	int "Maximum undo character queue size"
 //config:	default 256
--- a/findutils/find.c
+++ b/findutils/find.c
@ -89,8 +89,6 @@
 //config:	bool "Enable -perm: permissions matching"
 //config:	default y
 //config:	depends on FIND
-//config:	help
-//config:	  Enable searching based on file permissions.
 //config:
 //config:config FEATURE_FIND_TYPE
 //config:	bool "Enable -type: file type matching (file/dir/link/...)"
@ -104,15 +102,11 @@
 //config:	bool "Enable -xdev: 'stay in filesystem'"
 //config:	default y
 //config:	depends on FIND
-//config:	help
-//config:	  This option allows find to restrict searches to a single filesystem.
 //config:
 //config:config FEATURE_FIND_MAXDEPTH
 //config:	bool "Enable -mindepth N and -maxdepth N"
 //config:	default y
 //config:	depends on FIND
-//config:	help
-//config:	  This option enables -mindepth N and -maxdepth N option.
 //config:
 //config:config FEATURE_FIND_NEWER
 //config:	bool "Enable -newer: compare file modification times"
@ -126,8 +120,6 @@
 //config:	bool "Enable -inum: inode number matching"
 //config:	default y
 //config:	depends on FIND
-//config:	help
-//config:	  Support the 'find -inum' option for searching by inode number.
 //config:
 //config:config FEATURE_FIND_EXEC
 //config:	bool "Enable -exec: execute commands"
@ -151,15 +143,11 @@
 //config:	bool "Enable -user: username/uid matching"
 //config:	default y
 //config:	depends on FIND
-//config:	help
-//config:	  Support the 'find -user' option for searching by username or uid.
 //config:
 //config:config FEATURE_FIND_GROUP
 //config:	bool "Enable -group: group/gid matching"
 //config:	default y
 //config:	depends on FIND
-//config:	help
-//config:	  Support the 'find -group' option for searching by group name or gid.
 //config:
 //config:config FEATURE_FIND_NOT
 //config:	bool "Enable the 'not' (!) operator"
@ -188,8 +176,6 @@
 //config:	bool "Enable -size: file size matching"
 //config:	default y
 //config:	depends on FIND
-//config:	help
-//config:	  Support the 'find -size' option for searching by file size.
 //config:
 //config:config FEATURE_FIND_PRUNE
 //config:	bool "Enable -prune: exclude subdirectories"
--- a/init/init.c
+++ b/init/init.c
@ -104,13 +104,13 @@
 //config:	  sets TERM to "vt102" if one is found.
 //config:
 //config:config FEATURE_INIT_MODIFY_CMDLINE
-//config:	bool "Modify the command-line to \"init\""
+//config:	bool "Clear init's command line"
 //config:	default y
 //config:	depends on INIT || LINUXRC
 //config:	help
 //config:	  When launched as PID 1 and after parsing its arguments, init
 //config:	  wipes all the arguments but argv[0] and rewrites argv[0] to
-//config:	  contain only "init", so that its command-line appears solely as
+//config:	  contain only "init", so that its command line appears solely as
 //config:	  "init" in tools such as ps.
 //config:	  If this option is set to Y, init will keep its original behavior,
 //config:	  otherwise, all the arguments including argv[0] will be preserved,
--- a/libbb/Config.src
+++ b/libbb/Config.src
@ -70,24 +70,13 @@ config FEATURE_FAST_TOP
 	  but code size is slightly bigger.

 config FEATURE_ETC_NETWORKS
-	bool "Support for /etc/networks"
+	bool "Support /etc/networks"
 	default n
 	help
 	  Enable support for network names in /etc/networks. This is
 	  a rarely used feature which allows you to use names
 	  instead of IP/mask pairs in route command.

-config FEATURE_USE_TERMIOS
-	bool "Use termios to manipulate the screen"
-	default y
-	depends on MORE || TOP || POWERTOP
-	help
-	  This option allows utilities such as 'more' and 'top' to determine
-	  the size of the screen. If you leave this disabled, your utilities
-	  that display things on the screen will be especially primitive and
-	  will be unable to determine the current screen size, and will be
-	  unable to move the cursor.
-
 config FEATURE_EDITING
 	bool "Command line editing"
 	default y
@ -147,15 +136,11 @@ config FEATURE_TAB_COMPLETION
 	bool "Tab completion"
 	default y
 	depends on FEATURE_EDITING
-	help
-	  Enable tab completion.

 config FEATURE_USERNAME_COMPLETION
 	bool "Username completion"
 	default y
 	depends on FEATURE_TAB_COMPLETION
-	help
-	  Enable username completion.

 config FEATURE_EDITING_FANCY_PROMPT
 	bool "Fancy shell prompts"
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@ -6,7 +6,7 @@
 menu "Login/Password Management Utilities"

 config FEATURE_SHADOWPASSWDS
-	bool "Support for shadow passwords"
+	bool "Support shadow passwords"
 	default y
 	help
 	  Build support for shadow password in /etc/shadow. This file is only
--- a/loginutils/addgroup.c
+++ b/loginutils/addgroup.c
@ -19,15 +19,13 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on ADDGROUP && LONG_OPTS
-//config:	help
-//config:	  Support long options for the addgroup applet.
 //config:
 //config:config FEATURE_ADDUSER_TO_GROUP
-//config:	bool "Support for adding users to groups"
+//config:	bool "Support adding users to groups"
 //config:	default y
 //config:	depends on ADDGROUP
 //config:	help
-//config:	  If  called  with two non-option arguments,
+//config:	  If called with two non-option arguments,
 //config:	  addgroup will add an existing user to an
 //config:	  existing group.

--- a/loginutils/adduser.c
+++ b/loginutils/adduser.c
@ -17,8 +17,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on ADDUSER && LONG_OPTS
-//config:	help
-//config:	  Support long options for the adduser applet.
 //config:
 //config:config FEATURE_CHECK_NAMES
 //config:	bool "Enable sanity check on user/group names in adduser and addgroup"
--- a/loginutils/deluser.c
+++ b/loginutils/deluser.c
@ -21,7 +21,7 @@
 //config:	  Utility for deleting a group account.
 //config:
 //config:config FEATURE_DEL_USER_FROM_GROUP
-//config:	bool "Support for removing users from groups"
+//config:	bool "Support removing users from groups"
 //config:	default y
 //config:	depends on DELGROUP
 //config:	help
--- a/loginutils/login.c
+++ b/loginutils/login.c
@ -24,7 +24,7 @@
 //config:	  will not be cleaned up.
 //config:
 //config:config LOGIN_SCRIPTS
-//config:	bool "Support for login scripts"
+//config:	bool "Support login scripts"
 //config:	depends on LOGIN
 //config:	default y
 //config:	help
@ -32,7 +32,7 @@
 //config:	  just prior to switching from root to logged-in user.
 //config:
 //config:config FEATURE_NOLOGIN
-//config:	bool "Support for /etc/nologin"
+//config:	bool "Support /etc/nologin"
 //config:	default y
 //config:	depends on LOGIN
 //config:	help
@ -40,7 +40,7 @@
 //config:	  If it exists, non-root logins are prohibited.
 //config:
 //config:config FEATURE_SECURETTY
-//config:	bool "Support for /etc/securetty"
+//config:	bool "Support /etc/securetty"
 //config:	default y
 //config:	depends on LOGIN
 //config:	help
--- a/loginutils/su.c
+++ b/loginutils/su.c
@ -11,19 +11,18 @@
 //config:	help
 //config:	  su is used to become another user during a login session.
 //config:	  Invoked without a username, su defaults to becoming the super user.
-//config:
-//config:	  Note that Busybox binary must be setuid root for this applet to
+//config:	  Note that busybox binary must be setuid root for this applet to
 //config:	  work properly.
 //config:
 //config:config FEATURE_SU_SYSLOG
-//config:	bool "Enable su to write to syslog"
+//config:	bool "Log to syslog all attempts to use su"
 //config:	default y
 //config:	depends on SU
 //config:
 //config:config FEATURE_SU_CHECKS_SHELLS
-//config:	bool "Enable su to check user's shell to be listed in /etc/shells"
-//config:	depends on SU
+//config:	bool "If user's shell is not in /etc/shells, disallow -s PROG"
 //config:	default y
+//config:	depends on SU

 //applet:/* Needs to be run by root or be suid root - needs to change uid and gid: */
 //applet:IF_SU(APPLET(su, BB_DIR_BIN, BB_SUID_REQUIRE))
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@ -82,7 +82,7 @@
 //config:	  the external modutils.
 //config:
 //config:config DEVFSD_FG_NP
-//config:	bool "Enables the -fg and -np options"
+//config:	bool "Enable the -fg and -np options"
 //config:	default y
 //config:	depends on DEVFSD
 //config:	help
--- a/miscutils/hdparm.c
+++ b/miscutils/hdparm.c
@ -25,7 +25,7 @@
 //config:	default y
 //config:	depends on HDPARM
 //config:	help
-//config:	  Enables the -I and -i options to obtain detailed information
+//config:	  Enable the -I and -i options to obtain detailed information
 //config:	  directly from drives about their capabilities and supported ATA
 //config:	  feature set. If no device name is specified, hdparm will read
 //config:	  identify data from stdin. Enabling this option will add about 16k...
@ -35,7 +35,7 @@
 //config:	default y
 //config:	depends on HDPARM
 //config:	help
-//config:	  Enables the 'hdparm -R' option to register an IDE interface.
+//config:	  Enable the 'hdparm -R' option to register an IDE interface.
 //config:	  This is dangerous stuff, so you should probably say N.
 //config:
 //config:config FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
@ -43,7 +43,7 @@
 //config:	default y
 //config:	depends on HDPARM
 //config:	help
-//config:	  Enables the 'hdparm -U' option to un-register an IDE interface.
+//config:	  Enable the 'hdparm -U' option to un-register an IDE interface.
 //config:	  This is dangerous stuff, so you should probably say N.
 //config:
 //config:config FEATURE_HDPARM_HDIO_DRIVE_RESET
@ -51,7 +51,7 @@
 //config:	default y
 //config:	depends on HDPARM
 //config:	help
-//config:	  Enables the 'hdparm -w' option to perform a device reset.
+//config:	  Enable the 'hdparm -w' option to perform a device reset.
 //config:	  This is dangerous stuff, so you should probably say N.
 //config:
 //config:config FEATURE_HDPARM_HDIO_TRISTATE_HWIF
@ -59,7 +59,7 @@
 //config:	default y
 //config:	depends on HDPARM
 //config:	help
-//config:	  Enables the 'hdparm -x' option to tristate device for hotswap,
+//config:	  Enable the 'hdparm -x' option to tristate device for hotswap,
 //config:	  and the '-b' option to get/set bus state. This is dangerous
 //config:	  stuff, so you should probably say N.
 //config:
@ -68,7 +68,7 @@
 //config:	default y
 //config:	depends on HDPARM
 //config:	help
-//config:	  Enables the 'hdparm -d' option to get/set using_dma flag.
+//config:	  Enable the 'hdparm -d' option to get/set using_dma flag.

 //applet:IF_HDPARM(APPLET(hdparm, BB_DIR_SBIN, BB_SUID_DROP))

--- a/miscutils/last.c
+++ b/miscutils/last.c
@ -14,7 +14,7 @@
 //config:	  'last' displays a list of the last users that logged into the system.
 //config:
 //config:config FEATURE_LAST_FANCY
-//config:	bool "Turn on output of extra information"
+//config:	bool "Output extra information"
 //config:	default y
 //config:	depends on LAST
 //config:	help
--- a/miscutils/less.c
+++ b/miscutils/less.c
@ -87,7 +87,6 @@
 //config:	  this option makes less perform a last-ditch effort to find it:
 //config:	  position cursor to 999,999 and ask terminal to report real
 //config:	  cursor position using "ESC [ 6 n" escape sequence, then read stdin.
-//config:
 //config:	  This is not clean but helps a lot on serial lines and such.
 //config:
 //config:config FEATURE_LESS_DASHCMD
@ -99,11 +98,9 @@
 //config:	  less itself ('-' keyboard command).
 //config:
 //config:config FEATURE_LESS_LINENUMS
-//config:	bool "Enable dynamic switching of line numbers"
+//config:	bool "Enable -N (dynamic switching of line numbers)"
 //config:	default y
 //config:	depends on FEATURE_LESS_DASHCMD
-//config:	help
-//config:	  Enables "-N" command.

 //applet:IF_LESS(APPLET(less, BB_DIR_USR_BIN, BB_SUID_DROP))

--- a/modutils/Config.src
+++ b/modutils/Config.src
@ -133,7 +133,7 @@ config FEATURE_CHECK_TAINTED_MODULE
 	  This option is required to support GPLONLY modules.

 config FEATURE_MODUTILS_ALIAS
-	bool "Support for module.aliases file"
+	bool "Support module.aliases file"
 	default y
 	depends on DEPMOD || MODPROBE
 	select PLATFORM_LINUX
@ -150,7 +150,7 @@ config FEATURE_MODUTILS_ALIAS
 	  Say Y if unsure.

 config FEATURE_MODUTILS_SYMBOLS
-	bool "Support for module.symbols file"
+	bool "Support module.symbols file"
 	default y
 	depends on DEPMOD || MODPROBE
 	select PLATFORM_LINUX
--- 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"
--- 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))
--- 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
--- 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
--- 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))

--- 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
--- 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"
--- 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))
--- 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
--- 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
--- a/procps/Config.src
+++ b/procps/Config.src
@ -8,7 +8,7 @@ menu "Process Utilities"
 INSERT

 config FEATURE_SHOW_THREADS
-	bool "Support for showing threads in ps/pstree/top"
+	bool "Support thread display in ps/pstree/top"
 	default y
 	depends on PS || TOP || PSTREE
 	help
--- a/procps/pidof.c
+++ b/procps/pidof.c
@ -14,18 +14,18 @@
 //config:	  those id's on the standard output.
 //config:
 //config:config FEATURE_PIDOF_SINGLE
-//config:	bool "Enable argument for single shot (-s)"
+//config:	bool "Enable single shot (-s)"
 //config:	default y
 //config:	depends on PIDOF
 //config:	help
-//config:	  Support argument '-s' for returning only the first pid found.
+//config:	  Support '-s' for returning only the first pid found.
 //config:
 //config:config FEATURE_PIDOF_OMIT
-//config:	bool "Enable argument for omitting pids (-o)"
+//config:	bool "Enable omitting pids (-o PID)"
 //config:	default y
 //config:	depends on PIDOF
 //config:	help
-//config:	  Support argument '-o' for omitting the given pids in output.
+//config:	  Support '-o PID' for omitting the given pid(s) in output.
 //config:	  The special pid %PPID can be used to name the parent process
 //config:	  of the pidof, in other words the calling shell or shell script.

--- a/procps/ps.c
+++ b/procps/ps.c
@ -32,19 +32,10 @@
 //config:	  Adds fields PPID, RSS, START, TIME & TTY
 //config:
 //config:config FEATURE_PS_TIME
-//config:	bool "Enable time and elapsed time output"
+//config:	bool "Support -o time and -o etime output specifiers"
 //config:	default y
 //config:	depends on PS && DESKTOP
 //config:	select PLATFORM_LINUX
-//config:	help
-//config:	  Support -o time and -o etime output specifiers.
-//config:
-//config:config FEATURE_PS_ADDITIONAL_COLUMNS
-//config:	bool "Enable additional ps columns"
-//config:	default y
-//config:	depends on PS && DESKTOP
-//config:	help
-//config:	  Support -o rgroup, -o ruser, -o nice output specifiers.
 //config:
 //config:config FEATURE_PS_UNUSUAL_SYSTEMS
 //config:	bool "Support Linux prior to 2.4.0 and non-ELF systems"
@ -53,6 +44,11 @@
 //config:	help
 //config:	  Include support for measuring HZ on old kernels and non-ELF systems
 //config:	  (if you are on Linux 2.4.0+ and use ELF, you don't need this)
+//config:
+//config:config FEATURE_PS_ADDITIONAL_COLUMNS
+//config:	bool "Support -o rgroup, -o ruser, -o nice specifiers"
+//config:	default y
+//config:	depends on PS && DESKTOP

 //applet:IF_PS(APPLET(ps, BB_DIR_BIN, BB_SUID_DROP))

--- a/procps/uptime.c
+++ b/procps/uptime.c
@ -21,11 +21,11 @@
 //config:	  on, and the system load averages for the past 1, 5, and 15 minutes.
 //config:
 //config:config FEATURE_UPTIME_UTMP_SUPPORT
-//config:	bool "Support for showing the number of users"
+//config:	bool "Show the number of users"
 //config:	default y
 //config:	depends on UPTIME && FEATURE_UTMP
 //config:	help
-//config:	  Makes uptime display the number of users currently logged on.
+//config:	  Display the number of users currently logged on.

 //applet:IF_UPTIME(APPLET(uptime, BB_DIR_USR_BIN, BB_SUID_DROP))

--- a/selinux/chcon.c
+++ b/selinux/chcon.c
@ -18,8 +18,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on CHCON && LONG_OPTS
-//config:	help
-//config:	  Support long options for the chcon applet.

 //applet:IF_CHCON(APPLET(chcon, BB_DIR_USR_BIN, BB_SUID_DROP))

--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@ -39,8 +39,6 @@
 //config:	bool "Enable long options"
 //config:	default y
 //config:	depends on RUNCON && LONG_OPTS
-//config:	help
-//config:	  Support long options for the runcon applet.

 //applet:IF_RUNCON(APPLET(runcon, BB_DIR_USR_BIN, BB_SUID_DROP))

--- a/shell/ash.c
+++ b/shell/ash.c
@ -35,8 +35,6 @@
 //config:	bool "Optimize for size instead of speed"
 //config:	default y
 //config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:	help
-//config:	  Compile ash for reduced size at the price of speed.
 //config:
 //config:config ASH_INTERNAL_GLOB
 //config:	bool "Use internal glob() implementation"
@ -46,6 +44,23 @@
 //config:	  Do not use glob() function from libc, use internal implementation.
 //config:	  Use this if you are getting "glob.h: No such file or directory"
 //config:	  or similar build errors.
+//config:	  Note that as of now (2017-01), uclibc and musl glob() both have bugs
+//config:	  which would break ash if you select N here.
+//config:
+//config:config ASH_BASH_COMPAT
+//config:	bool "bash-compatible extensions"
+//config:	default y
+//config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
+//config:
+//config:config ASH_JOB_CONTROL
+//config:	bool "Job control"
+//config:	default y
+//config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
+//config:
+//config:config ASH_ALIAS
+//config:	bool "Alias support"
+//config:	default y
+//config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:
 //config:config ASH_RANDOM_SUPPORT
 //config:	bool "Pseudorandom generator and $RANDOM variable"
@ -63,88 +78,60 @@
 //config:	default y
 //config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:	help
-//config:	  "PS#" may contain volatile content, such as backquote commands.
+//config:	  $PS# may contain volatile content, such as backquote commands.
 //config:	  This option recreates the prompt string from the environment
 //config:	  variable each time it is displayed.
 //config:
-//config:config ASH_BASH_COMPAT
-//config:	bool "bash-compatible extensions"
-//config:	default y
-//config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:	help
-//config:	  Enable bash-compatible extensions.
-//config:
 //config:config ASH_IDLE_TIMEOUT
-//config:	bool "Idle timeout variable"
-//config:	default n
-//config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:	help
-//config:	  Enables bash-like auto-logout after $TMOUT seconds of idle time.
-//config:
-//config:config ASH_JOB_CONTROL
-//config:	bool "Job control"
+//config:	bool "Idle timeout variable $TMOUT"
 //config:	default y
 //config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:	help
-//config:	  Enable job control in the ash shell.
+//config:	  Enable bash-like auto-logout after $TMOUT seconds of idle time.
 //config:
-//config:config ASH_ALIAS
-//config:	bool "Alias support"
+//config:config ASH_MAIL
+//config:	bool "Check for new mail in interactive shell"
 //config:	default y
 //config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:	help
-//config:	  Enable alias support in the ash shell.
-//config:
-//config:config ASH_GETOPTS
-//config:	bool "Builtin getopt to parse positional parameters"
-//config:	default y
-//config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:	help
-//config:	  Enable support for getopts builtin in ash.
+//config:	  Enable "check for new mail" function:
+//config:	  if set, $MAIL file and $MAILPATH list of files
+//config:	  are checked for mtime changes, and "you have mail"
+//config:	  message is printed if change is detected.
 //config:
 //config:config ASH_BUILTIN_ECHO
-//config:	bool "Builtin version of 'echo'"
+//config:	bool "echo builtin"
 //config:	default y
 //config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:	help
-//config:	  Enable support for echo builtin in ash.
 //config:
 //config:config ASH_BUILTIN_PRINTF
-//config:	bool "Builtin version of 'printf'"
+//config:	bool "printf builtin"
 //config:	default y
 //config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:	help
-//config:	  Enable support for printf builtin in ash.
 //config:
 //config:config ASH_BUILTIN_TEST
-//config:	bool "Builtin version of 'test'"
+//config:	bool "test builtin"
 //config:	default y
 //config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:	help
-//config:	  Enable support for test builtin in ash.
 //config:
 //config:config ASH_HELP
 //config:	bool "help builtin"
 //config:	default y
 //config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:	help
-//config:	  Enable help builtin in ash.
+//config:
+//config:config ASH_GETOPTS
+//config:	bool "getopts builtin"
+//config:	default y
+//config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:
 //config:config ASH_CMDCMD
-//config:	bool "'command' command to override shell builtins"
+//config:	bool "command builtin"
 //config:	default y
 //config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:	help
-//config:	  Enable support for the ash 'command' builtin, which allows
-//config:	  you to run the specified command with the specified arguments,
-//config:	  even when there is an ash builtin command with the same name.
-//config:
-//config:config ASH_MAIL
-//config:	bool "Check for new mail on interactive shells"
-//config:	default y
-//config:	depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:	help
-//config:	  Enable "check for new mail" function in the ash shell.
+//config:	  Enable support for the 'command' builtin, which allows
+//config:	  you to run the specified command or builtin,
+//config:	  even when there is a function with the same name.
 //config:
 //config:endif # ash options

--- a/shell/hush.c
+++ b/shell/hush.c
@ -99,8 +99,6 @@
 //config:	bool "bash-compatible extensions"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable bash-compatible extensions.
 //config:
 //config:config HUSH_BRACE_EXPANSION
 //config:	bool "Brace expansion"
@ -123,8 +121,6 @@
 //config:	bool "Save command history to .hush_history"
 //config:	default y
 //config:	depends on HUSH_INTERACTIVE && FEATURE_EDITING_SAVEHISTORY
-//config:	help
-//config:	  Enable history saving in hush.
 //config:
 //config:config HUSH_JOB
 //config:	bool "Job control"
@ -138,39 +134,35 @@
 //config:	  but no separate process group is formed.
 //config:
 //config:config HUSH_TICK
-//config:	bool "Process substitution"
+//config:	bool "Support process substitution"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:	help
-//config:	  Enable process substitution `command` and $(command) in hush.
+//config:	  Enable `command` and $(command).
 //config:
 //config:config HUSH_IF
 //config:	bool "Support if/then/elif/else/fi"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable if/then/elif/else/fi in hush.
 //config:
 //config:config HUSH_LOOPS
 //config:	bool "Support for, while and until loops"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable for, while and until loops in hush.
 //config:
 //config:config HUSH_CASE
 //config:	bool "Support case ... esac statement"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:	help
-//config:	  Enable case ... esac statement in hush. +400 bytes.
+//config:	  Enable case ... esac statement. +400 bytes.
 //config:
 //config:config HUSH_FUNCTIONS
 //config:	bool "Support funcname() { commands; } syntax"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:	help
-//config:	  Enable support for shell functions in hush. +800 bytes.
+//config:	  Enable support for shell functions. +800 bytes.
 //config:
 //config:config HUSH_LOCAL
 //config:	bool "local builtin"
@ -199,22 +191,21 @@
 //config:	bool "echo builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable echo builtin in hush.
 //config:
 //config:config HUSH_PRINTF
 //config:	bool "printf builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable printf builtin in hush.
+//config:
+//config:config HUSH_HELP
+//config:	bool "help builtin"
+//config:	default y
+//config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:
 //config:config HUSH_EXPORT
 //config:	bool "export builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable export builtin in hush.
 //config:
 //config:config HUSH_EXPORT_N
 //config:	bool "Support 'export -n' option"
@ -223,82 +214,55 @@
 //config:	help
 //config:	  export -n unexports variables. It is a bash extension.
 //config:
-//config:config HUSH_HELP
-//config:	bool "help builtin"
-//config:	default y
-//config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable help builtin in hush. Code size + ~1 kbyte.
-//config:
 //config:config HUSH_KILL
-//config:	bool "kill builtin (for kill %jobspec)"
+//config:	bool "kill builtin (supports kill %jobspec)"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable kill builtin in hush.
 //config:
 //config:config HUSH_WAIT
 //config:	bool "wait builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable wait builtin in hush.
 //config:
 //config:config HUSH_TRAP
 //config:	bool "trap builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable trap builtin in hush.
-//config:
-//config:config HUSH_ULIMIT
-//config:	bool "ulimit builtin"
-//config:	default y
-//config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable ulimit builtin in hush.
 //config:
 //config:config HUSH_TYPE
 //config:	bool "type builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable type builtin in hush.
 //config:
 //config:config HUSH_READ
 //config:	bool "read builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable read builtin in hush.
 //config:
 //config:config HUSH_SET
 //config:	bool "set builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable set builtin in hush.
 //config:
 //config:config HUSH_UNSET
 //config:	bool "unset builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable unset builtin in hush.
+//config:
+//config:config HUSH_ULIMIT
+//config:	bool "ulimit builtin"
+//config:	default y
+//config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:
 //config:config HUSH_UMASK
 //config:	bool "umask builtin"
 //config:	default y
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable umask builtin in hush.
 //config:
 //config:config HUSH_MEMLEAK
 //config:	bool "memleak builtin (debugging)"
 //config:	default n
 //config:	depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
-//config:	help
-//config:	  Enable memleak builtin in hush.
 //config:
 //config:config MSH
 //config:	bool "msh (deprecated: aliased to hush)"
@ -1096,8 +1060,6 @@ static const struct built_in_command bltins1[] = {
 	BLTIN("wait"     , builtin_wait    , "Wait for process"),
 #endif
 };
-/* For now, echo and test are unconditionally enabled.
- * Maybe make it configurable? */
 static const struct built_in_command bltins2[] = {
 	BLTIN("["        , builtin_test    , NULL),
 #if ENABLE_HUSH_ECHO
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@ -40,7 +40,7 @@ config FEATURE_MOUNT_LOOP_CREATE
 	  if it does not find a free one.

 config FEATURE_MTAB_SUPPORT
-	bool "Support for the old /etc/mtab file"
+	bool "Support old /etc/mtab file"
 	default n
 	depends on MOUNT || UMOUNT
 	select FEATURE_MOUNT_FAKE
--- a/util-linux/dmesg.c
+++ b/util-linux/dmesg.c
@ -22,7 +22,7 @@
 //config:	  wish to enable the 'dmesg' utility.
 //config:
 //config:config FEATURE_DMESG_PRETTY
-//config:	bool "Pretty dmesg output"
+//config:	bool "Pretty output"
 //config:	default y
 //config:	depends on DMESG
 //config:	help
--- a/util-linux/fbset.c
+++ b/util-linux/fbset.c
@ -22,7 +22,7 @@
 //config:	  if you wish to enable the 'fbset' utility.
 //config:
 //config:config FEATURE_FBSET_FANCY
-//config:	bool "Turn on extra fbset options"
+//config:	bool "Enable extra options"
 //config:	default y
 //config:	depends on FBSET
 //config:	help
@ -32,7 +32,7 @@
 //config:	  options.
 //config:
 //config:config FEATURE_FBSET_READMODE
-//config:	bool "Turn on fbset readmode support"
+//config:	bool "Enable readmode support"
 //config:	default y
 //config:	depends on FBSET
 //config:	help
--- a/util-linux/fdisk.c
+++ b/util-linux/fdisk.c
@ -21,8 +21,6 @@
 //config:	default y
 //config:	depends on FDISK
 //config:	depends on !LFS   # with LFS no special code is needed
-//config:	help
-//config:	  Enable this option to support large disks > 4GB.
 //config:
 //config:config FEATURE_FDISK_WRITABLE
 //config:	bool "Write support"
--- a/util-linux/hwclock.c
+++ b/util-linux/hwclock.c
@ -20,10 +20,6 @@
 //config:	bool "Support long options (--hctosys,...)"
 //config:	default y
 //config:	depends on HWCLOCK && LONG_OPTS
-//config:	help
-//config:	  By default, the hwclock utility only uses short options. If you
-//config:	  are overly fond of its long options, such as --hctosys, --utc, etc)
-//config:	  then enable this option.
 //config:
 //config:config FEATURE_HWCLOCK_ADJTIME_FHS
 //config:	bool "Use FHS /var/lib/hwclock/adjtime"
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@ -90,7 +90,7 @@
 //config:
 //config:config FEATURE_MOUNT_FLAGS
 //config:	depends on MOUNT
-//config:	bool "Support lots of -o flags in mount"
+//config:	bool "Support lots of -o flags"
 //config:	default y
 //config:	help
 //config:	  Without this, mount only supports ro/rw/remount. With this, it
--- a/util-linux/volume_id/bcache.c
+++ b/util-linux/volume_id/bcache.c
@ -10,14 +10,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BCACHE) += bcache.o

-//config:
 //config:config FEATURE_VOLUMEID_BCACHE
 //config:	bool "bcache filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/btrfs.c
+++ b/util-linux/volume_id/btrfs.c
@ -21,14 +21,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_BTRFS) += btrfs.o

-//config:
 //config:config FEATURE_VOLUMEID_BTRFS
 //config:	bool "btrfs filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/cramfs.c
+++ b/util-linux/volume_id/cramfs.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_CRAMFS) += cramfs.o

-//config:
 //config:config FEATURE_VOLUMEID_CRAMFS
 //config:	bool "cramfs filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/exfat.c
+++ b/util-linux/volume_id/exfat.c
@ -20,7 +20,6 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXFAT) += exfat.o

-//config:
 //config:config FEATURE_VOLUMEID_EXFAT
 //config:	bool "exFAT filesystem"
 //config:	default y
@ -29,7 +28,6 @@
 //config:	  exFAT (extended FAT) is a proprietary file system designed especially
 //config:	  for flash drives. It has many features from NTFS, but with less
 //config:	  overhead. exFAT is used on most SDXC cards for consumer electronics.
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/ext.c
+++ b/util-linux/volume_id/ext.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_EXT) += ext.o

-//config:
 //config:config FEATURE_VOLUMEID_EXT
 //config:	bool "Ext filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"
 #include "bb_e2fs_defs.h"
--- a/util-linux/volume_id/f2fs.c
+++ b/util-linux/volume_id/f2fs.c
@ -8,7 +8,6 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_F2FS) += f2fs.o

-//config:
 //config:config FEATURE_VOLUMEID_F2FS
 //config:	bool "f2fs filesystem"
 //config:	default y
@ -18,7 +17,6 @@
 //config:	  which is adapted to newer forms of storage. F2FS also remedies some
 //config:	  known issues of the older log structured file systems, such as high
 //config:	  cleaning overhead.
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/fat.c
+++ b/util-linux/volume_id/fat.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_FAT) += fat.o

-//config:
 //config:config FEATURE_VOLUMEID_FAT
 //config:	bool "fat filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/hfs.c
+++ b/util-linux/volume_id/hfs.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_HFS) += hfs.o

-//config:
 //config:config FEATURE_VOLUMEID_HFS
 //config:	bool "hfs filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/iso9660.c
+++ b/util-linux/volume_id/iso9660.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ISO9660) += iso9660.o

-//config:
 //config:config FEATURE_VOLUMEID_ISO9660
 //config:	bool "iso9660 filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/jfs.c
+++ b/util-linux/volume_id/jfs.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_JFS) += jfs.o

-//config:
 //config:config FEATURE_VOLUMEID_JFS
 //config:	bool "jfs filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/linux_raid.c
+++ b/util-linux/volume_id/linux_raid.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXRAID) += linux_raid.o

-//config:
 //config:config FEATURE_VOLUMEID_LINUXRAID
 //config:	bool "linuxraid"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/linux_swap.c
+++ b/util-linux/volume_id/linux_swap.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LINUXSWAP) += linux_swap.o

-//config:
 //config:config FEATURE_VOLUMEID_LINUXSWAP
 //config:	bool "linux swap filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/luks.c
+++ b/util-linux/volume_id/luks.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_LUKS) += luks.o

-//config:
 //config:config FEATURE_VOLUMEID_LUKS
 //config:	bool "luks filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/nilfs.c
+++ b/util-linux/volume_id/nilfs.c
@ -21,7 +21,6 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NILFS) += nilfs.o

-//config:
 //config:config FEATURE_VOLUMEID_NILFS
 //config:	bool "nilfs filesystem"
 //config:	default y
@ -37,7 +36,6 @@
 //config:	  SOX compliance logging, and so forth. It can serve as an alternative
 //config:	  filesystem for Linux desktop environment, or as a basis of advanced
 //config:	  storage appliances.
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/ntfs.c
+++ b/util-linux/volume_id/ntfs.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_NTFS) += ntfs.o

-//config:
 //config:config FEATURE_VOLUMEID_NTFS
 //config:	bool "ntfs filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/ocfs2.c
+++ b/util-linux/volume_id/ocfs2.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_OCFS2) += ocfs2.o

-//config:
 //config:config FEATURE_VOLUMEID_OCFS2
 //config:	bool "ocfs2 filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/reiserfs.c
+++ b/util-linux/volume_id/reiserfs.c
@ -21,14 +21,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_REISERFS) += reiserfs.o

-//config:
 //config:config FEATURE_VOLUMEID_REISERFS
 //config:	bool "Reiser filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/romfs.c
+++ b/util-linux/volume_id/romfs.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_ROMFS) += romfs.o

-//config:
 //config:config FEATURE_VOLUMEID_ROMFS
 //config:	bool "romfs filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/squashfs.c
+++ b/util-linux/volume_id/squashfs.c
@ -8,7 +8,6 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SQUASHFS) += squashfs.o

-//config:
 //config:config FEATURE_VOLUMEID_SQUASHFS
 //config:	bool "SquashFS filesystem"
 //config:	default y
@ -18,7 +17,6 @@
 //config:	  intended for general read-only filesystem use and in constrained block
 //config:	  device/memory systems (e.g. embedded systems) where low overhead is
 //config:	  needed.
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/sysv.c
+++ b/util-linux/volume_id/sysv.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_SYSV) += sysv.o

-//config:
 //config:config FEATURE_VOLUMEID_SYSV
 //config:	bool "sysv filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/ubifs.c
+++ b/util-linux/volume_id/ubifs.c
@ -8,7 +8,6 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UBIFS) += ubifs.o

-//config:
 //config:config FEATURE_VOLUMEID_UBIFS
 //config:	bool "UBIFS filesystem"
 //config:	default y
@ -16,7 +15,6 @@
 //config:	help
 //config:	  UBIFS (Unsorted Block Image File System) is a file
 //config:	  system for use with raw flash memory media.
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/udf.c
+++ b/util-linux/volume_id/udf.c
@ -20,14 +20,10 @@

 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_UDF) += udf.o

-//config:
 //config:config FEATURE_VOLUMEID_UDF
 //config:	bool "udf filesystem"
 //config:	default y
 //config:	depends on VOLUMEID
-//config:	help
-//config:	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/unused_highpoint.c
+++ b/util-linux/volume_id/unused_highpoint.c
@ -20,14 +20,10 @@

 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HIGHPOINTRAID) += highpoint.o

-//config:
 //config:### config FEATURE_VOLUMEID_HIGHPOINTRAID
 //config:###	bool "highpoint raid"
 //config:###	default y
 //config:###	depends on VOLUMEID
-//config:###	help
-//config:###	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/unused_hpfs.c
+++ b/util-linux/volume_id/unused_hpfs.c
@ -20,14 +20,10 @@

 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_HPFS) += hpfs.o

-//config:
 //config:### config FEATURE_VOLUMEID_HPFS
 //config:###	bool "hpfs filesystem"
 //config:###	default y
 //config:###	depends on VOLUMEID
-//config:###	help
-//config:###	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/unused_isw_raid.c
+++ b/util-linux/volume_id/unused_isw_raid.c
@ -20,14 +20,10 @@

 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_ISWRAID) += isw_raid.o

-//config:
 //config:### config FEATURE_VOLUMEID_ISWRAID
 //config:###	bool "intel raid"
 //config:###	default y
 //config:###	depends on VOLUMEID
-//config:###	help
-//config:###	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/unused_lsi_raid.c
+++ b/util-linux/volume_id/unused_lsi_raid.c
@ -20,14 +20,10 @@

 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LSIRAID) += lsi_raid.o

-//config:
 //config:### config FEATURE_VOLUMEID_LSIRAID
 //config:###	bool "lsi raid"
 //config:###	default y
 //config:###	depends on VOLUMEID
-//config:###	help
-//config:###	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/unused_lvm.c
+++ b/util-linux/volume_id/unused_lvm.c
@ -20,14 +20,10 @@

 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_LVM) += lvm.o

-//config:
 //config:### config FEATURE_VOLUMEID_LVM
 //config:###	bool "lvm"
 //config:###	default y
 //config:###	depends on VOLUMEID
-//config:###	help
-//config:###	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/unused_mac.c
+++ b/util-linux/volume_id/unused_mac.c
@ -20,14 +20,10 @@

 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MAC) += mac.o

-//config:
 //config:### config FEATURE_VOLUMEID_MAC
 //config:###	bool "mac filesystem"
 //config:###	default y
 //config:###	depends on VOLUMEID
-//config:###	help
-//config:###	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/unused_minix.c
+++ b/util-linux/volume_id/unused_minix.c
@ -20,14 +20,10 @@

 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MINIX) += minix.o

-//config:
 //config:### config FEATURE_VOLUMEID_MINIX
 //config:###	bool "minix filesystem"
 //config:###	default y
 //config:###	depends on VOLUMEID
-//config:###	help
-//config:###	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/unused_msdos.c
+++ b/util-linux/volume_id/unused_msdos.c
@ -20,14 +20,10 @@

 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_MSDOS) += msdos.o

-//config:
 //config:### config FEATURE_VOLUMEID_MSDOS
 //config:###	bool "msdos filesystem"
 //config:###	default y
 //config:###	depends on VOLUMEID
-//config:###	help
-//config:###	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/util-linux/volume_id/unused_nvidia_raid.c
+++ b/util-linux/volume_id/unused_nvidia_raid.c
@ -20,14 +20,10 @@

 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_NVIDIARAID) += nvidia_raid.o

-//config:
 //config:### config FEATURE_VOLUMEID_NVIDIARAID
 //config:###	bool "nvidia raid"
 //config:###	default y
 //config:###	depends on VOLUMEID
-//config:###	help
-//config:###	  TODO
-//config:

 #include "volume_id_internal.h"

--- a/Show More
+++ b/Show More