aboutsummaryrefslogtreecommitdiffstats
path: root/docs/faq_general.md
diff options
context:
space:
mode:
authorArialdo Martini <arialdomartini@gmail.com>2017-11-01 16:21:54 +0100
committerJack Humbert <jack.humb@gmail.com>2017-11-01 11:21:54 -0400
commit32bb8f6b8af104c4a64b029820a4c7014eaf825d (patch)
tree2c8dd10a66be758b806956502bdea40518284b21 /docs/faq_general.md
parent1683d3a5592cb7ece371d45c85f531ffcff55934 (diff)
downloadfirmware-32bb8f6b8af104c4a64b029820a4c7014eaf825d.tar.gz
firmware-32bb8f6b8af104c4a64b029820a4c7014eaf825d.tar.bz2
firmware-32bb8f6b8af104c4a64b029820a4c7014eaf825d.zip
Improvements to documentation (#1919)
* Typo: Github => GitHub * Typo: windows => Windows, docker => Docker, and some punctuations * "QMK Introduction" links to the right file * "Unix" rather than "UNIX", which is a trademark * Directory name is "keyboards", not "keyboard" * "handwired" is a subdirectory of "keyboards" * Punctuation and minor fixes * macOS rather than Mac * Punctuation and other minor fixes * Vagrant Guide links to an existing file * Jun Wako referenced with his name rather than his nickname * Saxon genitive 's outside the link
Diffstat (limited to 'docs/faq_general.md')
-rw-r--r--docs/faq_general.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/faq_general.md b/docs/faq_general.md
index fcc40e0a1..7647b1c2a 100644
--- a/docs/faq_general.md
+++ b/docs/faq_general.md
@@ -10,7 +10,7 @@
## What Differences Are There Between QMK and TMK?
-TMK was originally designed and implemented by [Jun Wako](https://github.com/tmk). QMK started as [Jack Humbert's](https://github.com/jackhumbert) fork of TMK for the Planck. After a while Jack's fork had diverged quite a bit from TMK, and in 2015 Jack decided to rename his fork to QMK.
+TMK was originally designed and implemented by [Jun Wako](https://github.com/tmk). QMK started as [Jack Humbert](https://github.com/jackhumbert)'s fork of TMK for the Planck. After a while Jack's fork had diverged quite a bit from TMK, and in 2015 Jack decided to rename his fork to QMK.
From a technical standpoint QMK builds upon TMK by adding several new features. Most notably QMK has expanded the number of available keycodes and uses these to implement advanced features like `S()`, `LCTL()`, and `MO()`. You can see a complete list of these keycodes in [Keycodes](keycodes.md).