Patch from larry to fix some grammar errors.

git-svn-id: svn://busybox.net/trunk/busybox@2715 69ca8d6d-28ef-0310-b511-8ec308f3f277

32 files changed, 89 insertions, 89 deletions

diff --git a/Config.h b/Config.h
index d35f1a4bf..f506bc558 100644
--- a/Config.h
+++ b/Config.h
@@ -2,8 +2,8 @@
 // This file defines the feature set to be compiled into busybox.
 // When you turn things off here, they won't be compiled in at all.
 //
-//// This file is parsed by sed. You MUST use single line comments.
-//   i.e.  //#define BB_BLAH
+//// This file is parsed by sed.  You MUST use single line comments.
+//   i.e.,  //#define BB_BLAH
 //
 //
 // BusyBox Applications
@@ -229,7 +229,7 @@
 #define BB_FEATURE_NFSMOUNT
 //
 // Enable support forced filesystem unmounting 
-// (i.e. in case of an unreachable NFS system).
+// (i.e., in case of an unreachable NFS system).
 #define BB_FEATURE_MOUNT_FORCE
 //
 // Enable support for creation of tar files.
@@ -296,7 +296,7 @@
 //
 // Support for uClinux memory usage optimization, which will load the image
 // directly into the kernel memory.  This divides memory requrements by three.
-// If you are not running uClinux (i.e. your CPU has an MMU) leave this
+// If you are not running uClinux (i.e., your CPU has an MMU) leave this
 // disabled...
 //#define BB_FEATURE_INSMOD_LOADINKMEM
 //
diff --git a/Config.h.Hurd b/Config.h.Hurd
index 87be05f63..837c807cc 100644
--- a/Config.h.Hurd
+++ b/Config.h.Hurd
@@ -7,7 +7,7 @@
 // When you turn things off here, they won't be compiled in at all.
 //
 //// This file is parsed by sed. You MUST use single line comments.
-//   i.e.  //#define BB_BLAH
+//   i.e.,  //#define BB_BLAH
 //
 //
 // BusyBox Applications
@@ -208,7 +208,7 @@
 //#define BB_FEATURE_NFSMOUNT
 //
 // Enable support forced filesystem unmounting 
-// (i.e. in case of an unreachable NFS system).
+// (i.e., in case of an unreachable NFS system).
 #define BB_FEATURE_MOUNT_FORCE
 //
 // Enable support for creation of tar files.
diff --git a/TODO b/TODO
index 47ffe46de..7237ab736 100644
--- a/TODO
+++ b/TODO
@@ -42,7 +42,7 @@ Run the following:
     rm -f busybox && make LDFLAGS+=-nostdlib 2>&1 | \
         sed -ne 's/.*undefined reference to `\(.*\)..*/\1/gp' | sort | uniq
 
-reveals the list of all external (i.e. libc) things that BusyBox depends on.
+reveals the list of all external (i.e., libc) things that BusyBox depends on.
 It would be a very nice thing to reduce this list to an absolute minimum, to
 reduce the footprint of busybox, especially when staticly linking with
 libraries such as uClibc.
diff --git a/applets/busybox.c b/applets/busybox.c
index 9cc884854..f3d0c4c2f 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
 
 #ifdef BB_SH
         /* Add in a special case hack -- whenever **argv == '-'
-         * (i.e. '-su' or '-sh') always invoke the shell */
+         * (i.e., '-su' or '-sh') always invoke the shell */
         if (**argv == '-' && *(*argv+1)!= '-') {
                 applet_name = "sh";
         }
diff --git a/applets/usage.h b/applets/usage.h
index aa66d3733..da09c72c6 100644
--- a/applets/usage.h
+++ b/applets/usage.h
@@ -165,7 +165,7 @@
 #define dc_full_usage \
         "This is a Tiny RPN calculator that understands the\n" \
         "following operations: +, -, /, *, and, or, not, eor.\n" \
-        "i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
+        "i.e., 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
 #define dc_example_usage \
         "$ dc 2 2 +\n" \
         "4\n" \
@@ -221,7 +221,7 @@
         "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
         "\t-m\tprint sizes in megabytes\n" \
         "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-        "\n\t-k\tprint sizes in kilobytes(compatability)")
+        "\n\t-k\tprint sizes in kilobytes(compatibility)")
 #define df_example_usage \
         "$ df\n" \
         "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
@@ -275,7 +275,7 @@
         "\t-f\tDisplay control field name starting with [argument]\n" \
         "\t-I\tDisplay the control filenamed [argument]\n" \
         "\t-t\tExtract filesystem tree to stdout in tar format\n" \
-        "\t-x\tExctract packages filesystem tree to directory\n" \
+        "\t-x\tExtract packages filesystem tree to directory\n" \
         "\t-X\tVerbose extract"
 #define dpkg_deb_example_usage \
         "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
@@ -292,7 +292,7 @@
         "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
         "\t-m\tprint sizes in megabytes\n" \
         "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-        "\n\t-k\tprint sizes in kilobytes(compatability)")
+        "\n\t-k\tprint sizes in kilobytes(compatibility)")
 #define du_example_usage \
         "$ du\n" \
         "16      ./CVS\n" \
