diff --git a/gdb/mi/mi-cmd-disas.c b/gdb/mi/mi-cmd-disas.c
index f56daa5..a39a787 100644
--- a/gdb/mi/mi-cmd-disas.c
+++ b/gdb/mi/mi-cmd-disas.c
@@ -36,7 +36,7 @@

     FILENAME: The name of the file where we want disassemble from.
     LINE: The line around which we want to disassemble. It will
-   disassemble the function that contins that line.
+   disassemble the function that contains that line.
     HOW_MANY: Number of disassembly lines to display. With source, it
     is the number of disassembly lines only, not counting the source
     lines.
diff --git a/gdb/mi/mi-cmd-env.c b/gdb/mi/mi-cmd-env.c
index 8c9d170..66c2c48 100644
--- a/gdb/mi/mi-cmd-env.c
+++ b/gdb/mi/mi-cmd-env.c
@@ -40,7 +40,7 @@ static const char path_var_name[] = "PATH";
  static char *orig_path = NULL;

  /* The following is copied from mi-main.c so for m1 and below we can
-   perform old behavior and use cli commands.  If ARGS is non-null,
+   perform old behavior and use CLI commands.  If ARGS is non-null,
     append it to the CMD.  */

  static void
@@ -78,7 +78,7 @@ mi_cmd_env_pwd (char *command, char **argv, int argc)
        return;
      }

