diff options
| author | Xyverz <xyverz@gmail.com> | 2016-08-13 19:51:49 -0700 |
|---|---|---|
| committer | Xyverz <xyverz@gmail.com> | 2016-08-13 19:51:49 -0700 |
| commit | 1920c290a441db1355aa4b610539d0911c7d1477 (patch) | |
| tree | 66aed6a6cf3cdaab43d204afcaa5c2042a5894b0 /doc | |
| parent | e87506767cec6410d1a93c15d68452815c9c3553 (diff) | |
| parent | 6323f3d1e74350ef52dddc1f31d8b36ba637d254 (diff) | |
| download | firmware-1920c290a441db1355aa4b610539d0911c7d1477.tar.gz firmware-1920c290a441db1355aa4b610539d0911c7d1477.tar.bz2 firmware-1920c290a441db1355aa4b610539d0911c7d1477.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/TMK_README.md | 2 | ||||
| -rw-r--r-- | doc/keycode.txt | 2 |
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. |