summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRan Benita <ran234@gmail.com>2013-03-01 13:51:13 +0200
committerDaniel Stone <daniel@fooishbar.org>2013-03-18 22:20:04 +0000
commit540feef3bbfe8fc74caea306eed3af90ca9517ea (patch)
tree2a160f59471414be79150d779e3ecbb176d15388 /src
parenta0fc9066effee5ebebac87a6154be92422506382 (diff)
More spelling errors
Signed-off-by: Ran Benita <ran234@gmail.com>
Diffstat (limited to 'src')
-rw-r--r--src/xkbcomp/action.c2
-rw-r--r--src/xkbcomp/compat.c2
-rw-r--r--src/xkbcomp/keycodes.c2
-rw-r--r--src/xkbcomp/types.c4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/xkbcomp/action.c b/src/xkbcomp/action.c
index 22762c6..d45b143 100644
--- a/src/xkbcomp/action.c
+++ b/src/xkbcomp/action.c
@@ -752,7 +752,7 @@ HandlePrivate(struct xkb_keymap *keymap, union xkb_action *action,
* It's possible for someone to write something like this:
* actions = [ Private(type=3,data[0]=1,data[1]=3,data[2]=3) ]
* where the type refers to some existing action type, e.g. LockMods.
- * This assumes that this action's struct is layed out in memory
+ * This assumes that this action's struct is laid out in memory
* exactly as described in the XKB specification and libraries.
* We, however, have changed these structs in various ways, so this
* assumption is no longer true. Since this is a lousy "feature", we
diff --git a/src/xkbcomp/compat.c b/src/xkbcomp/compat.c
index 7a556ac..50e8801 100644
--- a/src/xkbcomp/compat.c
+++ b/src/xkbcomp/compat.c
@@ -129,7 +129,7 @@
*
* When set to 'level1', the interpret will only match levels which are
* the first level of the first group of the keys. This can be useful in
- * conjuction with e.g. a virtualModifier statement.
+ * conjunction with e.g. a virtualModifier statement.
*
* - action statement:
* action = LockMods(modifiers=NumLock);
diff --git a/src/xkbcomp/keycodes.c b/src/xkbcomp/keycodes.c
index dfa1a81..47bfecd 100644
--- a/src/xkbcomp/keycodes.c
+++ b/src/xkbcomp/keycodes.c
@@ -294,7 +294,7 @@ AddKeyName(KeyNamesInfo *info, xkb_keycode_t kc, xkb_atom_t name,
if (report)
log_warn(info->ctx,
"Multiple identical key name definitions; "
- "Later occurences of \"%s = %d\" ignored\n",
+ "Later occurrences of \"%s = %d\" ignored\n",
lname, kc);
return true;
}
diff --git a/src/xkbcomp/types.c b/src/xkbcomp/types.c
index 227d390..2f019e3 100644
--- a/src/xkbcomp/types.c
+++ b/src/xkbcomp/types.c
@@ -417,7 +417,7 @@ AddMapEntry(KeyTypesInfo *info, KeyTypeInfo *type,
}
else {
log_vrb(info->keymap->ctx, 10,
- "Multiple occurences of map[%s]= %d in %s; Ignored\n",
+ "Multiple occurrences of map[%s]= %d in %s; Ignored\n",
MapEntryTxt(info, new), new->level + 1,
TypeTxt(info, type));
return true;
@@ -518,7 +518,7 @@ AddPreserve(KeyTypesInfo *info, KeyTypeInfo *type,
/*
* Map does not exist, i.e. preserve[] came before map[].
* Create a map with the specified mask mapping to Level1. The level
- * may be overriden later with an explicit map[] statement.
+ * may be overridden later with an explicit map[] statement.
*/
new.level = 0;
new.mods.mods = mods;