@@ -317,7 +317,7 @@
         "[FILE]"
 #define dutmp_full_usage \
         "Dump utmp file format (pipe delimited) from FILE\n" \
-        "or stdin to stdout.  (i.e. 'dutmp /var/run/utmp')"
+        "or stdin to stdout.  (i.e., 'dutmp /var/run/utmp')"
 #define dutmp_example_usage \
         "$ dutmp /var/run/utmp\n" \
         "8|7||si|||0|0|0|955637625|760097|0\n" \
@@ -334,7 +334,7 @@
         "Prints the specified ARGs to stdout\n\n" \
         "Options:\n" \
         "\t-n\tsuppress trailing newline\n" \
-        "\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n" \
+        "\t-e\tinterpret backslash-escaped characters (i.e., \\t=tab)\n" \
         "\t-E\tdisable interpretation of backslash-escaped characters"
 #define echo_example_usage \
         "$ echo "Erik is cool"\n" \
@@ -713,7 +713,7 @@
 "                       sysinit actions are completed before continuing.  Following the\n" \
 "                       completion of all sysinit actions, all 'wait' actions are run.\n" \
 "                       'wait' actions, like  'sysinit' actions, cause init to wait until\n" \
-"                       the specified task completes.  'once' actions are asyncronous,\n" \
+"                       the specified task completes.  'once' actions are asynchronous,\n" \
 "                       therefore, init does not wait for them to complete.  'ctrlaltdel'\n" \
 "                       actions are run when the system detects that someone on the system\n" \
 "                       console has pressed the CTRL-ALT-DEL key combination.  Typically one\n" \
@@ -949,7 +949,7 @@
         USAGE_HUMAN_READABLE( \
         "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
         "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-        "\t-k\tprint sizes in kilobytes(compatability)") 
+        "\t-k\tprint sizes in kilobytes(compatibility)") 
 
 #define lsmod_trivial_usage \
         ""
@@ -1061,7 +1061,7 @@
         "[-q] TEMPLATE"
 #define mktemp_full_usage \
         "Creates a temporary file with its name based on TEMPLATE.\n" \
-        "TEMPLATE is any name with six `Xs' (i.e. /tmp/temp.XXXXXX)."
+        "TEMPLATE is any name with six `Xs' (i.e., /tmp/temp.XXXXXX)."
 #define mktemp_example_usage \
         "$ mktemp /tmp/temp.XXXXXX\n" \
         "/tmp/temp.mWiLjM\n" \
@@ -1608,7 +1608,7 @@
         "\nFlags:\n" "\t-a\tUnmount all file systems" \
         USAGE_MTAB(" in /etc/mtab\n\t-n\tDon't erase /etc/mtab entries") \
         "\n\t-r\tTry to remount devices as read-only if mount is busy" \
-        USAGE_MOUNT_FORCE("\n\t-f\tForce umount (i.e. unreachable NFS server)") \
+        USAGE_MOUNT_FORCE("\n\t-f\tForce umount (i.e., unreachable NFS server)") \
         USAGE_MOUNT_LOOP("\n\t-l\tDo not free loop device (if a loop device has been used)")
 #define umount_example_usage \
         "$ umount /dev/hdc1 \n"
diff --git a/archival/tar.c b/archival/tar.c
index 282656fe7..9e1270cca 100644
--- a/archival/tar.c
+++ b/archival/tar.c
@@ -4,7 +4,7 @@
  *
  * Note, that as of BusyBox-0.43, tar has been completely rewritten from the
  * ground up.  It still has remnents of the old code lying about, but it is
- * very different now (i.e. cleaner, less global variables, etc)
+ * very different now (i.e., cleaner, less global variables, etc.)
  *
  * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
@@ -121,7 +121,7 @@ struct TarInfo
         gid_t            gid;            /* Numeric GID */
         size_t           size;           /* Size of file */
         time_t           mtime;          /* Last-modified time */
-        enum TarFileType type;           /* Regular, directory, link, etc */
+        enum TarFileType type;           /* Regular, directory, link, etc. */
         char *           linkname;       /* Name for symbolic and hard links */
         long             devmajor;       /* Major number for special device */
         long             devminor;       /* Minor number for special device */
@@ -303,7 +303,7 @@ static void
 fixUpPermissions(TarInfo *header)
 {
         struct utimbuf t;
-        /* Now set permissions etc for the new file */
+        /* Now set permissions etc. for the new file */
         chown(header->name, header->uid, header->gid);
         chmod(header->name, header->mode);
         /* Reset the time */
@@ -418,7 +418,7 @@ tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
                 return( FALSE);
         }
 
-        /* Now set permissions etc for the new directory */
+        /* Now set permissions etc. for the new directory */
         fixUpPermissions(header);
         return( TRUE);
 }
@@ -471,7 +471,7 @@ tarExtractSpecial(TarInfo *header, int extractFlag, int tostdoutFlag)
                 }
         }
 
-        /* Now set permissions etc for the new directory */
+        /* Now set permissions etc. for the new directory */
         fixUpPermissions(header);
         return( TRUE);
 }
