fix spelling

Fix spelling in docbook comments, code comments, and a local variable
name.  Thanks to "ispell -h" for docbook HTML and "scspell" for source
code.

Signed-off-by: Alan Jenkins <alan-jenkins@tuffmail.co.uk>

diff --git a/extras/cdrom_id/cdrom_id.c b/extras/cdrom_id/cdrom_id.c
index d4156ce7ac310586f90e5c28ef924353d3bb9f6a..6ea763b415b3fdfca21d0663b162141beafa566c 100644 (file)
--- a/extras/cdrom_id/cdrom_id.c
+++ b/extras/cdrom_id/cdrom_id.c
@@ -173,27 +173,27 @@ static int scsi_cmd_run(struct udev *udev, struct scsi_cmd *cmd, int fd, unsigne
 
 static int cd_capability_compat(struct udev *udev, int fd)
 {
-       int capabilty;
+       int capability;
 
-       capabilty = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
-       if (capabilty < 0) {
+       capability = ioctl(fd, CDROM_GET_CAPABILITY, NULL);
+       if (capability < 0) {
                info(udev, "CDROM_GET_CAPABILITY failed\n");
                return -1;
        }
 
-       if (capabilty & CDC_CD_R)
+       if (capability & CDC_CD_R)
                cd_cd_r = 1;
-       if (capabilty & CDC_CD_RW)
+       if (capability & CDC_CD_RW)
                cd_cd_rw = 1;
-       if (capabilty & CDC_DVD)
+       if (capability & CDC_DVD)
                cd_dvd_rom = 1;
-       if (capabilty & CDC_DVD_R)
+       if (capability & CDC_DVD_R)
                cd_dvd_r = 1;
-       if (capabilty & CDC_DVD_RAM)
+       if (capability & CDC_DVD_RAM)
                cd_dvd_ram = 1;
-       if (capabilty & CDC_MRW)
+       if (capability & CDC_MRW)
                cd_mrw = 1;
-       if (capabilty & CDC_MRW_W)
+       if (capability & CDC_MRW_W)
                cd_mrw_w = 1;
        return 0;
 }

diff --git a/extras/collect/collect.c b/extras/collect/collect.c
index 1ec833ac9fa5a43d087a4be9b4e6847a1ef1e747..c4523f1d18b8ae827dc7e466529c461257569ad0 100644 (file)
--- a/extras/collect/collect.c
+++ b/extras/collect/collect.c
@@ -124,7 +124,7 @@ static int prepare(char *dir, char *filename)
  * Read checkpoint file
  *
  * Tricky reading this. We allocate a buffer twice as large
- * as we're goint to read. Then we read into the upper half
+ * as we're going to read. Then we read into the upper half
  * of that buffer and start parsing.
  * Once we do _not_ find end-of-work terminator (whitespace
  * character) we move the upper half to the lower half,

diff --git a/extras/gudev/gudevclient.c b/extras/gudev/gudevclient.c
index bb6d67326f781b94c2aec6f91299295c9c3a64ed..fa31f70bf5b278381892e62414ada57c8ce12f98 100644 (file)
--- a/extras/gudev/gudevclient.c
+++ b/extras/gudev/gudevclient.c
@@ -197,7 +197,7 @@ g_udev_client_constructed (GObject *object)
 
   if (client->priv->subsystems != NULL)
     {
-      /* install subsytem filters to only wake up for certain events */
+      /* install subsystem filters to only wake up for certain events */
       for (n = 0; client->priv->subsystems[n] != NULL; n++)
         {
           gchar *subsystem;

diff --git a/extras/keymap/keymap.c b/extras/keymap/keymap.c
index 117a41dbae594b81ad24051d7e71c94a4c4dbb36..b565c33e2fa010180ad3543b1df8ad16ea90dd8f 100644 (file)
--- a/extras/keymap/keymap.c
+++ b/extras/keymap/keymap.c
@@ -247,7 +247,7 @@ static const char* default_keymap_path(const char* path)
 {
        static char result[PATH_MAX];
 
-       /* If keymap file is given without a path, assume udev diretory; must end with '/' * */
+       /* If keymap file is given without a path, assume udev directory; must end with '/' * */
        if (!strchr(path, '/')) {
                snprintf(result, sizeof(result), "%s%s", LIBEXECDIR "/keymaps/", path);
                return result;

diff --git a/extras/path_id/path_id.c b/extras/path_id/path_id.c
index 2d70b6373df8ad0f2b58f11711b502202fb53b87..dcee37881fcd0de1565743d658f9f379c7e8d3ef 100644 (file)
--- a/extras/path_id/path_id.c
+++ b/extras/path_id/path_id.c
@@ -1,5 +1,5 @@
 /*
- * compose persisistent device path
+ * compose persistent device path
  *
  * Copyright (C) 2009 Kay Sievers <kay.sievers@vrfy.org>
  *

diff --git a/extras/scsi_id/scsi_serial.c b/extras/scsi_id/scsi_serial.c
index 4248829180b36475f519f775d3377a19a16d2033..0f883dc02f19b7c86d14e2611e3f885600d4f922 100644 (file)
--- a/extras/scsi_id/scsi_serial.c
+++ b/extras/scsi_id/scsi_serial.c
@@ -612,7 +612,7 @@ static int do_scsi_page83_inquiry(struct udev *udev,
        
        /*
         * XXX Some devices (IBM 3542) return all spaces for an identifier if
-        * the LUN is not actually configured. This leads to identifers of
+        * the LUN is not actually configured. This leads to identifiers of
         * the form: "1            ".
         */
 

diff --git a/libudev/libudev-device.c b/libudev/libudev-device.c
index 9d1e546c83dd304c84484cc21585a27726b092bb..eac6bd6041d1c628a810c51589046b106d06dc6b 100644 (file)
--- a/libudev/libudev-device.c
+++ b/libudev/libudev-device.c
@@ -30,7 +30,7 @@
  * Representation of kernel sys devices. Devices are uniquely identified
  * by their syspath, every device has exactly one path in the kernel sys
  * filesystem. Devices usually belong to a kernel subsystem, and and have
- * a unique name inside that subsytem.
+ * a unique name inside that subsystem.
  */
 
 /**
@@ -270,7 +270,7 @@ struct udev_device *udev_device_new(struct udev *udev)
  * @syspath: sys device path including sys directory
  *
  * Create new udev device, and fill in information from the sys
- * device and the udev database entry. The sypath is the absolute
+ * device and the udev database entry. The syspath is the absolute
  * path to the device, including the sys mount point.
  *
  * The initial refcount is 1, and needs to be decremented to
@@ -427,12 +427,12 @@ struct udev_device *udev_device_new_from_devnum(struct udev *udev, char type, de
 /**
  * udev_device_new_from_subsystem_sysname:
  * @udev: udev library context
- * @subsystem: the subsytem of the device
+ * @subsystem: the subsystem of the device
  * @sysname: the name of the device
  *
  * Create new udev device, and fill in information from the sys
  * device and the udev database entry. The device is looked up
- * by the subsytem and name string of the device, like "mem",
+ * by the subsystem and name string of the device, like "mem",
  * "zero", or "block", "sda".
  *
  * The initial refcount is 1, and needs to be decremented to
@@ -554,7 +554,7 @@ static struct udev_device *device_new_from_parent(struct udev_device *udev_devic
  * child device, and will be cleaned up when the child device
  * is cleaned up.
  *
- * It is not neccessarily just the upper level directory, empty or not
+ * It is not necessarily just the upper level directory, empty or not
  * recognized sys directories are ignored.
  *
  * It can be called as many times as needed, without caring about
@@ -578,7 +578,7 @@ struct udev_device *udev_device_get_parent(struct udev_device *udev_device)
 /**
  * udev_device_get_parent_with_subsystem_devtype:
  * @udev_device: udev device to start searching from
- * @subsystem: the subsytem of the device
+ * @subsystem: the subsystem of the device
  * @devtype: the type (DEVTYPE) of the device
  *
  * Find the next parent device, with a matching subsystem and devtype
@@ -778,7 +778,7 @@ const char *udev_device_get_subsystem(struct udev_device *udev_device)
                return NULL;
        if (!udev_device->subsystem_set) {
                udev_device->subsystem_set = 1;
-               /* read "subsytem" link */
+               /* read "subsystem" link */
                if (util_get_sys_subsystem(udev_device->udev, udev_device->syspath, subsystem, sizeof(subsystem)) > 0) {
                        udev_device_set_subsystem(udev_device, subsystem);
                        return udev_device->subsystem;

diff --git a/libudev/libudev-monitor.c b/libudev/libudev-monitor.c
index 2c6c685c6b9aa8f25417849a1f2622c71d5d98e0..657f23d727d1f741a68a7d84423b083da1f3996b 100644 (file)
--- a/libudev/libudev-monitor.c
+++ b/libudev/libudev-monitor.c
@@ -336,7 +336,7 @@ int udev_monitor_enable_receiving(struct udev_monitor *udev_monitor)
 
                        /*
                         * get the address the kernel has assigned us
-                        * it is usually, but not neccessarily the pid
+                        * it is usually, but not necessarily the pid
                         */
                        addrlen = sizeof(struct sockaddr_nl);
                        err = getsockname(udev_monitor->sock, (struct sockaddr *)&snl, &addrlen);
@@ -747,7 +747,7 @@ int udev_monitor_send_device(struct udev_monitor *udev_monitor,
                /*
                 * Use custom address for target, or the default one.
                 *
-                * If we send to a muticast group, we will get
+                * If we send to a multicast group, we will get
                 * ECONNREFUSED, which is expected.
                 */
                if (destination != NULL)
@@ -768,7 +768,7 @@ int udev_monitor_send_device(struct udev_monitor *udev_monitor,
  * udev_monitor_filter_add_match_subsystem_devtype:
  * @udev_monitor: the monitor
  * @subsystem: the subsystem value to match the incoming devices against
- * @devtype: the devtype value to matvh the incoming devices against
+ * @devtype: the devtype value to match the incoming devices against
  *
  * The filter must be installed before the monitor is switched to listening mode.
  *

diff --git a/libudev/libudev-queue.c b/libudev/libudev-queue.c
index 691e6a7919ec397242a9b73be1198a0b4a29d076..68efba0eeee2bd246e7d975aaceae73d10b1154a 100644 (file)
--- a/libudev/libudev-queue.c
+++ b/libudev/libudev-queue.c
@@ -28,7 +28,7 @@
  * SECTION:libudev-queue
  * @short_description: access to currently active events
  *
- * The udev daemon processes event asynchronously. All events wich do not have
+ * The udev daemon processes event asynchronously. All events which do not have
  * interdependencies are run in parallel. This exports the current state of the
  * event processing queue, and the currently event sequence numbers from the kernel
  * and the udev daemon.

diff --git a/libudev/libudev-util-private.c b/libudev/libudev-util-private.c
index 00d1c95d52fcd981d2d9a24c15da86cbd75dcd0c..3641b3630f8e4ef1fef56c905937cbb3daf043d7 100644 (file)
--- a/libudev/libudev-util-private.c
+++ b/libudev/libudev-util-private.c
@@ -96,7 +96,7 @@ int util_delete_path(struct udev *udev, const char *path)
 }
 
 /* Reset permissions on the device node, before unlinking it to make sure,
- * that permisions of possible hard links will be removed too.
+ * that permissions of possible hard links will be removed too.
  */
 int util_unlink_secure(struct udev *udev, const char *filename)
 {
@@ -342,7 +342,7 @@ int util_run_program(struct udev *udev, const char *command, char **envp,
                }
                execve(argv[0], argv, envp);
                if (errno == ENOENT || errno == ENOTDIR) {
-                       /* may be on a filesytem which is not mounted right now */
+                       /* may be on a filesystem which is not mounted right now */
                        info(udev, "program '%s' not found\n", argv[0]);
                } else {
                        /* other problems */

diff --git a/libudev/libudev.c b/libudev/libudev.c
index 05b62efd8686f09e6bfbb7eb9b7d47fd0e8b2b7b..190913871ea9b0ff5671010e1650bfec212ab11e 100644 (file)
--- a/libudev/libudev.c
+++ b/libudev/libudev.c
@@ -327,7 +327,7 @@ void udev_set_log_fn(struct udev *udev,
  * udev_get_log_priority:
  * @udev: udev library context
  *
- * The initial syslog priortity is read from the udev config file
+ * The initial syslog priority is read from the udev config file
  * at startup.
  *
  * Returns: the current syslog priority

diff --git a/rules/rules.d/50-udev-default.rules b/rules/rules.d/50-udev-default.rules
index fb8b1302c261a8e9a4d276ea2a065f9f8c21c76f..aef3b601a44adca836289c0b8fa6253f35c0d8fb 100644 (file)
--- a/rules/rules.d/50-udev-default.rules
+++ b/rules/rules.d/50-udev-default.rules
@@ -81,7 +81,7 @@ KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape"
 KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape"
 SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape"
 
-# block-releated
+# block-related
 KERNEL=="sch[0-9]*", GROUP="disk"
 SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="0", GROUP="disk"
 KERNEL=="pg[0-9]*", GROUP="disk"

diff --git a/udev/udev-event.c b/udev/udev-event.c
index 6a8bb44cf45cd89ce5b16980b7ad53dca8a838e2..f3c2bd2225311a79e5837cb8eae41ea26ae53fe4 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -571,7 +571,7 @@ int udev_event_execute_rules(struct udev_event *event, struct udev_rules *rules)
                }
 
                if (event->name != NULL && event->name[0] == '\0') {
-                       info(event->udev, "device node creation supressed\n");
+                       info(event->udev, "device node creation suppressed\n");
                        delete_kdevnode = 1;
                        goto exit_add;
                }

diff --git a/udev/udev-rules.c b/udev/udev-rules.c
index 03234fe2a1d302b5fa3816ce44954970901ab010..53baa187e6fed214112a85461d3e22b1b5119075 100644 (file)
--- a/udev/udev-rules.c
+++ b/udev/udev-rules.c
@@ -270,7 +270,7 @@ static const char *token_str(enum token_type type)
                [TK_M_PROGRAM] =                "M PROGRAM",
                [TK_M_IMPORT_FILE] =            "M IMPORT_FILE",
                [TK_M_IMPORT_PROG] =            "M IMPORT_PROG",
-               [TK_M_IMPORT_PARENT] =          "M MPORT_PARENT",
+               [TK_M_IMPORT_PARENT] =          "M IMPORT_PARENT",
                [TK_M_RESULT] =                 "M RESULT",
                [TK_M_MAX] =                    "M MAX",
 
@@ -1508,7 +1508,7 @@ static int add_rule(struct udev_rules *rules, char *line,
                                int tout = atoi(&pos[strlen("event_timeout=")]);
 
                                rule_add_key(&rule_tmp, TK_A_EVENT_TIMEOUT, 0, NULL, &tout);
-                               dbg(rules->udev, "event timout=%i\n", tout);
+                               dbg(rules->udev, "event timeout=%i\n", tout);
                        }
                        pos = strstr(value, "string_escape=");
                        if (pos != NULL) {

diff --git a/udev/udevadm-control.c b/udev/udevadm-control.c
index 3fe41977c5b1640d1ad9651dee645104005f4469..3eb03d8b04d63c48d990d62221db1725ec58e5c7 100644 (file)
--- a/udev/udevadm-control.c
+++ b/udev/udevadm-control.c
@@ -115,7 +115,7 @@ int udevadm_control(struct udev *udev, int argc, char *argv[])
                        break;
                case 'p':
                        if (strchr(optarg, '=') == NULL) {
-                               fprintf(stderr, "expect <KEY>=<valaue> instead of '%s'\n", optarg);
+                               fprintf(stderr, "expect <KEY>=<value> instead of '%s'\n", optarg);
                                goto exit;
                        }
                        udev_ctrl_send_set_env(uctrl, optarg);

diff --git a/udev/udevadm-trigger.c b/udev/udevadm-trigger.c
index 5cd4acd6ed0be944e19b03b34cd1aaaa30d87af5..8a626ec7446a7fef9884ce5471c529665e0b946b 100644 (file)
--- a/udev/udevadm-trigger.c
+++ b/udev/udevadm-trigger.c
@@ -186,8 +186,8 @@ int udevadm_trigger(struct udev *udev, int argc, char *argv[])
                               "      failed                        trigger only the events which have been\n"
                               "                                    marked as failed during a previous run\n"
                               "  --action=<action>               event action value, default is \"add\"\n"
-                              "  --subsystem-match=<subsystem>   trigger devices from a matching subystem\n"
-                              "  --subsystem-nomatch=<subsystem> exclude devices from a matching subystem\n"
+                              "  --subsystem-match=<subsystem>   trigger devices from a matching subsystem\n"
+                              "  --subsystem-nomatch=<subsystem> exclude devices from a matching subsystem\n"
                               "  --attr-match=<file[=<value>]>   trigger devices with a matching attribute\n"
                               "  --attr-nomatch=<file[=<value>]> exclude devices with a matching attribute\n"
                               "  --property-match=<key>=<value>  trigger devices with a matching property\n"