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>

diff --git a/Config.in b/Config.in
index 66f7787d2d6d6fa61a00676ecebf034baa69de97..db15871694acd850a330b94b2a98237a1192dc30 100644 (file)
--- 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.
 

diff --git a/archival/Config.src b/archival/Config.src
index 5e7cfc0a4d4ab6bc67469d379cfc93572f8a8232..0c97f3d7cc5b32d7fab7059058ef8d10842187cf 100644 (file)
--- 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
 

diff --git a/archival/ar.c b/archival/ar.c
index e49d5cb2bf23be497837ae0a4489732becc71d93..d119c75ad8c372cdcbb1ea4f362e67f63d91a84e 100644 (file)
--- 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

diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index aa8453440e3ccde8fdc627cca5817ea44c0126ff..fb7a3678dfbf0e57451ff804aaf294e7fa8ffcf2 100644 (file)
--- 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

diff --git a/archival/cpio.c b/archival/cpio.c
index 540218cb2622137d5c770731bb2a030835227be3..683f0bb1fe9474e1b12a058db06ad1828dc61b46 100644 (file)
--- 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

diff --git a/archival/gzip.c b/archival/gzip.c
index 63bf76053fdcd53cf1ea3808292e8a005eb4081d..e698c26cdc75173e1df235986cec54ee30f3614b 100644 (file)
--- 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

diff --git a/archival/tar.c b/archival/tar.c
index 8e315c610a9d208103252d4f4f837d2c3c8daa59..b1d58a2df6e745c13d4872f3a81dca754c29b7de 100644 (file)
--- 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

diff --git a/console-tools/loadfont.c b/console-tools/loadfont.c
index 52605baa198ff843687ae32a75a46f43f0c4582e..29f723ec00424f2671b8c63a55d2e587e0a10650 100644 (file)
--- 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))

diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c
index 58057268d29eb5f2622ab9686e58afb346650730..d47a33d59803e26ce1be63703d6c7bb6de798c06 100644 (file)
--- 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))
 

diff --git a/coreutils/Config.src b/coreutils/Config.src
index c056320f86279ede6fd491ab1e91dfbd1c96b07b..1d2fea1fbd5d56b00bd4351fcfc7fa408f3398c8 100644 (file)
--- 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

diff --git a/coreutils/chown.c b/coreutils/chown.c
index 50b06d73a1ce69fa6d37ff767d2edc1dd48d75f4..12cd0eacccbf2f46048bfd552d5108bd5cbc258f 100644 (file)
--- 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))
 

diff --git a/coreutils/cp.c b/coreutils/cp.c
index 4ecdaafda0aee16682674abf48b40042214217bd..1e5f36d100545a08e8e4aba40c64c13878a982f2 100644 (file)
--- 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))

diff --git a/coreutils/dd.c b/coreutils/dd.c
index 3d1ba2ee61d4493792752eecbc518ea1d06a6dad..5e68087fc708016291668d3a42e40f4db2d678ae 100644 (file)
--- 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))
 

diff --git a/coreutils/df.c b/coreutils/df.c
index 79e4c4670af9dffbdde855ccbb81d84c607b8ffa..cf367161a6aab8f0f0223881752a7f7c2e412533 100644 (file)
--- 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))
 

diff --git a/coreutils/echo.c b/coreutils/echo.c
index fd0d9b780a0076f294c29c79df927b552ac130b3..d0dba650d4bf42955bcd0f61ea02f4fdc953e6c4 100644 (file)
--- 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))
 

diff --git a/coreutils/env.c b/coreutils/env.c
index e91eddb5c8b4015b0827df7f44ffad3f0af500ef..2bd5f41d08813712ee4b7b780571e728dac5988b 100644 (file)
--- 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))
 

diff --git a/coreutils/expand.c b/coreutils/expand.c
index bb59af46d338e0b3453d61de7b9c2bb80d691b79..29affc932bf16781bcb789812897357997afac82 100644 (file)
--- 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))

