From bb11df6b7a4ef190be62746887f2421718ae2a6e Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Thu, 9 Nov 2017 16:18:56 -0500 Subject: [PATCH] update some docs --- docs/getting_started_introduction.md | 2 +- docs/getting_started_vagrant.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/getting_started_introduction.md b/docs/getting_started_introduction.md index 3e9a8eb0b..849e99208 100644 --- a/docs/getting_started_introduction.md +++ b/docs/getting_started_introduction.md @@ -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: diff --git a/docs/getting_started_vagrant.md b/docs/getting_started_vagrant.md index e6551cb25..705a6af1a 100644 --- a/docs/getting_started_vagrant.md +++ b/docs/getting_started_vagrant.md @@ -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)