Deploying to gh-pages from master @ b7a346600c 🚀

ja/syllabus.md

@@ -1,8 +1,8 @@
 # QMK シラバス
 
 <!---
-  original document: 0.9.51:docs/syllabus.md
+  original document: 0.14.22:docs/syllabus.md
-  git diff 0.9.51 HEAD -- docs/syllabus.md | cat
+  git diff 0.14.22 HEAD -- docs/syllabus.md | cat
 -->
 
 このページは最初に基本を紹介し、そして、QMK に習熟するために必要な全ての概念を理解するように導くことで、QMK の知識を構築するのに役立ちます。
@@ -45,6 +45,7 @@
    * [タップダンス](ja/feature_tap_dance.md)
    * [コンボ](ja/feature_combo.md)
    * [ユーザスペース](ja/feature_userspace.md)
+   * [キーオーバーライド](ja/feature_key_overrides.md)
 
 # 上級トピック
 
@@ -58,7 +59,7 @@
 * **高度な機能**
    * [ユニコード](ja/feature_unicode.md)
    * [API](ja/api_overview.md)
-   * [ブートマジック](ja/feature_bootmagic.md)
+   * [ブートマジックライト](ja/feature_bootmagic.md)
 * **ハードウェア**
    * [キーボードがどのように動作するか](ja/how_keyboards_work.md)
    * [キーボードマトリックスの仕組み](ja/how_a_matrix_works.md)

ja/understanding_qmk.md

@@ -1,15 +1,15 @@
 # QMK のコードの理解
 
 <!---
-  original document: 0.13.15:docs/understanding_qmk.md
+  original document: 0.14.22:docs/understanding_qmk.md
-  git diff 0.13.15 HEAD -- docs/understanding_qmk.md | cat
+  git diff 0.14.22 HEAD -- docs/understanding_qmk.md | cat
 -->
 
 このドキュメントでは、QMK ファームウェアがどのように機能するかを非常に高いレベルから説明しようとしています。基本的なプログラミングの概念を理解していることを前提としていますが、(実例を示す必要がある場合を除き) C に精通していることを前提にはしていません。以下のドキュメントの基本的な知識があることを前提としています。
 
 * [入門](ja/getting_started_introduction.md)
 * [キーボードがどのように動作するか](ja/how_keyboards_work.md)
-* [FAQ](ja/faq.md)
+* [FAQ](ja/faq_general.md)
 
 ## スタートアップ
 
@@ -151,6 +151,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * [`bool process_audio(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_audio.c#L19)
     * [`bool process_steno(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_steno.c#L160)
     * [`bool process_music(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_music.c#L114)
+    * [`bool process_key_override(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/5a1b857dea45a17698f6baa7dd1b7a7ea907fb0a/quantum/process_keycode/process_key_override.c#L397)
     * [`bool process_tap_dance(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_tap_dance.c#L141)
     * [`bool process_unicode_common(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_unicode_common.c#L169) は、以下のいずれかを呼び出します:
         * [`bool process_unicode(uint16_t keycode, keyrecord_t *record)`](https://github.com/qmk/qmk_firmware/blob/e1203a222bb12ab9733916164a000ef3ac48da93/quantum/process_keycode/process_unicode.c#L20)

reference_info_json.md

@@ -11,12 +11,18 @@ The `info.json` file is a JSON formatted dictionary with the following keys avai
 * `keyboard_name`
     * A free-form text string describing the keyboard.
     * Example: `Clueboard 66%`
+* `manufacturer`
+    * A free-form text string describing the keyboard's manufacturer.
+    * Example: `Clueboard`
 * `url`
     * A URL to the keyboard's product page, [QMK.fm/keyboards](https://qmk.fm/keyboards) page, or other page describing information about the keyboard.
+    * Example: `https://clueboard.co`
 * `maintainer`
-  * GitHub username of the maintainer, or `qmk` for community maintained boards
+    * GitHub username of the maintainer, or `qmk` for community maintained boards.
+    * Example: `skullydazed`
 * `debounce`
-  * How many milliseconds (ms) to wait for debounce to happen. (Default: 5)
+    * The amount of time in milliseconds to wait for debounce to happen.
+    * Default: `5`
 * `diode_direction`
     * The direction diodes face. See [`DIRECT_PINS` in the hardware configuration](https://docs.qmk.fm/#/config_options?id=hardware-options) for more details.
 * `layout_aliases`
@@ -24,11 +30,11 @@ The `info.json` file is a JSON formatted dictionary with the following keys avai
 * `layouts`
     * Physical Layout representations. See the [Layout Format](#layout_format) section for more detail.
 * `matrix_pins`
-  * Configure the pins corresponding to columns and rows, or direct pins. See [Matrix Pins](#matrix_pins) for more detail.
+    * Configure the pins corresponding to columns and rows, or direct pins. See the [Matrix Pins](#matrix_pins) section for more detail.
 * `rgblight`
     * Configure the [RGB Lighting feature](feature_rgblight.md). See the [RGB Lighting](#rgb_lighting) section for more detail.
 * `usb`
-  * Configure USB VID, PID, and other parameters. See [USB](#USB) for more detail.
+    * Configure USB VID, PID, and other parameters. See the [USB](#USB) section for more detail.
 
 ### Layout Format
 
@@ -44,18 +50,20 @@ Each Key Dictionary in a layout describes the physical properties of a key. If y
 All key positions and rotations are specified in relation to the top-left corner of the keyboard, and the top-left corner of each key.
 
 * `x`
-  * **Required**: The absolute position of the key in the horizontal axis, in Key Units.
+    * **Required**. The absolute position of the key in the horizontal axis, in Key Units.
 * `y`
-  * **Required**: The absolute position of the key in the vertical axis, in Key Units.
+    * **Required**. The absolute position of the key in the vertical axis, in Key Units.
 * `w`
-  * The width of the key, in Key Units. Ignored if `ks` is provided. Default: `1`
+    * The width of the key, in Key Units.
+    * Default: `1`
 * `h`
-  * The height of the key, in Key Units. Ignored if `ks` is provided. Default: `1`
+    * The height of the key, in Key Units.
+    * Default: `1`
 * `label`
-  * What to name this position in the matrix.
+    * What to name this position in the matrix. This should usually correspond to the keycode for the first layer of the default keymap.
-  * This should usually correspond to the keycode for the first layer of the default keymap.
 * `matrix`
-  * A 2 item list describing the row and column location for this key.
+    * A two item list describing the row and column location for this key.
+    * Example: `[0, 4]`
 
 ### Matrix Pins
 
@@ -149,7 +157,7 @@ Example:
 The following animations can be enabled:
 
 |Key              |Description                           |
-|-----|-------------|
+|-----------------|--------------------------------------|
 |`all`            |Enable all additional animation modes.|
 |`alternating`    |Enable alternating animation mode.    |
 |`breathing`      |Enable breathing animation mode.      |