5 files changed, 41 insertions, 41 deletions

diff --git a/src/boxes/BOXES.txt b/src/boxes/BOXES.txt
index 745b7c9..7cded87 100644
--- a/src/boxes/BOXES.txt
+++ b/src/boxes/BOXES.txt
@@ -128,7 +128,7 @@ Common bits / differences.
     Files - passed as arguments, or can add / remove them from the running editor.
         Process the file through some proggy, or just some function of the editor script.
         Save / save as / backups.
-        Modelines are actualy discouraged as a security issue by the standard, but encouraged by toybox to use vi modelines.
+        Modelines are actually discouraged as a security issue by the standard, but encouraged by toybox to use vi modelines.
         Filename completion.
         Filename prompts could have a couple of features.
             Can pass things in and out of a shell command, append to the file, edit a specific fixed section of a file or special file (disk block editing!), or use stdin and stdout (joe in a pipe).
@@ -184,7 +184,7 @@ Common bits / differences.
         Nano has essentially two status lines.
         Expert mode to turn it off, disable it for more screen space.
     Regexs - basic / extra / extended
-        Replacable stuff in search & replace.  Ex/vi has this as an option.
+        Replaceable stuff in search & replace.  Ex/vi has this as an option.
     Commands - invoked immediately with no echo, or typed via readline.
         Pre command numbers (usually not echoed) / post command arguments.  Also pre command regexs and other things to select the lines to work on.
         Methods of repeating commands.  Repeat last / next command, possibly X times.
@@ -251,7 +251,7 @@ Common bits / differences.
             File / all files / within selection.  Wrap around searching.
             Incremental.  Interactive / all replace.  Inverted (find non matches).
             Highlight / filter found.
-            Regex for the replace bit.   Replacable stuff in search & replace.  Ex/vi has this as an option.
+            Regex for the replace bit.   Replaceable stuff in search & replace.  Ex/vi has this as an option.
             Can search mixed hex and strings.
             History, repeat, repeat in other direction.
         Modified state.
@@ -290,7 +290,7 @@ Common bits / differences.
         Email quote handling.
         Count / highlight lines matching or not matching regexes.
         Sort block.
-        Persistant cursor position and selection.
+        Persistent cursor position and selection.
         Complete the word being typed based on other words in the file.
     Code editing.
         Ctags - basically lookup a symbol (word cursor is on) in the ctags files, which gives you a position in some other file that defines this symbol.  Then display this other file somehow, probably allowing editing.
@@ -367,7 +367,7 @@ less
     Filter found lines.
     Option to NOT do regex search.
     Change the command line arguments while running.
-    Shell commands with replacable params.
+    Shell commands with replaceable params.
     Input processor - some proggy that the input file is processed through, the output of that is shown.
         Um, why not use pipes and input redirection?
 
@@ -426,7 +426,7 @@ ex - obsolete for toybox, but part of vi.
     Execute a buffer as ex commands.
     Regexs have extra thingies.
     Replace commands can refer to other bits of text using parameters.  See the manual.
-    Autowrite - basicaly save the file after certain commands.
+    Autowrite - basically save the file after certain commands.
     Mode that strips out non printables on file read.
     Can be made ed compatible. lol
     Can display line numbers.
@@ -438,7 +438,7 @@ ex - obsolete for toybox, but part of vi.
     Margin auto wrap and end of line blanks removal.
     Can wrap searches.
     "modelines" (as used at the top of toybox source files) are apparently is strongly discouraged by the standard.  shrugs
-    Overlaping copies are allowed.
+    Overlapping copies are allowed.
     Automatic marks created sometimes.
 
 vi
@@ -538,7 +538,7 @@ microemacs (microGNUemacs  lol)
     Save some buffers - looks for buffers that need saving and prompts user.
     Just one space - delete all white space around cursor, then insert one single space.
     Query replace - an interactive search and replace.  Also a replace all with no interaction.
-        Oh nice - can do a search and replace with a regex for both the search string, AND for the replacable strings (selecting which ones get replaced with that regex).
+        Oh nice - can do a search and replace with a regex for both the search string, AND for the replaceable strings (selecting which ones get replaced with that regex).
     Beginning / end of buffer.
     Capitalize / upper / lower word.
     Delete word.
