diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-11-09 16:18:56 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-11-09 16:19:13 -0500 |
| commit | bb11df6b7a4ef190be62746887f2421718ae2a6e (patch) | |
| tree | f14d147a31d9821025d0267737ee0651a0332e61 | |
| parent | e236f1eba19f357e524300959e0127bfe2813de1 (diff) | |
| download | qmk_firmware-bb11df6b7a4ef190be62746887f2421718ae2a6e.tar.gz qmk_firmware-bb11df6b7a4ef190be62746887f2421718ae2a6e.zip | |
update some docs
| -rw-r--r-- | docs/getting_started_introduction.md | 2 | ||||
| -rw-r--r-- | 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 3e9a8eb0bb..849e992085 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 e6551cb25b..705a6af1ab 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) |