diff --git a/coreutils/head.c b/coreutils/head.c
index 176e91e3aa0b556aa21a650d49b82cef6a1018f8..d49113e7f87205f15a1e639d25fc11a3811547f2 100644 (file)
--- 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))
 

diff --git a/coreutils/install.c b/coreutils/install.c
index 831f9b802924c1aa93df97905c954e8f8a0fe854..2a642bdb68c2c8e3efad6db2a4f08330ed720a87 100644 (file)
--- 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))
 

diff --git a/coreutils/ls.c b/coreutils/ls.c
index 0f35c70d51df9f9cdedb5b0755716024e93c5d4a..531eb85b54b8c9e3232370aa3ad298c79ce44f5f 100644 (file)
--- 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"

diff --git a/coreutils/md5_sha1_sum.c b/coreutils/md5_sha1_sum.c
index 783f440279b6302cf79a3eed02023a8b3a38706e..76788554c3529c5a2b7bb419a8d59ee958157a00 100644 (file)
--- 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))

diff --git a/coreutils/mkdir.c b/coreutils/mkdir.c
index 3afe76c28bf6953fc6fb086ef97a01e05ee85a4d..fcc34f1addf81b8cf7311dea6c65b01a6a0132f5 100644 (file)
--- 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))
 

diff --git a/coreutils/mv.c b/coreutils/mv.c
index 1cc318fd1a9ff3357223bee13312fe77b48db86f..df2ef0a52a55989647ec6f253e9b38ec8b65e19f 100644 (file)
--- 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))
 

diff --git a/coreutils/split.c b/coreutils/split.c
index 50918a1ceb938532d7469a0a886c7deaa662b676..7af359d0e87bae8bcb34b6052f5cb45783f017b6 100644 (file)
--- 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"

diff --git a/coreutils/tail.c b/coreutils/tail.c
index 99f58ddd83cda5e306cf865c893c6b95e967e54b..e7a24a7a8be276d17c83b0812151242d681a3b54 100644 (file)
--- 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

diff --git a/coreutils/wc.c b/coreutils/wc.c
index 73837141ee26d85ae87650ff43b2b1e07ae982ae..4c53049b0d564f64de1cc6a69b3e6544d0d12b1e 100644 (file)
--- 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))
 

diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c
index 0bb666abc9a234d18a37c71ec27fe3aa7297e352..3ef28f1d4ae78c101ea4bf1317f24ab209def807 100644 (file)
--- 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"

diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 3625ffee888d0d3bcc88b07a771d110cbb680bef..4a9e0653e29a8da9a5a9c519fccab74e654490ae 100644 (file)
--- 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))
 

diff --git a/editors/Config.src b/editors/Config.src
index c6e9d92af58036f22b5e39ab8bf16f0455281ba8..8f2b265bd2e50a8fd3410d3714a8a3b71dde20da 100644 (file)
--- 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

diff --git a/editors/diff.c b/editors/diff.c
index 75229ad8c134d5839abca17fc13b0ea725a507b7..0eb825cfb144bd193c17975bebd58696287e7e89 100644 (file)
--- 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"

diff --git a/editors/vi.c b/editors/vi.c
index 38a4692fd4057a1697183234f899349fa7902b56..b56b04bdd5e1f7c0eda63740c6fc105164d655fe 100644 (file)
--- 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

diff --git a/findutils/find.c b/findutils/find.c
index 27698e537a1d68fc4f1ed7e92e9b0add574cd261..67aa40b211f9f4c32d795111e442897fa248bbae 100644 (file)
--- 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"

diff --git a/init/init.c b/init/init.c
index 08cfa2f8ce3dfce057d6666d00813541cec76df1..8db4ced58f7a04e907ab71b823702c2fb73f3044 100644 (file)
--- 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,

