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 /docs | |
| parent | e236f1eba19f357e524300959e0127bfe2813de1 (diff) | |
| download | qmk_firmware-bb11df6b7a4ef190be62746887f2421718ae2a6e.tar.gz qmk_firmware-bb11df6b7a4ef190be62746887f2421718ae2a6e.zip | |
update some docs
Diffstat (limited to '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 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 | |||
| 36 | #ifndef CONFIG_USER_H | 36 | #ifndef CONFIG_USER_H |
| 37 | #define CONFIG_USER_H | 37 | #define CONFIG_USER_H |
| 38 | 38 | ||
| 39 | #include "../../config.h" | 39 | #include "config_common.h" |
| 40 | ``` | 40 | ``` |
| 41 | 41 | ||
| 42 | 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: | 42 | 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 | |||
| 14 | 14 | ||
| 15 | The "easy" way to flash the firmware is using a tool from your host OS: | 15 | The "easy" way to flash the firmware is using a tool from your host OS: |
| 16 | 16 | ||
| 17 | * [QMK Flasher](https://github.com/qmk/qmk_flasher) | 17 | * [QMK Toolbox](https://github.com/qmk/qmk_toolbox) (reccommened) |
| 18 | * [Teensy Loader](https://www.pjrc.com/teensy/loader.html) | 18 | * [Teensy Loader](https://www.pjrc.com/teensy/loader.html) |
| 19 | * [Atmel FLIP](http://www.atmel.com/tools/flip.aspx) | 19 | * [Atmel FLIP](http://www.atmel.com/tools/flip.aspx) |
| 20 | 20 | ||