@@ -598,7 +598,7 @@ wordstar (joe, turbo C) - Using joe, which also comes in emacs and pico flavours
     Option to not use X lines at the top, for embedding in a BBS.
     Multi level undo and redo.
     Scrolling.
-    Automatic detection of source code files, other types get word wraping and autoindent by default.
+    Automatic detection of source code files, other types get word wrapping and autoindent by default.
         Can set left and right margins for word wrapping.
         Can center between them to.
         Can manually indent lines, highlighted blocks, or autodetected code blocks.
@@ -640,7 +640,7 @@ mcedit / cool edit
     Bookmarks, toggle, next, previous, "flush" (meaning to remove all bookmarks.)
     Copy / cut insert clipfile as well as prompting for a file.
     Highlight all lines with found text.
-    Search for hexidecimal, within selection, for whole words, and in "all charsets".
+    Search for hexadecimal, within selection, for whole words, and in "all charsets".
     Goto matching bracket.
     Show line numbers.
     Find "declaration", back from and forward to declaration.
@@ -655,7 +655,7 @@ mcedit / cool edit
     Run external format script on selection.
     Insert date/time.
     Half tabs.
-    Persistant cursor position and selection.
+    Persistent cursor position and selection.
     Visible white space.
     Optional go beyond end of line.
     Learn keys.
@@ -1047,10 +1047,10 @@ struct item
 
 struct menu
 {
-    *items[]                    // Circular pointer definiton for sub menus.
+    *items[]                    // Circular pointer definition for sub menus.
 }
 
