summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorPete Johanson <peter@peterjohanson.com>2020-09-04 23:59:01 -0400
committerPete Johanson <peter@peterjohanson.com>2020-09-04 23:59:01 -0400
commite15fe2665ad993ac4b377ce976af0ce04427d486 (patch)
tree24ce800c48cb13c84225c09584e9d6aff5ebbadb /docs
parent0559ec9013c02a878d94b0d7ad37fa2e9b00b58c (diff)
parent9475188869ad4179774c5f324018ca8aceb188df (diff)
Merge branch 'main' of github.com:zmkfirmware/zmk into main
Diffstat (limited to 'docs')
-rw-r--r--docs/docs/feature/keymaps.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/docs/feature/keymaps.md b/docs/docs/feature/keymaps.md
index d991925..56fc2cc 100644
--- a/docs/docs/feature/keymaps.md
+++ b/docs/docs/feature/keymaps.md
@@ -55,7 +55,7 @@ in the stack _also_ get the event.
## Behavior Bindings
Binding a behavior at a certain key position may include up to two extra parameters that are used to
-alter the behavior when that specific key position is activated/deactived. For example, when binding
+alter the behavior when that specific key position is activated/deactivated. For example, when binding
the "key press" (`kp`) behavior at a certain key position, you must specific _which_ keycode should
be used for that key position.