]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
update some docs
authorJack Humbert <jack.humb@gmail.com>
Thu, 9 Nov 2017 21:18:56 +0000 (16:18 -0500)
committerJack Humbert <jack.humb@gmail.com>
Thu, 9 Nov 2017 21:19:13 +0000 (16:19 -0500)
docs/getting_started_introduction.md
docs/getting_started_vagrant.md

index 3e9a8eb0bb12437d6b7da7b9f62e66cd98dc3255..849e992085df661aa2e1f44714a198ee03501cb5 100644 (file)
@@ -36,7 +36,7 @@ If the keymap `config.h` exists, that file is included by the build system and t
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H
 
-#include "../../config.h"
+#include "config_common.h"
 ```
 
 If you want to override a setting from the parent `config.h` file, you need to `#undef` and then `#define` the setting again, like this:
index e6551cb25b551aa68593cb0be266763b04fb00f9..705a6af1ab225d56dd15b758082927c40e814ae7 100644 (file)
@@ -14,7 +14,7 @@ Other than having Vagrant and Virtualbox installed and possibly a restart of you
 
 The "easy" way to flash the firmware is using a tool from your host OS:
 
-* [QMK Flasher](https://github.com/qmk/qmk_flasher)
+* [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (reccommened)
 * [Teensy Loader](https://www.pjrc.com/teensy/loader.html)
 * [Atmel FLIP](http://www.atmel.com/tools/flip.aspx)