nvidia-settings: fix spelling

Most of these typos are in comments, but a few are in strings visible in the
compiled application.

Signed-off-by: Aaron Plattner <aplattner@nvidia.com>

41 files changed, 173 insertions, 173 deletions

diff --git a/samples/nv-control-dpy.c b/samples/nv-control-dpy.c
index 9feddda..4371270 100644
--- a/samples/nv-control-dpy.c
+++ b/samples/nv-control-dpy.c
@@ -1237,7 +1237,7 @@ int main(int argc, char *argv[])
 
         /*
          * we have added a new MetaMode for this X screen, and we know
-         * it's id.  The last step is to use the XRandR extension to
+         * its id.  The last step is to use the XRandR extension to
          * switch to this mode; see the Xrandr(3) manpage for details.
          *
          * For demonstration purposes, just use the xrandr commandline
@@ -1401,7 +1401,7 @@ int main(int argc, char *argv[])
 
 
 /*
- * display_device_name() - return the display device name correspoding
+ * display_device_name() - return the display device name corresponding
  * to the specified display device mask.
  */
 
diff --git a/samples/nv-control-framelock.c b/samples/nv-control-framelock.c
index 3e6dbc8..322ccb2 100644
--- a/samples/nv-control-framelock.c
+++ b/samples/nv-control-framelock.c
@@ -412,7 +412,7 @@ static void do_enable(Display *dpy)
             printf("    - Frame Lock Sync Enabled.\n");
             
             /* If we just enabled the server, also toggle the test signal
-             * to guarentee accuracy of the universal frame count (as
+             * to guarantee accuracy of the universal frame count (as
              * returned by the glXQueryFrameCountNV() function in the
              * GLX_NV_swap_group extension).
              */
diff --git a/samples/nv-control-targets.c b/samples/nv-control-targets.c
index a718280..88f5eb5 100644
--- a/samples/nv-control-targets.c
+++ b/samples/nv-control-targets.c
@@ -42,7 +42,7 @@
 
 
 /*
- * display_device_name() - return the display device name correspoding
+ * display_device_name() - return the display device name corresponding
  * to the display device mask.
  */
 