@@ -952,7 +952,7 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name,
                 return ( FALSE);
         }
 
-        /* Calculate and store the checksum (i.e. the sum of all of the bytes of
+        /* Calculate and store the checksum (i.e., the sum of all of the bytes of
          * the header).  The checksum field must be filled with blanks for the
          * calculation.  The checksum field is formatted differently from the
          * other fields: it has [6] digits, a null, then a space -- rather than
diff --git a/busybox.c b/busybox.c
index 9cc884854..f3d0c4c2f 100644
--- a/busybox.c
+++ b/busybox.c
@@ -76,7 +76,7 @@ int main(int argc, char **argv)
 
 #ifdef BB_SH
         /* Add in a special case hack -- whenever **argv == '-'
-         * (i.e. '-su' or '-sh') always invoke the shell */
+         * (i.e., '-su' or '-sh') always invoke the shell */
         if (**argv == '-' && *(*argv+1)!= '-') {
                 applet_name = "sh";
         }
diff --git a/coreutils/date.c b/coreutils/date.c
index 93b078b45..6db3e2838 100644
--- a/coreutils/date.c
+++ b/coreutils/date.c
@@ -199,7 +199,7 @@ int date_main(int argc, char **argv)
                         date_conv_time(&tm_time, date_str);
                 }
 
-                /* Correct any day of week and day of year etc fields */
+                /* Correct any day of week and day of year etc. fields */
                 tm = mktime(&tm_time);
                 if (tm < 0)
                         error_msg_and_die(invalid_date, date_str); 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index c13b225fa..ec8e216fa 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -21,7 +21,7 @@
 /*
  * To achieve a small memory footprint, this version of 'ls' doesn't do any
  * file sorting, and only has the most essential command line switches
- * (i.e. the ones I couldn't live without :-) All features which involve
+ * (i.e., the ones I couldn't live without :-) All features which involve
  * linking in substantial chunks of libc can be disabled.
  *
  * Although I don't really want to add new features to this program to
diff --git a/date.c b/date.c
index 93b078b45..6db3e2838 100644
--- a/date.c
+++ b/date.c
@@ -199,7 +199,7 @@ int date_main(int argc, char **argv)
                         date_conv_time(&tm_time, date_str);
                 }
 
-                /* Correct any day of week and day of year etc fields */
+                /* Correct any day of week and day of year etc. fields */
                 tm = mktime(&tm_time);
                 if (tm < 0)
                         error_msg_and_die(invalid_date, date_str); 
diff --git a/debian/Config.h-deb b/debian/Config.h-deb
index 400895545..5db15f2da 100644
--- a/debian/Config.h-deb
+++ b/debian/Config.h-deb
@@ -3,7 +3,7 @@
 // When you turn things off here, they won't be compiled in at all.
 //
 //// This file is parsed by sed. You MUST use single line comments.
-//   i.e.  //#define BB_BLAH
+//   i.e.,  //#define BB_BLAH
 //
 //
 // BusyBox Applications
@@ -222,7 +222,7 @@
 #define BB_FEATURE_NFSMOUNT
 //
 // Enable support forced filesystem unmounting 
-// (i.e. in case of an unreachable NFS system).
+// (i.e., in case of an unreachable NFS system).
 #define BB_FEATURE_MOUNT_FORCE
 //
 // use -i (interactive) flag for rm
diff --git a/debian/Config.h-static b/debian/Config.h-static
index 9a40b6619..4fcd0407c 100644
--- a/debian/Config.h-static
+++ b/debian/Config.h-static
@@ -3,7 +3,7 @@
 // When you turn things off here, they won't be compiled in at all.
 //
 //// This file is parsed by sed. You MUST use single line comments.
-//   i.e.  //#define BB_BLAH
+//   i.e.,  //#define BB_BLAH
 //
 //
 // BusyBox Applications
@@ -222,7 +222,7 @@
 #define BB_FEATURE_NFSMOUNT
 //
 // Enable support forced filesystem unmounting 
-// (i.e. in case of an unreachable NFS system).
+// (i.e., in case of an unreachable NFS system).
 #define BB_FEATURE_MOUNT_FORCE
 //
 // use -i (interactive) flag for rm
diff --git a/debian/Config.h-udeb b/debian/Config.h-udeb
index 5184c9f45..00b59aef5 100644
--- a/debian/Config.h-udeb
+++ b/debian/Config.h-udeb
@@ -3,7 +3,7 @@
 // When you turn things off here, they won't be compiled in at all.
 //
 //// This file is parsed by sed. You MUST use single line comments.
-//   i.e.  //#define BB_BLAH
+//   i.e.,  //#define BB_BLAH
 //
 //
 // BusyBox Applications
@@ -222,7 +222,7 @@
 #define BB_FEATURE_NFSMOUNT
 //
 // Enable support forced filesystem unmounting 
-// (i.e. in case of an unreachable NFS system).
+// (i.e., in case of an unreachable NFS system).
 #define BB_FEATURE_MOUNT_FORCE
 //
 // use -i (interactive) flag for rm
diff --git a/debian/control b/debian/control
index 48aac821e..09990bf2a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Section: utils
 Description: Tiny utilities for small and embedded systems. 
  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides minimalist replacements for the most common