diff --git a/libbb/Config.src b/libbb/Config.src
index 172fbcc0e7c9ac0c6889cf2c56b19ce139fb633b..c516403059bc138495a1571cb117d332efaf14ac 100644 (file)
--- 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"

diff --git a/loginutils/Config.src b/loginutils/Config.src
index efb954b6c3e4793e77a72a6ba22c62f66a2192a8..beb4eb855a71c8dab54abaac1859946eeab4debf 100644 (file)
--- 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

diff --git a/loginutils/addgroup.c b/loginutils/addgroup.c
index 6b2fd7ba9b0a91ce7120cbaaff0be3e708d888e1..94da4efbbddd94823be31279014c3dc537eb17d1 100644 (file)
--- 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.
 

diff --git a/loginutils/adduser.c b/loginutils/adduser.c
index 608fb8437ae989b646fb9b3cd17bd18d2b4d82ac..c218ac4aa6cbe241b937e1b93f677d52136caef4 100644 (file)
--- 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"

diff --git a/loginutils/deluser.c b/loginutils/deluser.c
index 7c3caf9e3508b7786a58fa8f54d7d89ebebca98e..fbb1614fb9892cc5149b77405f78633ca7d635e9 100644 (file)
--- 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

diff --git a/loginutils/login.c b/loginutils/login.c
index 3ca8213bb98b6efe09d04f8f23d4535c33a843f1..d1757a65dcd493ff71b73741c6d39915e5d4cd03 100644 (file)
--- 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

diff --git a/loginutils/su.c b/loginutils/su.c
index 24ffbde86e8c92e93d023776a313c21c24d58278..d04b85fb13767521c655efe4dd4f46ebad70af43 100644 (file)
--- 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))

diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 99bdc72b8714093a48b7610c2d96aead04f038dc..334f1071b20c02f0c8d5f5e7461ce531014f48da 100644 (file)
--- 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

diff --git a/miscutils/hdparm.c b/miscutils/hdparm.c
index e43a0dec28419cf2657aa3fd0729dca760ae6ba5..84675285a9b0ef6e262d55e34e601171060b5ea2 100644 (file)
--- 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))
 

diff --git a/miscutils/last.c b/miscutils/last.c
index 67c1343f10c421dad7f16da94a2fb964698718ba..b3f125c3f20c0e31b6370d153f38d33291646e2f 100644 (file)
--- 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

diff --git a/miscutils/less.c b/miscutils/less.c
index e90691b49090b21e5755f260cb3070ca38797e65..0b0a9aed4be26e7290d9813cf946e5b25e2d44ca 100644 (file)
--- 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))
 

diff --git a/modutils/Config.src b/modutils/Config.src
index 84ff34a08224845907f824d47a3190527698dd75..1808f332d835deb33c9848fae51d39279bdd0d01 100644 (file)
--- 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

diff --git a/networking/ftpd.c b/networking/ftpd.c
index bcd60a2ad8ffe96ee8eb0adeaa052632669efb1c..a4626c0b54f13b02a7999f48d61cae50c0f9c7f2 100644 (file)
--- 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 40a3271ab0b172ee68fd0eeb0f41ca5a77f10322..35b4e4b6487b3ccb790956f5a9c21f887a0bacb5 100644 (file)
--- 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 cfcd2a06ec4c771c6706ceb291fd8c82f27cd80e..39aad90a8eca29cfe8de72300696fdaa303baadc 100644 (file)
--- 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 1806a6ccc858e503f4c11dcf9abf43f1c7c91ca1..78baa66905bda35389b8c562fc2106e254ee589b 100644 (file)
--- 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 21219424fc6e09d619b4537c52d8816410287e9f..9359f901611969e8978432e50a928fc5c7d5b83a 100644 (file)
--- 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 90da6cdb8e240ec55ffb7db4c3ba88cf59c395ac..68e0c1a040c53ff8b3f1efe6359d48847a5c1ae2 100644 (file)
--- 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 ed86720257aab7b62ba39ed9f218aa6724040741..189364f0c230be024fbf6bb52cb2fec751498eae 100644 (file)
--- 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 a463b0faa9381a204cc8c70a3ec454ed446e49b9..6817861ef7fcf98313a86c3f22c2171448f23fbb 100644 (file)
--- 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 7bc13a7193c818c3446e2b11583d0a3e6a191e69..5c068441ae31f807a40e584a6358caf5a3efc2c5 100644 (file)
--- 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 b082a0f591103dc8d16715bac53364dd732f05b3..c82086878473ebfceab6b9e6395d6060d60b9eb6 100644 (file)
--- 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