-  /* Otherwise the mi level is 2 or higher.  */
+  /* Otherwise the MI level is 2 or higher.  */

    if (! getcwd (gdb_dirbuf, sizeof (gdb_dirbuf)))
      error (_("-environment-pwd: error finding name of working 
directory: %s"),
@@ -140,7 +140,7 @@ mi_cmd_env_path (char *command, char **argv, int argc)
        return;
      }

-  /* Otherwise the mi level is 2 or higher.  */
+  /* Otherwise the MI level is 2 or higher.  */
    while (1)
      {
        int opt = mi_getopt ("-environment-path", argc, argv, opts,
@@ -213,7 +213,7 @@ mi_cmd_env_dir (char *command, char **argv, int argc)
        return;
      }

-  /* Otherwise mi level is 2 or higher.  */
+  /* Otherwise MI level is 2 or higher.  */
    while (1)
      {
        int opt = mi_getopt ("-environment-directory", argc, argv, opts,
diff --git a/gdb/mi/mi-cmd-stack.c b/gdb/mi/mi-cmd-stack.c
index 608dc4e..c491d88 100644
--- a/gdb/mi/mi-cmd-stack.c
+++ b/gdb/mi/mi-cmd-stack.c
@@ -600,7 +600,7 @@ list_args_or_locals (enum what_to_list what, enum 
print_valu
             case LOC_TYPEDEF:   /* local typedef         */
             case LOC_LABEL:     /* local label           */
             case LOC_BLOCK:     /* local function        */
-           case LOC_CONST_BYTES:       /* loc. byte seq.        */
+           case LOC_CONST_BYTES:       /* local byte sequence   */
             case LOC_UNRESOLVED:        /* unresolved static     */
             case LOC_OPTIMIZED_OUT:     /* optimized out         */
               print_me = 0;
diff --git a/gdb/mi/mi-cmd-var.c b/gdb/mi/mi-cmd-var.c
index f2ca326..52daa19 100644
--- a/gdb/mi/mi-cmd-var.c
+++ b/gdb/mi/mi-cmd-var.c
@@ -245,7 +245,7 @@ mi_cmd_var_set_format (char *command, char **argv, 
int argc)
    if (argc != 2)
      error (_("-var-set-format: Usage: NAME FORMAT."));

-  /* Get varobj handle, if a valid var obj name was specified.  */
+  /* Get varobj handle, if a valid varobj name was specified.  */
    var = varobj_get_handle (argv[0]);

    format = mi_parse_format (argv[1]);
@@ -313,7 +313,7 @@ mi_cmd_var_show_format (char *command, char **argv, 
int argc
    if (argc != 1)
      error (_("-var-show-format: Usage: NAME."));

-  /* Get varobj handle, if a valid var obj name was specified.  */
+  /* Get varobj handle, if a valid varobj name was specified.  */
    var = varobj_get_handle (argv[0]);

    format = varobj_get_display_format (var);
@@ -331,7 +331,7 @@ mi_cmd_var_info_num_children (char *command, char 
**argv, in
    if (argc != 1)
      error (_("-var-info-num-children: Usage: NAME."));

-  /* Get varobj handle, if a valid var obj name was specified.  */
+  /* Get varobj handle, if a valid varobj name was specified.  */
    var = varobj_get_handle (argv[0]);

    ui_out_field_int (uiout, "numchild", varobj_get_num_children (var));
@@ -385,7 +385,7 @@ mi_cmd_var_list_children (char *command, char 
**argv, int ar
      error (_("-var-list-children: Usage: "
              "[PRINT_VALUES] NAME [FROM TO]"));

-  /* Get varobj handle, if a valid var obj name was specified.  */
+  /* Get varobj handle, if a valid varobj name was specified.  */
    if (argc == 1 || argc == 3)
      var = varobj_get_handle (argv[0]);
    else
@@ -451,7 +451,7 @@ mi_cmd_var_info_type (char *command, char **argv, 
int argc)
    if (argc != 1)
      error (_("-var-info-type: Usage: NAME."));

-  /* Get varobj handle, if a valid var obj name was specified.  */
+  /* Get varobj handle, if a valid varobj name was specified.  */
    var = varobj_get_handle (argv[0]);

    ui_out_field_string (uiout, "type", varobj_get_type (var));
@@ -467,7 +467,7 @@ mi_cmd_var_info_path_expression (char *command, char 
**argv,
    if (argc != 1)
      error (_("Usage: NAME."));

-  /* Get varobj handle, if a valid var obj name was specified.  */
+  /* Get varobj handle, if a valid varobj name was specified.  */
    var = varobj_get_handle (argv[0]);

    path_expr = varobj_get_path_expr (var);
@@ -485,7 +485,7 @@ mi_cmd_var_info_expression (char *command, char 
**argv, int
    if (argc != 1)
      error (_("-var-info-expression: Usage: NAME."));

-  /* Get varobj handle, if a valid var obj name was specified.  */
+  /* Get varobj handle, if a valid varobj name was specified.  */
    var = varobj_get_handle (argv[0]);

    lang = varobj_get_language (var);
@@ -505,7 +505,7 @@ mi_cmd_var_show_attributes (char *command, char 
**argv, int
    if (argc != 1)
      error (_("-var-show-attributes: Usage: NAME."));

-  /* Get varobj handle, if a valid var obj name was specified */
+  /* Get varobj handle, if a valid varobj name was specified */
    var = varobj_get_handle (argv[0]);

    attr = varobj_get_attributes (var);
@@ -568,7 +568,7 @@ mi_cmd_var_evaluate_expression (char *command, char 
**argv,
    if (oind < argc - 1)
      error (_("Garbage at end of command"));

-  /* Get varobj handle, if a valid var obj name was specified.  */
+  /* Get varobj handle, if a valid varobj name was specified.  */
    var = varobj_get_handle (argv[oind]);

    if (formatFound)
@@ -598,7 +598,7 @@ mi_cmd_var_assign (char *command, char **argv, int argc)
    if (argc != 2)
      error (_("-var-assign: Usage: NAME EXPRESSION."));

-  /* Get varobj handle, if a valid var obj name was specified.  */
+  /* Get varobj handle, if a valid varobj name was specified.  */
    var = varobj_get_handle (argv[0]);

    if (!varobj_editable_p (var))
@@ -697,14 +697,14 @@ mi_cmd_var_update (char *command, char **argv, int 
argc)
        data.print_values = print_values;

        /* varobj_update_one automatically updates all the children of
-        VAROBJ.  Therefore update each VAROBJ only once by iterating
-        only the root VAROBJs.  */
+        varobj.  Therefore update each varobj only once by iterating
+        only the root varobjs.  */

        all_root_varobjs (mi_cmd_var_update_iter, &data);
      }
    else
      {
-      /* Get varobj handle, if a valid var obj name was specified.  */
+      /* Get varobj handle, if a valid varobj name was specified.  */
        struct varobj *var = varobj_get_handle (name);

        varobj_update_one (var, print_values, 1 /* explicit */);
diff --git a/gdb/mi/mi-cmds.c b/gdb/mi/mi-cmds.c
index ded36bf..fd10eec 100644
--- a/gdb/mi/mi-cmds.c
+++ b/gdb/mi/mi-cmds.c
@@ -179,11 +179,11 @@ static struct mi_cmd mi_cmds[] =
    { NULL, }
  };

-/* Pointer to the mi command table (built at run time). */
+/* Pointer to the MI command table (built at run time). */

  static struct mi_cmd **mi_table;

-/* A prime large enough to accomodate the entire command table.  */
+/* A prime large enough to accommodate the entire command table.  */
  enum
    {
      MI_TABLE_SIZE = 227
diff --git a/gdb/mi/mi-common.h b/gdb/mi/mi-common.h
index 71e5d78..8ae8bc9 100644
--- a/gdb/mi/mi-common.h
+++ b/gdb/mi/mi-common.h
@@ -20,7 +20,7 @@
  #define MI_COMMON_H

  /* Represents the reason why GDB is sending an asynchronous command to
-   the front end.  NOTE: When modifing this, don't forget to update
+   the front end.  NOTE: When modifying this, don't forget to update
     gdb.texinfo!  */
  enum async_reply_reason
  {
@@ -63,7 +63,7 @@ struct mi_interp
    /* MI's CLI builder (wraps OUT).  */
    struct ui_out *cli_uiout;

-  /* This is the interpreter for the mi... */
+  /* This is the interpreter for the MI... */
    struct interp *mi2_interp;
    struct interp *mi1_interp;
    struct interp *mi_interp;
diff --git a/gdb/mi/mi-getopt.h b/gdb/mi/mi-getopt.h
index 6fe6df0..2e0eca1 100644
--- a/gdb/mi/mi-getopt.h
+++ b/gdb/mi/mi-getopt.h
@@ -58,7 +58,7 @@ extern int mi_getopt_allow_unknown (const char 
*prefix, int ar

  /* mi_valid_noargs determines if ARGC/ARGV are a valid set of
     parameters to satisfy an MI function that is not supposed to
-   recieve any arguments.
+   receive any arguments.

     An MI function that should not receive arguments can still be
     passed parameters after the special option '--' such as below.
diff --git a/gdb/mi/mi-interp.c b/gdb/mi/mi-interp.c
index 3827830..dab931b 100644
--- a/gdb/mi/mi-interp.c
+++ b/gdb/mi/mi-interp.c
@@ -186,7 +186,7 @@ mi_interpreter_resume (void *data)
    async_command_editing_p = 0;
    /* FIXME: This is a total hack for now.  PB's use of the MI
       implicitly relies on a bug in the async support which allows
-     asynchronous commands to leak through the commmand loop.  The bug
+     asynchronous commands to leak through the command loop.  The bug
       involves (but is not limited to) the fact that sync_execution was
       erroneously initialized to 0.  Duplicate by initializing it thus
       here...  */
@@ -277,7 +277,7 @@ mi_cmd_interpreter_exec (char *command, char **argv, 
int arg
  /* This inserts a number of hooks that are meant to produce
     async-notify ("=") MI messages while running commands in another
     interpreter using mi_interpreter_exec.  The canonical use for this
-   is to allow access to the gdb CLI interpreter from within the MI,
+   is to allow access to the GDB CLI interpreter from within the MI,
     while still producing MI style output when actions in the CLI
     command change GDB's state.  */

@@ -316,7 +316,7 @@ mi_on_sync_execution_done (void)
       will print the prompt right after printing "^running", even if we
       cannot actually accept any input until the target stops.  See
       mi_on_resume.  However, if the target is async but MI is sync,
-     then we need to output the MI prompt now, to replicate gdb's
+     then we need to output the MI prompt now, to replicate GDB's
       behavior when neither the target nor MI are async.  (Note this
       observer is only called by the asynchronous target event handling
       code.)  */
@@ -588,7 +588,7 @@ static void
  mi_on_normal_stop (struct bpstats *bs, int print_frame)
  {
    /* Since this can be called when CLI command is executing,
-     using cli interpreter, be sure to use MI uiout for output,
+     using CLI interpreter, be sure to use MI uiout for output,
       not the current one.  */
    struct ui_out *mi_uiout = interp_ui_out (top_level_interpreter ());

@@ -965,7 +965,7 @@ mi_on_resume (ptid_t ptid)
    if (!running_result_record_printed && mi_proceeded)
      {
        running_result_record_printed = 1;
-      /* This is what gdb used to do historically -- printing prompt 
even if
+      /* This is what GDB used to do historically -- printing prompt 
even if
          it cannot actually accept any input.  This will be surely removed
          for MI3, and may be removed even earlier.  SYNC_EXECUTION is
          checked here because we only need to emit a prompt if a
@@ -1124,7 +1124,7 @@ mi_ui_out (struct interp *interp)

  static struct ui_file *saved_raw_stdout;

-/* Do MI-specific logging actions; save raw_stdout, and change all
+/* Do MI specific logging actions; save raw_stdout, and change all
     the consoles to use the supplied ui-file(s).  */

  static int
diff --git a/gdb/mi/mi-main.c b/gdb/mi/mi-main.c
index 59717ca..8bdcba0 100644
--- a/gdb/mi/mi-main.c
+++ b/gdb/mi/mi-main.c
@@ -169,7 +169,7 @@ mi_cmd_gdb_exit (char *command, char **argv, int argc)
  void
  mi_cmd_exec_next (char *command, char **argv, int argc)
  {
-  /* FIXME: Should call a libgdb function, not a cli wrapper.  */
+  /* FIXME: Should call a libgdb function, not a CLI wrapper.  */
    if (argc > 0 && strcmp(argv[0], "--reverse") == 0)
      mi_execute_async_cli_command ("reverse-next", argv + 1, argc - 1);
    else
@@ -179,7 +179,7 @@ mi_cmd_exec_next (char *command, char **argv, int argc)
  void
  mi_cmd_exec_next_instruction (char *command, char **argv, int argc)
  {
-  /* FIXME: Should call a libgdb function, not a cli wrapper.  */
+  /* FIXME: Should call a libgdb function, not a CLI wrapper.  */
    if (argc > 0 && strcmp(argv[0], "--reverse") == 0)
      mi_execute_async_cli_command ("reverse-nexti", argv + 1, argc - 1);
    else
@@ -189,7 +189,7 @@ mi_cmd_exec_next_instruction (char *command, char 
**argv, in
  void
  mi_cmd_exec_step (char *command, char **argv, int argc)
  {
-  /* FIXME: Should call a libgdb function, not a cli wrapper.  */
+  /* FIXME: Should call a libgdb function, not a CLI wrapper.  */
    if (argc > 0 && strcmp(argv[0], "--reverse") == 0)
      mi_execute_async_cli_command ("reverse-step", argv + 1, argc - 1);