- utilities you would usually find on your desktop system (i.e. ls, cp, mv,
- mount, tar, etc).  The utilities in BusyBox generally have fewer options than
+ utilities you would usually find on your desktop system (i.e., ls, cp, mv,
+ mount, tar, etc.).  The utilities in BusyBox generally have fewer options than
  their full-featured GNU cousins; however, the options that are included
  provide the expected functionality and behave very much like their GNU
  counterparts.
@@ -33,8 +33,8 @@ Section: shells
 Description: Provides a stand alone rescue shell with tons of builtin utilities. 
  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides minimalist replacements for the most common
- utilities you would usually find on your desktop system (i.e. ls, cp, mv,
- mount, tar, etc).  The utilities in BusyBox generally have fewer options than
+ utilities you would usually find on your desktop system (i.e., ls, cp, mv,
+ mount, tar, etc.).  The utilities in BusyBox generally have fewer options than
  their full-featured GNU cousins; however, the options that are included
  provide the expected functionality and behave very much like their GNU
  counterparts.
@@ -53,8 +53,8 @@ Section: debian-installer
 Description: Tiny utilities for the debian-installer
  BusyBox combines tiny versions of many common UNIX utilities into a single
  small executable. It provides minimalist replacements for the most common
- utilities you would usually find on your desktop system (i.e. ls, cp, mv,
- mount, tar, etc).  The utilities in BusyBox generally have fewer options than
+ utilities you would usually find on your desktop system (i.e., ls, cp, mv,
+ mount, tar, etc.).  The utilities in BusyBox generally have fewer options than
  their full-featured GNU cousins; however, the options that are included
  provide the expected functionality and behave very much like their GNU
  counterparts.
diff --git a/docs/busybox.sgml b/docs/busybox.sgml
index f794f896c..2d372506b 100644
--- a/docs/busybox.sgml
+++ b/docs/busybox.sgml
@@ -805,7 +805,7 @@
 
                 <para>
                 Summarize the disk space used for each FILE or current
-                directory.  Disk space printed in units of 1k (i.e.
+                directory.  Disk space printed in units of 1k (i.e.,
                 1024 bytes).
                 </para>
 
@@ -2285,7 +2285,7 @@
 
                 <para>
                 Creates a temporary file with its name based on
-                TEMPLATE.  TEMPLATE is any name with six `Xs' (i.e.
+                TEMPLATE.  TEMPLATE is any name with six `Xs' (i.e.,
                 /tmp/temp.XXXXXX).
                 </para>
 
@@ -3407,7 +3407,7 @@
                 <screen>
                         -a      Unmount all file systems
                         -r      Try to remount devices as read-only if mount is busy
-                        -f      Force filesystem umount (i.e. unreachable NFS server)
+                        -f      Force filesystem umount (i.e., unreachable NFS server)
                         -l      Do not free loop device (if a loop device has been used)
                 </screen>
                 </para>
diff --git a/docs/contributing.txt b/docs/contributing.txt
index abfd51684..2e0049289 100644
--- a/docs/contributing.txt
+++ b/docs/contributing.txt
@@ -45,7 +45,7 @@ Archives can be found here:
 
         http://opensource.lineo.com/lists/busybox/
 
-If you have a serious interest in Busybox, i.e. you are using it day-to-day or
+If you have a serious interest in Busybox, i.e., you are using it day-to-day or
 as part of an embedded project, it would be a good idea to join the mailing
 list.
 
@@ -294,7 +294,7 @@ are some guidelines on how to test your changes.
    behavior / output is identical between the two.
 
  - Try several different permutations and combinations of the features you're
-   adding (i.e. different combinations of command-line switches) and make sure
+   adding (i.e., different combinations of command-line switches) and make sure
    they all work; make sure one feature does not interfere with another.
 
  - Make sure you test compiling against the source both with the feature
@@ -456,7 +456,7 @@ mailing list if:
 
  - Your changes are broad and touch many different files
  - You are adding a feature
- - Your changes are speculative or experimental (i.e. trying a new algorithm)
+ - Your changes are speculative or experimental (i.e., trying a new algorithm)
  - You are not the maintainer and your changes make the maintainer cringe
 
 The more of the above are true, the better it is to post a patch to the
diff --git a/dutmp.c b/dutmp.c
index 5732539d2..df7f64d30 100644
--- a/dutmp.c
+++ b/dutmp.c
@@ -49,7 +49,7 @@ extern int dutmp_main(int argc, char **argv)
                                 (long)ut.ut_addr);
         }
 #else
