tree: Fix various typos and outdated terminology

This was mostly machine generated with the following command: ``` codespell \ --builtin clear,rare,usage \ --skip './po/*' --skip './.git/*' --skip './NEWS*' \ --write-changes . ``` using the latest git version of `codespell` as per [these instructions](https://github.com/codespell-project/codespell#user-content-updating). Then I manually checked each change using `git add -p`, made a few manual fixups and dropped a load of incorrect changes. There are still some outdated or loaded terms used in GLib, mostly to do with git branch terminology. They will need to be changed later as part of a wider migration of git terminology. If I’ve missed anything, please file an issue! Signed-off-by: Philip Withnall <withnall@endlessm.com>
2025-08-02 15:33:39 +02:00 · 2020-06-12 14:02:30 +01:00
parent c6ccff0ef4
commit 00bfb3ab44
128 changed files with 253 additions and 251 deletions
--- a/gio/completion/gio
+++ b/gio/completion/gio
@@ -90,7 +90,7 @@ __gio_location() {
    if ! __has_common_prefix; then
        COMPREPLY=("${mounts[@]} ${names[@]}")

-        # Workaround to prevent overwritting suggestions, it adds empty
+        # Workaround to prevent overwriting suggestions, it adds empty
        # suggestion, otherwise names with colons will be corrupted
        COMPREPLY+=(" ")

--- a/gio/gapplication.c
+++ b/gio/gapplication.c
@@ -2870,7 +2870,7 @@ g_application_unmark_busy (GApplication *application)
 * Gets the application's current busy state, as set through
 * g_application_mark_busy() or g_application_bind_busy_property().
 *
- * Returns: %TRUE if @application is currenty marked as busy
+ * Returns: %TRUE if @application is currently marked as busy
 *
 * Since: 2.44
 */
--- a/gio/gasynchelper.c
+++ b/gio/gasynchelper.c
@@ -67,7 +67,7 @@ loop:
       * current thread and since we're doing only sync operations,
       * this is safe.... */
      /* CancelIoEx is only Vista+. Since we have only one overlap
-       * operaton on this thread, we can just use: */
+       * operation on this thread, we can just use: */
      result = CancelIo (hfile);
      g_warn_if_fail (result);
    }
--- a/gio/gconverteroutputstream.c
+++ b/gio/gconverteroutputstream.c
@@ -595,7 +595,7 @@ g_converter_output_stream_flush (GOutputStream  *stream,
 	  if (!is_closing &&
 	      res == G_CONVERTER_FLUSHED)
 	    {
-	      /* Should not have retured FLUSHED with input left */
+	      /* Should not have returned FLUSHED with input left */
 	      g_assert (buffer_data_size (&priv->output_buffer) == 0);
 	      flushed = TRUE;
 	    }
--- a/gio/gdbus-2.0/codegen/codegen.py
+++ b/gio/gdbus-2.0/codegen/codegen.py
@@ -1847,7 +1847,7 @@ class CodeGenerator:
                    ' *\n'
                    ' * Finishes an operation started with %s_call_%s().\n'
                    ' *\n'
-                    ' * Returns: (skip): %%TRUE if the call succeded, %%FALSE if @error is set.\n'
+                    ' * Returns: (skip): %%TRUE if the call succeeded, %%FALSE if @error is set.\n'
                    %(i.name_lower, m.name_lower, i.name_lower, m.name_lower), False))
            self.write_gtkdoc_deprecated_and_since_and_close(m, self.outfile, 0)
            self.outfile.write('gboolean\n'
@@ -1909,7 +1909,7 @@ class CodeGenerator:
                    ' *\n'
                    ' * See %s_call_%s() for the asynchronous version of this method.\n'
                    ' *\n'
-                    ' * Returns: (skip): %%TRUE if the call succeded, %%FALSE if @error is set.\n'
+                    ' * Returns: (skip): %%TRUE if the call succeeded, %%FALSE if @error is set.\n'
                    %(i.name, m.name, i.name_lower, m.name_lower), False))
            self.write_gtkdoc_deprecated_and_since_and_close(m, self.outfile, 0)
            self.outfile.write('gboolean\n'
--- a/gio/gdbusmessage.c
+++ b/gio/gdbusmessage.c
@@ -264,7 +264,7 @@ g_memory_buffer_write (GMemoryBuffer  *mbuf,

  if (mbuf->pos + count > mbuf->len)
    {
-      /* At least enought to fit the write, rounded up
+      /* At least enough to fit the write, rounded up
 	     for greater than linear growth.
         TODO: This wastes a lot of memory at large buffer sizes.
               Figure out a more rational allocation strategy. */
@@ -3378,7 +3378,7 @@ g_dbus_message_to_gerror (GDBusMessage   *message,
    }
  else
    {
-      /* TOOD: this shouldn't happen - should check this at message serialization
+      /* TODO: this shouldn't happen - should check this at message serialization
       * time and disconnect the peer.
       */
      g_set_error (error,
--- a/gio/gdbusobjectmanagerclient.c
+++ b/gio/gdbusobjectmanagerclient.c
@@ -1164,7 +1164,7 @@ subscribe_signals (GDBusObjectManagerClient *manager,
                                            name_owner,
                                            NULL, /* interface */
                                            NULL, /* member */
-                                            NULL, /* path - TODO: really want wilcard support here */
+                                            NULL, /* path - TODO: really want wildcard support here */
                                            NULL, /* arg0 */
                                            G_DBUS_SIGNAL_FLAGS_NONE |
                                            G_DBUS_SIGNAL_FLAGS_NO_MATCH_RULE,
@@ -1197,7 +1197,7 @@ subscribe_signals (GDBusObjectManagerClient *manager,
                                            name_owner,
                                            NULL, /* interface */
                                            NULL, /* member */
-                                            NULL, /* path - TODO: really want wilcard support here */
+                                            NULL, /* path - TODO: really want wildcard support here */
                                            NULL, /* arg0 */
                                            G_DBUS_SIGNAL_FLAGS_NONE,
                                            signal_cb,
--- a/gio/gdbusprivate.c
+++ b/gio/gdbusprivate.c
@@ -1504,7 +1504,7 @@ continue_writing (GDBusWorker *worker)
        }
      else
        {
-          /* filters altered the message -> reencode */
+          /* filters altered the message -> re-encode */
          error = NULL;
          new_blob = g_dbus_message_to_blob (data->message,
                                             &new_blob_size,
--- a/gio/gdesktopappinfo.c
+++ b/gio/gdesktopappinfo.c
@@ -416,7 +416,7 @@ const gchar desktop_key_match_category[N_DESKTOP_KEYS] = {
 };

 /* Common prefix commands to ignore from Exec= lines */
-const char * const exec_key_match_blacklist[] = {
+const char * const exec_key_match_blocklist[] = {
  "bash",
  "env",
  "flatpak",
@@ -771,7 +771,7 @@ desktop_file_dir_unindexed_get_tweaks (DesktopFileDir *dir,
 static void
 expand_strv (gchar         ***strv_ptr,
             gchar          **to_add,
-             gchar * const   *blacklist)
+             gchar * const   *blocklist)
 {
  guint strv_len, add_len;
  gchar **strv;
@@ -790,10 +790,10 @@ expand_strv (gchar         ***strv_ptr,

  for (i = 0; to_add[i]; i++)
    {
-      /* Don't add blacklisted strings */
-      if (blacklist)
-        for (j = 0; blacklist[j]; j++)
-          if (g_str_equal (to_add[i], blacklist[j]))
+      /* Don't add blocklisted strings */
+      if (blocklist)
+        for (j = 0; blocklist[j]; j++)
+          if (g_str_equal (to_add[i], blocklist[j]))
            goto no_add;

      /* Don't add duplicates already in the list */
@@ -915,7 +915,7 @@ desktop_file_dir_unindexed_read_mimeapps_lists (DesktopFileDir *dir)

  dir->mime_tweaks = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, free_mime_tweaks);

-  /* We process in order of precedence, using a blacklisting approach to
+  /* We process in order of precedence, using a blocklisting approach to
   * avoid recording later instructions that conflict with ones we found
   * earlier.
   *
@@ -1134,8 +1134,8 @@ desktop_file_dir_unindexed_setup_search (DesktopFileDir *dir)
                  if ((slash = strrchr (raw, '/')))
                    value = slash + 1;

-                  /* Don't match on blacklisted binaries like interpreters */
-                  if (g_strv_contains (exec_key_match_blacklist, value))
+                  /* Don't match on blocklisted binaries like interpreters */
+                  if (g_strv_contains (exec_key_match_blocklist, value))
 		    value = NULL;
                }

@@ -1199,7 +1199,7 @@ static void
 desktop_file_dir_unindexed_mime_lookup (DesktopFileDir *dir,
                                        const gchar    *mime_type,
                                        GPtrArray      *hits,
-                                        GPtrArray      *blacklist)
+                                        GPtrArray      *blocklist)
 {
  UnindexedMimeTweaks *tweaks;
  gint i;
@@ -1216,7 +1216,7 @@ desktop_file_dir_unindexed_mime_lookup (DesktopFileDir *dir,
          gchar *app_name = tweaks->additions[i];

          if (!desktop_file_dir_app_name_is_masked (dir, app_name) &&
-              !array_contains (blacklist, app_name) && !array_contains (hits, app_name))
+              !array_contains (blocklist, app_name) && !array_contains (hits, app_name))
            g_ptr_array_add (hits, app_name);
        }
    }
@@ -1228,8 +1228,8 @@ desktop_file_dir_unindexed_mime_lookup (DesktopFileDir *dir,
          gchar *app_name = tweaks->removals[i];

          if (!desktop_file_dir_app_name_is_masked (dir, app_name) &&
-              !array_contains (blacklist, app_name) && !array_contains (hits, app_name))
-            g_ptr_array_add (blacklist, app_name);
+              !array_contains (blocklist, app_name) && !array_contains (hits, app_name))
+            g_ptr_array_add (blocklist, app_name);
        }
    }
 }
@@ -1447,14 +1447,14 @@ desktop_file_dir_get_all (DesktopFileDir *dir,
 * @dir: a #DesktopFileDir
 * @mime_type: the mime type to look up
 * @hits: the array to store the hits
- * @blacklist: the array to store the blacklist
+ * @blocklist: the array to store the blocklist
 *
 * Does a lookup of a mimetype against one desktop file directory,
- * recording any hits and blacklisting and "Removed" associations (so
+ * recording any hits and blocklisting and "Removed" associations (so
 * later directories don't record them as hits).
 *
- * The items added to @hits are duplicated, but the ones in @blacklist
- * are weak pointers.  This facilitates simply freeing the blacklist
+ * The items added to @hits are duplicated, but the ones in @blocklist
+ * are weak pointers.  This facilitates simply freeing the blocklist
 * (which is only used for internal bookkeeping) but using the pdata of
 * @hits as the result of the operation.
 */
@@ -1462,9 +1462,9 @@ static void
 desktop_file_dir_mime_lookup (DesktopFileDir *dir,
                              const gchar    *mime_type,
                              GPtrArray      *hits,
-                              GPtrArray      *blacklist)
+                              GPtrArray      *blocklist)
 {
-  desktop_file_dir_unindexed_mime_lookup (dir, mime_type, hits, blacklist);
+  desktop_file_dir_unindexed_mime_lookup (dir, mime_type, hits, blocklist);
 }

 /*< internal >
@@ -4131,12 +4131,12 @@ static gchar **
 g_desktop_app_info_get_desktop_ids_for_content_type (const gchar *content_type,
                                                     gboolean     include_fallback)
 {
-  GPtrArray *hits, *blacklist;
+  GPtrArray *hits, *blocklist;
  gchar **types;
  gint i, j;

  hits = g_ptr_array_new ();
-  blacklist = g_ptr_array_new ();
+  blocklist = g_ptr_array_new ();

  types = get_list_of_mimetypes (content_type, include_fallback);

@@ -4144,7 +4144,7 @@ g_desktop_app_info_get_desktop_ids_for_content_type (const gchar *content_type,

  for (i = 0; types[i]; i++)
    for (j = 0; j < desktop_file_dirs->len; j++)
-      desktop_file_dir_mime_lookup (g_ptr_array_index (desktop_file_dirs, j), types[i], hits, blacklist);
+      desktop_file_dir_mime_lookup (g_ptr_array_index (desktop_file_dirs, j), types[i], hits, blocklist);

  /* We will keep the hits past unlocking, so we must dup them */
  for (i = 0; i < hits->len; i++)
@@ -4154,7 +4154,7 @@ g_desktop_app_info_get_desktop_ids_for_content_type (const gchar *content_type,

  g_ptr_array_add (hits, NULL);

-  g_ptr_array_free (blacklist, TRUE);
+  g_ptr_array_free (blocklist, TRUE);
  g_strfreev (types);

  return (gchar **) g_ptr_array_free (hits, FALSE);
@@ -4327,7 +4327,7 @@ GAppInfo *
 g_app_info_get_default_for_type (const char *content_type,
                                 gboolean    must_support_uris)
 {
-  GPtrArray *blacklist;
+  GPtrArray *blocklist;
  GPtrArray *results;
  GAppInfo *info;
  gchar **types;
@@ -4337,7 +4337,7 @@ g_app_info_get_default_for_type (const char *content_type,

  types = get_list_of_mimetypes (content_type, TRUE);

-  blacklist = g_ptr_array_new ();
+  blocklist = g_ptr_array_new ();
  results = g_ptr_array_new ();
  info = NULL;

@@ -4351,7 +4351,7 @@ g_app_info_get_default_for_type (const char *content_type,

      /* Consider the associations as well... */
      for (j = 0; j < desktop_file_dirs->len; j++)
-        desktop_file_dir_mime_lookup (g_ptr_array_index (desktop_file_dirs, j), types[i], results, blacklist);
+        desktop_file_dir_mime_lookup (g_ptr_array_index (desktop_file_dirs, j), types[i], results, blocklist);

      /* (If any), see if one of those apps is installed... */
      for (j = 0; j < results->len; j++)
@@ -4373,7 +4373,7 @@ g_app_info_get_default_for_type (const char *content_type,
        }

      /* Reset the list, ready to try again with the next (parent)
-       * mimetype, but keep the blacklist in place.
+       * mimetype, but keep the blocklist in place.
       */
      g_ptr_array_set_size (results, 0);
    }
@@ -4381,7 +4381,7 @@ g_app_info_get_default_for_type (const char *content_type,
 out:
  desktop_file_dirs_unlock ();

-  g_ptr_array_unref (blacklist);
+  g_ptr_array_unref (blocklist);
  g_ptr_array_unref (results);
  g_strfreev (types);

--- a/gio/gdrive.c
+++ b/gio/gdrive.c
@@ -45,7 +45,7 @@
 *
 * If the #GDrive reports that media isn't automatically detected, one
 * can poll for media; typically one should not do this periodically
- * as a poll for media operation is potententially expensive and may
+ * as a poll for media operation is potentially expensive and may
 * spin up the drive creating noise.
 *
 * #GDrive supports starting and stopping drives with authentication
@@ -249,9 +249,9 @@ g_drive_get_volumes (GDrive *drive)
 * g_drive_is_media_check_automatic:
 * @drive: a #GDrive.
 * 
- * Checks if @drive is capabable of automatically detecting media changes.
+ * Checks if @drive is capable of automatically detecting media changes.
 * 
- * Returns: %TRUE if the @drive is capabable of automatically detecting 
+ * Returns: %TRUE if the @drive is capable of automatically detecting
 *     media changes, %FALSE otherwise.
 **/
 gboolean
--- a/gio/gdrive.h
+++ b/gio/gdrive.h
@@ -57,7 +57,7 @@ G_BEGIN_DECLS
 * @is_removable: Returns %TRUE if the #GDrive and/or its media is considered removable by the user. Since 2.50.
 * @is_media_removable: Returns %TRUE if the #GDrive supports removal and insertion of media.
 * @has_media: Returns %TRUE if the #GDrive has media inserted.
- * @is_media_check_automatic: Returns %TRUE if the #GDrive is capabable of automatically detecting media changes.
+ * @is_media_check_automatic: Returns %TRUE if the #GDrive is capable of automatically detecting media changes.
 * @can_poll_for_media: Returns %TRUE if the #GDrive is capable of manually polling for media change.
 * @can_eject: Returns %TRUE if the #GDrive can eject media.
 * @eject: Ejects a #GDrive.
--- a/gio/gfileattribute.c
+++ b/gio/gfileattribute.c
@@ -38,7 +38,7 @@
 *
 * Keys are strings that contain a key namespace and a key name, separated
 * by a colon, e.g. "namespace::keyname". Namespaces are included to sort
- * key-value pairs by namespaces for relevance. Keys can be retrived
+ * key-value pairs by namespaces for relevance. Keys can be retrieved
 * using wildcards, e.g. "standard::*" will return all of the keys in the
 * "standard" namespace.
 *
--- a/gio/gfileinfo.c
+++ b/gio/gfileinfo.c
@@ -830,7 +830,7 @@ _g_file_info_get_attribute_value (GFileInfo  *info,
 * @info: a #GFileInfo.
 * @attribute: a file attribute key.
 *
- * Gets the value of a attribute, formated as a string.
+ * Gets the value of a attribute, formatted as a string.
 * This escapes things as needed to make the string valid
 * UTF-8.
 *
@@ -2295,7 +2295,7 @@ struct _GFileAttributeMatcher {

  GArray *sub_matchers;

-  /* Interator */
+  /* Iterator */
  guint32 iterator_ns;
  gint iterator_pos;
 };
--- a/gio/gfileinfo.h
+++ b/gio/gfileinfo.h
@@ -157,7 +157,7 @@ typedef struct _GFileInfoClass   GFileInfoClass;
 *
 * A key in the "standard" namespace for getting the description of the file.
 * The description is a utf8 string that describes the file, generally containing
- * the filename, but can also contain furter information. Example descriptions
+ * the filename, but can also contain further information. Example descriptions
 * could be "filename (on hostname)" for a remote file or "filename (in trash)"
 * for a file in the trash. This is useful for instance as the window title
 * when displaying a directory or for a bookmarks menu.
--- a/gio/gfilenamecompleter.c
+++ b/gio/gfilenamecompleter.c
@@ -278,7 +278,7 @@ got_enum (GObject *source_object,
 	g_object_unref (data->completer->basenames_dir);
      g_list_free_full (data->completer->basenames, g_free);

-      /* Mark uptodate with no basenames */
+      /* Mark up-to-date with no basenames */
      data->completer->basenames_dir = g_object_ref (data->dir);
      data->completer->basenames = NULL;
      data->completer->basenames_are_escaped = data->should_escape;
--- a/gio/ginitable.c
+++ b/gio/ginitable.c
@@ -50,7 +50,7 @@
 * unreferenced).
 *
 * For bindings in languages where the native constructor supports
- * exceptions the binding could check for objects implemention %GInitable
+ * exceptions the binding could check for objects implementing %GInitable
 * during normal construction and automatically initialize them, throwing
 * an exception on failure.
 */
--- a/gio/gioenums.h
+++ b/gio/gioenums.h
@@ -117,7 +117,7 @@ typedef enum {

 /**
 * GFileAttributeType:
- * @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitalized type.
+ * @G_FILE_ATTRIBUTE_TYPE_INVALID: indicates an invalid or uninitialized type.
 * @G_FILE_ATTRIBUTE_TYPE_STRING: a null terminated UTF8 string.
 * @G_FILE_ATTRIBUTE_TYPE_BYTE_STRING: a zero terminated string of non-zero bytes.
 * @G_FILE_ATTRIBUTE_TYPE_BOOLEAN: a boolean value.
--- a/gio/giomodule.c
+++ b/gio/giomodule.c
@@ -444,7 +444,7 @@ is_valid_module_name (const gchar        *basename,
 *
 * This may not actually load and initialize all the types in each
 * module, some modules may be lazily loaded and initialized when
- * an extension point it implementes is used with e.g.
+ * an extension point it implements is used with e.g.
 * g_io_extension_point_get_extensions() or
 * g_io_extension_point_get_extension_by_name().
 *
@@ -586,7 +586,7 @@ g_io_modules_scan_all_in_directory_with_scope (const char     *dirname,
 *
 * This may not actually load and initialize all the types in each
 * module, some modules may be lazily loaded and initialized when
- * an extension point it implementes is used with e.g.
+ * an extension point it implements is used with e.g.
 * g_io_extension_point_get_extensions() or
 * g_io_extension_point_get_extension_by_name().
 *
--- a/gio/giostream.c
+++ b/gio/giostream.c
@@ -830,7 +830,7 @@ splice_cancelled_cb (GCancellable *cancellable,
 * @callback: (scope async): a #GAsyncReadyCallback.
 * @user_data: (closure): user data passed to @callback.
 *
- * Asyncronously splice the output stream of @stream1 to the input stream of
+ * Asynchronously splice the output stream of @stream1 to the input stream of
 * @stream2, and splice the output stream of @stream2 to the input stream of
 * @stream1.
 *
--- a/gio/giotypes.h
+++ b/gio/giotypes.h
@@ -194,7 +194,7 @@ typedef struct _GSocketListener                             GSocketListener;
 /**
 * GSocketService:
 *
- * A helper class for handling accepting incomming connections in the
+ * A helper class for handling accepting incoming connections in the
 * glib mainloop.
 *
 * Since: 2.22
--- a/gio/glistmodel.c
+++ b/gio/glistmodel.c
@@ -73,7 +73,7 @@ G_DEFINE_INTERFACE (GListModel, g_list_model, G_TYPE_OBJECT)
 * it are gone.
 *
 * On the other side, a consumer is expected only to hold references on
- * objects that are currently "user visible", in order to faciliate the
+ * objects that are currently "user visible", in order to facilitate the
 * maximum level of laziness in the implementation of the list and to
 * reduce the required number of signal connections at a given time.
 *
--- a/gio/gmenumodel.c
+++ b/gio/gmenumodel.c
@@ -429,7 +429,7 @@ g_menu_model_class_init (GMenuModelClass *class)
   * @removed: the number of items removed
   * @added: the number of items added
   *
-   * Emitted when a change has occured to the menu.
+   * Emitted when a change has occurred to the menu.
   *
   * The only changes that can occur to a menu is that items are removed
   * or added.  Items may not change (except by being removed and added
--- a/gio/gmountoperation.c
+++ b/gio/gmountoperation.c
@@ -431,7 +431,7 @@ g_mount_operation_class_init (GMountOperationClass *klass)
  /**
   * GMountOperation::show-unmount-progress:
   * @op: a #GMountOperation:
-   * @message: string containing a mesage to display to the user
+   * @message: string containing a message to display to the user
   * @time_left: the estimated time left before the operation completes,
   *     in microseconds, or -1
   * @bytes_left: the amount of bytes to be written before the operation
--- a/gio/gnetworkservice.c
+++ b/gio/gnetworkservice.c
@@ -318,7 +318,7 @@ g_network_service_get_domain (GNetworkService *srv)
 * g_network_service_get_scheme:
 * @srv: a #GNetworkService
 *
- * Get's the URI scheme used to resolve proxies. By default, the service name
+ * Gets the URI scheme used to resolve proxies. By default, the service name
 * is used as scheme.
 *
 * Returns: @srv's scheme name
--- a/gio/gosxappinfo.m
+++ b/gio/gosxappinfo.m
@@ -326,7 +326,7 @@ get_bundle_for_id (CFStringRef bundle_id)
  CFArrayRef urls = LSCopyApplicationURLsForBundleIdentifier (bundle_id, NULL);
  if (urls)
    {
-      /* TODO: if there's multiple, we should perhaps prefer one thats in $HOME,
+      /* TODO: if there's multiple, we should perhaps prefer one that's in $HOME,
       * instead of just always picking the first.
       */
      app_url = CFArrayGetValueAtIndex (urls, 0);
--- a/gio/goutputstream.c
+++ b/gio/goutputstream.c
@@ -2953,7 +2953,7 @@ close_async_thread (GTask        *task,
      result = class->flush (stream, cancellable, &error);
    }

-  /* Auto handling of cancelation disabled, and ignore
+  /* Auto handling of cancellation disabled, and ignore
     cancellation, since we want to close things anyway, although
     possibly in a quick-n-dirty way. At least we never want to leak
     open handles */
--- a/gio/gproxyaddress.c
+++ b/gio/gproxyaddress.c
@@ -233,7 +233,7 @@ g_proxy_address_class_init (GProxyAddressClass *klass)
  g_object_class_install_property (gobject_class,
 				   PROP_DESTINATION_PROTOCOL,
 				   g_param_spec_string ("destination-protocol",
-						       P_("Destionation Protocol"),
+						       P_("Destination Protocol"),
 						       P_("The proxy destination protocol"),
 						       NULL,
 						       G_PARAM_READWRITE |
--- a/gio/gregistrysettingsbackend.c
+++ b/gio/gregistrysettingsbackend.c
@@ -745,7 +745,7 @@ registry_cache_update_node (GNode        *cache_node,
 }

 /* Blocking notifications is a useful optimisation. When a change is made
- * through GSettings we update the cache manually, but a notifcation is
+ * through GSettings we update the cache manually, but a notification is
 * triggered as well. This function is also used for nested notifications,
 * eg. if /test and /test/foo are watched, and /test/foo/value is changed then
 * we will get notified both for /test/foo and /test and it is helpful to block
--- a/gio/gseekable.c
+++ b/gio/gseekable.c
@@ -168,7 +168,7 @@ g_seekable_can_truncate (GSeekable *seekable)
 * 
 * Sets the length of the stream to @offset. If the stream was previously
 * larger than @offset, the extra data is discarded. If the stream was
- * previouly shorter than @offset, it is extended with NUL ('\0') bytes.
+ * previously shorter than @offset, it is extended with NUL ('\0') bytes.
 * 
 * If @cancellable is not %NULL, then the operation can be cancelled by
 * triggering the cancellable object from another thread. If the operation
--- a/gio/gsocket.c
+++ b/gio/gsocket.c
@@ -2249,7 +2249,7 @@ g_socket_w32_get_adapter_ipv4_addr (const gchar *name_or_ip)
   */
  if_index = if_nametoindex (name_or_ip);

-  /* Step 3: Prepare wchar string for friendly name comparision */
+  /* Step 3: Prepare wchar string for friendly name comparison */
  if (if_index == 0)
    {
      size_t if_name_len = strlen (name_or_ip);
@@ -2259,7 +2259,7 @@ g_socket_w32_get_adapter_ipv4_addr (const gchar *name_or_ip)
      wchar_name_or_ip = (wchar_t *) g_try_malloc ((if_name_len + 1) * sizeof(wchar_t));
      if (wchar_name_or_ip)
        mbstowcs (wchar_name_or_ip, name_or_ip, if_name_len + 1);
-      /* NOTE: Even if malloc fails here, some comparisions can still be done later... so no exit here! */
+      /* NOTE: Even if malloc fails here, some comparisons can still be done later... so no exit here! */
    }

  /*
--- a/gio/gsocketservice.h
+++ b/gio/gsocketservice.h
@@ -48,7 +48,7 @@ typedef struct _GSocketServiceClass                         GSocketServiceClass;

 /**
 * GSocketServiceClass:
- * @incomming: signal emitted when new connections are accepted
+ * @incoming: signal emitted when new connections are accepted
 *
 * Class structure for #GSocketService.
 */
--- a/gio/gsocks5proxy.c
+++ b/gio/gsocks5proxy.c
@@ -323,7 +323,7 @@ set_connect_msg (guint8       *msg,
 * +----+-----+-------+------+----------+----------+
 * | 1  |  1  | X'00' |  1   | Variable |    2     |
 * +----+-----+-------+------+----------+----------+
- * This reply need to be read by small part to determin size. Buffer
+ * This reply need to be read by small part to determine size. Buffer
 * size is determined in function of the biggest part to read.
 *
 * The parser only requires 4 bytes.
--- a/gio/gtask.c
+++ b/gio/gtask.c
@@ -911,7 +911,7 @@ static void g_task_thread_complete (GTask *task);
 * g_task_return_error_if_cancelled() and then returned.
 *
 * This allows you to create a cancellable wrapper around an
- * uninterruptable function. The #GTaskThreadFunc just needs to be
+ * uninterruptible function. The #GTaskThreadFunc just needs to be
 * careful that it does not modify any externally-visible state after
 * it has been cancelled. To do that, the thread should call
 * g_task_set_return_on_cancel() again to (atomically) set
--- a/gio/gtcpwrapperconnection.c
+++ b/gio/gtcpwrapperconnection.c
@@ -188,7 +188,7 @@ g_tcp_wrapper_connection_new (GIOStream *base_io_stream,
 * g_tcp_wrapper_connection_get_base_io_stream:
 * @conn: a #GTcpWrapperConnection
 *
- * Get's @conn's base #GIOStream
+ * Gets @conn's base #GIOStream
 *
 * Returns: (transfer none): @conn's base #GIOStream
 */
--- a/gio/gthreadedresolver.c
+++ b/gio/gthreadedresolver.c
@@ -398,7 +398,7 @@ typedef struct {
 			/* fields in third byte */
 	unsigned	qr: 1;		/* response flag */
 	unsigned	opcode: 4;	/* purpose of message */
-	unsigned	aa: 1;		/* authoritive answer */
+	unsigned	aa: 1;		/* authoritative answer */
 	unsigned	tc: 1;		/* truncated message */
 	unsigned	rd: 1;		/* recursion desired */
 			/* fields in fourth byte */
@@ -412,7 +412,7 @@ typedef struct {
 			/* fields in third byte */
 	unsigned	rd :1;		/* recursion desired */
 	unsigned	tc :1;		/* truncated message */
-	unsigned	aa :1;		/* authoritive answer */
+	unsigned	aa :1;		/* authoritative answer */
 	unsigned	opcode :4;	/* purpose of message */
 	unsigned	qr :1;		/* response flag */
 			/* fields in fourth byte */
@@ -508,7 +508,7 @@ typedef enum __ns_type {
 	ns_t_cert = 37,		/* Certification record */
 	ns_t_a6 = 38,		/* IPv6 address (deprecates AAAA) */
 	ns_t_dname = 39,	/* Non-terminal DNAME (for IPv6) */
-	ns_t_sink = 40,		/* Kitchen sink (experimentatl) */
+	ns_t_sink = 40,		/* Kitchen sink (experimental) */
 	ns_t_opt = 41,		/* EDNS0 option (meta-RR) */
 	ns_t_apl = 42,		/* Address prefix list (RFC 3123) */
 	ns_t_tkey = 249,	/* Transaction key */
--- a/gio/gunionvolumemonitor.c
+++ b/gio/gunionvolumemonitor.c
@@ -546,7 +546,7 @@ _g_mount_get_for_mount_path (const gchar  *mount_path,

  /* TODO: How do we know this succeeded? Keep in mind that the native
   *       volume monitor may fail (e.g. not being able to connect to
-   *       hald). Is the get_mount_for_mount_path() method allowed to
+   *       udisks). Is the get_mount_for_mount_path() method allowed to
   *       return NULL? Seems like it is ... probably the method needs
   *       to take a boolean and write if it succeeds or not.. Messy.
   *       Very messy.
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -421,7 +421,7 @@ guess_system_internal (const char *mountpoint,
   * to not mengle those mounts with the "regular" mounts (i.e. which points to
   * the root). But because those mounts usually just duplicate other mounts and
   * are completely ignored with mntend-based implementation, let's mark them as
-   * system internal. Given the different approches it doesn't mean that all
+   * system internal. Given the different approaches it doesn't mean that all
   * mounts which were ignored will be system internal now, but this should work
   * in most cases. For more info, see g_unix_mount_get_root_path() annotation,
   * comment in mntent-based _g_get_unix_mounts() implementation and the
--- a/gio/gwin32registrykey.c
+++ b/gio/gwin32registrykey.c
@@ -2234,7 +2234,7 @@ MuiRegQueryValueExW (HKEY                     hKey,
 * When calling with value_data == NULL (to get data size without getting
 * the data itself) remember that returned size corresponds to possibly
 * unterminated string data (if value is some kind of string), because
- * termination cannot be checked and fixed unless the data is retreived
+ * termination cannot be checked and fixed unless the data is retrieved
 * too.
 *
 * When not %NULL, @mui_dll_dirs indicates that `RegLoadMUIStringW()` API
--- a/gio/gwin32volumemonitor.c
+++ b/gio/gwin32volumemonitor.c
@@ -105,7 +105,7 @@ get_viewable_logical_drives (void)
  return viewable_drives; 
 }

-/* deliver accesible (aka 'mounted') volumes */
+/* deliver accessible (aka 'mounted') volumes */
 static GList *
 get_mounts (GVolumeMonitor *volume_monitor)
 {
@@ -237,7 +237,7 @@ g_win32_volume_monitor_class_init (GWin32VolumeMonitorClass *klass)
 static void
 g_win32_volume_monitor_init (GWin32VolumeMonitor *win32_monitor)
 {
-  /* maybe we shoud setup a callback window to listern for WM_DEVICECHANGE ? */
+  /* maybe we should setup a callback window to listen for WM_DEVICECHANGE ? */
 #if 0
  unix_monitor->mount_monitor = g_win32_mount_monitor_new ();

--- a/gio/kqueue/dep-list.c
+++ b/gio/kqueue/dep-list.c
@@ -231,7 +231,7 @@ error:
 * 
 * @param[in,out] before A pointer to a pointer to a list. Will contain items
 *     which were not found in the 'after' list.
- * @param[in,out] after  A pointer to a pointer to a list. Will containt items
+ * @param[in,out] after  A pointer to a pointer to a list. Will contain items
 *     which were not found in the 'before' list.
 **/
 void
@@ -356,7 +356,7 @@ G_STMT_START {                                                          \
 * Detect and notify about moves in the watched directory.
 *
 * A move is what happens when you rename a file in a directory, and
- * a new name is unique, i.e. you didnt overwrite any existing files
+ * a new name is unique, i.e. you didn't overwrite any existing files
 * with this one.
 *
 * @param[in,out] removed  A list of the removed files in the directory.
@@ -387,7 +387,7 @@ dl_detect_moves (dep_list           **removed,
 /**
 * Detect and notify about replacements in the watched directory.
 *
- * Consider you are watching a directory foo with the folloing files
+ * Consider you are watching a directory foo with the following files
 * insinde:
 *
 *    foo/bar
--- a/gio/kqueue/gkqueuefilemonitor.c
+++ b/gio/kqueue/gkqueuefilemonitor.c
@@ -354,7 +354,7 @@ g_kqueue_file_monitor_callback (gint fd, GIOCondition condition, gpointer user_d
             * rescan of missing files immediately so we don't have to wait for
             * 4 seconds for discovering missing files. We pass the sub_file
             * corresponding to the GKqueueFileMonitor to 'check_this_sub_only'
-             * argument to prevent _km_scan_missing from emiting 'CREATED'
+             * argument to prevent _km_scan_missing from emitting 'CREATED'
             * events because _kh_dir_diff will do it for us. */
            if (sub->mon->sub_file != NULL && sub->mon->sub_file->fd == -1)
              _km_scan_missing (sub->mon->sub_file);
--- a/gio/org.freedesktop.portal.Documents.xml
+++ b/gio/org.freedesktop.portal.Documents.xml
@@ -262,7 +262,7 @@
    <!--
        List:
        @app_id: an application ID, or '' to list all documents
-        @docs: a dictonary mapping document IDs to their filesystem path
+        @docs: a dictionary mapping document IDs to their filesystem path

        Lists documents in the document store for an application (or for
        all applications).
--- a/gio/tests/gdbus-addresses.c
+++ b/gio/tests/gdbus-addresses.c
@@ -39,7 +39,7 @@ test_empty_address (void)
  g_error_free (error);
 }

-/* Test that g_dbus_is_supported_address() returns FALSE for an unparseable
+/* Test that g_dbus_is_supported_address() returns FALSE for an unparsable
 * address. */
 static void
 test_unsupported_address (void)
--- a/gio/tests/gdbus-export.c
+++ b/gio/tests/gdbus-export.c
@@ -1279,7 +1279,7 @@ test_object_registration (void)
  g_strfreev (nodes);
  g_assert_cmpint (count_interfaces (c, "/foo/dyna/dynamicallycreated"), ==, 4);

-  /* now check that the object hierarachy is properly generated... yes, it's a bit
+  /* now check that the object hierarchy is properly generated... yes, it's a bit
   * perverse that we round-trip to the bus to introspect ourselves ;-)
   */
  nodes = get_nodes_at (c, "/");
--- a/gio/tests/gdbus-peer.c
+++ b/gio/tests/gdbus-peer.c
@@ -1862,7 +1862,7 @@ codegen_test_peer (void)
  g_assert (value != NULL);
  g_variant_unref (value);

-  /* Give the proxies a chance to refresh in the defaul main loop */
+  /* Give the proxies a chance to refresh in the default main loop */
  g_timeout_add (100, codegen_quit_mainloop_timeout, NULL);
  g_main_loop_run (loop);

@@ -1897,7 +1897,7 @@ codegen_test_peer (void)
  g_assert (value != NULL);
  g_variant_unref (value);

-  /* Give the proxies a chance to refresh in the defaul main loop */
+  /* Give the proxies a chance to refresh in the default main loop */
  g_timeout_add (1000, codegen_quit_mainloop_timeout, NULL);
  g_main_loop_run (loop);

--- a/gio/tests/gdbus-proxy-threads.c
+++ b/gio/tests/gdbus-proxy-threads.c
@@ -230,7 +230,7 @@ test_proxy (void)
  g_main_loop_unref (loop);

  /* TODO: should call session_bus_down() but that requires waiting
-   * for all the oustanding method calls to complete...
+   * for all the outstanding method calls to complete...
   */
  if (g_test_verbose ())
    g_printerr ("\n");
--- a/gio/tests/gdbus-proxy.c
+++ b/gio/tests/gdbus-proxy.c
@@ -388,7 +388,7 @@ test_proxy_signals_on_emit_signal_cb (GDBusProxy   *proxy,
  g_assert_cmpstr (g_variant_get_type_string (result), ==, "()");
  g_variant_unref (result);

-  /* check that the signal was recieved before we got the method result */
+  /* check that the signal was received before we got the method result */
  g_assert_cmpuint (strlen (data->s->str), >, 0);

  /* break out of the loop */
--- a/gio/tests/gdbus-test-codegen.c
+++ b/gio/tests/gdbus-test-codegen.c
@@ -2434,7 +2434,7 @@ test_interface_stability (void)
 *
 * - check that a property with name "Type" is mapped into g-name "type"
 *   with C accessors get_type_ (to avoid clashing with the GType accessor)
- *   and set_type_ (for symmetri)
+ *   and set_type_ (for symmetry)
 *   (see https://bugzilla.gnome.org/show_bug.cgi?id=679473 for details)
 *
 * - (could add more tests here)
--- a/gio/tests/gdbus-threading.c
+++ b/gio/tests/gdbus-threading.c
@@ -409,7 +409,7 @@ test_method_calls_on_proxy (GDBusProxy *proxy)
  guint n, divisor;

  /*
-   * Check that multiple threads can do calls without interferring with
+   * Check that multiple threads can do calls without interfering with
   * each other. We do this by creating three threads that call the
   * Sleep() method on the server (which handles it asynchronously, e.g.
   * it won't block other requests) with different sleep durations and
--- a/gio/tests/gsubprocess.c
+++ b/gio/tests/gsubprocess.c
@@ -1046,7 +1046,7 @@ test_communicate_utf8_async (gconstpointer test_data)
  g_object_unref (proc);
 }

-/* Test g_subprocess_communicate_utf8_async() can be cancelled correclty. */
+/* Test g_subprocess_communicate_utf8_async() can be cancelled correctly. */
 static void
 test_communicate_utf8_cancelled_async (gconstpointer test_data)
 {
@@ -1721,7 +1721,7 @@ test_launcher_environment (void)
  /* unset a variable */
  g_subprocess_launcher_unsetenv (launcher, "A");

-  /* and set a diffferent one */
+  /* and set a different one */
  g_subprocess_launcher_setenv (launcher, "E", "F", TRUE);

  args = get_test_subprocess_args ("printenv", "A", "C", "E", NULL);
--- a/gio/tests/gtlsconsoleinteraction.c
+++ b/gio/tests/gtlsconsoleinteraction.c
@@ -32,7 +32,7 @@

 /*
 * WARNING: This is not the example you're looking for [slow hand wave]. This
- * is not industrial strength, it's just for testing. It uses embarassing
+ * is not industrial strength, it's just for testing. It uses embarrassing
 * functions like getpass() and does lazy things with threads.
 */

--- a/gio/tests/live-g-file.txt
+++ b/gio/tests/live-g-file.txt
@@ -3,7 +3,7 @@ Before you start testing it would be good to explain how it works.
 The script works in three modes:
 1. read-only (no special arguments) - suitable for read-only backends. Just 
        create the sample structure using the second mode, pack it (tar -p is 
-        preffered to preserve unix modes) and put it on a reachable place.
+        preferred to preserve unix modes) and put it on a reachable place.
 2. create-structure - only creates reference structure for later testing 
        in read-only mode
 3. write mode - full test suite, creates testing structure and performs all 
--- a/gio/tests/resourceplugin.c
+++ b/gio/tests/resourceplugin.c
@@ -4,7 +4,7 @@
 * This must be done before including any GLib headers,
 * since GLIB_AVAILABLE_IN_ALL, which is used to mark the
 * g_io_module*() symbols, is defined to be _GLIB_EXTERN,
- * which must be overriden to export the symbols.
+ * which must be overridden to export the symbols.
 */
 #include "modules/symbol-visibility.h"
 #define _GLIB_EXTERN GLIB_TEST_EXPORT_SYMBOL
--- a/gio/tests/resources.c
+++ b/gio/tests/resources.c
@@ -605,7 +605,7 @@ test_resource_binary_linked (void)

 /* Test resource whose xml file starts with more than one digit
 * and where no explicit c-name is given
- * Checks if resources are sucessfully registered and
+ * Checks if resources are successfully registered and
 * data can be found and read. */
 static void
 test_resource_digits (void)
--- a/gio/tests/socket-service.c
+++ b/gio/tests/socket-service.c
@@ -63,7 +63,7 @@ test_start_stop (void)
  saddr = g_inet_socket_address_new (iaddr, 0);
  g_object_unref (iaddr);

-  /* instanciate with g_object_new so we can pass active = false */
+  /* instantiate with g_object_new so we can pass active = false */
  service = g_object_new (G_TYPE_SOCKET_SERVICE, "active", FALSE, NULL);
  g_assert_false (g_socket_service_is_active (service));

--- a/gio/tests/test2.gresource.xml
+++ b/gio/tests/test2.gresource.xml
@@ -4,7 +4,7 @@
    <file>test1.txt</file>
  </gresource>
  <!-- Test compiling the generated GResource C-code
-       that has a resouce entry size over 65536 bytes -->
+       that has a resource entry size over 65536 bytes -->
  <gresource prefix="/big_prefix">
    <file>gresource-big-test.txt</file>
  </gresource>
--- a/gio/tests/tls-certificate.c
+++ b/gio/tests/tls-certificate.c
@@ -285,7 +285,7 @@ from_files (const Reference *ref)
  g_assert_null (cert);

  /* Using this method twice with a file containing both private key and
-   * certificate as a way to inforce private key presence is a fair use
+   * certificate as a way to enforce private key presence is a fair use
   */
  cert = g_tls_certificate_new_from_files (g_test_get_filename (G_TEST_DIST, "cert-tests", "key-cert.pem", NULL),
                                           g_test_get_filename (G_TEST_DIST, "cert-tests", "key-cert.pem", NULL),
--- a/gio/win32/gwin32fsmonitorutils.c
+++ b/gio/win32/gwin32fsmonitorutils.c
@@ -416,7 +416,7 @@ g_win32_fs_monitor_close_handle (GWin32FSMonitorPrivate *monitor)
  /* This triggers a last callback() with nBytes==0. */

  /* Actually I am not so sure about that, it seems to trigger a last
-   * callback allright, but the way to recognize that it is the final
+   * callback correctly, but the way to recognize that it is the final
   * one is not to check for nBytes==0, I think that was a
   * misunderstanding.
   */