-struct context                  // Somehow I get the feeling I'm having a failure of imagination here with the menus and function keys.  Might be better to manage them seperately per box, but have common ones available?  Nano might have a problem with this.
+struct context                  // Somehow I get the feeling I'm having a failure of imagination here with the menus and function keys.  Might be better to manage them separately per box, but have common ones available?  Nano might have a problem with this.
 {
     *commands[]                 // The master list, the ones pointed to by the menu structs should be in this list.
     menu *menu                  // Can be NULL.
diff --git a/src/boxes/boxes.c b/src/boxes/boxes.c
index 4f542e1..b1c6e55 100644
--- a/src/boxes/boxes.c
+++ b/src/boxes/boxes.c
@@ -58,7 +58,7 @@ GLOBALS(
  * The things it is targeting are - vi and more (part of the standards, so
  * part of the toybox TODO), less (also on the toybox TODO), joe and
  * wordstar (coz Rob said they would be good to include), nano (again Rob
- * thinks it would be good and I agree), microemacs (to avoid religous
+ * thinks it would be good and I agree), microemacs (to avoid religious
  * wars), and mcedit (coz that's what I actually use).  The ex editor comes
  * along for the ride coz vi is basically a screen editor wrapper around
  * the ex line editor.  Sed might be supported coz I'll need to do basic
@@ -117,7 +117,7 @@ GLOBALS(
  * few examples.  A context holds a list of command to C function mappings,
  * key to command mappings, and a list of modes.
  *
- * Most of the editors targetted include a command line where the user
+ * Most of the editors targeted include a command line where the user
  * types in editor commands, and each of those editors has different
  * commands.  They would mostly use the same editing C functions though, or
  * short wrappers around them.  The vi context at the end of this file is a
@@ -132,7 +132,7 @@ GLOBALS(
  * menu to command mappings, and a list of displayed key/command pairs. 
  * Menu and key/command pair display is not written yet.  Most editors have
  * a system for remapping key to command mappings, that's not supported
- * yet.  Emacs has a heirarchy of key to command mappings, that's not
+ * yet.  Emacs has a hierarchy of key to command mappings, that's not
  * supported yet.  Some twiddling of the current design would be needed for
  * those.
  *
@@ -159,7 +159,7 @@ GLOBALS(
  * command" function.  Using most of the system with not much special casing.
  *
  *
- * I assume that there wont be a terribly large number of boxes.
+ * I assume that there won't be a terribly large number of boxes.
  * Things like minimum box sizes, current maximum screen sizes, and the fact
  * that they all have to be on the screen mean that this assumption should
  * be safe.  It's likely that most of the time there will be only a few at
@@ -174,7 +174,7 @@ GLOBALS(
  * My usual terminal is 104 x 380 characters.
  * There will be people with bigger monitors and smaller fonts.
  * So use sixteen bits for storing screen positions and the like.
- * Eight bits wont cut it.
+ * Eight bits won't cut it.
  *
  *
  * These are the escape sequences we send -
@@ -222,7 +222,7 @@ editing the contents of those lines, one line at a time.  For persistent
 line history, they both have to save and load those lines to a file.
 Other than that "readline" adds other behaviour, like moving the
 current line to the end when you hit return and presenting that line to
-the caller (here's the command).  So just making "readline" wont cut
+the caller (here's the command).  So just making "readline" won't cut
 out much of the code.  In fact, my "readline" is really just a thin
 wrapper around the rest of the code.
 
@@ -257,7 +257,7 @@ On Thu, 27 Dec 2012 06:06:53 -0600 Rob Landley <rob@landley.net> wrote:
 > On 12/27/2012 12:56:07 AM, David Seikel wrote:  
 > > On Thu, 27 Dec 2012 00:37:46 -0600 Rob Landley <rob@landley.net>  
 > > wrote:  
-> > > Since ls isn't doiing any of that, probing would just be awkward
+> > > Since ls isn't doing any of that, probing would just be awkward
 > > > so toysh should set COLUMNS to a sane value. The problem is,
 > > > we're not using toysh yet because it's still just a stub...  
 > > 
@@ -378,7 +378,7 @@ struct context			// Defines a context for content.  Text viewer, editor, file br
 {
   struct function *commands;    // The master list, the ones pointed to by the menus etc should be in this list.
   struct mode *modes;           // A possible empty array of modes, indexed by the view.
-    // OR might be better to have these as a linked list, so that things like Emacs can have it's mode keymap hierarcy.
+    // OR might be better to have these as a linked list, so that things like Emacs can have it's mode keymap hierarchy.
   eventHandler handler;         // TODO - Might be better to put this in the modes.  I think vi will need that.
     // Should set the damage list if it needs a redraw, and flags if border or status line needs updating.
     // Keyboard / mouse events if the box did not handle them itself.
@@ -412,7 +412,7 @@ struct damage
 {
   struct damage *next;  // A list for faster draws?
   uint16_t X, Y, W, H;  // The rectangle to be redrawn.
-  uint16_t offset;      // Offest from the left for showing lines.
+  uint16_t offset;      // Offset from the left for showing lines.
   struct line *lines;   // Pointer to a list of text lines, or NULL.
     // Note - likely a pointer into the middle of the line list in a content.
 };
@@ -462,7 +462,7 @@ struct _box
 {
   box *sub1, *sub2, *parent;
   view *view;                   // This boxes view into it's content.  For sharing contents, like a split pane editor for instance, there might be more than one box with this content, but a different view.
-    // If it's just a parent box, it wont have this, so just make it a damn pointer, that's the simplest thing.  lol
+    // If it's just a parent box, it won't have this, so just make it a damn pointer, that's the simplest thing.  lol
     // TODO - Are parent boxes getting a view anyway?
   uint16_t X, Y, W, H;          // Position and size of the box itself, not the content.  Calculated, but cached coz that might be needed for speed.
   float split;                  // Ratio of sub1's part of the split, the sub2 box gets the rest.
@@ -475,7 +475,7 @@ void drawBox(box *box);
 
 
 #define BOX_HSPLIT  1   // Marks if it's a horizontally or vertically split.
-#define BOX_BORDER  2   // Mark if it has a border, often full screen boxes wont.
+#define BOX_BORDER  2   // Mark if it has a border, often full screen boxes won't.
 
 static int overWriteMode;
 static box *rootBox;    // Parent of the rest of the boxes, or the only box.  Always a full screen.
@@ -543,7 +543,7 @@ void loadFile(struct content *content)
 
     do
     {
-      // TODO - get_line() is slow, and wont help much with DOS and Mac line endings.
+      // TODO - get_line() is slow, and won't help much with DOS and Mac line endings.
       temp = get_line(fd);
       if (temp)
         addLine(content, NULL, temp, len);
@@ -691,7 +691,7 @@ void drawLine(int y, int start, int end, char *left, char *internal, char *conte
 
   if (contents)
   {
-    // strncpy wont add a null at the end if the source is longer, but will pad with nulls if source is shorter.
+    // strncpy won't add a null at the end if the source is longer, but will pad with nulls if source is shorter.
     // So it's best to put a safety null in first.
     line[len] = '\0';
     strncpy(line, contents, len);
@@ -955,7 +955,7 @@ int moveCursorAbsolute(view *view, long cX, long cY, long sX, long sY)
   }
   else if (lX < cX)  // Trying to move beyond end of line.
   {
-    // See if we can move to the begining of the next line.
+    // See if we can move to the beginning of the next line.
     if (view->line->next != &(view->content->lines))
     {
       cY++;
@@ -1147,7 +1147,7 @@ void drawBox(box *box)
     bchars = (toys.optflags & FLAG_a) ? borderCharsCurrent[0] : borderCharsCurrent[1];
 
   // Slow and laborious way to figure out where in the linked list of lines we start from.
-  // Wont scale well, but is simple.
+  // Won't scale well, but is simple.
   if (box->view && box->view->content)
   {
     int i = box->view->offsetY;
@@ -1352,7 +1352,7 @@ void splitBox(box *box, float split)
   }
 
   // Note that a split box is actually three boxes.  The parent, which is not drawn, and the two subs, which are.
-  // Based on the assumption that there wont be lots of boxes, this keeps things simple.
+  // Based on the assumption that there won't be lots of boxes, this keeps things simple.
   // It's possible that the box has already been split, and this is called just to update the split.
   box->split = split;
   if (NULL == box->sub1)  // If not split already, do so.
@@ -2405,7 +2405,7 @@ void boxes_main(void)
       context = &simpleVi;
   }
 
-  // TODO - Should do an isatty() here, though not sure about the usefullness of driving this from a script or redirected input, since it's supposed to be a UI for terminals.
+  // TODO - Should do an isatty() here, though not sure about the usefulness of driving this from a script or redirected input, since it's supposed to be a UI for terminals.
   //          It would STILL need the terminal size for output though.  Perhaps just bitch and abort if it's not a tty?
   //          On the other hand, sed don't need no stinkin' UI.  And things like more or less should be usable on the end of a pipe.
 
@@ -2440,7 +2440,7 @@ void boxes_main(void)
 
     IGNBRK      ignore BREAK
     BRKINT      complicated, bet in this context, sends BREAK as '\x00'
-    PARMRK      characters with parity or frame erors are sent as '\x00'
+    PARMRK      characters with parity or frame errors are sent as '\x00'
     ISTRIP      strip 8th byte
     INLCR       translate LF to CR in input
     IGLCR       ignore CR
@@ -2490,7 +2490,7 @@ void boxes_main(void)
   // http://leonerds-code.blogspot.co.uk/2012/04/wide-mouse-support-in-libvterm.html is helpful.
   // Enable mouse (VT200 normal tracking mode, UTF8 encoding).  The limit is 2015.  Seems to only be in later xterms.
 //  fputs("\x1B[?1005h", stdout);
-  // Enable mouse (VT340 locator reporting mode).  In theory has no limit.  Wont actually work though.
+  // Enable mouse (VT340 locator reporting mode).  In theory has no limit.  Won't actually work though.
   // On the other hand, only allows for four buttons, so only half a mouse wheel.
   // Responds with "\1B[e;p;r;c;p&w" where e is event type, p is a bitmap of buttons pressed, r and c are the mouse coords in decimal, and p is the "page number".
 //  fputs("\x1B[1;2'z\x1B[1;3'{", stdout);
diff --git a/src/boxes/dumbsh.c b/src/boxes/dumbsh.c
index 9ad0204..8ef56e7 100644
--- a/src/boxes/dumbsh.c
+++ b/src/boxes/dumbsh.c
@@ -3,7 +3,7 @@
  * Copyright 2014 David Seikel <won_fang@yahoo.com.au>
  *
  * Not a real shell, so doesn't follow any standards,
- * coz it wont implement them anyway.
+ * coz it won't implement them anyway.
 
 USE_DUMBSH(NEWTOY(dumbsh, "", TOYFLAG_USR|TOYFLAG_BIN))
 
diff --git a/src/boxes/handlekeys.c b/src/boxes/handlekeys.c
index 8bae529..115b7c6 100644
--- a/src/boxes/handlekeys.c
+++ b/src/boxes/handlekeys.c
@@ -26,7 +26,7 @@ struct key
 // TODO - Add other miscelany that does not use an escape sequence.
 
 // This is sorted by type, though there is some overlap.
-// Human typing speeds wont need fast searching speeds on this small table.
+// Human typing speeds won't need fast searching speeds on this small table.
 // So simple wins out over speed, and sorting by terminal type wins
 // the simple test.
 static struct key keys[] =
@@ -242,7 +242,7 @@ void handle_keys(long extra, int (*handle_event)(long extra, struct keyevent *ev
         strcat(sequence, "Esc");
         buffer[0] = buffIndex = 0;
       }
-      // TODO - Call some sort of timer tick callback.  This wont be
+      // TODO - Call some sort of timer tick callback.  This won't be
       //        a precise timed event, but don't think we need one.
     }
     else if ((0 < p) && FD_ISSET(0, &selectFds))
@@ -292,8 +292,8 @@ void handle_keys(long extra, int (*handle_event)(long extra, struct keyevent *ev
 
     // Check for known key sequences.
     // For a real timeout checked Esc, buffer is now empty, so this for loop
-    // wont find it anyway.  While it's true we could avoid it by checking,
-    // the user already had to wait for a time out, and this loop wont take THAT long.
+    // won't find it anyway.  While it's true we could avoid it by checking,
+    // the user already had to wait for a time out, and this loop won't take THAT long.
     for (j = 0; j < ARRAY_LEN(keys); j++)
     {
       if (strcmp(keys[j].code, buffer) == 0)
@@ -322,7 +322,7 @@ void handle_keys(long extra, int (*handle_event)(long extra, struct keyevent *ev
        * Next is a semi colon separated list of parameters (n1, n2, etc), which
        * can be any characters from this set "01234567890:;<=>?".  What the non
        * digit ones mean is up to the command.  Parameters can be left out, but
-       * their defaults are command dependant.
+       * their defaults are command dependent.
        *
        * Next is an optional [extra] part from this set of characters
        * "!#$%&'()*+,-./", which includes double quotes.  Can be many of these,
@@ -361,7 +361,7 @@ void handle_keys(long extra, int (*handle_event)(long extra, struct keyevent *ev
         csFinal[0] = 0;
         p = 0;
 
-        // Unspecified params default to a value that is command dependant.
+        // Unspecified params default to a value that is command dependent.
         // However, they will never be negative, so we can use -1 to flag
         // a default value.
         for (j = 0; j < ARRAY_LEN(csParams); j++)
@@ -381,7 +381,7 @@ void handle_keys(long extra, int (*handle_event)(long extra, struct keyevent *ev
         {
           // So we know when we get to the end of parameter space.
           t = index("01234567890:;<=>?", buffer[j + 1]);
-          // See if we passed a paremeter.
+          // See if we passed a parameter.
           if ((';' == buffer[j]) || (!t))
           {
             // Only stomp on the ; if it's really the ;.
diff --git a/src/boxes/handlekeys.h b/src/boxes/handlekeys.h
index 868183f..96893d9 100644
--- a/src/boxes/handlekeys.h
+++ b/src/boxes/handlekeys.h
@@ -51,7 +51,7 @@ struct keyevent {
  *   count is the count of translated CSI parameters.
  *   params is an array of translateted CSI parameters.
  *   Empty parameters are set to -1, coz -1 parameters are not legal,
- *   and empty ones should default to something that is command dependant.
+ *   and empty ones should default to something that is command dependent.
  *
  * HK_KEYS
  *  sequence the keystrokes as ASCII, either translated or not.