-        /* Glibc, uClibc, etc */
+        /* Glibc, uClibc, etc. */
         while (read(file, (void*)&ut, sizeof(struct utmp))) {
                 printf("%d|%d|%s|%s|%s|%s|%d|%d|%ld|%ld|%ld|%x\n",
                 ut.ut_type, ut.ut_pid, ut.ut_line,
diff --git a/editors/sed.c b/editors/sed.c
index 16e8e1866..47fb63712 100644
--- a/editors/sed.c
+++ b/editors/sed.c
@@ -617,7 +617,7 @@ static int do_sed_command(const struct sed_cmd *sed_cmd, const char *line)
                          *    flag exists in the first place.
                          */
 
-                        /* if the user specified that they didn't want anything printed (i.e. a -n
+                        /* if the user specified that they didn't want anything printed (i.e., a -n
                          * flag and no 'p' flag after the s///), then there's really no point doing
                          * anything here. */
                         if (be_quiet && !sed_cmd->sub_p)
diff --git a/include/usage.h b/include/usage.h
index aa66d3733..da09c72c6 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -165,7 +165,7 @@
 #define dc_full_usage \
         "This is a Tiny RPN calculator that understands the\n" \
         "following operations: +, -, /, *, and, or, not, eor.\n" \
-        "i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
+        "i.e., 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
 #define dc_example_usage \
         "$ dc 2 2 +\n" \
         "4\n" \
@@ -221,7 +221,7 @@
         "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
         "\t-m\tprint sizes in megabytes\n" \
         "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-        "\n\t-k\tprint sizes in kilobytes(compatability)")
+        "\n\t-k\tprint sizes in kilobytes(compatibility)")
 #define df_example_usage \
         "$ df\n" \
         "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
@@ -275,7 +275,7 @@
         "\t-f\tDisplay control field name starting with [argument]\n" \
         "\t-I\tDisplay the control filenamed [argument]\n" \
         "\t-t\tExtract filesystem tree to stdout in tar format\n" \
-        "\t-x\tExctract packages filesystem tree to directory\n" \
+        "\t-x\tExtract packages filesystem tree to directory\n" \
         "\t-X\tVerbose extract"
 #define dpkg_deb_example_usage \
         "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
@@ -292,7 +292,7 @@
         "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
         "\t-m\tprint sizes in megabytes\n" \
         "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-        "\n\t-k\tprint sizes in kilobytes(compatability)")
+        "\n\t-k\tprint sizes in kilobytes(compatibility)")
 #define du_example_usage \
         "$ du\n" \
         "16      ./CVS\n" \
@@ -317,7 +317,7 @@
         "[FILE]"
 #define dutmp_full_usage \
         "Dump utmp file format (pipe delimited) from FILE\n" \
-        "or stdin to stdout.  (i.e. 'dutmp /var/run/utmp')"
+        "or stdin to stdout.  (i.e., 'dutmp /var/run/utmp')"
 #define dutmp_example_usage \
         "$ dutmp /var/run/utmp\n" \
         "8|7||si|||0|0|0|955637625|760097|0\n" \
@@ -334,7 +334,7 @@
         "Prints the specified ARGs to stdout\n\n" \
         "Options:\n" \
         "\t-n\tsuppress trailing newline\n" \
-        "\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n" \
+        "\t-e\tinterpret backslash-escaped characters (i.e., \\t=tab)\n" \
         "\t-E\tdisable interpretation of backslash-escaped characters"
 #define echo_example_usage \
         "$ echo "Erik is cool"\n" \
@@ -713,7 +713,7 @@
 "                       sysinit actions are completed before continuing.  Following the\n" \
 "                       completion of all sysinit actions, all 'wait' actions are run.\n" \
 "                       'wait' actions, like  'sysinit' actions, cause init to wait until\n" \
-"                       the specified task completes.  'once' actions are asyncronous,\n" \
+"                       the specified task completes.  'once' actions are asynchronous,\n" \
 "                       therefore, init does not wait for them to complete.  'ctrlaltdel'\n" \
 "                       actions are run when the system detects that someone on the system\n" \
 "                       console has pressed the CTRL-ALT-DEL key combination.  Typically one\n" \
@@ -949,7 +949,7 @@
         USAGE_HUMAN_READABLE( \
         "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
         "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-        "\t-k\tprint sizes in kilobytes(compatability)") 
+        "\t-k\tprint sizes in kilobytes(compatibility)") 
 
 #define lsmod_trivial_usage \
         ""
@@ -1061,7 +1061,7 @@
         "[-q] TEMPLATE"
 #define mktemp_full_usage \
         "Creates a temporary file with its name based on TEMPLATE.\n" \
-        "TEMPLATE is any name with six `Xs' (i.e. /tmp/temp.XXXXXX)."
+        "TEMPLATE is any name with six `Xs' (i.e., /tmp/temp.XXXXXX)."
 #define mktemp_example_usage \
         "$ mktemp /tmp/temp.XXXXXX\n" \
         "/tmp/temp.mWiLjM\n" \
@@ -1608,7 +1608,7 @@
         "\nFlags:\n" "\t-a\tUnmount all file systems" \
         USAGE_MTAB(" in /etc/mtab\n\t-n\tDon't erase /etc/mtab entries") \
         "\n\t-r\tTry to remount devices as read-only if mount is busy" \
-        USAGE_MOUNT_FORCE("\n\t-f\tForce umount (i.e. unreachable NFS server)") \
+        USAGE_MOUNT_FORCE("\n\t-f\tForce umount (i.e., unreachable NFS server)") \
         USAGE_MOUNT_LOOP("\n\t-l\tDo not free loop device (if a loop device has been used)")
 #define umount_example_usage \
         "$ umount /dev/hdc1 \n"