diff --git a/procps/Config.src b/procps/Config.src
index eb47607526d723fafa9b1f39c2841f45c2235ac0..35fef2eda533f49982f1130222dcc27540ce8468 100644 (file)
--- 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

diff --git a/procps/pidof.c b/procps/pidof.c
index 069adb7a444d4ef4902fd7f3b779dd8e61afcc50..b64f0cbd6482e5e7e02043eb26111ee487c41e12 100644 (file)
--- 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.
 

diff --git a/procps/ps.c b/procps/ps.c
index e291ecd7ed40d78bff8848ad15566e157c89ac95..1d380590d409a469d6946a7826554da52588854e 100644 (file)
--- 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))
 

diff --git a/procps/uptime.c b/procps/uptime.c
index 4361939255d1b507d93fcd6194808527cfa5a85f..8e8956c0f4e9f330f7fc7a86766070f65c50ef19 100644 (file)
--- 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))
 

diff --git a/selinux/chcon.c b/selinux/chcon.c
index c743013cec394d30d45ea907adcf6991ba793eb8..4a9a4d3d5dfababd55736884d3bd92d5929f2e63 100644 (file)
--- 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))
 

diff --git a/selinux/runcon.c b/selinux/runcon.c
index 16f17110141d01836fb2bfdf8b43f0ae3b6197c7..a30e3552f7c928bac252f17ae23b854729e06b22 100644 (file)
--- 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))
 

diff --git a/shell/ash.c b/shell/ash.c
index 9c46a93e0d4e5303e34fb72a98ff0b83f4365577..20ed9652c28ea8a562fa8ae8527796dc65ebc739 100644 (file)
--- 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:      default y
-//config:      depends on ASH || SH_IS_ASH || BASH_IS_ASH
-//config:      help
-//config:        Enable job control in the ash shell.
-//config:
-//config:config ASH_ALIAS
-//config:      bool "Alias support"
+//config:      bool "Idle timeout variable $TMOUT"
 //config:      default y
 //config:      depends on ASH || SH_IS_ASH || BASH_IS_ASH
 //config:      help
-//config:        Enable alias support in the ash shell.
+//config:        Enable bash-like auto-logout after $TMOUT seconds of idle time.
 //config:
-//config:config ASH_GETOPTS
-//config:      bool "Builtin getopt to parse positional parameters"
+//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 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_CMDCMD
-//config:      bool "'command' command to override shell builtins"
+//config:config ASH_GETOPTS
+//config:      bool "getopts 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:config ASH_CMDCMD
+//config:      bool "command builtin"
 //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
 

diff --git a/shell/hush.c b/shell/hush.c
index 22d71cb0711f6678f35a0fd8c88805390d71d77b..9e508fc6ddd12ebb1126c9fbe9d99e04b9f0b173 100644 (file)
--- 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

diff --git a/util-linux/Config.src b/util-linux/Config.src
index 3c522f948b5adcb60b572568030ee549dfae7191..0971d714a1a3ff8a838f79377441c56f6f2335a6 100644 (file)
--- 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

diff --git a/util-linux/dmesg.c b/util-linux/dmesg.c
index b7b2c69241894f44741a814450e59793d013a85d..c3574f8f57ca6f773e1670a9c27aa05c83914b92 100644 (file)
--- 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

