Branch point for 2019 Nov 30 Breaking Change.

* move canoe into percent directory

* update readme for new make path

* move skog into percent directory

* update readme for new path and new instructions

* update readme

* fix error in naming

keyboards/percent/canoe/readme.md

@@ -1,5 +1,4 @@
-CANOE
-========
+# Canoe
 
 A 65% keyboard with some RGB
 
@@ -9,7 +8,7 @@ Hardware Availability: https://geekhack.org/index.php?topic=92418.0
 
 Make example for this keyboard (after setting up your build environment):
 
-    make canoe:default
+    make percent/canoe:default
 
 Flashing
 
@@ -33,12 +32,13 @@ macOS:
     ```
 3. Install the following packages:
     ```
-    brew install python
-    pip install pyusb
+    brew install python3
+    pip3 install pyusb
     brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
+    ```
 
 4. Place your keyboard into reset. 
 5. Flash the board by typing `bootloadHID -r` followed by the path to your `.hex` file. 
 
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/percent/skog/README.md

@@ -1,5 +1,4 @@
-Skog TKL by Percent
-==========================
+# Skog TKL
 
 Keyboard Maintainer: QMK Community  
 Hardware Supported: Skog PCB  
@@ -7,21 +6,14 @@ Hardware Availability: https://geekhack.org/index.php?topic=87953.0
 
 Make example for this keyboard (after setting up your build environment):
 
-    make skog:default
+    make percent/skog:default
 
-## Setting the board to bootloader mode
-
-If you're lucky, the programming script does this automagically for you. If
-however this doesn't work for you, you need to enter the bootloader mode manually
-by plugging the keyboard in while holding the bootloader key. If you did this
-correctly the LEDs will blink and you'll be able to flash your firmware.
-
-The bootloader key is in the top-right (Pause).
-
-## Flashing
+Flashing
 
 ps2avr(GB) boards use an atmega32a microcontroller and a different bootloader. It is not flashable using the regular QMK methods. 
 
+**Reset Key:** Hold down the key located at `K00`, commonly programmed as Pause while plugging in the keyboard.
+
 Windows: 
 1. Download [HIDBootFlash](http://vusb.wikidot.com/project:hidbootflash).
 2. Place your keyboard into reset. 
@@ -40,22 +32,14 @@ macOS:
     ```
 3. Install the following packages:
     ```
-    brew install python
-    brew install pyusb
-    brew install --HEAD`https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
+    brew install python3
+    pip3 install pyusb
+    brew install --HEAD https://raw.githubusercontent.com/robertgzr/homebrew-tap/master/bootloadhid.rb
+    ```
 
 4. Place your keyboard into reset. 
 5. Flash the board by typing `bootloadHID -r` followed by the path to your `.hex` file. 
 
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
+**Please Note:** You will need to use the `EEP_RST` keycode first, followed by unplugging/replugging the board to get RGB underglow effects to work.
 
-## Troubleshooting
-
-From my experience, it's really hard to brick these boards. But these
-tricks have been useful when it got stuck in a weird scenario.
-
-1. Try plugging the board in while holding the bootloader key. This will force 
-   it to boot only the bootloader without loading the firmware. Once this is
-   done, just reflash the board with the original firmware.
-2. Sometimes USB hubs can act weird, so try connecting the board directly
-   to your computer or plugging/unplugging the USB hub.
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/planck/light/light.h

@@ -61,7 +61,7 @@ LAYOUT_ortho_4x12( \
 )
 
 #define KEYMAP LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit  LAYOUT_planck_1x2uC
+#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
 #define LAYOUT_kc_ortho_4x12 LAYOUT_kc
 #define KC_KEYMAP LAYOUT_kc

keyboards/planck/rev1/rev1.h

@@ -43,7 +43,7 @@ LAYOUT_ortho_4x12( \
 )
 
 #define KEYMAP LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit  LAYOUT_planck_1x2uC
+#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
 #define LAYOUT_kc_ortho_4x12 LAYOUT_kc
 #define KC_KEYMAP LAYOUT_kc

keyboards/planck/rev2/rev2.h

@@ -43,7 +43,7 @@ LAYOUT_ortho_4x12( \
 )
 
 #define KEYMAP LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit  LAYOUT_planck_1x2uC
+#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
 #define LAYOUT_kc_ortho_4x12 LAYOUT_kc
 #define KC_KEYMAP LAYOUT_kc

keyboards/planck/rev3/rev3.h

@@ -43,7 +43,7 @@ LAYOUT_ortho_4x12( \
 )
 
 #define KEYMAP LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit  LAYOUT_planck_1x2uC
+#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
 #define LAYOUT_kc_ortho_4x12 LAYOUT_kc
 #define KC_KEYMAP LAYOUT_kc

keyboards/planck/rev4/rev4.h

@@ -43,7 +43,7 @@ LAYOUT_ortho_4x12( \
 )
 
 #define KEYMAP LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit  LAYOUT_planck_1x2uC
+#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
 #define LAYOUT_kc_ortho_4x12 LAYOUT_kc
 #define KC_KEYMAP LAYOUT_kc

keyboards/planck/rev5/rev5.h

@@ -43,7 +43,7 @@ LAYOUT_ortho_4x12( \
 )
 
 #define KEYMAP LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit  LAYOUT_planck_1x2uC
+#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
 #define LAYOUT_kc_ortho_4x12 LAYOUT_kc
 #define KC_KEYMAP LAYOUT_kc

keyboards/planck/rev6/rev6.h

@@ -119,7 +119,7 @@ LAYOUT_ortho_4x12( \
 )
 
 #define KEYMAP LAYOUT_ortho_4x12
-#define LAYOUT_planck_mit  LAYOUT_planck_1x2uC
+#define LAYOUT_planck_mit LAYOUT_planck_1x2uC
 #define LAYOUT_planck_grid LAYOUT_ortho_4x12
 #define LAYOUT_kc_ortho_4x12 LAYOUT_kc
 #define KC_KEYMAP LAYOUT_kc

keyboards/preonic/preonic.h

@@ -4,7 +4,7 @@
 
 /**************************************************
 ** Include headers specific to keyboard revision **
-***************************************************/
+**************************************************/
 #ifdef KEYBOARD_preonic_rev1
   #include "rev1.h"
 #endif
@@ -20,7 +20,7 @@
 
 /**************************************************
 ** Layout macros aliases common to all revisions **
-
-        Name of Alias      Matrix Name:
-        -----------------  ------------------- ****/
-#define LAYOUT_ortho_5x12  LAYOUT_preonic_grid
+**                                               **
+**      Name of Alias     Matrix Name:           **
+******* ----------------- ------------------- ****/
+#define LAYOUT_ortho_5x12 LAYOUT_preonic_grid

readme.md

@@ -7,6 +7,12 @@
 [![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
 [![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
 
+# THIS IS THE FUTURE BRANCH
+
+Warning- This is the `future` branch of QMK Firmware. You may encounter broken code here. Please see [Breaking Changes](https://docs.qmk.fm/#/breaking_changes) for more information.
+
+# Original readme continues
+
 This is a keyboard firmware based on the [tmk\_keyboard firmware](https://github.com/tmk/tmk_keyboard) with some useful features for Atmel AVR and ARM controllers, and more specifically, the [OLKB product line](https://olkb.com), the [ErgoDox EZ](https://ergodox-ez.com) keyboard, and the [Clueboard product line](https://clueboard.co).
 
 ## Documentation