diff options
author | QMK Bot <hello@qmk.fm> | 2021-01-30 11:01:46 +0000 |
---|---|---|
committer | QMK Bot <hello@qmk.fm> | 2021-01-30 11:01:46 +0000 |
commit | a0e733391532490a216da044efb40451f67774f2 (patch) | |
tree | 8cc6bd43d0b70283b90cfadee1f512ef1161ff4c /docs/reference_glossary.md | |
parent | 6b9a7e21e953d68d6ae093c2d727f1f3ac2798c0 (diff) | |
parent | 92a787ca4cdecbbb7e2c1394d5192d5fa3dabf6d (diff) | |
download | qmk_firmware-a0e733391532490a216da044efb40451f67774f2.tar.gz qmk_firmware-a0e733391532490a216da044efb40451f67774f2.zip |
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'docs/reference_glossary.md')
-rw-r--r-- | docs/reference_glossary.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/reference_glossary.md b/docs/reference_glossary.md index 1da27ff24..f9317b7ba 100644 --- a/docs/reference_glossary.md +++ b/docs/reference_glossary.md | |||
@@ -4,7 +4,7 @@ | |||
4 | A line of 32-bit MCUs produced by a number of companies, such as Atmel, Cypress, Kinetis, NXP, ST, and TI. | 4 | A line of 32-bit MCUs produced by a number of companies, such as Atmel, Cypress, Kinetis, NXP, ST, and TI. |
5 | 5 | ||
6 | ## AVR | 6 | ## AVR |
7 | A line of 8-bit MCUs produced by [Atmel](http://www.microchip.com/). AVR was the original platform that TMK supported. | 7 | A line of 8-bit MCUs produced by [Atmel](https://www.microchip.com/). AVR was the original platform that TMK supported. |
8 | 8 | ||
9 | ## AZERTY | 9 | ## AZERTY |
10 | The standard Français (French) keyboard layout. Named for the first 6 keys on the keyboard. | 10 | The standard Français (French) keyboard layout. Named for the first 6 keys on the keyboard. |
@@ -125,7 +125,7 @@ The standard Deutsche (German) keyboard layout. Named for the first 6 letters on | |||
125 | The term for pressing a key while a key is already held down. Variants include 2KRO, 6KRO, and NKRO. | 125 | The term for pressing a key while a key is already held down. Variants include 2KRO, 6KRO, and NKRO. |
126 | 126 | ||
127 | ## Scancode | 127 | ## Scancode |
128 | A 1 byte number that is sent as part of a HID report over USB that represents a single key. These numbers are documented in the [HID Usage Tables](https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf) published by the [USB-IF](http://www.usb.org/). | 128 | A 1 byte number that is sent as part of a HID report over USB that represents a single key. These numbers are documented in the [HID Usage Tables](https://www.usb.org/sites/default/files/documents/hut1_12v2.pdf) published by the [USB-IF](https://www.usb.org/). |
129 | 129 | ||
130 | ## Space Cadet Shift | 130 | ## Space Cadet Shift |
131 | A special set of shift keys which allow you to type various types of braces by tapping the left or right shift one or more times. | 131 | A special set of shift keys which allow you to type various types of braces by tapping the left or right shift one or more times. |