diff --git a/util-linux/fbset.c b/util-linux/fbset.c
index 8a78c1ef93a657e4a6cf0f06e44944dcadc36b06..673bf9aa4f81e887781e2c9b8d64fd8eeb9db30a 100644 (file)
--- 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

diff --git a/util-linux/fdisk.c b/util-linux/fdisk.c
index b988e65a981cb2c057fbd2cae28f0b16d0a4c1eb..54f37baa6d0d9537313caa464935961248ff77e4 100644 (file)
--- 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"

diff --git a/util-linux/hwclock.c b/util-linux/hwclock.c
index 084a7f1e9766ea82b418a27d00c99e63d887d7b3..d65011a71e219d82fb42e2b9a3e8ade0c62e0311 100644 (file)
--- 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"

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 42962b85920c6241ee2b5385da09ddbf9a8069d2..4f5dced1048b0968d92ee14e9ba577bb6bbe5938 100644 (file)
--- 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

diff --git a/util-linux/volume_id/bcache.c b/util-linux/volume_id/bcache.c
index fd40eb0818e4390073386c85e2e8faeceec779e4..334a341c3dcf9caa22376060d589e74ac54a36f2 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/btrfs.c b/util-linux/volume_id/btrfs.c
index e4dddf26d5521ff6739e5a1cd06d66ae4c9d89ba..338a48762278e2d5719d2e3ee3f4994ee4e380f0 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/cramfs.c b/util-linux/volume_id/cramfs.c
index aeb7f20ac8017c5521b9388ef948ad1472034f82..c63223e2bce974beb8bbf21eaa0417fff1949e47 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/exfat.c b/util-linux/volume_id/exfat.c
index c3aa3680435f86f43660e4034136eed774cfe12a..7ed13a70e1a7cab190d3d51c723e60f9347bad20 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/ext.c b/util-linux/volume_id/ext.c
index df39d9342263cb0ba2225696044770d0678c80d7..473b3229a166b9559594db923b987be09e56e301 100644 (file)
--- 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"

