Patch from David Meggy to make the swap default to the new version if no

[oweals/busybox.git] / archival / Config.in

diff --git a/archival/Config.in b/archival/Config.in
index 09e40dd494c10311263bac6c3270ea5cb08323dd..8859bb1376099d18578ae9b520f8961a1f2c4983 100644 (file)
--- a/archival/Config.in
+++ b/archival/Config.in
@@ -16,13 +16,14 @@ config CONFIG_AR
          The original files' contents, mode (permissions), timestamp, owner,
          and group are preserved in the archive, and can be restored on
          extraction.
+
          The stored filename is limited to 15 characters. (for more information
          see long filename support).
          ar has 60 bytes of overheads for every stored file.
 
          This implementation of ar can extract archives, it cannot create or
          modify them.
-         On an x86 system, the ar applet adds about XXX bytes.
+         On an x86 system, the ar applet adds about 1K.
 
          Unless you have a specific application which requires ar, you should
          probably say N here.
@@ -41,14 +42,14 @@ config CONFIG_BUNZIP2
        bool "bunzip2"
        default n
        help
-         bunzip2 is an compression utility using the Burrows-Wheeler block
+         bunzip2 is a compression utility using the Burrows-Wheeler block
          sorting text compression algorithm, and Huffman coding.  Compression
          is generally considerably better than that achieved by more
          conventional LZ77/LZ78-based compressors, and approaches the
          performance of the PPM family of statistical compressors.  
          
          The BusyBox bunzip2 applet is limited to de-compression only.
-         On an x86 system, this applet adds about XXX bytes.
+         On an x86 system, this applet adds about 11K.
          
          Unless you have a specific application which requires bunzip2, you
          should probably say N here.
@@ -92,7 +93,7 @@ config CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
        default n
        depends on CONFIG_DPKG_DEB
        help
-         This reduced dpkg-deb to the equivalent of "ar -p <deb> data.tar.gz | tar -zx".
+         This reduces dpkg-deb to the equivalent of "ar -p <deb> data.tar.gz | tar -zx".
          However it saves space as none of the extra dpkg-deb, ar or tar options are 
          needed, they are linked to internally.
 
@@ -103,7 +104,7 @@ config CONFIG_FEATURE_DEB_TAR_GZ
        help
          This is the default compression method inside the debian ar file.
          
-         If you want compatability with standard .deb's you should say yes here.
+         If you want compatibility with standard .deb's you should say yes here.
 
 config CONFIG_FEATURE_DEB_TAR_BZ2
        bool "  bzip2 debian packages"
@@ -113,7 +114,7 @@ config CONFIG_FEATURE_DEB_TAR_BZ2
          This allows dpkg and dpkg-deb to extract deb's that are compressed internally
          with bzip2 instead of gzip.
          
-         You only want this is your are creating your own custom debian packages that
+         You only want this if you are creating your own custom debian packages that
          use an internal control.tar.bz2 or data.tar.bz2.
 
 config CONFIG_GUNZIP
@@ -129,7 +130,7 @@ config CONFIG_FEATURE_GUNZIP_UNCOMPRESS
        default n
        depends on CONFIG_GUNZIP
        help
-         If you want gunzip to have the ability to decompress
+         Enable if you want gunzip to have the ability to decompress
          archives created by the program compress (not much
          used anymore).
 
@@ -138,7 +139,7 @@ config CONFIG_GZIP
        default n
        help
          gzip is used to compress files.
-         It's probably the most used UNIX compression program.
+         It's probably the most widely used UNIX compression program.
 
 config CONFIG_RPM2CPIO
        bool "rpm2cpio"
@@ -150,14 +151,14 @@ config CONFIG_RPM
        bool "rpm"
        default n
        help
-         Mini RPM applet - querys and extracts
+         Mini RPM applet - queries and extracts
 
 config CONFIG_TAR
        bool "tar"
        default n
        help
          tar is an archiving program. It's commonly used with gzip to
-         create compressed archives. It's probably the most used
+         create compressed archives. It's probably the most widely used
          UNIX archive program.
 
 config CONFIG_FEATURE_TAR_CREATE
@@ -197,8 +198,8 @@ config CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY
        default N
        depends on CONFIG_TAR
        help
-         This option is required to unpack archives created with
-         in the old GNU format, help to kill this old format by
+         This option is required to unpack archives created in
+         the old GNU format; help to kill this old format by
          repacking your ancient archives with the new format.
 
 config CONFIG_FEATURE_TAR_GNU_EXTENSIONS
@@ -209,13 +210,6 @@ config CONFIG_FEATURE_TAR_GNU_EXTENSIONS
          With this option busybox supports GNU long filenames and 
          linknames.
 
-config CONFIG_FEATURE_UNARCHIVE_TAPE
-       bool "  Enable tape drive support"
-       default n
-       depends on CONFIG_TAR || CONFIG_CPIO
-       help
-         I dont think this is needed anymore.
-
 config CONFIG_UNCOMPRESS
        bool "uncompress"
        default n
@@ -233,4 +227,14 @@ config CONFIG_UNZIP
          current directory. Use the `-d' option to extract to a
          directory of your choice.
 
+comment "Common options for cpio and tar"
+       depends on CONFIG_CPIO || CONFIG_TAR
+
+config CONFIG_FEATURE_UNARCHIVE_TAPE
+       bool "  Enable tape drive support"
+       default n
+       depends on CONFIG_CPIO || CONFIG_TAR
+       help
+         I don't think this is needed anymore.
+
 endmenu