diff -wur nano-cvs/src/browser.c nano-new/src/browser.c
--- nano-cvs/src/browser.c	2006-07-25 23:20:04.000000000 +0200
+++ nano-new/src/browser.c	2006-07-28 13:41:58.000000000 +0200
@@ -626,7 +626,7 @@
 	bool dots = (COLS >= 15 && filetaillen >= longest -
 		foomaxlen - 1);
 		/* Do we put an ellipsis before the filename?  Don't set
-		 * this to TRUE if we have fewer than 15 columns (i.e, 1
+		 * this to TRUE if we have fewer than 15 columns (i.e. 1
 		 * column for padding, plus 7 columns for a filename
 		 * other than ".."). */
 	char *disp = display_string(filetail, dots ? filetaillen -
@@ -655,7 +655,7 @@
 	/* Show information about the file.  We don't want to report
 	 * file sizes for links, so we use lstat(). */
 	if (lstat(filelist[i], &st) == -1 || S_ISLNK(st.st_mode)) {
-	    /* If the file doesn't exist (i.e, it's been deleted while
+	    /* If the file doesn't exist (i.e. it's been deleted while
 	     * the file browser is open), or it's a symlink that doesn't
 	     * point to a directory, display "--". */
 	    if (stat(filelist[i], &st) == -1 || !S_ISDIR(st.st_mode))
diff -wur nano-cvs/src/cut.c nano-new/src/cut.c
--- nano-cvs/src/cut.c	2006-06-19 14:27:56.000000000 +0200
+++ nano-new/src/cut.c	2006-07-28 13:41:58.000000000 +0200
@@ -90,7 +90,7 @@
     else if (openfile->current != openfile->filebot) {
 	/* If we're at the end of the line, and it isn't the last line
 	 * of the file, move all the text from the current position up
-	 * to the beginning of the next line, i.e, the newline at the
+	 * to the beginning of the next line, i.e. the newline at the
 	 * end, into the cutbuffer. */
 	move_to_filestruct(&cutbuffer, &cutbottom, openfile->current,
 		openfile->current_x, openfile->current->next, 0);
diff -wur nano-cvs/src/files.c nano-new/src/files.c
--- nano-cvs/src/files.c	2006-07-25 23:20:04.000000000 +0200
+++ nano-new/src/files.c	2006-07-28 13:41:58.000000000 +0200
@@ -540,7 +540,7 @@
 	openfile->filebot);
 
     /* If the NO_NEWLINES flag isn't set, and text has been added to
-     * the magicline (i.e, a file that doesn't end in a newline has been
+     * the magicline (i.e. a file that doesn't end in a newline has been
      * inserted at the end of the current buffer), add a new magicline,
      * and move the current line down to it. */
     if (!ISSET(NO_NEWLINES) && openfile->filebot->data[0] != '\0') {
@@ -2299,7 +2299,7 @@
 
 	    assert(longest_name <= COLS - 1);
 
-	    /* Each column will be (longest_name + 2) columns wide, i.e,
+	    /* Each column will be (longest_name + 2) columns wide, i.e.
 	     * two spaces between columns, except that there will be
 	     * only one space after the last column. */
 	    columns = (COLS + 1) / (longest_name + 2);
diff -wur nano-cvs/src/global.c nano-new/src/global.c
--- nano-cvs/src/global.c	2006-07-28 11:45:05.000000000 +0200
+++ nano-new/src/global.c	2006-07-28 13:41:58.000000000 +0200
@@ -54,7 +54,7 @@
 	 * number of nano, the name of the current file, and whether the
 	 * current file has been modified. */
 WINDOW *edit;
-	/* The middle portion of the window, i.e, the edit window, where
+	/* The middle portion of the window, i.e. the edit window, where
 	 * we display the current file we're editing. */
 WINDOW *bottomwin;
 	/* The bottom portion of the window, where we display statusbar
diff -wur nano-cvs/src/prompt.c nano-new/src/prompt.c
--- nano-cvs/src/prompt.c	2006-07-25 23:20:04.000000000 +0200
+++ nano-new/src/prompt.c	2006-07-28 13:41:58.000000000 +0200
@@ -839,7 +839,7 @@
 }
 #endif /* !NANO_TINY */
 
-/* Return the placewewant associated with statusbar_x, i.e, the
+/* Return the placewewant associated with statusbar_x, i.e. the
  * zero-based column position of the cursor.  The value will be no
  * smaller than statusbar_x. */
 size_t statusbar_xplustabs(void)
@@ -1323,7 +1323,7 @@
 			editwinrows - 1;
 			/* Calculate the y-coordinate relative to the
 			 * beginning of the Yes/No/All shortcuts in
-			 * bottomwin, i.e, with the sizes of topwin,
+			 * bottomwin, i.e. with the sizes of topwin,
 			 * edit, and the first line of bottomwin
 			 * subtracted out. */
 
diff -wur nano-cvs/src/text.c nano-new/src/text.c
--- nano-cvs/src/text.c	2006-07-18 22:22:30.000000000 +0200
+++ nano-new/src/text.c	2006-07-28 13:41:58.000000000 +0200
@@ -1942,7 +1942,7 @@
 
     /* A new process to run spell in. */
     if ((pid_spell = fork()) == 0) {
-	/* Child continues (i.e, future spell process). */
+	/* Child continues (i.e. future spell process). */
 	close(spell_fd[0]);
 
 	/* Replace the standard input with the temp file. */
@@ -1972,7 +1972,7 @@
 
     /* A new process to run sort in. */
     if ((pid_sort = fork()) == 0) {
-	/* Child continues (i.e, future spell process).  Replace the
+	/* Child continues (i.e. future spell process).  Replace the
 	 * standard input with the standard output of the old pipe. */
 	if (dup2(spell_fd[0], STDIN_FILENO) != STDIN_FILENO)
 	    goto close_pipes_and_exit;
@@ -1998,7 +1998,7 @@
 
     /* A new process to run uniq in. */
     if ((pid_uniq = fork()) == 0) {
-	/* Child continues (i.e, future uniq process).  Replace the
+	/* Child continues (i.e. future uniq process).  Replace the
 	 * standard input with the standard output of the old pipe. */
 	if (dup2(sort_fd[0], STDIN_FILENO) != STDIN_FILENO)
 	    goto close_pipes_and_exit;
diff -wur nano-cvs/src/utils.c nano-new/src/utils.c
--- nano-cvs/src/utils.c	2006-06-22 00:25:14.000000000 +0200
+++ nano-new/src/utils.c	2006-07-28 13:41:58.000000000 +0200
@@ -425,7 +425,7 @@
 	return column - (COLS - 2);
 }
 
-/* Return the placewewant associated with current_x, i.e, the zero-based
+/* Return the placewewant associated with current_x, i.e. the zero-based
  * column position of the cursor.  The value will be no smaller than
  * current_x. */
 size_t xplustabs(void)
@@ -434,7 +434,7 @@
 }
 
 /* Return the index in s of the character displayed at the given column,
- * i.e, the largest value such that strnlenpt(s, actual_x(s, column)) <=
+ * i.e. the largest value such that strnlenpt(s, actual_x(s, column)) <=
  * column. */
 size_t actual_x(const char *s, size_t column)
 {
diff -wur nano-cvs/src/winio.c nano-new/src/winio.c
--- nano-cvs/src/winio.c	2006-07-25 23:20:04.000000000 +0200
+++ nano-new/src/winio.c	2006-07-28 13:41:58.000000000 +0200
@@ -653,7 +653,7 @@
 #endif
 	}
 
-	/* If our result is an extended keypad value (i.e, a value
+	/* If our result is an extended keypad value (i.e. a value
 	 * outside of byte range), set func_key to TRUE. */
 	if (retval != ERR)
 	    *func_key = !is_byte(retval);
@@ -1606,7 +1606,7 @@
 	    i = COLS / ((currslen / 2) + (currslen % 2));
 
 	/* Calculate the y-coordinate relative to the beginning of
-	 * the shortcut list in bottomwin, i.e, with the sizes of
+	 * the shortcut list in bottomwin, i.e. with the sizes of
 	 * topwin, edit, and the first line of bottomwin subtracted
 	 * out, and set j to it. */
 	j = *mouse_y - (2 - no_more_space()) - editwinrows - 1;
@@ -1754,7 +1754,7 @@
 	blank_line(topwin, 1, 0, COLS);
 }
 
-/* Blank all the lines of the middle portion of the window, i.e, the
+/* Blank all the lines of the middle portion of the window, i.e. the
  * edit window. */
 void blank_edit(void)
 {
@@ -2096,7 +2096,7 @@
     if (!newfie) {
 	size_t lenpt = strlenpt(path), start_col;
 
-	/* Don't set dots to TRUE if we have fewer than 8 columns (i.e,
+	/* Don't set dots to TRUE if we have fewer than 8 columns (i.e.
 	 * 1 column for padding, plus 7 columns for a filename). */
 	dots = (space >= 8 && lenpt >= space);