diff --git a/util-linux/volume_id/f2fs.c b/util-linux/volume_id/f2fs.c
index bf0b6627841af20b6fb05686df4d1518f3f1f15d..1d3bdae364334257eadda0febae4a350c88e2b59 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/fat.c b/util-linux/volume_id/fat.c
index 476d500a686169924f648424531bc50c92493c77..bc3433daf92818f8018ed3c5cbb082a2d8bcee40 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/hfs.c b/util-linux/volume_id/hfs.c
index 8d34aaf68d547dcf5c2054c8eff1de0692d1b752..78dae0790c6095579abe8e660afa7577909a915a 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/iso9660.c b/util-linux/volume_id/iso9660.c
index 3848de4531407998955a8841a3aba46535b50c2e..23072f87ccb999ba16838794a9b4be6420b954b6 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/jfs.c b/util-linux/volume_id/jfs.c
index a6eaff45b3bb9e437994e2c549b3925d1465aa2c..543d90fe5b2c640676e561d3684d2323ee1ef37a 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/linux_raid.c b/util-linux/volume_id/linux_raid.c
index f20823a6edd6356b18493fb80f0a1ace75b969a8..0db6e866299a79e74f7d59ff1ded50ee00f1cfd4 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/linux_swap.c b/util-linux/volume_id/linux_swap.c
index 39470d48c4b7f328c6ecd28ed86ab86131c2b68e..a35769dfc1b2c82a22cf10dbf66684ea40a9f264 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/luks.c b/util-linux/volume_id/luks.c
index 21cb26f51198246b56a06cb7de404eb148f765a4..4b80b7a6d5fdfc4872d1cb5097b855a80eb5ee2b 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/nilfs.c b/util-linux/volume_id/nilfs.c
index f3a9ef58d63c06133a0d6c8757ab3478df2b4615..ffe919f36db148cc9613f59e8a19ec311a3c469b 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/ntfs.c b/util-linux/volume_id/ntfs.c
index 46f687a564aef232b108cdab3723a2059c1f3cf8..bf85f7ed380604e5be273e9222e0cded2010d945 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/ocfs2.c b/util-linux/volume_id/ocfs2.c
index 415e0bf6192042a791fd1677cfaa598e754351ed..2dedac98b07ecb98ec10672f8baea56b55d7bdfc 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/reiserfs.c b/util-linux/volume_id/reiserfs.c
index 24979fb1c676e75fd84c65f35e2d6caf5f70892e..369d4d9bbf2c43c414c4d5413e6bd10831e69dcd 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/romfs.c b/util-linux/volume_id/romfs.c
index 4754fdb37a568b7b9fd2b37c0e7040cd3ff384a7..95a65f9ef9b40b5d86e91dce76c25b2632b521a8 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/squashfs.c b/util-linux/volume_id/squashfs.c
index 079b6cc31a57bf9bed79205f0dd080b0b78d5e50..6bba199cd024c5c14129fe211c634742e09bea94 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/sysv.c b/util-linux/volume_id/sysv.c
index 7b4b5360b082e70a04f59ea85aa3ac5e5089fa78..cd4cd906b13424219bb604fd9166336a6bf90f11 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/ubifs.c b/util-linux/volume_id/ubifs.c
index 13604ec35c8921a603d7da83b7f09e78396488d9..99b0aa830f3646ef91dfdf6d2ca21249bd6c280c 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/udf.c b/util-linux/volume_id/udf.c
index 921454503d7b83539d82afca616152841ca6c16c..613c80c863cad4c3d9fe8464af4727fb2bbbc9f6 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_highpoint.c b/util-linux/volume_id/unused_highpoint.c
index 7231a1db27951cbf9bd21972e106bc70abb67336..4afa6d9271da9b9fcd2902aa675903116774dc0d 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_hpfs.c b/util-linux/volume_id/unused_hpfs.c
index a87c89fb3e9c2c6c71fdfbc9133bbcb7586a5795..3e16dedbd809e2c77163771c93715865e2cfdbf5 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_isw_raid.c b/util-linux/volume_id/unused_isw_raid.c
index 851bd2f8f4d9d777a0ec4ceefc4dbd1541a1e1ec..fba99be580d5594eea44b17929f120eeea0e99da 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_lsi_raid.c b/util-linux/volume_id/unused_lsi_raid.c
index 52d68deab14b9df36b5ebdb4c5646c2617527412..9dd2b409c1123e3f3283365562afa2ba3da0c654 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_lvm.c b/util-linux/volume_id/unused_lvm.c
index 08fa05243d461fa2d371a1d470d02d255e68a9e1..5ad6d585cbafa07418408ebd266bbcffaafa6a6f 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_mac.c b/util-linux/volume_id/unused_mac.c
index a1a53d1fb6b7364249637579c2385d763dd58ee0..997d330a4e729559e02de4d531c7098b5240f96a 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_minix.c b/util-linux/volume_id/unused_minix.c
index 50afd5c3ebfda69c79fec9742f90b5944d894e7a..443dbc27252cd19ce884c421914ab3fa796a131b 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_msdos.c b/util-linux/volume_id/unused_msdos.c
index 5ebaa3eeff16580835714dedfd096090a414b4c5..f84c0f06fa106ba35610049af1eb4fbe794d7b40 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_nvidia_raid.c b/util-linux/volume_id/unused_nvidia_raid.c
index d99a108f3b1e82b82f5cc19806f707768f64329f..dfb54fa9df6a32528779ce9693a1eff6dbab0863 100644 (file)
--- 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"
 

