25 files changed, 473 insertions, 177 deletions

diff --git a/docs/_summary.md b/docs/_summary.md
index f6b03867f..a429138b8 100644
--- a/docs/_summary.md
+++ b/docs/_summary.md
@@ -18,6 +18,7 @@
   * [Getting Help](getting_started_getting_help.md)
 
 * [Breaking Changes](breaking_changes.md)
+  * [My Pull Request Was Flagged](breaking_changes_instructions.md)
   * [2019 Aug 30](ChangeLog/20190830.md)
 
 * [FAQ](faq.md)
@@ -104,7 +105,9 @@
   * [ADC Driver](adc_driver.md)
   * [I2C Driver](i2c_driver.md)
   * [WS2812 Driver](ws2812_driver.md)
+  * [EEPROM Driver](eeprom_driver.md)
   * [GPIO Controls](internals_gpio_control.md)
+  * [Custom Matrix](custom_matrix.md)
   * [Proton C Conversion](proton_c_conversion.md)
 
 * For a Deeper Understanding
diff --git a/docs/breaking_changes.md b/docs/breaking_changes.md
index 56d14438d..d3af3c79b 100644
--- a/docs/breaking_changes.md
+++ b/docs/breaking_changes.md
@@ -15,8 +15,8 @@ The next Breaking Change is scheduled for February 29, 2020.
 ### Important Dates
 
 * [x] 2019 Sep 21 - `future` is created. It will be rebased weekly.
-* [ ] 2020 Feb 1 - `future` closed to new PR's.
-* [ ] 2020 Feb 1 - Call for testers.
+* [x] 2020 Feb 1 - `future` closed to new PR's.
+* [x] 2020 Feb 1 - Call for testers.
 * [ ] 2020 Feb 26 - `master` is locked, no PR's merged.
 * [ ] 2020 Feb 28 - Merge `future` to `master`.
 * [ ] 2020 Feb 29 - `master` is unlocked. PR's can be merged again.
