[kernel] refresh 2.6.31 patches

[openwrt.git] / package / busybox / config / editors / Config.in

diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in
index 0f0a18c..6175df7 100644 (file)
--- a/package/busybox/config/editors/Config.in
+++ b/package/busybox/config/editors/Config.in
@@ -9,17 +9,10 @@ config BUSYBOX_CONFIG_AWK
        bool "awk"
        default y
        help
-         Awk is used as a pattern scanning and processing language.  This is
+         Awk is used as a pattern scanning and processing language. This is
          the BusyBox implementation of that programming language.
 
-config BUSYBOX_CONFIG_AWX
-       bool "Enable awx (awk web extension)"
-       default y
-       depends on BUSYBOX_CONFIG_AWK
-       help
-         awx - awk web extension
-
-config BUSYBOX_CONFIG_FEATURE_AWK_MATH
+config BUSYBOX_CONFIG_FEATURE_AWK_LIBM
        bool "Enable math functions (requires libm)"
        default y
        depends on BUSYBOX_CONFIG_AWK
@@ -42,13 +35,12 @@ config BUSYBOX_CONFIG_DIFF
          differences between them in a form that can be given to
          the patch command.
 
-config BUSYBOX_CONFIG_FEATURE_DIFF_BINARY
-       bool "Enable checks for binary files"
+config BUSYBOX_CONFIG_FEATURE_DIFF_LONG_OPTIONS
+       bool "Enable long options"
        default n
-       depends on BUSYBOX_CONFIG_DIFF
+       depends on BUSYBOX_CONFIG_DIFF && BUSYBOX_CONFIG_LONG_OPTS
        help
-         This option enables support for checking for binary files
-         before a comparison is carried out.
+         Enable use of long options.
 
 config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
        bool "Enable directory support"
@@ -58,20 +50,12 @@ config BUSYBOX_CONFIG_FEATURE_DIFF_DIR
          This option enables support for directory and subdirectory
          comparison.
 
-config BUSYBOX_CONFIG_FEATURE_DIFF_MINIMAL
-       bool "Enable -d option to find smaller sets of changes"
-       default n
-       depends on BUSYBOX_CONFIG_DIFF
-       help
-         Enabling this option allows the use of -d to make diff
-         try hard to find the smallest possible set of changes.
-
 config BUSYBOX_CONFIG_ED
        bool "ed"
        default n
        help
          The original 1970's Unix text editor, from the days of teletypes.
-         Small, simple, evil.  Part of SUSv3.  If you're not already using
+         Small, simple, evil. Part of SUSv3. If you're not already using
          this, you don't need it.
 
 config BUSYBOX_CONFIG_PATCH
@@ -91,9 +75,9 @@ config BUSYBOX_CONFIG_VI
        bool "vi"
        default y
        help
-         'vi' is a text editor.  More specifically, it is the One True
-         text editor <grin>.  It does, however, have a rather steep
-         learning curve.  If you are not already comfortable with 'vi'
+         'vi' is a text editor. More specifically, it is the One True
+         text editor <grin>. It does, however, have a rather steep
+         learning curve. If you are not already comfortable with 'vi'
          you may wish to use something else.
 
 config BUSYBOX_CONFIG_FEATURE_VI_MAX_LEN
@@ -120,7 +104,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_COLON
        default y
        depends on BUSYBOX_CONFIG_VI
        help
-         Enable a limited set of colon commands for vi.  This does not
+         Enable a limited set of colon commands for vi. This does not
          provide an "ex" mode.
 
 config BUSYBOX_CONFIG_FEATURE_VI_YANKMARK
@@ -144,7 +128,7 @@ config BUSYBOX_CONFIG_FEATURE_VI_USE_SIGNALS
        default y
        depends on BUSYBOX_CONFIG_VI
        help
-         Selecting this option will make busybox vi signal aware.  This will
+         Selecting this option will make busybox vi signal aware. This will
          make busybox vi support SIGWINCH to deal with Window Changes, catch
          Ctrl-Z and Ctrl-C and alarms.