diff --git a/util-linux/volume_id/unused_promise_raid.c b/util-linux/volume_id/unused_promise_raid.c
index cebebe35f4521960a279225b51747d2753ed494d..d594de39c9668cab8c47a8efcecfa1d587649ebf 100644 (file)
--- a/util-linux/volume_id/unused_promise_raid.c
+++ b/util-linux/volume_id/unused_promise_raid.c
@@ -20,14 +20,10 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_PROMISERAID) += promise_raid.o
 
-//config:
 //config:### config FEATURE_VOLUMEID_PROMISERAID
 //config:###   bool "promise raid"
 //config:###   default y
 //config:###   depends on VOLUMEID
-//config:###   help
-//config:###     TODO
-//config:
 
 #include "volume_id_internal.h"
 

diff --git a/util-linux/volume_id/unused_silicon_raid.c b/util-linux/volume_id/unused_silicon_raid.c
index 40c8faa9e8bc6de1c98c65fe22e3070f9c9c7cca..886721b618d99fdb08ed514f3e90b734edcde5f4 100644 (file)
--- a/util-linux/volume_id/unused_silicon_raid.c
+++ b/util-linux/volume_id/unused_silicon_raid.c
@@ -20,14 +20,10 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_SILICONRAID) += silicon_raid.o
 
-//config:
 //config:### config FEATURE_VOLUMEID_SILICONRAID
 //config:###   bool "silicon raid"
 //config:###   default y
 //config:###   depends on VOLUMEID
-//config:###   help
-//config:###     TODO
-//config:
 
 #include "volume_id_internal.h"
 

diff --git a/util-linux/volume_id/unused_ufs.c b/util-linux/volume_id/unused_ufs.c
index d33c10fc41bc21b080f48235f6ebd8bbf128d40c..78ef26ad4a7c9c88f0cf571687e1bf5193a18500 100644 (file)
--- a/util-linux/volume_id/unused_ufs.c
+++ b/util-linux/volume_id/unused_ufs.c
@@ -20,14 +20,10 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_UFS) += ufs.o
 
-//config:
 //config:### config FEATURE_VOLUMEID_UFS
 //config:###   bool "ufs filesystem"
 //config:###   default y
 //config:###   depends on VOLUMEID
-//config:###   help
-//config:###     TODO
-//config:
 
 #include "volume_id_internal.h"
 

diff --git a/util-linux/volume_id/unused_via_raid.c b/util-linux/volume_id/unused_via_raid.c
index 258f93a4fc547e115a2c1f98556211a4c8cb1cc3..f8262665560f4aa633fe307cf80c2ff6eb54b714 100644 (file)
--- a/util-linux/volume_id/unused_via_raid.c
+++ b/util-linux/volume_id/unused_via_raid.c
@@ -20,14 +20,10 @@
 
 //kbuild:### lib-$(CONFIG_FEATURE_VOLUMEID_VIARAID) += via_raid.o
 
-//config:
 //config:### config FEATURE_VOLUMEID_VIARAID
 //config:###   bool "via raid"
 //config:###   default y
 //config:###   depends on VOLUMEID
-//config:###   help
-//config:###     TODO
-//config:
 
 #include "volume_id_internal.h"
 

diff --git a/util-linux/volume_id/xfs.c b/util-linux/volume_id/xfs.c
index 5eefc201de50e1b7215446d6d2926937c65f9231..656d5bfcf6cfb360c2675a093e8ce18fdb4392a4 100644 (file)
--- a/util-linux/volume_id/xfs.c
+++ b/util-linux/volume_id/xfs.c
@@ -20,14 +20,10 @@
 
 //kbuild:lib-$(CONFIG_FEATURE_VOLUMEID_XFS) += xfs.o
 
-//config:
 //config:config FEATURE_VOLUMEID_XFS
 //config:      bool "xfs filesystem"
 //config:      default y
 //config:      depends on VOLUMEID
-//config:      help
-//config:        TODO
-//config:
 
 #include "volume_id_internal.h"