summaryrefslogtreecommitdiffstats
path: root/docs/faq_general.md
diff options
context:
space:
mode:
authorskullY <skullydazed@gmail.com>2017-08-07 05:57:57 +0200
committerJack Humbert <jack.humb@gmail.com>2017-08-16 21:47:20 +0200
commit9d1a08e38ac9937cff4e61abfd0acc26ad5fdf4a (patch)
tree352da3e60b219405be323306bcd67a6729107d61 /docs/faq_general.md
parent9b879b1267cd5cbebf4d73595c7ca4ed52fe5ef4 (diff)
downloadqmk_firmware-9d1a08e38ac9937cff4e61abfd0acc26ad5fdf4a.tar.gz
qmk_firmware-9d1a08e38ac9937cff4e61abfd0acc26ad5fdf4a.tar.xz
Doc updates from going through every file
Diffstat (limited to 'docs/faq_general.md')
-rw-r--r--docs/faq_general.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/faq_general.md b/docs/faq_general.md
index efa564743..fcc40e0a1 100644
--- a/docs/faq_general.md
+++ b/docs/faq_general.md
@@ -12,9 +12,9 @@
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.
-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 [Quantum Keycodes](quantum_keycodes.html).
+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).
-From a project and community management standpoint TMK maintains all the officially supported keyboards by himself, with a bit of community support. Separate community maintained forks exist or can be created for other keyboards. Only a few keymaps are provided by default, so users typically don't share keymaps with each other. QMK encourages sharing of both keyboards and keymaps through a centrally managed repository, accepting all pull requests that follows the quality standards. These are mostly community maintained, but the QMK team also helps when necessary.
+From a project and community management standpoint TMK maintains all the officially supported keyboards by himself, with a bit of community support. Separate community maintained forks exist or can be created for other keyboards. Only a few keymaps are provided by default, so users typically don't share keymaps with each other. QMK encourages sharing of both keyboards and keymaps through a centrally managed repository, accepting all pull requests that follow the quality standards. These are mostly community maintained, but the QMK team also helps when necessary.
Both approaches have their merits and their drawbacks, and code flows freely between TMK and QMK when it makes sense.