diff --git a/src/command-line.h b/src/command-line.h
index 75d04ce..2cfa076 100644
--- a/src/command-line.h
+++ b/src/command-line.h
@@ -45,13 +45,13 @@ typedef struct {
     
     char *config;        /*
                           * The name of the configuration file (to be
-                          * read from, and to be writen to); defaults
+                          * read from, and to be written to); defaults
                           * to the value of the constant
                           * DEFAULT_RC_FILE.
                           */
 
     char **assignments;  /*
-                          * Dyanamically allocated array of assignment
+                          * Dynamically allocated array of assignment
                           * strings specified on the commandline.
                           */
     
@@ -61,7 +61,7 @@ typedef struct {
                           */
     
     char **queries;      /*
-                          * Dyanamically allocated array of query
+                          * Dynamically allocated array of query
                           * strings specified on the commandline.
                           */
     
diff --git a/src/config-file.c b/src/config-file.c
index ff64d8a..1195f99 100644
--- a/src/config-file.c
+++ b/src/config-file.c
@@ -288,7 +288,7 @@ int nv_write_config_file(const char *filename, CtrlHandles *h,
 
         /*
          * construct the prefix that will be printed in the config
-         * file infront of each attribute on this screen; this will
+         * file in front of each attribute on this screen; this will
          * either be "[screen]" or "[displayname]".
          */
 
@@ -340,7 +340,7 @@ int nv_write_config_file(const char *filename, CtrlHandles *h,
                 mask = 1 << bit;
 
                 /*
-                 * if this bit is not present in the screens's enabled
+                 * if this bit is not present in the screen's enabled
                  * display device mask (and the X screen has enabled
                  * display devices), skip to the next bit
                  */
@@ -390,7 +390,7 @@ int nv_write_config_file(const char *filename, CtrlHandles *h,
     } /* screen */
 
     /*
-     * Write attributes addresssable to display targets
+     * Write attributes addressable to display targets
      */
 
     for (display = 0; display < h->targets[DISPLAY_TARGET].n; display++) {
@@ -683,8 +683,8 @@ static int process_config_file_attributes(const char *file,
          * We do not fail if processing the attribute failed.  If the
          * GPU or the X config changed (for example stereo is
          * disabled), some attributes written in the config file may
-         * not be advertised by the the NVCTRL extension (for example
-         * the control to force stereo)
+         * not be advertised by the NVCTRL extension (for example the
+         * control to force stereo)
          */
     }
     
diff --git a/src/gtk+-2.x/ctk3dvisionpro.c b/src/gtk+-2.x/ctk3dvisionpro.c
index 872de0d..312be78 100644
--- a/src/gtk+-2.x/ctk3dvisionpro.c
+++ b/src/gtk+-2.x/ctk3dvisionpro.c
@@ -1845,8 +1845,8 @@ GtkTextBuffer *ctk_3d_vision_pro_create_help(GtkTextTagTable *table)
                          "You can reduce the hub range to limit the experience "
                          "to a small group, or increase the range to include "
                          "everyone in a large room.\n"
-                         "Possible values for transeiver range are 'Short Range' "
-                         "'Medium Range' and 'Long Range'.");
+                         "Possible values for transceiver range are 'Short "
+                         "Range' 'Medium Range' and 'Long Range'.");
     ctk_help_para(b, &i, "Short Range: \n"
                          "Allows glasses within a 5-meter (16.5-foot) range to "
                          "be synced with the hub. This range is typically used "
diff --git a/src/gtk+-2.x/ctkappprofile.c b/src/gtk+-2.x/ctkappprofile.c
index a7183ed..fd74859 100644
--- a/src/gtk+-2.x/ctkappprofile.c
+++ b/src/gtk+-2.x/ctkappprofile.c
@@ -1781,7 +1781,7 @@ static void edit_rule_dialog_save_changes(GtkWidget *widget, gpointer user_data)
     g_string_assign(dialog->matches, gtk_entry_get_text(GTK_ENTRY(dialog->matches_entry)));
     g_string_assign(dialog->source_file, gtk_entry_get_text(GTK_ENTRY(source_file_entry)));
 
-    // Chceck for inconsistencies and errors
+    // Check for inconsistencies and errors
     if (!edit_rule_dialog_validate(dialog)) {
         return;
     }
diff --git a/src/gtk+-2.x/ctkclocks.c b/src/gtk+-2.x/ctkclocks.c
index 84d056f..35d5bdf 100644
--- a/src/gtk+-2.x/ctkclocks.c
+++ b/src/gtk+-2.x/ctkclocks.c
@@ -598,7 +598,7 @@ GtkTextBuffer *ctk_clocks_create_help(GtkTextTagTable *table,
                   "also reduce the life expectancy of your components and "
                   "void manufacturer warranties.  DO THIS AT YOUR OWN RISK."
                   );
-    ctk_help_heading(b, &i, "Enabeling Clock Frequencies");
+    ctk_help_heading(b, &i, "Enabling Clock Frequencies");
     ctk_help_para(b, &i, __enable_button_help);
     ctk_help_para(b, &i,
                   "GPU Overclocking functionality is currently limited to "
@@ -621,8 +621,8 @@ GtkTextBuffer *ctk_clocks_create_help(GtkTextTagTable *table,
     ctk_help_para(b, &i, __apply_button_help);
     ctk_help_heading(b, &i, "Auto Detect Optimal 3D Clock Frequencies");
     ctk_help_para(b, &i, __detect_button_help);
-    ctk_help_heading(b, &i, "Canceling Optimal 3D Clock Frequency Auto "
-                     "Dection.");
+    ctk_help_heading(b, &i, "Canceling Optimal 3D Clock Frequency Auto-"
+                     "detection.");
     ctk_help_para(b, &i, __cancel_button_help);
     ctk_help_para(b, &i,
                   "This button is only available if the Optimal "
@@ -730,7 +730,7 @@ static void overclocking_state_update_gui(CtkClocks *ctk_object)
 
 
     /* We need to check the overclocking state status with 
-     * the server everytime someone tries to change the state
+     * the server every time someone tries to change the state
      * because the set might have failed.
      */
 
@@ -1095,7 +1095,7 @@ static void clock_menu_changed(GtkWidget *widget, gpointer user_data)
     history = ctk_drop_down_menu_get_current_value(menu);
     switch (history) {
     default:
-        /* Fall throught */
+        /* Fall through */
     case 0: /* 2D */
         sync_gui_to_modify_clocks(ctk_object, CLOCKS_2D);
         break;
diff --git a/src/gtk+-2.x/ctkcolorcorrection.c b/src/gtk+-2.x/ctkcolorcorrection.c
index 2aae8ec..25b3fe9 100644
--- a/src/gtk+-2.x/ctkcolorcorrection.c
+++ b/src/gtk+-2.x/ctkcolorcorrection.c
@@ -53,7 +53,7 @@ static const char *__confirm_button_help = "Some color correction settings "
 "button by then to accept the changes, it will restore your previous values.";
 
 static const char *__color_curve_help = "The color curve graph changes to "
-"reflect your adjustments made with the Brightness, Constrast, and Gamma "
+"reflect your adjustments made with the Brightness, Contrast, and Gamma "
 "sliders.";
 
 static void
@@ -963,7 +963,7 @@ static void apply_parsed_attribute_list(
 
 /** update_confirm_text() ************************************
  *
- * Generates the text used to lable confirmation button.
+ * Generates the text used to label confirmation button.
  *
  **/
 
diff --git a/src/gtk+-2.x/ctkconfig.c b/src/gtk+-2.x/ctkconfig.c
index 7293f9a..753dacf 100644
--- a/src/gtk+-2.x/ctkconfig.c
+++ b/src/gtk+-2.x/ctkconfig.c
@@ -55,7 +55,7 @@ static const char *__x_display_names_help =
 "When the current settings are saved to the "
 "configuration file, the attributes can either be "
 "qualified with just the screen to which the attribute "
-"should be applied, or the attribute can be qualifed with "
+"should be applied, or the attribute can be qualified with "
 "the entire X Display name.  If you want to be able to "
 "use the same configuration file across multiple "
 "computers, be sure to leave this option unchecked.  "
@@ -216,7 +216,7 @@ GtkWidget* ctk_config_new(ConfigProperties *conf, CtrlHandles *pCtrlHandles)
     gtk_statusbar_set_has_resize_grip
         (GTK_STATUSBAR(ctk_config->status_bar.widget), FALSE);
     
-    /* XXX force the status bar window to be vertially centered */
+    /* XXX force the status bar window to be vertically centered */
 
     gtk_misc_set_alignment
         (GTK_MISC(GTK_STATUSBAR(ctk_config->status_bar.widget)->label),
diff --git a/src/gtk+-2.x/ctkdisplayconfig-utils.c b/src/gtk+-2.x/ctkdisplayconfig-utils.c
index 36c0e04..ee58898 100644
--- a/src/gtk+-2.x/ctkdisplayconfig-utils.c
+++ b/src/gtk+-2.x/ctkdisplayconfig-utils.c
@@ -812,7 +812,7 @@ nvModePtr mode_parse(nvDisplayPtr display, const char *mode_str)
     }
 
     /* If rotation is specified, swap W/H if they are still set to the
-     * modeline's unrotated dimentions.  Panning should not be rotated
+     * modeline's unrotated dimensions.  Panning should not be rotated
      * here since it is returned rotated by the X driver.
      */
     if (((mode->rotation == ROTATION_90) ||
@@ -987,7 +987,7 @@ static gchar *mode_get_str(nvModePtr mode, int be_generic)
      * XXX Later, we'll want to allow the user to select how
      *     the metamodes are generated:
      *
-     *   Programability:
+     *   Programmability:
      *     make mode->viewPortIn relative to screen->dim
      *
      *   Coherency:
@@ -1094,8 +1094,8 @@ static gchar *mode_get_str(nvModePtr mode, int be_generic)
         int width;
         int height;
 
-        /* Only write out the ViewPortIn if it is specified and differes from
-         * the ViewPortOut.
+        /* Only write out the ViewPortIn if it is specified and differs from the
+         * ViewPortOut.
          */
         if ((mode->rotation == ROTATION_90) ||
             (mode->rotation == ROTATION_270)) {
@@ -1988,7 +1988,7 @@ static void screen_remove_metamodes(nvScreenPtr screen)
  *
  * Special strtok function for parsing modes.  This function ignores
  * anything between curly braces, including commas when parsing tokens
- * deliminated by commas.
+ * delimited by commas.
  *
  **/
 static char *mode_strtok(char *str)
@@ -2203,10 +2203,10 @@ static Bool screen_check_metamodes(nvScreenPtr screen)
             }
         }
 
-        /* Each display must have as many modes as it's screen has metamodes */
+        /* Each display must have as many modes as its screen has metamodes */
         while (metamode) {
 
-            /* Create a dumy mode */
+            /* Create a dummy mode */
             mode = mode_parse(display, "NULL");
             mode->dummy = 1;
             mode->metamode = metamode;
@@ -3422,7 +3422,7 @@ static Bool layout_add_screen_from_server(nvLayoutPtr layout,
         if (ret == NvCtrlSuccess && primary_str) {
             char *str;
 
-            /* The TwinView Xinerana Info Order string may be a comma-separated
+            /* The TwinView Xinerama Info Order string may be a comma-separated
              * list of display device names, though we could add full support
              * for ordering these, just keep track of a single display here.
              */
@@ -3562,7 +3562,7 @@ nvLayoutPtr layout_load_from_server(NvCtrlAttributeHandle *handle,
     layout->handle = handle;
 
 
-    /* Is Xinerma enabled? */
+    /* Is Xinerama enabled? */
     ret = NvCtrlGetAttribute(handle, NV_CTRL_XINERAMA,
                              &layout->xinerama_enabled);
     if (ret != NvCtrlSuccess) {
@@ -3823,7 +3823,7 @@ static int save_xconfig_file(SaveXConfDlg *dlg,
     ret = 1;
 
  done:
-    /* Display any errors that might have occured */
+    /* Display any errors that might have occurred */
     if (err_msg) {
         ctk_display_error_msg(ctk_get_parent_window(GTK_WIDGET(dlg->parent)),
                               err_msg);
@@ -3975,7 +3975,7 @@ static void update_xconfig_save_buffer(SaveXConfDlg *dlg)
                 }
             }
 
-            /* If we're not actualy doing a merge, close the file */
+            /* If we're not actually doing a merge, close the file */
             if (!merge && xconfCur) {
                 xconfigFreeConfig(&xconfCur);
             }
diff --git a/src/gtk+-2.x/ctkdisplayconfig.c b/src/gtk+-2.x/ctkdisplayconfig.c
index b9797f5..15be0e5 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.c
+++ b/src/gtk+-2.x/ctkdisplayconfig.c
@@ -2879,7 +2879,7 @@ static void setup_display_refresh_dropdown(CtkDisplayConfig *ctk_object)
     }
 
 
-    /* Update the nodename label */
+    /* Update the modename label */
     setup_display_modename(ctk_object);
     return;
 
@@ -3001,7 +3001,7 @@ append_unique_selected_mode(nvSelectedModePtr head,
         targetHeight = mode->modeline->data.vdisplay;
     }
 
-    /* Keep the list sorted by targetted resolution */
+    /* Keep the list sorted by targeted resolution */
     iter = head;
     while (iter) {
         int currentWidth, currentHeight;
@@ -4144,7 +4144,7 @@ static void setup_screen_virtual_size(CtkDisplayConfig *ctk_object)
         (CTK_DISPLAY_LAYOUT(ctk_object->obj_layout));
 
 
-    /* Only show this box for no-scannout screens */
+    /* Only show this box for no-scanout screens */
     if (!screen || !screen->no_scanout) {
         gtk_widget_hide(ctk_object->box_screen_virtual_size);
         return;
@@ -4525,7 +4525,7 @@ static void setup_screen_position_offset(CtkDisplayConfig *ctk_object)
 
 /** setup_screen_position() ******************************************
  *
- * Sets up the the screen position section to reflect the position
+ * Sets up the screen position section to reflect the position
  * settings for the currently selected screen.
  *
  **/
@@ -4807,7 +4807,7 @@ static gint validation_auto_fix(CtkDisplayConfig *ctk_object)
  *
  * This function returns NULL if the screen is found to be in a
  * valid state.  To be in a valid state the screen's metamodes must
- * adhear to the following:
+ * adhere to the following:
  *
  * - Have at least 1 display device activated for all metamodes.
  *
@@ -4945,7 +4945,7 @@ static int validate_layout(CtkDisplayConfig *ctk_object, int validation_type)
                      "Multiple X screens are set to use absolute "
                      "positioning.  Though it is valid to do so, one or more "
                      "X screens may be (or may become) unreachable due to "
-                     "overlapping and/or deadspace.  It is recommended to "
+                     "overlapping and/or dead space.  It is recommended to "
                      "only use absolute positioning for the first X screen, "
                      "and relative positioning for all subsequent X screens.");
                 gtk_dialog_run(GTK_DIALOG(dlg));
@@ -5387,7 +5387,7 @@ static void do_enable_display_for_twinview(CtkDisplayConfig *ctk_object,
         }
 
 
-        /* Create the nvidia-auto-select mode fo the display */
+        /* Create the nvidia-auto-select mode for the display */
         mode = mode_parse(display, "nvidia-auto-select");
         mode->metamode = metamode;
 
@@ -5570,7 +5570,7 @@ static void do_configure_display_for_twinview(CtkDisplayConfig *ctk_object,
     prepare_gpu_for_twinview(ctk_object, gpu, use_screen);
 
 
-    /* Make sure the screen has enough metamodes to accomodate all
+    /* Make sure the screen has enough metamodes to accommodate all
      * the displays.
      */
     for (display = gpu->displays; display; display = display->next_on_gpu) {
@@ -6128,7 +6128,7 @@ static void display_rotation_changed(GtkWidget *widget, gpointer user_data)
 
 /** display_reflection_changed() *************************************
  *
- * Called when user selectes a new reflection axis.
+ * Called when user selects a new reflection axis.
  *
  **/
 static void display_reflection_changed(GtkWidget *widget, gpointer user_data)
@@ -7515,7 +7515,7 @@ static void preprocess_metamodes(nvScreenPtr screen, char *metamode_strs,
                 num_metamodes_in_X++;
             }
         } else {
-            /* Current metamode will be overriden, so stub it here so that it
+            /* Current metamode will be overridden, so stub it here so that it
              * does not get deleted later.
              */
             stub_metamode_str(cur_metamode_str);
@@ -7915,7 +7915,7 @@ static void apply_clicked(GtkWidget *widget, gpointer user_data)
     }
 
     /* Clear the apply button if all went well, and we were able to apply
-     * eveything.
+     * everything.
      */
     if (ctk_object->apply_possible && clear_apply) {
         gtk_widget_set_sensitive(widget, False);
@@ -8251,7 +8251,7 @@ static Bool add_display_to_screen(nvScreenPtr screen,
     /* XXX Don't do any further tweaking to the display subsection.
      *     All mode configuration should be done through the 'MetaModes"
      *     X Option.  The modes generated by xconfigAddDisplay() will
-     *     be used as a fallack.
+     *     be used as a fallback.
      */
 
     return TRUE;
@@ -9097,7 +9097,7 @@ done:
  * block of events) to be called when the app becomes idle (which
  * will happen once there are no more pending events) using
  * g_idle_add().  Once force_layout_reset() is called, it will
- * unresgister itself by returning FALSE.
+ * unregister itself by returning FALSE.
  *
  **/
 
diff --git a/src/gtk+-2.x/ctkdisplayconfig.h b/src/gtk+-2.x/ctkdisplayconfig.h
index 965673d..d6dd7d0 100644
--- a/src/gtk+-2.x/ctkdisplayconfig.h
+++ b/src/gtk+-2.x/ctkdisplayconfig.h
@@ -205,7 +205,7 @@ typedef struct _CtkDisplayConfig
     GtkWidget *btn_apply;
     gboolean apply_possible; /* True if all modifications are applicable */
 
-    gboolean reset_required; /* Reser required to apply */
+    gboolean reset_required; /* Reset required to apply */
     gboolean forced_reset_allowed; /* OK to reset layout w/o user input */
     gboolean notify_user_of_reset; /* User was notified of reset requirement */
     gboolean ignore_reset_events; /* Ignore reset-causing events */
diff --git a/src/gtk+-2.x/ctkdisplaydevice.c b/src/gtk+-2.x/ctkdisplaydevice.c
index 31bce92..0202c40 100644
--- a/src/gtk+-2.x/ctkdisplaydevice.c
+++ b/src/gtk+-2.x/ctkdisplaydevice.c
@@ -366,7 +366,7 @@ GtkWidget* ctk_display_device_new(NvCtrlAttributeHandle *handle,
 
     /*
      * Create layout for second tab for controls but don't add the tab until we
-     * make sure its required
+     * make sure it's required
      */
 
     nbox = gtk_vbox_new(FALSE, FRAME_PADDING);
@@ -634,7 +634,7 @@ static gboolean update_signal_info(InfoEntry *entry)
 
 
 /* NOTE: Link information is dependent on signal type, and this function
- * assumes the signal type is querried first.
+ * assumes the signal type is queried first.
  */
 static gboolean update_link_info(InfoEntry *entry)
 {
diff --git a/src/gtk+-2.x/ctkdisplaylayout.c b/src/gtk+-2.x/ctkdisplaylayout.c
index 68155bb..707476f 100644
--- a/src/gtk+-2.x/ctkdisplaylayout.c
+++ b/src/gtk+-2.x/ctkdisplaylayout.c
@@ -1165,9 +1165,9 @@ static void reposition_screen(nvScreenPtr screen, int resolve_all_modes)
 
 /** switch_screen_to_absolute() **************************************
  *
- * Prepair a screen for using absolute positioning.  This is needed
+ * Prepare a screen for using absolute positioning.  This is needed
  * since screens using relative positioning may not have all their
- * metamodes's top left corner coincideat the same place.  This
+ * metamodes's top left corner coincident the same place.  This
  * function makes sure that all metamodes in the screen have the
  * same top left corner by offsetting the modes of metamodes that
  * are offset from the screen's bounding box top left corner.
@@ -1308,7 +1308,7 @@ static void snap_dim_to_dim(GdkRectangle *dst, GdkRectangle *src,
  *
  * Snaps the sides of src to snap and stores the result in dst
  *
- * Returns 1 if a snap occured.
+ * Returns 1 if a snap occurred.
  *
  **/
 
@@ -1405,10 +1405,10 @@ static void snap_move(CtkDisplayLayout *ctk_object)
                 continue;
             }
 
-            /* NOTE: When the display devices's screens are relative to each
+            /* NOTE: When the display devices' screens are relative to each
              *       other, we may still want to allow snapping of the non-
              *       related edges.  This is useful, for example, when two
-             *       screens have a right of/left of relationtship and
+             *       screens have a right of/left of relationship and
              *       one of them is taller.
              */
             bv = &info->best_snap_v;
@@ -1461,10 +1461,10 @@ static void snap_move(CtkDisplayLayout *ctk_object)
 
         if (screen == info->screen) continue;
 
-        /* NOTE: When the (display devices's) screens are relative to
+        /* NOTE: When the (display devices') screens are relative to
          *       each other, we may still want to allow snapping of the
          *       non-related edges.  This is useful, for example, when
-         *       two screens have a right of/left of relationtship and
+         *       two screens have a right of/left of relationship and
          *       one of them is taller.
          */
 
@@ -1554,7 +1554,7 @@ static void snap_move(CtkDisplayLayout *ctk_object)
  * of the snap are placed into the destination dimensions (dst_dim).
  *
  * This is used for changing both the panning domain of a display
- * device as well as setting a (no-scannout) screen's virtual size.
+ * device as well as setting a (no-scanout) screen's virtual size.
  *
  **/
 
@@ -1622,7 +1622,7 @@ static void snap_pan(CtkDisplayLayout *ctk_object)
         /* NOTE: When display devices are relative to each other,
          *       we may still want to allow snapping of the non-related
          *       edges.  This is useful, for example, when two
-         *       displays have a right of/left of relationtship and
+         *       displays have a right of/left of relationship and
          *       one of the displays is taller.
          */
         bv = &info->best_snap_v;
@@ -4270,7 +4270,7 @@ void ctk_display_layout_set_screen_position(CtkDisplayLayout *ctk_object,
 /** ctk_display_layout_set_advanced_mode() ***************************
  *
  * Enables/Disables the user's ability to modify advanced layout
- * bells and whisles.
+ * bells and whistles.
  *
  * In advanced mode the user has access to:
  *
@@ -4297,7 +4297,7 @@ void ctk_display_layout_set_advanced_mode(CtkDisplayLayout *ctk_object,
 
 /** ctk_display_layout_register_callbacks() **************************
  *
- * Sets up callbacks so users of the display layout can recieve
+ * Sets up callbacks so users of the display layout can receive
  * notifications.
  *
  **/
@@ -4532,7 +4532,7 @@ button_press_event_callback(GtkWidget *widget, GdkEventButton *event,
         return TRUE;
     }
 
-    /* XXX Ignore tripple clicks */
+    /* XXX Ignore triple clicks */
     if (event->type != GDK_BUTTON_PRESS) return TRUE;
 
     switch (event->button) {
diff --git a/src/gtk+-2.x/ctkdisplaylayout.h b/src/gtk+-2.x/ctkdisplaylayout.h
index 82d1dd8..499e7b7 100644
--- a/src/gtk+-2.x/ctkdisplaylayout.h
+++ b/src/gtk+-2.x/ctkdisplaylayout.h
@@ -188,7 +188,7 @@ typedef struct nvSelectedModeRec {
 typedef struct nvModeRec {
     struct nvModeRec *next;
 
-    /* Defines a single mode for a dispay device as part of an X screen's
+    /* Defines a single mode for a display device as part of an X screen's
      * metamode.
      *
      * "WxH_Hz +x+y @WxH"
diff --git a/src/gtk+-2.x/ctkecc.c b/src/gtk+-2.x/ctkecc.c
index 05525c4..7aa3933 100644
--- a/src/gtk+-2.x/ctkecc.c
+++ b/src/gtk+-2.x/ctkecc.c
@@ -234,7 +234,7 @@ static void ecc_set_config_status(CtkEcc *ctk_ecc)
 
 /*
  * ecc_configuration_update_received() - this function is called when the
- * NV_CTRL_GPU_ECC_CONFIGURATION atribute is changed by another
+ * NV_CTRL_GPU_ECC_CONFIGURATION attribute is changed by another
  * NV-CONTROL client.
  */
 
@@ -246,7 +246,7 @@ static void ecc_configuration_update_received(GtkObject *object,
 
     ctk_ecc->ecc_configured = event_struct->value;
  
-    /* set ECC configuration buttion status */
+    /* set ECC configuration button status */
     ecc_set_config_status(ctk_ecc);
 
     /* Update status bar message */
diff --git a/src/gtk+-2.x/ctkevent.c b/src/gtk+-2.x/ctkevent.c
index e22757a..40054c0 100644
--- a/src/gtk+-2.x/ctkevent.c
+++ b/src/gtk+-2.x/ctkevent.c
@@ -828,7 +828,7 @@ static gboolean ctk_event_dispatch(GSource *source,
 
 
 /* ctk_event_emit() - Emits signal(s) on a registered ctk_event object.
- * This function is primarly used to simulate NV-CONTROL events such
+ * This function is primarily used to simulate NV-CONTROL events such
  * that various parts of nvidia-settings can communicate (internally)
  */
 void ctk_event_emit(CtkEvent *ctk_event,
@@ -853,7 +853,7 @@ void ctk_event_emit(CtkEvent *ctk_event,
     if (!source) return;
 
 
-    /* Broadcast event to all relavent ctk_event objects */
+    /* Broadcast event to all relevant ctk_event objects */
     event.attribute = attrib;
     event.value = value;
     event.display_mask = mask;
@@ -869,7 +869,7 @@ void ctk_event_emit(CtkEvent *ctk_event,
 
 
 /* ctk_event_emit_string() - Emits signal(s) on a registered ctk_event object.
- * This function is primarly used to simulate NV-CONTROL events such
+ * This function is primarily used to simulate NV-CONTROL events such
  * that various parts of nvidia-settings can communicate (internally)
  */
 void ctk_event_emit_string(CtkEvent *ctk_event,
@@ -894,7 +894,7 @@ void ctk_event_emit_string(CtkEvent *ctk_event,
     if (!source) return;
 
 
-    /* Broadcast event to all relavent ctk_event objects */
+    /* Broadcast event to all relevant ctk_event objects */
 
     event.attribute = attrib;
     event.value = 0;
diff --git a/src/gtk+-2.x/ctkframelock.c b/src/gtk+-2.x/ctkframelock.c
index 39e6e95..68c48f7 100644
--- a/src/gtk+-2.x/ctkframelock.c
+++ b/src/gtk+-2.x/ctkframelock.c
@@ -283,7 +283,7 @@ static const char * __use_house_sync_button_help =
 
 static const char * __sync_interval_scale_help =
 "The Sync Interval allows you to set the number of incoming house sync "
-"pulses the master frame lock board recieves before generating an outgoing "
+"pulses the master frame lock board receives before generating an outgoing "
 "frame lock sync pulse.  A value of 0 means a frame lock sync pulse is sent "
 "for every house sync pulse.";
 
@@ -378,7 +378,7 @@ static void framelock_state_received(GtkObject *object,
 /************************************************************************/
 
 /*
- * Widget creation hepher functions
+ * Widget creation helper functions
  */
 
 
@@ -906,7 +906,7 @@ static char *get_framelock_name(nvFrameLockDataPtr data, gboolean simple)
 
     /* NOTE: The display name of a non-X Screen target will
      *       return the server name and server # only.
-     *       (ie, it does not return a screen #)
+     *       (i.e., it does not return a screen #)
      */
     server_name = NvCtrlGetDisplayName(data->handle);
 
@@ -1632,7 +1632,7 @@ static void list_entry_clicked(GtkWidget *widget, GdkEventButton *event,
 
 /** expander_button_clicked() ****************************************
  *
- * - Handles button clicks on an nvListEntry's expantion button
+ * - Handles button clicks on an nvListEntry's expansion button
  *   widget.
  *
  *   This function either shows or hides the list entry's children
@@ -1881,7 +1881,7 @@ static void list_entry_add_child(nvListEntryPtr parent, nvListEntryPtr child)
         return;
     }
 
-    /* Add the child into the paren't child list */
+    /* Add the child into the parent's child list */
     
     child->parent = parent;
     child->tree   = parent->tree;
@@ -2750,7 +2750,7 @@ static void expand_all_clicked(GtkWidget *widget, gpointer data)
     /* expand or collapse all the entries */
     list_entry_expand_collapse(tree->entries, !ctk_framelock->is_expanded);
 
-    /* update the expand_all button stattus */
+    /* update the expand_all button status */
     update_expand_all_button_status(ctk_framelock);
 }
 
@@ -3172,7 +3172,7 @@ static gint test_link_done(gpointer data)
     gdk_window_set_cursor((GTK_WIDGET(ctk_framelock->parent_window))->window,
                           NULL);
 
-    /* un-press the testlink button */
+    /* un-press the test link button */
    
     g_signal_handlers_block_by_func
         (G_OBJECT(ctk_framelock->test_link_button),
@@ -3601,7 +3601,7 @@ static void list_entry_update_framelock_status(CtkFramelock *ctk_framelock,
     snprintf(str, 32, "%.2f uS", fvalue); // 10.2f
     gtk_label_set_text(GTK_LABEL(data->delay_text), str);
 
-    /* Incomming signal rate */
+    /* Incoming signal rate */
     gtk_widget_set_sensitive(data->house_sync_rate_label, framelock_enabled);
     gtk_widget_set_sensitive(data->house_sync_rate_text, framelock_enabled);
 
@@ -3745,7 +3745,7 @@ static void list_entry_update_display_status(CtkFramelock *ctk_framelock,
         gint timing = TRUE;
         gint stereo_sync;
 
-        /* If the display's GPU is not recieving timing, activate the
+        /* If the display's GPU is not receiving timing, activate the
          * stereo label but make sure to gray out the LED.
          */
         gtk_widget_set_sensitive(data->stereo_label, TRUE);
@@ -3819,7 +3819,7 @@ static gboolean update_framelock_status(gpointer user_data)
 
 /** check_for_ethernet() *********************************************
  *
- * Queries ethernet status for all frame lock devices and reports
+ * Queries Ethernet status for all frame lock devices and reports
  * on any error.
  *
  * XXX This assumes that the frame lock (Quadro Sync) devices are
@@ -3835,7 +3835,7 @@ static gboolean check_for_ethernet(gpointer user_data)
     
 
     /* Look through the framelock entries and check the
-     * ethernet status on each one
+     * Ethernet status on each one
      */
     entry = ((nvListTreePtr)(ctk_framelock->tree))->entries;
     while (entry) {
@@ -3888,7 +3888,7 @@ static gboolean check_for_ethernet(gpointer user_data)
 
 /** update_house_sync_controls() *************************************
  *
- * Queries the X Server for hosue sync status information for the
+ * Queries the X Server for house sync status information for the
  * currently selected frame lock server and updates the GUI.
  *
  */
@@ -4156,7 +4156,7 @@ static void gpu_state_received(GtkObject *object,
                  G_CALLBACK(toggle_client),
                  (gpointer) display_entry);
             
-            /* If there is an inconsistensy, unselect the server */
+            /* If there is an inconsistency, unselect the server */
 
             if (checked && !sensitive && gpu_entry->tree->server_entry) {
                 
@@ -4240,7 +4240,7 @@ static void gpu_state_received(GtkObject *object,
                  NULL);
             break;
         default:
-            /* Unknwon state, ignore */
+            /* Unknown state, ignore */
             break;
         }
 
@@ -5707,8 +5707,8 @@ static void add_devices(CtkFramelock *ctk_framelock,
 
 /** add_entry_to_parsed_attributes() *********************************
  *
- * Adds information reguarding a list entry (GPU or Frame Lock
- * device) to the parsed attribute list.
+ * Adds information regarding a list entry (GPU or Frame Lock device)
+ * to the parsed attribute list.
  *
  */
 #define __ADD_ATTR(x,y,z)                               \
@@ -5794,7 +5794,7 @@ static void add_entry_to_parsed_attributes(nvListEntryPtr entry,
         break;
 
     case ENTRY_DATA_DISPLAY:
-        /* Nothign to save */
+        /* Nothing to save */
         break;
 
     default:
@@ -5850,7 +5850,7 @@ void ctk_framelock_config_file_attributes(GtkWidget *w,
     add_entries_to_parsed_attributes
         (((nvListTreePtr)(ctk_framelock->tree))->entries, head);
 
-    /* Save the frame lock server's hous esync settings */
+    /* Save the frame lock server's house sync settings */
     add_entry_to_parsed_attributes
         (get_framelock_server_entry((nvListTreePtr)(ctk_framelock->tree)),
          head);
@@ -5959,14 +5959,14 @@ GtkTextBuffer *ctk_framelock_create_help(GtkTextTagTable *table)
 
     ctk_help_heading(b, &i, "Display Device Entry Information");
     ctk_help_para(b, &i, "Display Device entries display information and "
-                  "configuration options for configuring how the dislay "
+                  "configuration options for configuring how the display "
                   "device should behave in the frame lock group.  Setting  of "
                   "options is only available while frame lock is disabled.  "
                   "The following options are available:");
     ctk_help_para(b, &i, __server_checkbox_help);
     ctk_help_para(b, &i, __client_checkbox_help);
     ctk_help_para(b, &i, "Stereo LED: This indicates whether or not the "
-                  "display device is sync'ed to the stereo signal coming from "
+                  "display device is synced to the stereo signal coming from "
                   "the Quadro Sync device.  This LED is only available to "
                   "display devices set as clients when frame lock is enabled.  "
                   "The Stereo LED is dependent on the parent GPU being in sync "
@@ -5987,7 +5987,7 @@ GtkTextBuffer *ctk_framelock_create_help(GtkTextTagTable *table)
     ctk_help_para(b, &i, "The House Sync section allows you to configure "
                   "the selected server Quadro Sync board for using an incoming "
                   "house sync signal instead of internal GPU timings.  This "
-                  "section is only accesible by selecting a server display "
+                  "section is only accessible by selecting a server display "
                   "device (See Display Device Information above.");
 
     ctk_help_heading(b, &i, "Use House Sync on Server");
diff --git a/src/gtk+-2.x/ctkglx.c b/src/gtk+-2.x/ctkglx.c
index 0dba528..28b8544 100644
--- a/src/gtk+-2.x/ctkglx.c
+++ b/src/gtk+-2.x/ctkglx.c
@@ -109,7 +109,7 @@ static const char * __cav_help =
   "cav (Caveats) - Caveats for this configuration.  A frame buffer "
   "configuration may have the following caveats: 'NonC' if it supports "
   "any non-conformant visual extension.  'Slow' if it has reduced "
-  "preformance.  '-' if it has no caveats.";
+  "performance.  '-' if it has no caveats.";
 static const char * __pbw_help =
   "pbw (Pbuffer width) - Width of pbuffer (in hexadecimal).";
 static const char * __pbh_help =
@@ -120,15 +120,15 @@ static const char * __pbp_help =
 static const char * __trt_help =
   "trt (Transparency type) - Type of transparency (RGBA or Index).";
 static const char * __trr_help =
-  "trr (Transparency red value) - Red value consided transparent.";
+  "trr (Transparency red value) - Red value considered transparent.";
 static const char * __trg_help =
-  "trg (Transparency green value) - Green value consided transparent.";
+  "trg (Transparency green value) - Green value considered transparent.";
 static const char * __trb_help =
-  "trb (Transparency blue value) - Blue value consided transparent.";
+  "trb (Transparency blue value) - Blue value considered transparent.";
 static const char * __tra_help =
-  "tra (Transparency alpha value) - Alpha value consided transparent.";
+  "tra (Transparency alpha value) - Alpha value considered transparent.";
 static const char * __tri_help =
-  "tri (Transparency index value) - Color index value consided transparent.";
+  "tri (Transparency index value) - Color index value considered transparent.";
 
 
 GType ctk_glx_get_type(void)
diff --git a/src/gtk+-2.x/ctkgpu.c b/src/gtk+-2.x/ctkgpu.c
index 7f4a1b7..ccbd5a8 100644
--- a/src/gtk+-2.x/ctkgpu.c
+++ b/src/gtk+-2.x/ctkgpu.c
@@ -403,7 +403,7 @@ GtkWidget* ctk_gpu_new(
     /*
      * GPU information: TOP->MIDDLE - LEFT->RIGHT
      *
-     * This displays basic display adatper information, including
+     * This displays basic display adapter information, including
      * product name, bios version, bus type, video ram and interrupt
      * line.
      */
@@ -602,7 +602,7 @@ GtkTextBuffer *ctk_gpu_create_help(GtkTextTagTable *table,
                   "in X configuration file 'BusID' format: "
                   "\"bus:device:function\", or, if the PCI domain of the GPU "
                   "is non-zero, \"bus@domain:device:function\".  Note "
-                  "that all values are in decimal (as opposed to hexidecimal, "
+                  "that all values are in decimal (as opposed to hexadecimal, "
                   "which is how `lspci` formats its BusID values).");
 
     ctk_help_heading(b, &i, "PCI Device ID");
diff --git a/src/gtk+-2.x/ctkgvo-banner.c b/src/gtk+-2.x/ctkgvo-banner.c
index ca2128a..99057fd 100644
--- a/src/gtk+-2.x/ctkgvo-banner.c
+++ b/src/gtk+-2.x/ctkgvo-banner.c
@@ -692,7 +692,7 @@ gint ctk_gvo_banner_probe(gpointer data)
 
 
     // XXX We could get notified of these (sync source/mode) and
-    //     not have to probe - ie, it could be the job of the
+    //     not have to probe - i.e., it could be the job of the
     //     caller/user of the ctk_gvo_banner widget to notify the
     //     banner when these change.  We don't however since doing
     //     that could be prone to bitrot.
diff --git a/src/gtk+-2.x/ctkgvo-csc.c b/src/gtk+-2.x/ctkgvo-csc.c
index 71f813f..cbd1cc3 100644
--- a/src/gtk+-2.x/ctkgvo-csc.c
+++ b/src/gtk+-2.x/ctkgvo-csc.c
@@ -101,7 +101,7 @@ static void apply_button_clicked            (GtkButton *button,
 static void initialize_csc_dropdown_changed (CtkDropDownMenu *combo,
                                              gpointer user_data);
 
-static void set_apply_button_senstive       (CtkGvoCsc *ctk_gvo_csc);
+static void set_apply_button_sensitive      (CtkGvoCsc *ctk_gvo_csc);
 
 static void apply_csc_values                (CtkGvoCsc *ctk_gvo_csc);
 
@@ -141,7 +141,7 @@ static const char * __initialize_help =
 "values from the selected standard.";
 
 static const char * __csc_help =
-"The color space conversion matrix defines the paramaters used for "
+"The color space conversion matrix defines the parameters used for "
 "converting the color data.";
 
 static const char * __apply_immediately_help =
@@ -849,7 +849,7 @@ static void spin_button_value_changed(GtkWidget *button,
      * the data has changed, make sure the apply button is sensitive
      */
 
-    set_apply_button_senstive(ctk_gvo_csc);
+    set_apply_button_sensitive(ctk_gvo_csc);
 
     /* if we are supposed to apply immediately, send the data now */
 
@@ -965,7 +965,7 @@ static void initialize_csc_dropdown_changed(CtkDropDownMenu *menu,
      * the data has changed, make sure the apply button is sensitive
      */
 
-    set_apply_button_senstive(ctk_gvo_csc);
+    set_apply_button_sensitive(ctk_gvo_csc);
 
     /* if we are supposed to apply immediately, send the data now */
 
@@ -978,10 +978,10 @@ static void initialize_csc_dropdown_changed(CtkDropDownMenu *menu,
 
 
 /*
- * set_apply_button_senstive() - make the "Apply" button sensitive
+ * set_apply_button_sensitive() - make the "Apply" button sensitive
  */
 
-static void set_apply_button_senstive(CtkGvoCsc *ctk_gvo_csc)
+static void set_apply_button_sensitive(CtkGvoCsc *ctk_gvo_csc)
 {
     /* if data is applied immediately, then we don't */
 
@@ -989,7 +989,7 @@ static void set_apply_button_senstive(CtkGvoCsc *ctk_gvo_csc)
     
     gtk_widget_set_sensitive(ctk_gvo_csc->applyButton, TRUE);
     
-} /* set_apply_button_senstive() */
+} /* set_apply_button_sensitive() */
 
 
 
@@ -1116,7 +1116,7 @@ static void gvo_csc_event_received(GtkObject *object,
         break;
     }
 
-} /* gvo_csc_event_recieved() */
+}
 
 
 
@@ -1268,17 +1268,17 @@ GtkTextBuffer *ctk_gvo_csc_create_help(GtkTextTagTable *table,
                   "Scb = Cb Scaling factor\n"
                   "Scr = Cr Scaling factor");
     ctk_help_para(b, &i,
-                  "Ry  = Red coeficient for Y\n"
-                  "Rcb = Red coeficient for Cb\n"
-                  "Rcr = Red coeficient for Cr");
+                  "Ry  = Red coefficient for Y\n"
+                  "Rcb = Red coefficient for Cb\n"
+                  "Rcr = Red coefficient for Cr");
     ctk_help_para(b, &i,
-                  "Gy  = Green coeficient for Y\n"
-                  "Gcb = Green coeficient for Cb\n"
-                  "Gcr = Green coeficient for Cr");
+                  "Gy  = Green coefficient for Y\n"
+                  "Gcb = Green coefficient for Cb\n"
+                  "Gcr = Green coefficient for Cr");
     ctk_help_para(b, &i,
-                  "By  = Blue coeficient for Y\n"
-                  "Bcb = Blue coeficient for Cb\n"
-                  "Bcr = Blue coeficient for Cr");
+                  "By  = Blue coefficient for Y\n"
+                  "Bcb = Blue coefficient for Cb\n"
+                  "Bcr = Blue coefficient for Cr");
 
     if (ctk_gvo_csc->caps & NV_CTRL_GVO_CAPABILITIES_APPLY_CSC_IMMEDIATELY) {
         ctk_help_heading(b, &i, "Apply Changes Immediately");
diff --git a/src/gtk+-2.x/ctkgvo-sync.c b/src/gtk+-2.x/ctkgvo-sync.c
index c1fc528..90902b8 100644
--- a/src/gtk+-2.x/ctkgvo-sync.c
+++ b/src/gtk+-2.x/ctkgvo-sync.c
@@ -676,7 +676,7 @@ GtkWidget* ctk_gvo_sync_new(NvCtrlAttributeHandle *handle,
 
 
 /*
- * start_menu() - Start the creation of a labled dropdown menu.  (Packs
+ * start_menu() - Start the creation of a labeled dropdown menu.  (Packs
  * the dropdown label into the table row.
  */
 
@@ -902,7 +902,7 @@ static void register_for_gvo_sync_events(CtkGvoSync *ctk_gvo_sync)
 
 /*
  * update_gvo_sync_sensitivity() - Updates the sensitivity of various UI
- * wigets based on whether or not an input sync signal is detected.
+ * widgets based on whether or not an input sync signal is detected.
  *
  */
 
@@ -1007,7 +1007,7 @@ static void post_sync_mode_menu_changed(CtkGvoSync *ctk_gvo_sync, gint value)
 
 
 /*
- * post_sync_format_menu_changed() - Call this function after teh sync
+ * post_sync_format_menu_changed() - Call this function after the sync
  * format has changed.
  */
 
diff --git a/src/gtk+-2.x/ctkimagesliders.c b/src/gtk+-2.x/ctkimagesliders.c
index e6aa842..f5e417b 100644
--- a/src/gtk+-2.x/ctkimagesliders.c
+++ b/src/gtk+-2.x/ctkimagesliders.c
@@ -123,7 +123,7 @@ GtkWidget* ctk_image_sliders_new(NvCtrlAttributeHandle *handle,
     gint val;
 
     /*
-     * now that we know that we will have atleast one attribute,
+     * now that we know that we will have at least one attribute,
      * create the object
      */
 
diff --git a/src/gtk+-2.x/ctkmultisample.c b/src/gtk+-2.x/ctkmultisample.c
index e5f5eb7..ad3b30e 100644
--- a/src/gtk+-2.x/ctkmultisample.c
+++ b/src/gtk+-2.x/ctkmultisample.c
@@ -118,12 +118,12 @@ static gchar *applicationSettings[] = {
 static const char *__aa_override_app_help =
 "Enable the Antialiasing \"Override Application Setting\" "
 "checkbox to make the antialiasing slider active and "
-"override any appliation antialiasing setting with the "
+"override any application antialiasing setting with the "
 "value of the slider.";
 
 static const char *__aa_menu_help =
 "The Application Antialiasing Settings Menu allows the antialiasing "
-"setting of OpenGL applications to be overriden with the value of "
+"setting of OpenGL applications to be overridden with the value of "
 "the slider.";
 
 static const char *__aa_slider_help =
@@ -133,7 +133,7 @@ static const char *__aa_slider_help =
 static const char *__aniso_override_app_help =
 "Enable the Anisotropic Filtering \"Override Application Setting\" "
 "checkbox to make the anisotropic filtering slider "
-"active and override any appliation anisotropic "
+"active and override any application anisotropic "
 "filtering setting with the value of the slider.";
 
 static const char *__aniso_slider_help =
@@ -1516,7 +1516,7 @@ GtkTextBuffer *ctk_multisample_create_help(GtkTextTagTable *table,
                       "rendering may decrease performance.");
 
         ctk_help_para(b, &i, "You can also configure Antialiasing "
-                      "using the __GL_FSAA_MODE environment varible (see "
+                      "using the __GL_FSAA_MODE environment variable (see "
                       "the README for details).  The __GL_FSAA_MODE "
                       "environment variable overrides the value in "
                       "nvidia-settings.");
@@ -1662,7 +1662,7 @@ GtkTextBuffer *ctk_multisample_create_help(GtkTextTagTable *table,
                       "expense of some performance.");
 
         ctk_help_para(b, &i, "You can also configure Anisotropic filtering "
-                      "using the __GL_LOG_MAX_ANISO environment varible "
+                      "using the __GL_LOG_MAX_ANISO environment variable "
                       "(see the README for details).  The "
                       "__GL_LOG_MAX_ANISO environment variable overrides "
                       "the value in nvidia-settings.");
diff --git a/src/gtk+-2.x/ctkopengl.c b/src/gtk+-2.x/ctkopengl.c
index 97f957e..f0a2e83 100644
--- a/src/gtk+-2.x/ctkopengl.c
+++ b/src/gtk+-2.x/ctkopengl.c
@@ -1110,7 +1110,7 @@ static void slider_changed(GtkAdjustment *adjustment, gpointer user_data)
 
 /*
  * aa_line_gamma_update_received() - this function is called when the
- * NV_CTRL_OPENGL_AA_LINE_GAMMA_VALUE atribute is changed by another NV-CONTROL
+ * NV_CTRL_OPENGL_AA_LINE_GAMMA_VALUE attribute is changed by another NV-CONTROL
  * client.
  */
 
diff --git a/src/gtk+-2.x/ctkscreen.c b/src/gtk+-2.x/ctkscreen.c
index e29f7b1..56bce3f 100644
--- a/src/gtk+-2.x/ctkscreen.c
+++ b/src/gtk+-2.x/ctkscreen.c
@@ -115,13 +115,13 @@ static gchar *make_display_device_list(NvCtrlAttributeHandle *handle)
 
 /*
  * Calculations of the screen dimensions and resolution are based on
- * the dxpyinfo utility code.
+ * the xdpyinfo utility code.
  *
  * Copyright Information for xdpyinfo:
  *
  ***********************************************************************
  * 
- * xdpyinfo - print information about X display connecton
+ * xdpyinfo - print information about X display connection
  *
  * 
 Copyright 1988, 1998  The Open Group
@@ -482,7 +482,7 @@ static void associated_displays_received(GtkObject *object, gpointer arg1,
 
 
 /*
- * When the  number of gpu errors occured changes,
+ * When the number of gpu errors occurred changes,
  * update the count showed on the page.
  */
 
diff --git a/src/gtk+-2.x/ctkserver.c b/src/gtk+-2.x/ctkserver.c
index 7a1b5fa..19851e1 100644
--- a/src/gtk+-2.x/ctkserver.c
+++ b/src/gtk+-2.x/ctkserver.c
@@ -66,7 +66,7 @@ GType ctk_server_get_type(void)
  *
  ***********************************************************************
  * 
- * xdpyinfo - print information about X display connecton
+ * xdpyinfo - print information about X display connection
  *
  * 
 Copyright 1988, 1998  The Open Group
diff --git a/src/gtk+-2.x/ctkslimm.c b/src/gtk+-2.x/ctkslimm.c
index 5db917e..15afce4 100644
--- a/src/gtk+-2.x/ctkslimm.c
+++ b/src/gtk+-2.x/ctkslimm.c
@@ -191,7 +191,7 @@ static void add_slimm_options(XConfigPtr xconf, gchar *metamode_str)
 
     /* 
      * Now fix up the screen in the Device section (to prevent failure with
-     * seperate x screen config
+     * separate x screen config
      *
      */
     xconf->layouts->adjacencies->screen->device->screen = -1;
@@ -1063,7 +1063,7 @@ static Bool parse_slimm_layout(CtkSLIMM *ctk_slimm,
         }
 
 
-        /* Calculte column overlap */
+        /* Calculate column overlap */
         *hoverlap = 0;
         found = 0;
         if (cols > 1) {
@@ -1290,7 +1290,7 @@ GtkWidget* ctk_slimm_new(NvCtrlAttributeHandle *handle,
 
     /*
      * Check for NV-CONTROL protocol version.
-     * This used for not trust old X drivers which always reported
+     * This is used to not trust old X drivers which always reported
      * it available (on NV50+).
      */
     ret = NvCtrlGetAttribute(handle,
@@ -1367,7 +1367,7 @@ GtkWidget* ctk_slimm_new(NvCtrlAttributeHandle *handle,
             }
         }
 
-        /* Make sure we have enough dislays for the minimum config */
+        /* Make sure we have enough displays for the minimum config */
         if (num_valid <= 0) {
             err_str = g_strdup_printf("Not enough display devices to "
                                       "configure SLI Mosaic Mode.\nYou must "
diff --git a/src/gtk+-2.x/ctkthermal.c b/src/gtk+-2.x/ctkthermal.c
index 26c23b0..92673ac 100644
--- a/src/gtk+-2.x/ctkthermal.c
+++ b/src/gtk+-2.x/ctkthermal.c
@@ -390,7 +390,7 @@ static void cooler_control_state_update_gui(CtkThermal *ctk_thermal)
 
 
     /* We need to check the cooler control state status with 
-     * the server everytime someone tries to change the state
+     * the server every time someone tries to change the state
      * because the set might have failed.
      */
 
@@ -1269,7 +1269,7 @@ GtkWidget* ctk_thermal_new(NvCtrlAttributeHandle *handle,
             cur_sensor_idx++;
         }
     } else {
-        /* GPU Core Treshold Temperature */
+        /* GPU Core Threshold Temperature */
 
         vbox1 = gtk_vbox_new(FALSE, 0);
         hbox1 = gtk_hbox_new(FALSE, 0);
diff --git a/src/gtk+-2.x/ctkvcs.c b/src/gtk+-2.x/ctkvcs.c
index 9932fea..ab337d3 100644
--- a/src/gtk+-2.x/ctkvcs.c
+++ b/src/gtk+-2.x/ctkvcs.c
@@ -624,7 +624,7 @@ GtkWidget* ctk_vcs_new(NvCtrlAttributeHandle *handle,
                                   &psu_str)  == NvCtrlSuccess)) {
         GtkWidget *vbox_padding;
 
-        /* Show the additonal queried information */
+        /* Show the additional queried information */
 
 
         /* Populate scrolling window with data */
diff --git a/src/gtk+-2.x/ctkwindow.c b/src/gtk+-2.x/ctkwindow.c
index 6db77c3..03c187d 100644
--- a/src/gtk+-2.x/ctkwindow.c
+++ b/src/gtk+-2.x/ctkwindow.c
@@ -343,7 +343,7 @@ static void tree_selection_changed(GtkTreeSelection *selection,
 
 /*
  * tree_view_key_event() - callback for additional keyboard events we
- * want to track (space and Return) to expand and collapse collapsable
+ * want to track (space and Return) to expand and collapse collapsible
  * categories in the treeview.
  */
 
diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributes.c b/src/libXNVCtrlAttributes/NvCtrlAttributes.c
index eb3e350..be7b033 100644
--- a/src/libXNVCtrlAttributes/NvCtrlAttributes.c
+++ b/src/libXNVCtrlAttributes/NvCtrlAttributes.c
@@ -122,7 +122,7 @@ NvCtrlAttributeHandle *NvCtrlAttributeInit(Display *dpy, int target_type,
  * NvCtrlAttributeHandle.  This is done by getting the string that
  * describes the display connection, and then substituting the correct
  * screen number.  If no hostname is present in the display string,
- * uname.nodename is prepended.  Returns NULL if any error occors.
+ * uname.nodename is prepended.  Returns NULL if any error occurs.
  */
 
 char *NvCtrlGetDisplayName(NvCtrlAttributeHandle *handle)
@@ -658,7 +658,7 @@ GetValidStringDisplayAttributeValuesExtraAttr(NVCTRLAttributeValidValuesRec
 
 /*
  * NvCtrlGetValidStringDisplayAttributeValues() -fill the
- * NVCTRLAttributeValidValuesRec strucure for String atrributes
+ * NVCTRLAttributeValidValuesRec structure for String attributes
  */
 
 ReturnStatus
@@ -875,7 +875,7 @@ void NvCtrlAttributeClose(NvCtrlAttributeHandle *handle)
 
 
 /*
- * NvCtrlGetMultisampleModeName() - lookup a string desribing the
+ * NvCtrlGetMultisampleModeName() - lookup a string describing the
  * NV-CONTROL constant.
 */
 
diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributes.h b/src/libXNVCtrlAttributes/NvCtrlAttributes.h
index fdd7498..c59a001 100644
--- a/src/libXNVCtrlAttributes/NvCtrlAttributes.h
+++ b/src/libXNVCtrlAttributes/NvCtrlAttributes.h
@@ -258,7 +258,7 @@ typedef struct GLXFBConfigAttrRec {
 
 
 /*
- * NvCtrlAttributeInit() - intializes the control panel backend; this
+ * NvCtrlAttributeInit() - initializes the control panel backend; this
  * includes probing for the various extensions, downloading the
  * initial state of attributes, etc.  Takes a Display pointer and
  * screen number, and returns an opaque handle on success; returns
@@ -338,7 +338,7 @@ ReturnStatus NvCtrlQueryTargetCount(NvCtrlAttributeHandle *handle,
 /*
  * NvCtrlGetAttribute()/NvCtrlSetAttribute() - these get and set
  * functions can be used to query and modify all integer attributes.
- * Modifications made via SetAttribute() are made immediatedly.  The
+ * Modifications made via SetAttribute() are made immediately.  The
  * attr argument is the attribute to query/modify; valid attributes
  * are those listed in NVCtrl.h and the NV_CTRL_ attributes #define'd
  * above.  NvCtrlGetAttribute64() behaves like NvCtrlGetAttribute(),
diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesGlx.c b/src/libXNVCtrlAttributes/NvCtrlAttributesGlx.c
index 7603cb8..717bd43 100644
--- a/src/libXNVCtrlAttributes/NvCtrlAttributesGlx.c
+++ b/src/libXNVCtrlAttributes/NvCtrlAttributesGlx.c
@@ -328,7 +328,7 @@ NvCtrlGlxAttributesClose (NvCtrlAttributePrivateHandle *h)
  * Returns an array of GLX Frame Buffer Configuration Attributes for the
  * given Display/Screen.
  *
- * NOTE: A seperate display connection is used to avoid the dependence on
+ * NOTE: A separate display connection is used to avoid the dependence on
  *       libGL when an XCloseDisplay is issued.   If we did not, calling
  *       XCloseDisplay AFTER the libGL library has been dlclose'ed (after
  *       having made at least one GLX call) would cause a segfault.
@@ -614,7 +614,7 @@ NvCtrlGlxGetVoidAttribute (NvCtrlAttributePrivateHandle *h,
  * NvCtrlGlxGetStringAttribute()
  *
  *
- * Retrieves a particular GLX information string by calling the appropreate
+ * Retrieves a particular GLX information string by calling the appropriate
  * OpenGL/GLX function.
  *
  *
@@ -622,7 +622,7 @@ NvCtrlGlxGetVoidAttribute (NvCtrlAttributePrivateHandle *h,
  * context such that valid information may be retrieved. (Having a context is
  * required for getting OpenGL and 'Direct rendering' information.)
  *
- * NOTE: A seperate display connection is used to avoid the dependence on
+ * NOTE: A separate display connection is used to avoid the dependence on
  *       libGL when an XCloseDisplay is issued.   If we did not, calling
  *       XCloseDisplay AFTER the libGL library has been dlclose'ed (after
  *       having made at least one GLX call) would cause a segfault.
diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesNvControl.c b/src/libXNVCtrlAttributes/NvCtrlAttributesNvControl.c
index 04f9a7f..2567cb6 100644
--- a/src/libXNVCtrlAttributes/NvCtrlAttributesNvControl.c
+++ b/src/libXNVCtrlAttributes/NvCtrlAttributesNvControl.c
@@ -55,7 +55,7 @@ NvCtrlInitNvControlAttributes (NvCtrlAttributePrivateHandle *h)
 
     if (major < NV_MINMAJOR || (major == NV_MINMAJOR && minor < NV_MINMINOR)) {
         nv_error_msg("NV-CONTROL extension version %d.%d is too old; "
-                     "the minimimum required version is %d.%d.",
+                     "the minimum required version is %d.%d.",
                      major, minor, NV_MINMAJOR, NV_MINMINOR);
         return NULL;
     }
diff --git a/src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h b/src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h
index 3e9df16..90204b1 100644
--- a/src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h
+++ b/src/libXNVCtrlAttributes/NvCtrlAttributesPrivate.h
@@ -130,7 +130,7 @@ struct __NvCtrlXrandrAttributes {
 
 struct __NvCtrlAttributePrivateHandle {
     Display *dpy;                   /* display connection */
-    int target_type;                /* Type of target this handle conrols */
+    int target_type;                /* Type of target this handle controls */
     int target_id;                  /* screen num, gpu num (etc) of target */
 
     /* Common attributes */
diff --git a/src/parse.c b/src/parse.c
index 528549a..4e83e97 100644
--- a/src/parse.c
+++ b/src/parse.c
@@ -607,7 +607,7 @@ static int nv_parse_special_xscreen_target(ParsedAttribute *a,
  * before the DISPLAY_NAME_SEPARATOR.
  *
  * \param[in]  start  Start of the string to parse.
- * \param[in]  end    End of the the string to parse.
+ * \param[in]  end    End of the string to parse.
  * \param[out] a      ParsedAttribute to be modified with the X Display and/or
  *                    target type + target id or generic specification
  *                    information.
@@ -1191,7 +1191,7 @@ uint32 expand_display_device_mask_wildcards(const uint32 d, const uint32 e)
 
 /*
  * nv_assign_default_display() - assign an X display, if none has been
- * assigned already.  Also, parse the the display name to find any
+ * assigned already.  Also, parse the display name to find any
  * specified X screen.
  */
 
@@ -1212,7 +1212,7 @@ void nv_assign_default_display(ParsedAttribute *a, const char *display)
             if (dot) {
 
                 /*
-                 * if all characters afer the '.' are digits, interpret it as a
+                 * if all characters after the '.' are digits, interpret it as a
                  * screen number.
                  */
                 nv_parse_special_xscreen_target(a, dot + 1, NULL);
@@ -1446,7 +1446,7 @@ char *remove_spaces(const char *o)
 
 /*
  * allocate an output string and copy the input string to this
- * output string, replacing any occurances of the character
+ * output string, replacing any occurrences of the character
  * 'c' with the character 'r'.
  */
 
@@ -1513,7 +1513,7 @@ static char **nv_strtok(char *s, char c, int *n)
     delims[count] = (char *) strchr(s, '\0');
     
     /*
-     * so now, we have pointers to each deliminator; copy what's in between
+     * so now, we have pointers to each delimiter; copy what's in between
      * the divisions (the tokens) into the dynamic array of strings
      */
     
@@ -1741,7 +1741,7 @@ const char *parse_read_name(const char *str, char **name, char term)
  *
  * Convert a 'CRT-1' style display device name into a device_mask
  * '0x00000002' bitmask.  The location where parsing stopped is returned
- * or NULL if an error occured.
+ * or NULL if an error occurred.
  *
  **/
 const char *parse_read_display_name(const char *str, unsigned int *mask)
@@ -1781,7 +1781,7 @@ const char *parse_read_display_name(const char *str, unsigned int *mask)
  *
  * Convert a 'DPY-#' style display device name into a display device
  * id.  The location where parsing stopped is returned or NULL if an
- * error occured.
+ * error occurred.
  *
  **/
 const char *parse_read_display_id(const char *str, unsigned int *id)
@@ -1812,7 +1812,7 @@ const char *parse_read_display_id(const char *str, unsigned int *id)
 
 /** parse_read_float_range() *****************************************
  *
- * Reads the maximun/minimum information from a string in the
+ * Reads the maximum/minimum information from a string in the
  * following format:
  *     "MIN-MAX"
  * or
@@ -1842,7 +1842,7 @@ int parse_read_float_range(const char *str, float *min, float *max)
 /** parse_token_value_pairs() ****************************************
  *
  * Parses the given string for "token=value, token=value, ..." pairs
- * and dispatches the handeling of tokens to the given function with
+ * and dispatches the handling of tokens to the given function with
  * the given data as an extra argument.
  *
  * Note that the value may be in parentheses:  "token=(value), ..."
diff --git a/src/parse.h b/src/parse.h
index ea79383..5f81eb7 100644
--- a/src/parse.h
+++ b/src/parse.h
@@ -218,7 +218,7 @@ const TargetTypeEntry *nv_get_target_type_entry_by_name(const char *name);
 
 
 /* nv_get_sdi_csc_matrxi() - Returns an array of floats that specifies
- * all the color, offset and scale values for specifing one of the
+ * all the color, offset and scale values for specifying one of the
  * Standard CSC. 's' is a string that names the matrix values to return.
  * The values are placed in the float buffer like so:
  *
@@ -240,7 +240,7 @@ const float * nv_get_sdi_csc_matrix(char *s);
  * the default X server is used.  If no X screen is specified, then
  * all X screens on the X server are used.
  *
- * {screen}/ may be specified by itself (ie: without the
+ * {screen}/ may be specified by itself (i.e.: without the
  * "{host}:{display}." part).
  *
  * Additionally, instead of specifying a screen, a target
@@ -263,7 +263,7 @@ const float * nv_get_sdi_csc_matrix(char *s);
  *
  * The query parameter controls whether the attribute string is parsed
  * for setting or querying.  If query == NV_PARSER_SET, then the
- * attribute string will be interpretted as described above.  If query
+ * attribute string will be interpreted as described above.  If query
  * == NV_PARSER_QUERY, the "={value}" portion of the string should be
  * omitted.
  *
@@ -303,7 +303,7 @@ char *remove_spaces(const char *o);
 char *replace_characters(const char *o, const char c, const char r);
 
 /*
- * diaplay_mask/display_name conversions: the NV-CONTROL X extension
+ * display_mask/display_name conversions: the NV-CONTROL X extension
  * identifies a display device by a bit in a display device mask.  The
  * below functions translate between a display mask, and a string
  * describing the display devices.
diff --git a/src/query-assign.c b/src/query-assign.c
index c44f494..54b4537 100644
--- a/src/query-assign.c
+++ b/src/query-assign.c
@@ -159,7 +159,7 @@ static void load_display_target_proto_names(CtrlHandleTarget *t)
 
 
 /*!
- * Adds the default names for the given target to the list of protocal names.
+ * Adds the default names for the given target to the list of protocol names.
  *
  * \param[in]  t  The CtrlHandleTarget to load names for.
  */
@@ -184,7 +184,7 @@ static void load_default_target_proto_name(CtrlHandleTarget *t)
 
 
 /*!
- * Adds the all the appropriate names for the given target to the list of protocal names.
+ * Adds the all the appropriate names for the given target to the list of protocol names.
  *
  * \param[in]  t  The CtrlHandleTarget to load names for.
  */
@@ -612,10 +612,10 @@ static int target_has_qualification(const CtrlHandleTarget *t,
  * \param[out] targetName  Assigned the target name, or NULL for all target
  *                         names.
  *
- * \return  Returns NV_PARSER_STATUS_SUCCESS if sAAA and sBBB were successfuly
+ * \return  Returns NV_PARSER_STATUS_SUCCESS if sAAA and sBBB were successfully
  *          parsed into at target specification; else, returns
  *          NV_PARSER_STATUS_TARGET_SPEC_BAD_TARGET if a parsing failure
- *          occured.
+ *          occurred.
  */
 
 static int parse_single_target_specification(const char *sAAA,
@@ -697,7 +697,7 @@ static int parse_single_target_specification(const char *sAAA,
  * \param[in]     h  The list of targets to choose from.
  *
  * \return  Returns NV_PARSER_STATUS_SUCCESS if the ParsedAttribute's target
- *          specification string was successfully prased into a list of targets
+ *          specification string was successfully parsed into a list of targets
  *          (though this list could be empty, if no targets are found to
  *          match!); else, returns one of the other NV_PARSER_STATUS_XXX
  *          error codes that detail the particular parsing error.
@@ -2404,7 +2404,7 @@ static int query_all_targets(const char *display_name, const int target_index,
         }
 
         /*
-         * use the name for the target handle, or "Unknown" if we
+         * use the name for the target handle, or "Not NVIDIA" if we
          * don't have a target handle name (this can happen for a
          * non-NVIDIA X screen)
          */
@@ -2634,8 +2634,8 @@ static int process_parsed_attribute_internal(CtrlHandleTarget *t,
  * devices) is the same, regardless of what sort of processing we
  * actually need to do (thus this shared function).
  *
- * To accomodate the differences in processing needed for each of the
- * callers of this function, the paramenters 'assign' and 'verbose'
+ * To accommodate the differences in processing needed for each of the
+ * callers of this function, the parameters 'assign' and 'verbose'
  * are used; if assign is TRUE, then the attribute will be assigned
  * during processing, otherwise it will be queried.  If verbose is
  * TRUE, then a message will be printed out during each assignment (or
@@ -2810,7 +2810,7 @@ int nv_process_parsed_attribute(ParsedAttribute *a, CtrlHandles *h,
 
             /*
              * if we are hotkey switching, check against all connected
-             * displays; otherwise, check agains the currently active
+             * displays; otherwise, check against the currently active
              * display devices
              */
 
@@ -2886,7 +2886,7 @@ int nv_process_parsed_attribute(ParsedAttribute *a, CtrlHandles *h,
             status = NvCtrlGetAttribute(t->h, NV_CTRL_FRAMELOCK, &available);
             if (status != NvCtrlSuccess) {
                 nv_error_msg("The attribute '%s' specified %s cannot be "
-                             "%s; error querying frame lock availablity on "
+                             "%s; error querying frame lock availability on "
                              "%s (%s).",
                              a->name, whence, assign ? "assigned" : "queried",
                              t->name, NvCtrlAttributesStrError(status));
@@ -2948,7 +2948,7 @@ int nv_process_parsed_attribute(ParsedAttribute *a, CtrlHandles *h,
                                         &available);
             if (status != NvCtrlSuccess) {
                 nv_error_msg("The attribute '%s' specified %s cannot be "
-                             "%s; error querying SDI availablity on "
+                             "%s; error querying SDI availability on "
                              "%s (%s).",
                              a->name, whence, assign ? "assigned" : "queried",
                              t->name, NvCtrlAttributesStrError(status));