diff --git a/init.c b/init.c
index c26314c8b..370ee7294 100644
--- a/init.c
+++ b/init.c
@@ -752,7 +752,7 @@ static void delete_initAction(initAction * action)
 
 /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined,
  * then parse_inittab() simply adds in some default
- * actions(i.e runs INIT_SCRIPT and then starts a pair 
+ * actions(i.e., runs INIT_SCRIPT and then starts a pair 
  * of "askfirst" shells).  If BB_FEATURE_USE_INITTAB 
  * _is_ defined, but /etc/inittab is missing, this 
  * results in the same set of default behaviors.
@@ -952,7 +952,7 @@ extern int init_main(int argc, char **argv)
 
                 /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined,
                  * then parse_inittab() simply adds in some default
-                 * actions(i.e runs INIT_SCRIPT and then starts a pair 
+                 * actions(i.e., runs INIT_SCRIPT and then starts a pair 
                  * of "askfirst" shells */
                 parse_inittab();
         }
diff --git a/init/init.c b/init/init.c
index c26314c8b..370ee7294 100644
--- a/init/init.c
+++ b/init/init.c
@@ -752,7 +752,7 @@ static void delete_initAction(initAction * action)
 
 /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined,
  * then parse_inittab() simply adds in some default
- * actions(i.e runs INIT_SCRIPT and then starts a pair 
+ * actions(i.e., runs INIT_SCRIPT and then starts a pair 
  * of "askfirst" shells).  If BB_FEATURE_USE_INITTAB 
  * _is_ defined, but /etc/inittab is missing, this 
  * results in the same set of default behaviors.
@@ -952,7 +952,7 @@ extern int init_main(int argc, char **argv)
 
                 /* NOTE that if BB_FEATURE_USE_INITTAB is NOT defined,
                  * then parse_inittab() simply adds in some default
-                 * actions(i.e runs INIT_SCRIPT and then starts a pair 
+                 * actions(i.e., runs INIT_SCRIPT and then starts a pair 
                  * of "askfirst" shells */
                 parse_inittab();
         }
diff --git a/lash.c b/lash.c
index f1200ba95..3a421b372 100644
--- a/lash.c
+++ b/lash.c
@@ -1076,9 +1076,9 @@ static int expand_arguments(char *command)
                                 else
                                         var = itoa(last_bg_pid);
                                 break;
-                                /* Everything else like $$, $#, $[0-9], etc should all be
+                                /* Everything else like $$, $#, $[0-9], etc. should all be
                                  * expanded by wordexp(), so we can in theory skip that stuff
-                                 * here, but just to be on the safe side (i.e. since uClibc
+                                 * here, but just to be on the safe side (i.e., since uClibc
                                  * wordexp doesn't do this stuff yet), lets leave it in for
                                  * now. */
                         case '$':
diff --git a/libbb/parse_mode.c b/libbb/parse_mode.c
index a68b7d3aa..30d2f21cf 100644
--- a/libbb/parse_mode.c
+++ b/libbb/parse_mode.c
@@ -31,7 +31,7 @@
 
 
 /* This function parses the sort of string you might pass
- * to chmod (i.e.  [ugoa]{+|-|=}[rwxst] ) and returns the
+ * to chmod (i.e., [ugoa]{+|-|=}[rwxst] ) and returns the
  * correct mode described by the string. */
 extern int parse_mode(const char *s, mode_t * theMode)
 {
diff --git a/ls.c b/ls.c
index c13b225fa..ec8e216fa 100644
--- a/ls.c
+++ b/ls.c
@@ -21,7 +21,7 @@
 /*
  * To achieve a small memory footprint, this version of 'ls' doesn't do any
  * file sorting, and only has the most essential command line switches
- * (i.e. the ones I couldn't live without :-) All features which involve
+ * (i.e., the ones I couldn't live without :-) All features which involve
  * linking in substantial chunks of libc can be disabled.
  *
  * Although I don't really want to add new features to this program to
diff --git a/miscutils/dutmp.c b/miscutils/dutmp.c
index 5732539d2..df7f64d30 100644
--- a/miscutils/dutmp.c
+++ b/miscutils/dutmp.c
@@ -49,7 +49,7 @@ extern int dutmp_main(int argc, char **argv)
                                 (long)ut.ut_addr);
         }
 #else
-        /* Glibc, uClibc, etc */
+        /* Glibc, uClibc, etc. */
         while (read(file, (void*)&ut, sizeof(struct utmp))) {
                 printf("%d|%d|%s|%s|%s|%s|%d|%d|%ld|%ld|%ld|%x\n",
                 ut.ut_type, ut.ut_pid, ut.ut_line,
diff --git a/procps/ps.c b/procps/ps.c
index 24f806c4b..bf162bbe5 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -94,7 +94,7 @@ static void parse_proc_status(char *S, proc_t * P)
         else
                 error_msg("Internal error!");
 
-        /* For busybox, ignoring effective, saved, etc */
+        /* For busybox, ignoring effective, saved, etc. */
         tmp = strstr(S, "Uid:");
         if (tmp)
                 sscanf(tmp, "Uid:\t%d", &P->ruid);
diff --git a/ps.c b/ps.c
index 24f806c4b..bf162bbe5 100644
--- a/ps.c
+++ b/ps.c
@@ -94,7 +94,7 @@ static void parse_proc_status(char *S, proc_t * P)
         else
                 error_msg("Internal error!");
 
-        /* For busybox, ignoring effective, saved, etc */
+        /* For busybox, ignoring effective, saved, etc. */
         tmp = strstr(S, "Uid:");
         if (tmp)
                 sscanf(tmp, "Uid:\t%d", &P->ruid);
diff --git a/sed.c b/sed.c
index 16e8e1866..47fb63712 100644
--- a/sed.c
+++ b/sed.c
@@ -617,7 +617,7 @@ static int do_sed_command(const struct sed_cmd *sed_cmd, const char *line)
                          *    flag exists in the first place.
                          */
 
-                        /* if the user specified that they didn't want anything printed (i.e. a -n
+                        /* if the user specified that they didn't want anything printed (i.e., a -n
                          * flag and no 'p' flag after the s///), then there's really no point doing
                          * anything here. */
                         if (be_quiet && !sed_cmd->sub_p)
diff --git a/shell/lash.c b/shell/lash.c
index f1200ba95..3a421b372 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1076,9 +1076,9 @@ static int expand_arguments(char *command)
                                 else
                                         var = itoa(last_bg_pid);
                                 break;
-                                /* Everything else like $$, $#, $[0-9], etc should all be
+                                /* Everything else like $$, $#, $[0-9], etc. should all be
                                  * expanded by wordexp(), so we can in theory skip that stuff
-                                 * here, but just to be on the safe side (i.e. since uClibc
+                                 * here, but just to be on the safe side (i.e., since uClibc
                                  * wordexp doesn't do this stuff yet), lets leave it in for
                                  * now. */
                         case '$':
diff --git a/tar.c b/tar.c
index 282656fe7..9e1270cca 100644
--- a/tar.c
+++ b/tar.c
@@ -4,7 +4,7 @@
  *
  * Note, that as of BusyBox-0.43, tar has been completely rewritten from the
  * ground up.  It still has remnents of the old code lying about, but it is
- * very different now (i.e. cleaner, less global variables, etc)
+ * very different now (i.e., cleaner, less global variables, etc.)
  *
  * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
@@ -121,7 +121,7 @@ struct TarInfo
         gid_t            gid;            /* Numeric GID */
         size_t           size;           /* Size of file */
         time_t           mtime;          /* Last-modified time */
-        enum TarFileType type;           /* Regular, directory, link, etc */
+        enum TarFileType type;           /* Regular, directory, link, etc. */
         char *           linkname;       /* Name for symbolic and hard links */
         long             devmajor;       /* Major number for special device */
         long             devminor;       /* Minor number for special device */
@@ -303,7 +303,7 @@ static void
 fixUpPermissions(TarInfo *header)
 {
         struct utimbuf t;
-        /* Now set permissions etc for the new file */
+        /* Now set permissions etc. for the new file */
         chown(header->name, header->uid, header->gid);
         chmod(header->name, header->mode);
         /* Reset the time */
@@ -418,7 +418,7 @@ tarExtractHardLink(TarInfo *header, int extractFlag, int tostdoutFlag)
                 return( FALSE);
         }
 
-        /* Now set permissions etc for the new directory */
+        /* Now set permissions etc. for the new directory */
         fixUpPermissions(header);
         return( TRUE);
 }
@@ -471,7 +471,7 @@ tarExtractSpecial(TarInfo *header, int extractFlag, int tostdoutFlag)
                 }
         }
 
-        /* Now set permissions etc for the new directory */
+        /* Now set permissions etc. for the new directory */
         fixUpPermissions(header);
         return( TRUE);
 }
@@ -952,7 +952,7 @@ writeTarHeader(struct TarBallInfo *tbInfo, const char *header_name,
                 return ( FALSE);
         }
 
-        /* Calculate and store the checksum (i.e. the sum of all of the bytes of
+        /* Calculate and store the checksum (i.e., the sum of all of the bytes of
          * the header).  The checksum field must be filled with blanks for the
          * calculation.  The checksum field is formatted differently from the
          * other fields: it has [6] digits, a null, then a space -- rather than
diff --git a/tests/testcases b/tests/testcases
index f636e17ea..24d491c5b 100644
--- a/tests/testcases
+++ b/tests/testcases
@@ -17,7 +17,7 @@
 #
 #  - please try to keep applets alphabetized, it will make life easier
 #  - use the file tester.sh or testcases when you need to do a non-destructive
-#    test on a file (i.e. cat, md5sum)
+#    test on a file (i.e., cat, md5sum)
 #  - try to make the applet you're testing the first thing on the line (this
 #    not always possible)
 #  - (???) if you have to create a temporary file, call it TMPFILE
diff --git a/usage.h b/usage.h
index aa66d3733..da09c72c6 100644
--- a/usage.h
+++ b/usage.h
@@ -165,7 +165,7 @@
 #define dc_full_usage \
         "This is a Tiny RPN calculator that understands the\n" \
         "following operations: +, -, /, *, and, or, not, eor.\n" \
-        "i.e. 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
+        "i.e., 'dc 2 2 add' -> 4, and 'dc 8 8 \\* 2 2 + /' -> 16"
 #define dc_example_usage \
         "$ dc 2 2 +\n" \
         "4\n" \
@@ -221,7 +221,7 @@
         "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
         "\t-m\tprint sizes in megabytes\n" \
         "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-        "\n\t-k\tprint sizes in kilobytes(compatability)")
+        "\n\t-k\tprint sizes in kilobytes(compatibility)")
 #define df_example_usage \
         "$ df\n" \
         "Filesystem           1k-blocks      Used Available Use% Mounted on\n" \
@@ -275,7 +275,7 @@
         "\t-f\tDisplay control field name starting with [argument]\n" \
         "\t-I\tDisplay the control filenamed [argument]\n" \
         "\t-t\tExtract filesystem tree to stdout in tar format\n" \
-        "\t-x\tExctract packages filesystem tree to directory\n" \
+        "\t-x\tExtract packages filesystem tree to directory\n" \
         "\t-X\tVerbose extract"
 #define dpkg_deb_example_usage \
         "$ dpkg-deb -X ./busybox_0.48-1_i386.deb /tmp\n"
@@ -292,7 +292,7 @@
         "\n\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
         "\t-m\tprint sizes in megabytes\n" \
         "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-        "\n\t-k\tprint sizes in kilobytes(compatability)")
+        "\n\t-k\tprint sizes in kilobytes(compatibility)")
 #define du_example_usage \
         "$ du\n" \
         "16      ./CVS\n" \
@@ -317,7 +317,7 @@
         "[FILE]"
 #define dutmp_full_usage \
         "Dump utmp file format (pipe delimited) from FILE\n" \
-        "or stdin to stdout.  (i.e. 'dutmp /var/run/utmp')"
+        "or stdin to stdout.  (i.e., 'dutmp /var/run/utmp')"
 #define dutmp_example_usage \
         "$ dutmp /var/run/utmp\n" \
         "8|7||si|||0|0|0|955637625|760097|0\n" \
@@ -334,7 +334,7 @@
         "Prints the specified ARGs to stdout\n\n" \
         "Options:\n" \
         "\t-n\tsuppress trailing newline\n" \
-        "\t-e\tinterpret backslash-escaped characters (i.e. \\t=tab etc)\n" \
+        "\t-e\tinterpret backslash-escaped characters (i.e., \\t=tab)\n" \
         "\t-E\tdisable interpretation of backslash-escaped characters"
 #define echo_example_usage \
         "$ echo "Erik is cool"\n" \
@@ -713,7 +713,7 @@
 "                       sysinit actions are completed before continuing.  Following the\n" \
 "                       completion of all sysinit actions, all 'wait' actions are run.\n" \
 "                       'wait' actions, like  'sysinit' actions, cause init to wait until\n" \
-"                       the specified task completes.  'once' actions are asyncronous,\n" \
+"                       the specified task completes.  'once' actions are asynchronous,\n" \
 "                       therefore, init does not wait for them to complete.  'ctrlaltdel'\n" \
 "                       actions are run when the system detects that someone on the system\n" \
 "                       console has pressed the CTRL-ALT-DEL key combination.  Typically one\n" \
@@ -949,7 +949,7 @@
         USAGE_HUMAN_READABLE( \
         "\t-h\tprint sizes in human readable format (e.g., 1K 243M 2G )\n" \
         "\t-k\tprint sizes in kilobytes(default)") USAGE_NOT_HUMAN_READABLE( \
-        "\t-k\tprint sizes in kilobytes(compatability)") 
+        "\t-k\tprint sizes in kilobytes(compatibility)") 
 
 #define lsmod_trivial_usage \
         ""
@@ -1061,7 +1061,7 @@
         "[-q] TEMPLATE"
 #define mktemp_full_usage \
         "Creates a temporary file with its name based on TEMPLATE.\n" \
-        "TEMPLATE is any name with six `Xs' (i.e. /tmp/temp.XXXXXX)."
+        "TEMPLATE is any name with six `Xs' (i.e., /tmp/temp.XXXXXX)."
 #define mktemp_example_usage \
         "$ mktemp /tmp/temp.XXXXXX\n" \
         "/tmp/temp.mWiLjM\n" \
@@ -1608,7 +1608,7 @@
         "\nFlags:\n" "\t-a\tUnmount all file systems" \
         USAGE_MTAB(" in /etc/mtab\n\t-n\tDon't erase /etc/mtab entries") \
         "\n\t-r\tTry to remount devices as read-only if mount is busy" \
-        USAGE_MOUNT_FORCE("\n\t-f\tForce umount (i.e. unreachable NFS server)") \
+        USAGE_MOUNT_FORCE("\n\t-f\tForce umount (i.e., unreachable NFS server)") \
         USAGE_MOUNT_LOOP("\n\t-l\tDo not free loop device (if a loop device has been used)")
 #define umount_example_usage \
         "$ umount /dev/hdc1 \n"