update some docs
This commit is contained in:
		
							parent
							
								
									e236f1eba1
								
							
						
					
					
						commit
						bb11df6b7a
					
				@ -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:
 | 
			
		||||
 | 
			
		||||
@ -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)
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user