diff --git a/docs/breaking_changes_instructions.md b/docs/breaking_changes_instructions.md
new file mode 100644
index 000000000..3f2f93834
--- /dev/null
+++ b/docs/breaking_changes_instructions.md
@@ -0,0 +1,42 @@
+# Breaking Changes: My Pull Request Was Flagged
+
+A QMK member may have replied to your pull request stating that your submission is a breaking change. In their judgment, the changes you have proposed have greater implications for either QMK, or its users.
+
+Some things that may cause a pull request to be flagged are:
+
+- **Edits to User Keymaps**
+  A user may submit their keymap to QMK, then some time later open a pull request with further updates, only to find it can't be merged because it was edited in the `qmk/qmk_firmware` repository. As not all users are proficient at using Git or GitHub, the user may find themself unable to fix the issue on their own.
+- **Changes to Expected Behavior**
+  Changes to QMK behavior may cause users to believe their hardware or QMK is broken if they flash new firmware that incorporates changes to existing QMK features, and find themselves without a means to restore the desired behavior.
+- **Changes Requiring User Action**
+  Changes may also require action to be taken by users, such as updating a toolchain or taking some action in Git.
+- **Changes Necessitating Increased Scrutiny**
+  On occasion, a submission may have implications for QMK as a project. This could be copyright/licensing issues, coding conventions, large feature overhauls, "high-risk" changes that need wider testing by our community, or something else entirely.
+- **Changes Requiring Communication to End Users**
+  This includes warnings about future deprecations, outdated practices, and anything else that needs to be communicated but doesn't fit into one of the above categories.
+
+## What Do I Do?
+
+If it is determined that your submission is a breaking change, there are a few things you can do to smooth the process:
+
+### Consider Splitting Up Your PR
+
+If you are contributing core code, and the only reason it needs to go through breaking changes is that you are updating keymaps to match your change, consider whether you can submit your feature in a way that the old keymaps continue to work. Then submit a separate PR that goes through the breaking changes process to remove the old code.
+
+### Contribute a ChangeLog Entry
+
+We require submissions that go through the Breaking Change process to include a changelog entry. The entry should be a short summary of the changes your pull request makes – [each section here started as a changelog](ChangeLog/20190830.md "n.b. This should link to the 2019 Aug 30 Breaking Changes doc  - @noroadsleft").
+
+Your changelog should be located at `docs/ChangeLog/YYYYMMDD/PR####.md`, where `YYYYMMDD` is the date on which QMK's breaking change branch – usually named `future` – will be merged into the `master` branch, and `####` is the number of your pull request.
+
+If your submission requires action on the part of users, your changelog should instruct users what action(s) must be taken, or link to a location that does so.
+
+### Document Your Changes
+
+Understanding the purpose for your submission, and possible implications or actions it will require can make the review process more straightforward. A changelog may suffice for this purpose, but more extensive changes may require a level of detail that is ill-suited for a changelog.
+
+Commenting on your pull request and being responsive to questions, comments, and change requests is much appreciated.
+
+### Ask for Help
+
+Having your submission flagged may have caught you off guard. If you find yourself intimidated or overwhelmed, let us know. Comment on your pull request, or [reach out to the QMK team on Discord](https://discord.gg/Uq7gcHh).
diff --git a/docs/cli.md b/docs/cli.md
index 1c0952722..4f328a75a 100644
--- a/docs/cli.md
+++ b/docs/cli.md
@@ -141,14 +141,28 @@ qmk docs [-p PORT]
 
 ## `qmk doctor`
 
-This command examines your environment and alerts you to potential build or flash problems.
+This command examines your environment and alerts you to potential build or flash problems. It can fix many of them if you want it to.
 
 **Usage**:
 
 ```
-qmk doctor
+qmk doctor [-y] [-n]
 ```
 
+**Examples**:
+
+Check your environment for problems and prompt to fix them:
+
+    qmk doctor
+
+Check your environment and automatically fix any problems found:
+
+    qmk doctor -y
+
+Check your environment and report problems only:
+
+    qmk doctor -n
+
 ## `qmk json-keymap`
 
 Creates a keymap.c from a QMK Configurator export.
diff --git a/docs/config_options.md b/docs/config_options.md
index 0b83ed9e4..be328405e 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -149,6 +149,8 @@ If you define these options you will enable the associated feature, which may in
   * makes it possible to use a dual role key as modifier shortly after having been tapped
   * See [Hold after tap](feature_advanced_keycodes.md#tapping-force-hold)
   * Breaks any Tap Toggle functionality (`TT` or the One Shot Tap Toggle)
+* `#define TAPPING_FORCE_HOLD_PER_KEY`
+  * enables handling for per key `TAPPING_FORCE_HOLD` settings
 * `#define LEADER_TIMEOUT 300`
   * how long before the leader key times out
     * If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the `LEADER_PER_KEY_TIMING` option, which resets the timeout after each key is tapped.
@@ -274,9 +276,12 @@ There are a few different ways to set handedness for split keyboards (listed in
   * Default behavior for ARM
   * Required for AVR Teensy
 
-* `#define SPLIT_USB_TIMEOUT 2500`
+* `#define SPLIT_USB_TIMEOUT 2000`
   * Maximum timeout when detecting master/slave when using `SPLIT_USB_DETECT`
 
+* `#define SPLIT_USB_TIMEOUT_POLL 10`
+  * Poll frequency when detecting master/slave when using `SPLIT_USB_DETECT`
+
 # The `rules.mk` File
 
 This is a [make](https://www.gnu.org/software/make/manual/make.html) file that is included by the top-level `Makefile`. It is used to set some information about the MCU that we will be compiling for as well as enabling and disabling certain features.
diff --git a/docs/custom_matrix.md b/docs/custom_matrix.md
new file mode 100644
index 000000000..cfa900a33
--- /dev/null
+++ b/docs/custom_matrix.md
@@ -0,0 +1,108 @@
+# Custom Matrix
+
+QMK provides a mechanism to supplement or replace the default matrix scanning routine with your own code.
+
+The reasons to use this feature include:
+
+* Extra hardware between the keyboard's switches and MCU pins
+  * I/O multiplexer
+  * Line decoder
+* Irregular switch matrix
+  * Simultaneous use of `COL2ROW` and `ROW2COL`
+
+## Prerequisites
+
+Implementing custom matrix usually involves compilation of an additional source file. It is recommended that for consistency, this file is called `matrix.c`.
+
+Add a new file to your keyboard directory:
+```text
+keyboards/<keyboard>/matrix.c
+```
+
+And to configure compilation for the new file, add this to your `rules.mk`:
+```make
+SRC += matrix.c
+```
+
+## 'lite'
+
+Provides a default implementation for various scanning functions, reducing the boilerplate code when implementing custom matrix.
+To configure it, add this to your `rules.mk`:
+
+```make
+CUSTOM_MATRIX = lite
+```
+
+And implement the following functions in a `matrix.c` file in your keyboard folder:
+
+```c
+void matrix_init_custom(void) {
+    // TODO: initialize hardware here
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool matrix_has_changed = false;
+
+    // TODO: add matrix scanning routine here
+
+    return matrix_has_changed;
+}
+```
+
+
+## Full Replacement
+
+When more control over the scanning routine is required, you can choose to implement the full scanning routine.
+To configure it, add this to your rules.mk:
+
+```make
+CUSTOM_MATRIX = yes
+```
+
+And implement the following functions in a `matrix.c` file in your keyboard folder:
+
+```c
+matrix_row_t matrix_get_row(uint8_t row) {
+    // TODO: return the requested row data
+}
+
+void matrix_print(void) {
+    // TODO: use print() to dump the current matrix state to console
+}
+
+void matrix_init(void) {
+    // TODO: initialize hardware and global matrix state here
+
+    // Unless hardware debouncing - Init the configured debounce routine
+    debounce_init(MATRIX_ROWS);
+
+    // This *must* be called for correct keyboard behavior
+    matrix_init_quantum();
+}
+
+uint8_t matrix_scan(void) {
+    bool matrix_has_changed = false;
+
+    // TODO: add matrix scanning routine here
+
+    // Unless hardware debouncing - use the configured debounce routine
+    debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
+
+    // This *must* be called for correct keyboard behavior
+    matrix_scan_quantum();
+
+    return matrix_has_changed;
+}
+```
+
+And also provide defaults for the following callbacks:
+
+```c
+__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
+
+__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
+
+__attribute__((weak)) void matrix_init_user(void) {}
+
+__attribute__((weak)) void matrix_scan_user(void) {}
+```
diff --git a/docs/eeprom_driver.md b/docs/eeprom_driver.md
new file mode 100644
index 000000000..dd12d8ec7
--- /dev/null
+++ b/docs/eeprom_driver.md
@@ -0,0 +1,50 @@
+# EEPROM Driver Configuration
+
+The EEPROM driver can be swapped out depending on the needs of the keyboard, or whether extra hardware is present.
+
+Driver                      | Description
+--------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+`EEPROM_DRIVER = vendor`    | Uses the on-chip driver provided by the chip manufacturer. For AVR, this is provided by avr-libc. This is supported on ARM for a subset of chips -- STM32F3xx, STM32F1xx, and STM32F072xB will be emulated by writing to flash. Other chips will generally act as "transient" below.
+`EEPROM_DRIVER = i2c`       | Supports writing to I2C-based 24xx EEPROM chips. See the driver section below.
+`EEPROM_DRIVER = transient` | Fake EEPROM driver -- supports reading/writing to RAM, and will be discarded when power is lost.
+
+## Vendor Driver Configuration
+
+No configurable options are available.
+
+## I2C Driver Configuration
+
+Currently QMK supports 24xx-series chips over I2C. As such, requires a working i2c_master driver configuration. You can override the driver configuration via your config.h:
+
+`config.h` override                         | Description                                                                         | Default Value
+------------------------------------------- | ----------------------------------------------------------------------------------- | ------------------------------------
+`#define EXTERNAL_EEPROM_I2C_BASE_ADDRESS`  | Base I2C address for the EEPROM -- shifted left by 1 as per i2c_master requirements | 0b10100000
+`#define EXTERNAL_EEPROM_I2C_ADDRESS(addr)` | Calculated I2C address for the EEPROM                                               | `(EXTERNAL_EEPROM_I2C_BASE_ADDRESS)`
+`#define EXTERNAL_EEPROM_BYTE_COUNT`        | Total size of the EEPROM in bytes                                                   | 8192
+`#define EXTERNAL_EEPROM_PAGE_SIZE`         | Page size of the EEPROM in bytes, as specified in the datasheet                     | 32
+`#define EXTERNAL_EEPROM_ADDRESS_SIZE`      | The number of bytes to transmit for the memory location within the EEPROM           | 2
+`#define EXTERNAL_EEPROM_WRITE_TIME`        | Write cycle time of the EEPROM, as specified in the datasheet                       | 5
+
+Default values and extended descriptions can be found in `drivers/eeprom/eeprom_i2c.h`.
+
+Alternatively, there are pre-defined hardware configurations for available chips/modules:
+
+Module           | Equivalent `#define`            | Source
+-----------------|---------------------------------|------------------------------------------
+CAT24C512 EEPROM | `#define EEPROM_I2C_CAT24C512`  | <https://www.sparkfun.com/products/14764>
+RM24C512C EEPROM | `#define EEPROM_I2C_RM24C512C`  | <https://www.sparkfun.com/products/14764>
+24LC128 EEPROM   | `#define EEPROM_I2C_24LC128`    | <https://www.microchip.com/wwwproducts/en/24LC128>
+24LC256 EEPROM   | `#define EEPROM_I2C_24LC256`    | <https://www.sparkfun.com/products/525>
+MB85RC256V FRAM  | `#define EEPROM_I2C_MB85RC256V` | <https://www.adafruit.com/product/1895>
+
+?> If you find that the EEPROM is not cooperating, ensure you've correctly shifted up your EEPROM address by 1. For example, the datasheet might state the address as `0b01010000` -- the correct value of `EXTERNAL_EEPROM_I2C_BASE_ADDRESS` needs to be `0b10100000`.
+
+## Transient Driver configuration
+
+The only configurable item for the transient EEPROM driver is its size:
+
+`config.h` override             | Description                               | Default Value
+------------------------------- | ----------------------------------------- | -------------
+`#define TRANSIENT_EEPROM_SIZE` | Total size of the EEPROM storage in bytes | 64
+
+Default values and extended descriptions can be found in `drivers/eeprom/eeprom_transient.h`.
diff --git a/docs/feature_advanced_keycodes.md b/docs/feature_advanced_keycodes.md
index ec3807f40..ebb24dc99 100644
--- a/docs/feature_advanced_keycodes.md
+++ b/docs/feature_advanced_keycodes.md
@@ -291,6 +291,25 @@ Normally, this would send `X` (`SHIFT`+`x`). With `Ignore Mod Tap Interrupt` ena
 
 ?> If you have `Permissive Hold` enabled, as well, this will modify how both work. The regular key has the modifier added if the first key is released first or if both keys are held longer than the `TAPPING_TERM`.
 
+For more granular control of this feature, you can add the following to your `config.h`:
+
+```c
+#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
+```
+
+You can then add the following function to your keymap:
+
+```c
+bool get_ignore_mod_tap_interrupt(uint16_t keycode) {
+  switch (keycode) {
+    case SFT_T(KC_SPC):
+      return true;
+    default:
+      return false;
+  }
+}
+```
+
 ## Tapping Force Hold
 
 To enable `tapping force hold`, add the following to your `config.h`: 
@@ -315,6 +334,25 @@ With `TAPPING_FORCE_HOLD`, the second press will be interpreted as a Shift, allo
 
 !> `TAPPING_FORCE_HOLD` will break anything that uses tapping toggles (Such as the `TT` layer keycode, and the One Shot Tapping Toggle).
 
+For more granular control of this feature, you can add the following to your `config.h`:
+
+```c
+#define TAPPING_FORCE_HOLD_PER_KEY
+```
+
+You can then add the following function to your keymap:
+
+```c
+bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case LT(1, KC_BSPC):
+      return true;
+    default:
+      return false;
+  }
+}
+```
+
 ## Retro Tapping
 
 To enable `retro tapping`, add the following to your `config.h`: 
diff --git a/docs/feature_oled_driver.md b/docs/feature_oled_driver.md
index b124ba5a8..29548cb82 100644
--- a/docs/feature_oled_driver.md
+++ b/docs/feature_oled_driver.md
@@ -1,139 +1,142 @@
 # OLED Driver
 
-## OLED Supported Hardware
+## Supported Hardware
 
 OLED modules using SSD1306 or SH1106 driver ICs, communicating over I2C.
 Tested combinations:
 
-| IC driver |   Size | Keyboard Platform | Notes                    |
-|-----------|--------|-------------------|--------------------------|
-| SSD1306   | 128x32 | AVR               | Primary support          |
-| SSD1306   | 128x64 | AVR               | Verified working         |
-| SSD1306   | 128x32 | ARM               |                          |
-| SH1106    | 128x64 | AVR               | No rotation or scrolling |
+|IC       |Size  |Platform|Notes                   |
+|---------|------|--------|------------------------|
+|SSD1306  |128x32|AVR     |Primary support         |
+|SSD1306  |128x64|AVR     |Verified working        |
+|SSD1306  |128x32|Arm     |                        |
+|SH1106   |128x64|AVR     |No rotation or scrolling|
 
-Hardware configurations using ARM-based microcontrollers or different sizes of OLED modules may be compatible, but are untested.
+Hardware configurations using Arm-based microcontrollers or different sizes of OLED modules may be compatible, but are untested.
 
-!> Warning: This OLED Driver currently uses the new i2c_master driver from split common code. If your split keyboard uses I2C to communicate between sides, this driver could cause an address conflict (serial is fine). Please contact your keyboard vendor and ask them to migrate to the latest split common code to fix this. In addition, the display timeout system to reduce OLED burn-in also uses split common to detect keypresses, so you will need to implement custom timeout logic for non-split common keyboards.
+!> Warning: This OLED driver currently uses the new i2c_master driver from Split Common code. If your split keyboard uses I2C to communicate between sides, this driver could cause an address conflict (serial is fine). Please contact your keyboard vendor and ask them to migrate to the latest Split Common code to fix this. In addition, the display timeout system to reduce OLED burn-in also uses Split Common to detect keypresses, so you will need to implement custom timeout logic for non-Split Common keyboards.
 
 ## Usage
 
-To enable the OLED feature, there are three steps. First, when compiling your keyboard, you'll need to set `OLED_DRIVER_ENABLE=yes` in `rules.mk`, e.g.:
+To enable the OLED feature, there are three steps. First, when compiling your keyboard, you'll need to add the following to your `rules.mk`:
 
-```
+```make
 OLED_DRIVER_ENABLE = yes
 ```
 
-This enables the feature and the `OLED_DRIVER_ENABLE` define. Then in your `keymap.c` file, you will need to implement the user task call, e.g:
+Then in your `keymap.c` file, implement the OLED task call. This example assumes your keymap has three layers named `_QWERTY`, `_FN` and `_ADJ`:
 
-```C++
+```c
 #ifdef OLED_DRIVER_ENABLE
 void oled_task_user(void) {
-  // Host Keyboard Layer Status
-  oled_write_P(PSTR("Layer: "), false);
-  switch (get_highest_layer(layer_state)) {
-    case _QWERTY:
-      oled_write_P(PSTR("Default\n"), false);
-      break;
-    case _FN:
-      oled_write_P(PSTR("FN\n"), false);
-      break;
-    case _ADJ:
-      oled_write_P(PSTR("ADJ\n"), false);
-      break;
-    default:
-      // Or use the write_ln shortcut over adding '\n' to the end of your string
-      oled_write_ln_P(PSTR("Undefined"), false);
-  }
-
-  // Host Keyboard LED Status
-  uint8_t led_usb_state = host_keyboard_leds();
-  oled_write_P(led_usb_state & (1<<USB_LED_NUM_LOCK) ? PSTR("NUMLCK ") : PSTR("       "), false);
-  oled_write_P(led_usb_state & (1<<USB_LED_CAPS_LOCK) ? PSTR("CAPLCK ") : PSTR("       "), false);
-  oled_write_P(led_usb_state & (1<<USB_LED_SCROLL_LOCK) ? PSTR("SCRLCK ") : PSTR("       "), false);
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case _FN:
+            oled_write_P(PSTR("FN\n"), false);
+            break;
+        case _ADJ:
+            oled_write_P(PSTR("ADJ\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUM ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAP ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCR ") : PSTR("    "), false);
 }
 #endif
 ```
 
 ## Logo Example
 
-In the default font, ranges in the font file are reserved for a QMK Logo. To Render this logo to the oled screen, use the following code example:
+In the default font, certain ranges of characters are reserved for a QMK logo. To render this logo to the OLED screen, use the following code example:
 
-```C++
+```c
 static void render_logo(void) {
-  static const char PROGMEM qmk_logo[] = {
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,0};
+    static const char PROGMEM qmk_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+    };
 
-  oled_write_P(qmk_logo, false);
+    oled_write_P(qmk_logo, false);
 }
 ```
 
 ## Other Examples
 
-In split keyboards, it is very common to have two OLED displays that each render different content and oriented flipped differently. You can do this by switching which content to render by using the return from `is_keyboard_master()` or `is_keyboard_left()` found in `split_util.h`, e.g:
+In split keyboards, it is very common to have two OLED displays that each render different content and are oriented or flipped differently. You can do this by switching which content to render by using the return value from `is_keyboard_master()` or `is_keyboard_left()` found in `split_util.h`, e.g:
 
-```C++
+```c
 #ifdef OLED_DRIVER_ENABLE
 oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-  if (!is_keyboard_master())
-    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
-  return rotation;
+    if (!is_keyboard_master()) {
+        return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+    }
+
+    return rotation;
 }
 
 void oled_task_user(void) {
-  if (is_keyboard_master()) {
-    render_status();     // Renders the current keyboard state (layer, lock, caps, scroll, etc)
-  } else {
-    render_logo();       // Renders a statuc logo
-    oled_scroll_left();  // Turns on scrolling
-  }
+    if (is_keyboard_master()) {
+        render_status();  // Renders the current keyboard state (layer, lock, caps, scroll, etc)
+    } else {
+        render_logo();  // Renders a static logo
+        oled_scroll_left();  // Turns on scrolling
+    }
 }
 #endif
 ```
 
-
- ## Basic Configuration
-
-| Define                     | Default           | Description                                                                                                                |
-|----------------------------|-------------------|----------------------------------------------------------------------------------------------------------------------------|
-| `OLED_DISPLAY_ADDRESS`     | `0x3C`            | The i2c address of the OLED Display                                                                                        |
-| `OLED_FONT_H`              | `"glcdfont.c"`    | The font code file to use for custom fonts                                                                                 |
-| `OLED_FONT_START`          | `0`               | The starting characer index for custom fonts                                                                               |
-| `OLED_FONT_END`            | `224`             | The ending characer index for custom fonts                                                                                 |
-| `OLED_FONT_WIDTH`          | `6`               | The font width                                                                                                             |
-| `OLED_FONT_HEIGHT`         | `8`               | The font height (untested)                                                                                                 |
-| `OLED_TIMEOUT`             | `60000`           | Turns off the OLED screen after 60000ms of keyboard inactivity. Helps reduce OLED Burn-in. Set to 0 to disable.            |
-| `OLED_SCROLL_TIMEOUT`      | `0`               | Scrolls the OLED screen after 0ms of OLED inactivity. Helps reduce OLED Burn-in. Set to 0 to disable.                      |
-| `OLED_SCROLL_TIMEOUT_RIGHT`| *Not defined*     | Scroll timeout direction is right when defined, left when undefined.                                                       |
-| `OLED_IC`                  | `OLED_IC_SSD1306` | Set to `OLED_IC_SH1106` if you're using the SH1106 OLED controller.                                                        |
-| `OLED_COLUMN_OFFSET`       | `0`               | (SH1106 only.) Shift output to the right this many pixels.<br />Useful for 128x64 displays centered on a 132x64 SH1106 IC. |
+## Basic Configuration
+
+|Define                     |Default          |Description                                                                                                               |
+|---------------------------|-----------------|--------------------------------------------------------------------------------------------------------------------------|
+|`OLED_DISPLAY_ADDRESS`     |`0x3C`           |The i2c address of the OLED Display                                                                                       |
+|`OLED_FONT_H`              |`"glcdfont.c"`   |The font code file to use for custom fonts                                                                                |
+|`OLED_FONT_START`          |`0`              |The starting characer index for custom fonts                                                                              |
+|`OLED_FONT_END`            |`224`            |The ending characer index for custom fonts                                                                                |
+|`OLED_FONT_WIDTH`          |`6`              |The font width                                                                                                            |
+|`OLED_FONT_HEIGHT`         |`8`              |The font height (untested)                                                                                                |
+|`OLED_TIMEOUT`             |`60000`          |Turns off the OLED screen after 60000ms of keyboard inactivity. Helps reduce OLED Burn-in. Set to 0 to disable.           |
+|`OLED_SCROLL_TIMEOUT`      |`0`              |Scrolls the OLED screen after 0ms of OLED inactivity. Helps reduce OLED Burn-in. Set to 0 to disable.                     |
+|`OLED_SCROLL_TIMEOUT_RIGHT`|*Not defined*    |Scroll timeout direction is right when defined, left when undefined.                                                      |
+|`OLED_IC`                  |`OLED_IC_SSD1306`|Set to `OLED_IC_SH1106` if you're using the SH1106 OLED controller.                                                       |
+|`OLED_COLUMN_OFFSET`       |`0`              |(SH1106 only.) Shift output to the right this many pixels.<br />Useful for 128x64 displays centered on a 132x64 SH1106 IC.|
 
  ## 128x64 & Custom sized OLED Displays
 
  The default display size for this feature is 128x32 and all necessary defines are precalculated with that in mind. We have added a define, `OLED_DISPLAY_128X64`, to switch all the values to be used in a 128x64 display, as well as added a custom define, `OLED_DISPLAY_CUSTOM`, that allows you to provide the necessary values to the driver.
 
-|Define                 |Default        |Description                                                      |
-|-----------------------|---------------|-----------------------------------------------------------------|
-|`OLED_DISPLAY_128X64`  |*Not defined*  |Changes the display defines for use with 128x64 displays.        |
-|`OLED_DISPLAY_CUSTOM`  |*Not defined*  |Changes the display defines for use with custom displays.<br />Requires user to implement the below defines. |
-|`OLED_DISPLAY_WIDTH`   |`128`          |The width of the OLED display.                                   |
-|`OLED_DISPLAY_HEIGHT`  |`32`           |The height of the OLED display.                                  |
-|`OLED_MATRIX_SIZE`     |`512`          |The local buffer size to allocate.<br />`(OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)`. |
-|`OLED_BLOCK_TYPE`      |`uint16_t`     |The unsigned integer type to use for dirty rendering. |
-|`OLED_BLOCK_COUNT`     |`16`           |The number of blocks the display is divided into for dirty rendering.<br />`(sizeof(OLED_BLOCK_TYPE) * 8)`. |
-|`OLED_BLOCK_SIZE`      |`32`           |The size of each block for dirty rendering<br />`(OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)`. |
-|`OLED_COM_PINS`        |`COM_PINS_SEQ` |How the SSD1306 chip maps it's memory to display.<br />Options are `COM_PINS_SEQ`, `COM_PINS_ALT`, `COM_PINS_SEQ_LR`, & `COM_PINS_ALT_LR`. |
-|`OLED_SOURCE_MAP`      |`{ 0, ... N }` |Precalculated source array to use for mapping source buffer to target OLED memory in 90 degree rendering.         |
-|`OLED_TARGET_MAP`      |`{ 24, ... N }`|Precalculated target array to use for mapping source buffer to target OLED memory in 90 degree rendering.         |
+|Define               |Default        |Description                                                                                                                             |
+|---------------------|---------------|----------------------------------------------------------------------------------------------------------------------------------------|
+|`OLED_DISPLAY_128X64`|*Not defined*  |Changes the display defines for use with 128x64 displays.                                                                               |
+|`OLED_DISPLAY_CUSTOM`|*Not defined*  |Changes the display defines for use with custom displays.<br>Requires user to implement the below defines.                              |
+|`OLED_DISPLAY_WIDTH` |`128`          |The width of the OLED display.                                                                                                          |
+|`OLED_DISPLAY_HEIGHT`|`32`           |The height of the OLED display.                                                                                                         |
+|`OLED_MATRIX_SIZE`   |`512`          |The local buffer size to allocate.<br>`(OLED_DISPLAY_HEIGHT / 8 * OLED_DISPLAY_WIDTH)`.                                                 |
+|`OLED_BLOCK_TYPE`    |`uint16_t`     |The unsigned integer type to use for dirty rendering.                                                                                   |
+|`OLED_BLOCK_COUNT`   |`16`           |The number of blocks the display is divided into for dirty rendering.<br>`(sizeof(OLED_BLOCK_TYPE) * 8)`.                               |
+|`OLED_BLOCK_SIZE`    |`32`           |The size of each block for dirty rendering<br>`(OLED_MATRIX_SIZE / OLED_BLOCK_COUNT)`.                                                  |
+|`OLED_COM_PINS`      |`COM_PINS_SEQ` |How the SSD1306 chip maps it's memory to display.<br>Options are `COM_PINS_SEQ`, `COM_PINS_ALT`, `COM_PINS_SEQ_LR`, & `COM_PINS_ALT_LR`.|
+|`OLED_SOURCE_MAP`    |`{ 0, ... N }` |Precalculated source array to use for mapping source buffer to target OLED memory in 90 degree rendering.                               |
+|`OLED_TARGET_MAP`    |`{ 24, ... N }`|Precalculated target array to use for mapping source buffer to target OLED memory in 90 degree rendering.                               |
 
 
-### 90 Degree Rotation - Technical Mumbo Jumbo 
+### 90 Degree Rotation - Technical Mumbo Jumbo
 
 !> Rotation is unsupported on the SH1106.
 
-```C
+```c
 // OLED Rotation enum values are flags
 typedef enum {
     OLED_ROTATION_0   = 0,
@@ -143,9 +146,9 @@ typedef enum {
 } oled_rotation_t;
 ```
 
- OLED displays driven by SSD1306 drivers only natively support in hard ware 0 degree and 180 degree rendering. This feature is done in software and not free. Using this feature will increase the time to calculate what data to send over i2c to the OLED. If you are strapped for cycles, this can cause keycodes to not register. In testing however, the rendering time on an `atmega32u4` board only went from 2ms to 5ms and keycodes not registering was only noticed once we hit 15ms. 
- 
- 90 Degree Rotated Rendering is achieved by using bitwise operations to rotate each 8 block of memory and uses two precalculated arrays to remap buffer memory to OLED memory. The memory map defines are precalculated for remap performance and are calculated based on the OLED Height, Width, and Block Size. For example, in the 128x32 implementation with a `uint8_t` block type, we have a 64 byte block size. This gives us eight 8 byte blocks that need to be rotated and rendered. The OLED renders horizontally two 8 byte blocks before moving down a page, e.g:
+OLED displays driven by SSD1306 drivers only natively support in hardware 0 degree and 180 degree rendering. This feature is done in software and not free. Using this feature will increase the time to calculate what data to send over i2c to the OLED. If you are strapped for cycles, this can cause keycodes to not register. In testing however, the rendering time on an ATmega32U4 board only went from 2ms to 5ms and keycodes not registering was only noticed once we hit 15ms.
+
+90 degree rotation is achieved by using bitwise operations to rotate each 8 block of memory and uses two precalculated arrays to remap buffer memory to OLED memory. The memory map defines are precalculated for remap performance and are calculated based on the display height, width, and block size. For example, in the 128x32 implementation with a `uint8_t` block type, we have a 64 byte block size. This gives us eight 8 byte blocks that need to be rotated and rendered. The OLED renders horizontally two 8 byte blocks before moving down a page, e.g:
 
 |   |   |   |   |   |   |
 |---|---|---|---|---|---|
@@ -167,8 +170,8 @@ So those precalculated arrays just index the memory offsets in the order in whic
 
 ## OLED API
 
-```C++
-// OLED Rotation enum values are flags
+```c
+// OLED rotation enum values are flags
 typedef enum {
     OLED_ROTATION_0   = 0,
     OLED_ROTATION_90  = 1,
@@ -272,26 +275,26 @@ uint8_t oled_max_lines(void);
 
 !> Scrolling and rotation are unsupported on the SH1106.
 
-## SSD1306.h driver conversion guide
-
-|Old API                    |Recommended New API                |
-|---------------------------|-----------------------------------|
-|`struct CharacterMatrix`   |*removed - delete all references*  |
-|`iota_gfx_init`            |`oled_init`                        |
-|`iota_gfx_on`              |`oled_on`                          |
-|`iota_gfx_off`             |`oled_off`                         |
-|`iota_gfx_flush`           |`oled_render`                      |
-|`iota_gfx_write_char`      |`oled_write_char`                  |
-|`iota_gfx_write`           |`oled_write`                       |
-|`iota_gfx_write_P`         |`oled_write_P`                     |
-|`iota_gfx_clear_screen`    |`oled_clear`                       |
-|`matrix_clear`             |*removed - delete all references*  |
-|`matrix_write_char_inner`  |`oled_write_char`                  |
-|`matrix_write_char`        |`oled_write_char`                  |
-|`matrix_write`             |`oled_write`                       |
-|`matrix_write_ln`          |`oled_write_ln`                    |
-|`matrix_write_P`           |`oled_write_P`                     |
-|`matrix_write_ln_P`        |`oled_write_ln_P`                  |
-|`matrix_render`            |`oled_render`                      |
-|`iota_gfx_task`            |`oled_task`                        |
-|`iota_gfx_task_user`       |`oled_task_user`                   |
+## SSD1306.h Driver Conversion Guide
+
+|Old API                  |Recommended New API              |
+|-------------------------|---------------------------------|
+|`struct CharacterMatrix` |*removed - delete all references*|
+|`iota_gfx_init`          |`oled_init`                      |
+|`iota_gfx_on`            |`oled_on`                        |
+|`iota_gfx_off`           |`oled_off`                       |
+|`iota_gfx_flush`         |`oled_render`                    |
+|`iota_gfx_write_char`    |`oled_write_char`                |
+|`iota_gfx_write`         |`oled_write`                     |
+|`iota_gfx_write_P`       |`oled_write_P`                   |
+|`iota_gfx_clear_screen`  |`oled_clear`                     |
+|`matrix_clear`           |*removed - delete all references*|
+|`matrix_write_char_inner`|`oled_write_char`                |
+|`matrix_write_char`      |`oled_write_char`                |
+|`matrix_write`           |`oled_write`                     |
+|`matrix_write_ln`        |`oled_write_ln`                  |
+|`matrix_write_P`         |`oled_write_P`                   |
+|`matrix_write_ln_P`      |`oled_write_ln_P`                |
+|`matrix_render`          |`oled_render`                    |
+|`iota_gfx_task`          |`oled_task`                      |
+|`iota_gfx_task_user`     |`oled_task_user`                 |
diff --git a/docs/feature_rgb_matrix.md b/docs/feature_rgb_matrix.md
index 92fd62b32..23082ef2a 100644
--- a/docs/feature_rgb_matrix.md
+++ b/docs/feature_rgb_matrix.md
@@ -380,6 +380,10 @@ These are defined in [`rgblight_list.h`](https://github.com/qmk/qmk_firmware/blo
 #define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_LEFT_RIGHT // Sets the default mode, if none has been set
+#define RGB_MATRIX_STARTUP_HUE 0 // Sets the default hue value, if none has been set
+#define RGB_MATRIX_STARTUP_SAT 255 // Sets the default saturation value, if none has been set
+#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS // Sets the default brightness value, if none has been set
+#define RGB_MATRIX_STARTUP_SPD 127 // Sets the default animation speed, if none has been set
 ```
 
 ## EEPROM storage
diff --git a/docs/feature_split_keyboard.md b/docs/feature_split_keyboard.md
index affce3429..66194c5f4 100644
--- a/docs/feature_split_keyboard.md
+++ b/docs/feature_split_keyboard.md
@@ -198,10 +198,15 @@ This option changes the startup behavior to detect an active USB connection when
 ?> This setting will stop the ability to demo using battery packs.
 
 ```c
-#define SPLIT_USB_TIMEOUT 2500
+#define SPLIT_USB_TIMEOUT 2000
 ```
 This sets the maximum timeout when detecting master/slave when using `SPLIT_USB_DETECT`.
 
+```c
+#define SPLIT_USB_TIMEOUT_POLL 10
+```
+This sets the poll frequency when detecting master/slave when using `SPLIT_USB_DETECT`
+
 ## Additional Resources
 
 Nicinabox has a [very nice and detailed guide](https://github.com/nicinabox/lets-split-guide) for the Let's Split keyboard, that covers most everything you need to know, including troubleshooting information. 
diff --git a/docs/getting_started_make_guide.md b/docs/getting_started_make_guide.md
index bf8d472d0..df82a001f 100644
--- a/docs/getting_started_make_guide.md
+++ b/docs/getting_started_make_guide.md
@@ -135,7 +135,7 @@ As there is no standard split communication driver for ARM-based split keyboards
 
 `CUSTOM_MATRIX`
 
-Lets you replace the default matrix scanning routine with your own code. You will need to provide your own implementations of matrix_init() and matrix_scan().
+Lets you replace the default matrix scanning routine with your own code. For further details, see the [Custom Matrix page](custom_matrix.md).
 
 `DEBOUNCE_TYPE`
 
diff --git a/docs/hardware_drivers.md b/docs/hardware_drivers.md
index 165187795..7e89c0d2b 100644
--- a/docs/hardware_drivers.md
+++ b/docs/hardware_drivers.md
@@ -33,3 +33,7 @@ Support for up to 2 drivers. Each driver impliments 2 charlieplex matrices to in
 ## IS31FL3733
 
 Support for up to a single driver with room for expansion. Each driver can control 192 individual LEDs or 64 RGB LEDs. For more information on how to setup the driver see the [RGB Matrix](feature_rgb_matrix.md) page.
+
+## 24xx series external I2C EEPROM
+
+Support for an external I2C-based EEPROM instead of using the on-chip EEPROM. For more information on how to setup the driver see the [EEPROM Driver](eeprom_driver.md) page.
diff --git a/docs/ja/_summary.md b/docs/ja/_summary.md
index e5e19ddc8..afe962f86 100644
--- a/docs/ja/_summary.md
+++ b/docs/ja/_summary.md
@@ -10,32 +10,34 @@
    * [学習リソース](ja/newbs_learn_more_resources.md)
 
 * [QMK�基本](ja/README.md)
-   * [QMK�導入](ja/getting_started_introduction.md)
+   * [QMK �導入](ja/getting_started_introduction.md)
    * [QMK CLI](ja/cli.md)
    * [QMK CLI 設定](ja/cli_configuration.md)
-   * [QMK��貢献](ja/contributing.md)
-   * [Github�使�方](ja/getting_started_github.md)
+   * [QMK ��貢献](ja/contributing.md)
+   * [Github �使�方](ja/getting_started_github.md)
    * [ヘルプ](ja/getting_started_getting_help.md)
 
 * [破壊的�変更](ja/breaking_changes.md)
+   * [プルリクエスト�フラグ�付�られ�](ja/breaking_changes_instructions.md)
    * [2019年8月30日](ja/ChangeLog/20190830.md)
 
 * [FAQ](ja/faq.md)
-   * [一般的�FAQ](ja/faq_general.md)
-   * [QMK�ビルド/コンパイル](ja/faq_build.md)
-   * [QMK�デ�ッグ/トラブルシューティング](ja/faq_debug.md)
+   * [一般的� FAQ](ja/faq_general.md)
+   * [QMK �ビルド/コンパイル](ja/faq_build.md)
+   * [QMK �デ�ッグ/トラブルシューティング](ja/faq_debug.md)
    * [キーマップ](ja/faq_keymap.md)
-   * [Zadigを使��ドライ��インストール](ja/driver_installation_zadig.md)
+   * [Zadig を使��ドライ��インストール](ja/driver_installation_zadig.md)
 
 * 詳細�ガイド
    * [ビルドツール�インストール](ja/getting_started_build_tools.md)
-   * [Vagrant�ガイド](ja/getting_started_vagrant.md)
+   * [Vagrant �ガイド](ja/getting_started_vagrant.md)
    * [ビルド/コンパイル�説明](ja/getting_started_make_guide.md)
    * [ファームウェア�フラッシュ](ja/flashing.md)
    * [機能�カスタマイズ](ja/custom_quantum_functions.md)
    * [キーマップ�概�](ja/keymap.md)
 
 * [�ードウェア](ja/hardware.md)
+   * [互�性��るマイクロコントローラ](ja/compatible_microcontrollers.md)
    * [AVR プロセッサ](ja/hardware_avr.md)
    * [ドライ�](ja/hardware_drivers.md)
 
@@ -66,7 +68,7 @@
    * [ブートマジック](ja/feature_bootmagic.md)
    * [コンボ](ja/feature_combo.md)
    * [コマンド](ja/feature_command.md)
-   * [Debounce API](ja/feature_debounce_type.md)
+   * [デ�ウンス API](ja/feature_debounce_type.md)
    * [DIP スイッ�](ja/feature_dip_switch.md)
    * [動的マクロ](ja/feature_dynamic_macros.md)
    * [エンコーダ](ja/feature_encoders.md)
@@ -90,27 +92,31 @@
    * [Stenography](ja/feature_stenography.md)
    * [Swap Hands](ja/feature_swap_hands.md)
    * [タップ ダンス](ja/feature_tap_dance.md)
-   * [Terminal](ja/feature_terminal.md)
+   * [ターミナル](ja/feature_terminal.md)
    * [感熱�プリンタ](ja/feature_thermal_printer.md)
    * [ユニコード](ja/feature_unicode.md)
-   * [Userspace](ja/feature_userspace.md)
+   * [ユーザスペース](ja/feature_userspace.md)
    * [Velocikey](ja/feature_velocikey.md)
 
 * メーカー�よ�モッダー����
-   * [Hand Wiring Guide](ja/hand_wire.md)
-   * [ISP Flashing Guide](ja/isp_flashing_guide.md)
+   * [Hand Wiring ガイド](ja/hand_wire.md)
+   * [ISP 書�込�ガイド](ja/isp_flashing_guide.md)
    * [ARM デ�ッグ ガイド](ja/arm_debugging.md)
+   * [ADC ドライ�](ja/adc_driver.md)
    * [I2C ドライ�](ja/i2c_driver.md)
+   * [WS2812 ドライ�](ja/ws2812_driver.md)
+   * [EEPROM ドライ�](ja/eeprom_driver.md)
    * [GPIO コントロール](ja/internals_gpio_control.md)
+   * [カスタムマトリックス](ja/custom_matrix.md)
    * [Proton C �約](ja/proton_c_conversion.md)
 
 * より深�知る���
    * [キーボード���よ��動作�る�](ja/how_keyboards_work.md)
-   * [QMK��解](ja/understanding_qmk.md)
+   * [QMK ��解](ja/understanding_qmk.md)
 
 * 他�話題
-   * [Eclipse�QMKを使用](ja/other_eclipse.md)
-   * [VSCode�QMKを使用](ja/other_vscode.md)
+   * [Eclipse � QMK を使用](ja/other_eclipse.md)
+   * [VSCode � QMK を使用](ja/other_vscode.md)
    * [サ�ート](ja/support.md)
    * [翻訳を追加�る方法](ja/translating.md)
 
diff --git a/docs/ja/arm_debugging.md b/docs/ja/arm_debugging.md
index 6267d0f8a..9a6cd515a 100644
--- a/docs/ja/arm_debugging.md
+++ b/docs/ja/arm_debugging.md
@@ -64,13 +64,13 @@ Eclipse ã�« QMK をビルドã�—よã�†ã�¨ã�™ã‚‹ãƒ‡ãƒ�イスを教ã�ˆã‚‹å¿…è¦�ã�Œã
 
 ## ビルド
 
-全�正��セットアップ����れ���ンマーボタンを押��ファームウェア�ビルド�れ�.binファイル�出力�れる����。
+全�正��セットアップ����れ���ンマーボタンを押��ファームウェア�ビルド�れ�.bin ファイル�出力�れる����。
 
 ## デ�ッグ
 
 ### デ�ッガ�接続
 
-ARM MCU ��クロック信�(SWCLK) �データ信�(SWDIO) �構��れる Single Wire Debug (SWD) プロトコルを使���。MCUを 完全��作�る�����2本�ワイヤ�グラウンドを接続�る����分��。�����キーボード� USB を介��電力�供給�れる�想定�����。手動�リセットボタンを使�る���RESET 信��必��り��ん。より高度�セットアップ���� printf � scanf をホスト���期�パイプ�る SWO 信�を使用����������セットアップ��無視���。
+ARM MCU ��クロック信�(SWCLK) �データ信�(SWDIO) �構��れる Single Wire Debug (SWD) プロトコルを使���。MCU を 完全��作�る�����2本�ワイヤ�グラウンドを接続�る����分��。�����キーボード� USB を介��電力�供給�れる�想定�����。手動�リセットボタンを使�る���RESET 信��必��り��ん。より高度�セットアップ���� printf � scanf をホスト���期�パイプ�る SWO 信�を使用����������セットアップ��無視���。
 
 注�: SWCLK � SWDIO ピン�キーボード�マトリックス�使�れ������を確�������。も�使�れ��る場���一時的�他�ピン�切り替�る�������。
 
diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md
index 6cdbd2cf1..a1d745438 100644
--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -1,8 +1,8 @@
 # QMK �設定
 
 <!---
-  original document: 0f43c2652:docs/config_options.md
-  git diff 0f43c2652 HEAD -- docs/config_options.md | cat
+  original document: 9ff61601e:docs/config_options.md
+  git diff 9ff61601e HEAD -- docs/config_options.md | cat
 -->
 
 QMK ���無制��設定�能��。�能��������る����も�やり���程�ユーザー�コードサイズを犠牲����も彼ら�キーボードをカスタマイズを�る��を許�����。������レベル�柔軟性�より設定�困難��り��。
@@ -154,6 +154,8 @@ QMK ã�§ã�®å…¨ã�¦ã�®åˆ©ç”¨å�¯èƒ½ã�ªè¨­å®šã�«ã�¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�Œã�‚ã‚Šã�¾ã�™ã€‚ã
    * タップ�れ�直後��デュアルロールキーを修飾����使用��るよ�����
    * [Hold after tap](ja/feature_advanced_keycodes.md#tapping-force-hold)を見�����
    * タップトグル機能を無効���� (`TT` �る�� One Shot Tap Toggle)
+* `#define TAPPING_FORCE_HOLD_PER_KEY`
+   * キー��� `TAPPING_FORCE_HOLD` 設定処�を有効����。
 * `#define LEADER_TIMEOUT 300`
    * リーダーキー�タイムアウト�る���時間
       * タイムアウト�る��シーケンスを終了����場���タイムアウト�設定を増や�必���る�も�れ��ん。�る���`LEADER_PER_KEY_TIMING` オプションを有効��る�良���ょ�。�れ��キー�タップ�れ�後�タイムアウトを�設定���。
@@ -187,7 +189,7 @@ QMK ã�§ã�®å…¨ã�¦ã�®åˆ©ç”¨å�¯èƒ½ã�ªè¨­å®šã�«ã�¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�Œã�‚ã‚Šã�¾ã�™ã€‚ã
 * `#define RGBLIGHT_SPLIT`
    * 分割キーボード�左�分� RGB LED �出力を��分� RGB LED �入力����る��り���れ�れ���個別�コントローラ�出力ピン�直接 RGB LED �入力�繋����る������定義�必���。
 * `#define RGBLED_SPLIT { 6, 6 }`
-   * 分割キーボード���分� `RGB_DI_PIN` �直接�線�れ��る接続�れ��るLED�数
+   * 分割キーボード���分� `RGB_DI_PIN` �直接�線�れ��る接続�れ��る LED �数
    * 最��値�左�分� LED �数を示��2番目�値���分��。
    * RGBLED_SPLIT �定義�れ��る場��RGBLIGHT_SPLIT �暗黙的�定義�れ��。
 * `#define RGBLIGHT_HUE_STEP 12`
@@ -216,7 +218,7 @@ QMK ã�§ã�®å…¨ã�¦ã�®åˆ©ç”¨å�¯èƒ½ã�ªè¨­å®šã�«ã�¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�Œã�‚ã‚Šã�¾ã�™ã€‚ã
 
 ### 左��設定
 
-一�覚������れ��ら������USB �ート�接続�れ��る��常�マスター���る�������。USB �接続�れ������スレーブ��。
+1�覚������れ��ら������USB �ート�接続�れ��る��常�マスター���る�������。USB �接続�れ������スレーブ��。
 
 分割キーボード�左�を設定�る���幾���異�る方法��り�� (優先度�順�リスト�れ����):
 
@@ -260,7 +262,7 @@ QMK ã�§ã�®å…¨ã�¦ã�®åˆ©ç”¨å�¯èƒ½ã�ªè¨­å®šã�«ã�¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆã�Œã�‚ã‚Šã�¾ã�™ã€‚ã
 * `#define SELECT_SOFT_SERIAL_SPEED <speed>` (デフォルト�速度�1��)
    * serial 通信を使�時�プロトコル�速度を設定���。
    * 速度:
-      * 0: 約189kbps (実験目的��)
+      * 0: 約 189kbps (実験目的��)
       * 1: 約 137kbps (デフォルト)
       * 2: ç´„ 75kbps
       * 3: ç´„ 39kbps
diff --git a/docs/ja/newbs_building_firmware_configurator.md b/docs/ja/newbs_building_firmware_configurator.md
index ae3d3cf28..89c37a1e6 100644
--- a/docs/ja/newbs_building_firmware_configurator.md
+++ b/docs/ja/newbs_building_firmware_configurator.md
@@ -63,7 +63,7 @@ QMK Configurator � Chrome/Firefox �最��動作���。
 
 2分割��シフト: 両方�も�シフト�埋���。
 
-左シフト�ISOサ�ート用�1���: 両方�も左シフト�埋���。
+左シフト� ISO サ�ート用�1���: 両方�も左シフト�埋���。
 
 5分割��4キー��: 以�や������る人を推測��確��る�尋������。
 
@@ -73,7 +73,7 @@ QMK Configurator � Chrome/Firefox �最��動作���。
 
 後日�`Import Keymap` ボタンを押������� .json ファイルをロード����。
 
-!> **注�:** ��ファイル��kbfirmware.com �����他�ツール�使用�れる .jsonファイル���形����り��ん。�れら�ツール��れを使用��り�QMK Configurator ��れら�ツール� .json を使用�よ���る��キーボード� **爆発** �る�能性��り��。
+!> **注�:** ��ファイル��kbfirmware.com �����他�ツール�使用�れる .json ファイル���形����り��ん。�れら�ツール��れを使用��り�QMK Configurator ��れら�ツール� .json を使用�よ���る��キーボード� **爆発** �る�能性��り��。
 
 ## ファームウェアファイルを生��る
 
diff --git a/docs/ja/newbs_flashing.md b/docs/ja/newbs_flashing.md
index f2ca914ee..a407066a5 100644
--- a/docs/ja/newbs_flashing.md
+++ b/docs/ja/newbs_flashing.md
@@ -13,7 +13,7 @@
 キーボード�書�込む最も簡��方法� [QMK Toolbox](https://github.com/qmk/qmk_toolbox/releases) を使�����。
 
 ����QMK Toolbox ���在� Windows � macOS ���使���ん。
-Linuxを使用���る場�(�よ��コマンドライン�ファームウェアを書�込���場�)��下�方�概説�る[方法](ja/newbs_flashing.md#flash-your-keyboard-from-the-command-line)�行��必���り��。
+Linux を使用���る場�(�よ��コマンドライン�ファームウェアを書�込���場�)��下�方�概説�る[方法](ja/newbs_flashing.md#flash-your-keyboard-from-the-command-line)�行��必���り��。
 
 ### QMK Toolbox �ファイルをロード�る
 
@@ -65,7 +65,7 @@ planck_rev5_default.hex
 * 基�(PCB)�付�られ��る物�的� `RESET` ボタンを押�
 * PCB 上� `BOOT0` � `RESET` �ラベル�付��ヘッダピンを探��PCB 接続中��れらを互��ショート�る
 
-�������QMK Toolbox�次�よ��メッセージ�表示�れ��。
+�������QMK Toolbox �次�よ��メッセージ�表示�れ��。
 
 ```
 *** Clueboard - Clueboard 66% HotSwap disconnected -- 0xC1ED:0x2390
@@ -121,7 +121,7 @@ QMK Toolbox � `Flash` ボタンをクリック���。
 ��場������明示的�ブートローダを指定�る方法を使���れ��り��ん。
 
 ブートローダ�主� 5 種類�も��使�れ����。
-Pro Micro ���クローン� Caterina を�Teensy � HalfKay を�OLKB� AVR ボード� QMK-DFU を���他� ATmega32U4 ボード� DFU を����多�� ARM ボード� ARM DFU を使���。
+Pro Micro ���クローン� Caterina を�Teensy � HalfKay を�OLKB � AVR ボード� QMK-DFU を���他� ATmega32U4 ボード� DFU を����多�� ARM ボード� ARM DFU を使���。
 
 より詳��ブートローダ�情報��[Flashing Instructions and Bootloader Information](ja/flashing.md) ��り��。
 
@@ -178,10 +178,10 @@ Checking file size of planck_rev5_xyverz.hex
 
 ファームウェアを DFU デ�イス�書�込む���使用��る DFU コマンド������り��。
 
-* `:dfu` - �れ�通常�オプション��DFUデ�イス�使用�能��る��待機����ファームウェアを書�込���。5秒����DFUデ�イス�存在�る��ェック�����。
+* `:dfu` - �れ�通常�オプション��DFU デ�イス�使用�能��る��待機����ファームウェアを書�込���。5秒����DFU デ�イス�存在�る��ェック�����。
 * `:dfu-ee` - 通常� hex ファイル�代�り� `eep` ファイルを書�込���。�れを使用�る���れ��。
-* `:dfu-split-left` - デフォルトオプション (`:dfu`) ��様��通常�ファームウェア�書�込�れ��。����分割キーボード�「左��� EEPROMファイルも書�込�れ��。_�れ��Elite C ベース�分割キーボード�最���。_
-* `:dfu-split-right` - デフォルトオプション (`:dfu`) ��様��通常�ファームウェア�書�込�れ��。����分割キーボード�「����EEPROMファイルも書�込�れ��。_�れ��Elite C ベース�分割キーボード�最���。_
+* `:dfu-split-left` - デフォルトオプション (`:dfu`) ��様��通常�ファームウェア�書�込�れ��。����分割キーボード�「左��� EEPROM ファイルも書�込�れ��。_�れ��Elite C ベース�分割キーボード�最���。_
+* `:dfu-split-right` - デフォルトオプション (`:dfu`) ��様��通常�ファームウェア�書�込�れ��。����分割キーボード�「����EEPROM ファイルも書�込�れ��。_�れ��Elite C ベース�分割キーボード�最���。_
 
 
 ### Caterina 
@@ -259,8 +259,8 @@ avrdude.exe done.  Thank you.
 
 * `:avrdude` - �れ�通常�オプション��Caterina デ�イス�(新�� COM �ートを検出��)使用�能��る��待機��ファームウェアを書�込���。
 * `:avrdude-loop` - �れ� `:avrdude` �����。���書�込��終了�る��� Caterina デ�イス�書�込�待��戻り��。�れ�何�も�デ�イス��書�込��便利��。_Control+C を押���手動���繰り返�を終了��る必���り��。_
-* `:avrdude-split-left` - デフォルトオプション(`:avrdude`)��様�通常�ファームウェア�書�込�れ��。����分割キーボード�「左���EEPROMファイルもフラッシュ�れ��。 _�れ��Pro Micro ベース�分割キーボード�最���。_
-* `:avrdude-split-right` - デフォルトオプション(`:avrdude`)��様�通常�ファームウェア�書�込�れ��。����分割キーボード�「����EEPROMファイルもフラッシュ�れ��。 _�れ��Pro Micro ベース�分割キーボード�最���。_
+* `:avrdude-split-left` - デフォルトオプション(`:avrdude`)��様�通常�ファームウェア�書�込�れ��。����分割キーボード�「左���EEPROM ファイルもフラッシュ�れ��。 _�れ��Pro Micro ベース�分割キーボード�最���。_
+* `:avrdude-split-right` - デフォルトオプション(`:avrdude`)��様�通常�ファームウェア�書�込�れ��。����分割キーボード�「����EEPROM ファイルもフラッシュ�れ��。 _�れ��Pro Micro ベース�分割キーボード�最���。_
 
 ### HalfKay
 
diff --git a/docs/ja/newbs_getting_started.md b/docs/ja/newbs_getting_started.md
index 6f5cd92cd..2e283840c 100644
--- a/docs/ja/newbs_getting_started.md
+++ b/docs/ja/newbs_getting_started.md
@@ -12,7 +12,7 @@ QMK ã�¯ã€�ã��ã�®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ã�®å½¹å‰²ã‚’æžœã�Ÿã�—ã€�ボタンã�®æŠ¼ä¸‹ã‚’æ
 カスタムキーマップを作る�������キーボード上�動�プログラムを作る���������。
 
 QMK ��簡�����簡�������難����を�能�����る��������手����ん�パワーをも�ら���。
-パワフル�キーマップを作る���プログラムを作��る方法を知る必���り��ん。�����シンプル�文法�従����OK��。
+パワフル�キーマップを作る���プログラムを作��る方法を知る必���り��ん。�����シンプル�文法�従���� OK ��。
 
 # ����
 
diff --git a/docs/ja/newbs_git_resynchronize_a_branch.md b/docs/ja/newbs_git_resynchronize_a_branch.md
index 80ae794a9..e81d2da1f 100644
--- a/docs/ja/newbs_git_resynchronize_a_branch.md
+++ b/docs/ja/newbs_git_resynchronize_a_branch.md
@@ -7,7 +7,7 @@
 -->
 
 仮����� `master` ブラン������コミットを行��������� QMK リ�ジトリ�更新�必���������。
-(フォーク元�) QMK� `master` ブラン�を���� `master` ブラン�� `git pull` �る��も������GitHub ������ブラン�� `qmk:master` より何コミット�先行���る�通知������状態� QMK �プルリクエストを行�場���題�発生�る�能性��り��。
+(フォーク元�) QMK � `master` ブラン�を���� `master` ブラン�� `git pull` �る��も������GitHub ������ブラン�� `qmk:master` より何コミット�先行���る�通知������状態� QMK �プルリクエストを行�場���題�発生�る�能性��り��。
 (訳注：��通知��GitHub �����リ�ジトリ� code ペイン�ブラン��択メニュー�下���り� `This branch is 3 commit ahead of qmk:master` ���様�文��表示�れ����。)
 
 ?> ��ドキュメント� [����フォーク� master ブラン�: 更新�頻���コミット������](ja/newbs_git_using_your_master_branch.md) �詳述�れ��る概念�基������。��概念�慣れ����場������れを読ん��ら����戻������。  
diff --git a/docs/ja/newbs_git_using_your_master_branch.md b/docs/ja/newbs_git_using_your_master_branch.md
index 086005034..3ee1996c1 100644
--- a/docs/ja/newbs_git_using_your_master_branch.md
+++ b/docs/ja/newbs_git_using_your_master_branch.md
@@ -41,7 +41,7 @@ upstream        https://github.com/qmk/qmk_firmware.git (push)
 ��コマンド� `upstream` ���ニック�ームを�� QMK リ�ジトリ�ら�ブラン��タグ &mdash; "refs" ��称�れ�� &mdash; を�得���。
 �れ������フォーク `origin` �データを QMK ����るデータ�比較����。
 
-����フォーク� `master` を更新�る���次を実行�����行�後�Enterキーを押������:
+����フォーク� `master` を更新�る���次を実行�����行�後� Enter キーを押������:
 
 ```
 git checkout master
@@ -98,4 +98,4 @@ git commit -m "My commit message."
 
 最後�ステップ��変更をフォーク�プッシュ�る����。
 �れを行����`git push`�入力���。
-Git�� `dev_branch`��在�状態をフォーク�公開���。
+Git �� `dev_branch`��在�状態をフォーク�公開���。
diff --git a/docs/ja/newbs_learn_more_resources.md b/docs/ja/newbs_learn_more_resources.md
index 9adcf5360..523d91a05 100644
--- a/docs/ja/newbs_learn_more_resources.md
+++ b/docs/ja/newbs_learn_more_resources.md
@@ -6,7 +6,7 @@
   git diff ed0575fc8 HEAD -- docs/newbs_learn_more_resources.md | cat
 -->
 
-�れら�リソース��QMKコミュニティ�新��メン�ー���心者��ドキュメント��供�れ��る情報�対�る�解を深�る��を目的������。
+�れら�リソース��QMK コミュニティ�新��メン�ー���心者��ドキュメント��供�れ��る情報�対�る�解を深�る��を目的������。
 
 ## Git �関�るリース:
 
diff --git a/docs/ja/newbs_testing_debugging.md b/docs/ja/newbs_testing_debugging.md
index 5ec5811a1..784f872e6 100644
--- a/docs/ja/newbs_testing_debugging.md
+++ b/docs/ja/newbs_testing_debugging.md
@@ -12,7 +12,7 @@
 
 通常�キーボードをテスト�る���常�簡���。全��キーを�����押���期待�れるキー��信�れ��る��を確����。キーを押����を見逃������プログラムも�り��。
 
-メモ：　�れら�プログラム�QMK�よ���供・承��れ�も����り��ん。
+メモ：　�れら�プログラム� QMK �よ���供・承��れ�も����り��ん。
 
 * [QMK Configurator](https://config.qmk.fm/#/test/) (Web Based)
 * [Switch Hitter](https://web.archive.org/web/20190413233743/https://elitekeyboards.com/switchhitter.php) (Windows Only)
@@ -40,7 +40,7 @@ void keyboard_post_init_user(void) {
 
 ### hid_listenを使��デ�ッグ
 
-ターミナルベース�方法��好����？PJRC��供�る[hid_listen](https://www.pjrc.com/teensy/hid_listen.html)もデ�ッグメッセージ�表示�使用����。ビルド済��実行ファイル�Windows, Linux, MacOS用�用��れ����。
+ターミナルベース�方法��好����？PJRC ��供�る[hid_listen](https://www.pjrc.com/teensy/hid_listen.html)もデ�ッグメッセージ�表示�使用����。ビルド済��実行ファイル� Windows, Linux, MacOS 用�用��れ����。
 
 <!-- FIXME: Describe the debugging messages here. -->
 
@@ -50,7 +50,7 @@ void keyboard_post_init_user(void) {
 
     #include <print.h>
 
-�����������異���print関数を使用�る���出���。
+�����������異��� print 関数を使用�る���出���。
 
 * `print("string")`: シンプル�文字列を出力���
 * `uprintf("%s string", var)`: フォーマット�れ�文字列を出力���
diff --git a/docs/keycodes.md b/docs/keycodes.md
index dd4c4418b..c151c5700 100644
--- a/docs/keycodes.md
+++ b/docs/keycodes.md
@@ -208,14 +208,11 @@ This is a reference only. Each group of keys links to the page documenting their
 
 ## [Quantum Keycodes](quantum_keycodes.md#qmk-keycodes)
 
-|Key            |Aliases    |Description                                                          |
-|---------------|-----------|---------------------------------------------------------------------|
-|`RESET`        |           |Put the keyboard into DFU mode for flashing                          |
-|`DEBUG`        |           |Toggle debug mode                                                    |
-|`EEPROM_RESET` |`EEP_RST`  |Resets EEPROM state by reinitializing it                             |
-|`KC_GESC`      |`GRAVE_ESC`|Escape when tapped, <code>&#96;</code> when pressed with Shift or GUI|
-|`KC_LEAD`      |           |The [Leader key](feature_leader_key.md)                              |
-|`KC_LOCK`      |           |The [Lock key](feature_key_lock.md)                                  |
+|Key           |Aliases  |Description                                            |
+|--------------|---------|-------------------------------------------------------|
+|`RESET`       |         |Put the keyboard into bootloader mode for flashing     |
+|`DEBUG`       |         |Toggle debug mode                                      |
+|`EEPROM_RESET`|`EEP_RST`|Reinitializes the keyboard's EEPROM (persistent memory)|
 
 ## [Audio Keys](feature_audio.md)
 
@@ -289,7 +286,7 @@ This is a reference only. Each group of keys links to the page documenting their
 
 ## [Dynamic Macros](feature_dynamic_macros.md)
 
-|Key              |Alias    |Description                                       |
+|Key              |Aliases  |Description                                       |
 |-----------------|---------|--------------------------------------------------|
 |`DYN_REC_START1` |`DM_REC1`|Start recording Macro 1                           |
 |`DYN_REC_START2` |`DM_REC2`|Start recording Macro 2                           |
@@ -297,6 +294,18 @@ This is a reference only. Each group of keys links to the page documenting their
 |`DYN_MACRO_PLAY2`|`DM_PLY2`|Replay Macro 2                                    |
 |`DYN_REC_STOP`   |`DM_RSTP`|Finish the macro that is currently being recorded.|
 
+## [Grave Escape](feature_grave_esc.md)
+
+|Key        |Aliases  |Description                                                       |
+|-----------|---------|------------------------------------------------------------------|
+|`GRAVE_ESC`|`KC_GESC`|Escape when pressed, <code>&#96;</code> when Shift or GUI are held|
+
+## [Key Lock](feature_key_lock.md)
+
+|Key      |Description                                                   |
+|---------|--------------------------------------------------------------|
+|`KC_LOCK`|Hold down the next key pressed, until the key is pressed again|
+
 ## [Layer Switching](feature_advanced_keycodes.md#switching-and-toggling-layers)
 
 |Key             |Description                                                                       |
@@ -310,6 +319,12 @@ This is a reference only. Each group of keys links to the page documenting their
 |`TO(layer)`     |Turns on `layer` and turns off all other layers, except the default layer |
 |`TT(layer)`     |Normally acts like MO unless it's tapped multiple times, which toggles `layer` on |
 
+## [Leader Key](feature_leader_key.md)
+
+|Key      |Description             |
+|---------|------------------------|
+|`KC_LEAD`|Begins a leader sequence|
+
 ## [Mouse Keys](feature_mouse_keys.md)
 
 |Key             |Aliases  |Description                |
diff --git a/docs/quantum_keycodes.md b/docs/quantum_keycodes.md
index 26ce6d244..969849cda 100644
--- a/docs/quantum_keycodes.md
+++ b/docs/quantum_keycodes.md
@@ -8,11 +8,8 @@ On this page we have documented keycodes between `0x00FF` and `0xFFFF` which are
 
 ## QMK Keycodes
 
-|Key            |Aliases    |Description                                                          |
-|---------------|-----------|---------------------------------------------------------------------|
-|`RESET`        |           |Put the keyboard into DFU mode for flashing                          |
-|`DEBUG`        |           |Toggle debug mode                                                    |
-|`EEPROM_RESET` |`EEP_RST`  |Resets EEPROM state by reinitializing it                             |
-|`KC_GESC`      |`GRAVE_ESC`|Escape when tapped, <code>&#96;</code> when pressed with Shift or GUI|
-|`KC_LEAD`      |           |The [Leader key](feature_leader_key.md)                              |
-|`KC_LOCK`      |           |The [Lock key](feature_key_lock.md)                                  |
+|Key           |Aliases  |Description                                            |
+|--------------|---------|-------------------------------------------------------|
+|`RESET`       |         |Put the keyboard into bootloader mode for flashing     |
+|`DEBUG`       |         |Toggle debug mode                                      |
+|`EEPROM_RESET`|`EEP_RST`|Reinitializes the keyboard's EEPROM (persistent memory)|