summaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authordi0ib <git@porkhash.net>2016-08-14 22:58:22 +0200
committerdi0ib <git@porkhash.net>2016-08-14 22:58:22 +0200
commitb4218a2b3e928468110eb034fbac61631b71d30d (patch)
tree7d5f318b5bc81b01bf7a97e95eba6c65b2feacec /doc
parentc6c2c3fc14736e4d226c5f410d8c3faf3d36629f (diff)
parent6323f3d1e74350ef52dddc1f31d8b36ba637d254 (diff)
downloadqmk_firmware-b4218a2b3e928468110eb034fbac61631b71d30d.tar.gz
qmk_firmware-b4218a2b3e928468110eb034fbac61631b71d30d.tar.xz
Merge remote-tracking branch 'refs/remotes/jackhumbert/master'
Diffstat (limited to 'doc')
-rw-r--r--doc/TMK_README.md2
-rw-r--r--doc/keycode.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/TMK_README.md b/doc/TMK_README.md
index f3d96717a..e3438eda2 100644
--- a/doc/TMK_README.md
+++ b/doc/TMK_README.md
@@ -113,7 +113,7 @@ Third party libraries like LUFA, PJRC and V-USB have their own license respectiv
Build Firmware and Program Controller
-------------------------------------
-See [doc/build.md](tmk_core/doc/build.md), or the readme in the particular keyboards/* folder.
+See [build environment setup](/readme.md#build-environment-setup), or the readme in the particular keyboards/* folder.
diff --git a/doc/keycode.txt b/doc/keycode.txt
index c1134f9bf..5a42c50bf 100644
--- a/doc/keycode.txt
+++ b/doc/keycode.txt
@@ -2,7 +2,7 @@ Keycode Symbol Table
====================
Keycodes are defined in `common/keycode.h`.
Range of 00-A4 and E0-E7 are identical with HID Usage:
-<http://www.usb.org/developers/devclass_docs/Hut1_11.pdf>
+<http://www.usb.org/developers/hidpage/Hut1_12v2.pdf>
Virtual keycodes are defined out of above range to support special actions.