diff options
| author | Joshua T <joshua@sonofone.net> | 2016-07-30 08:41:22 -0500 |
|---|---|---|
| committer | Joshua T <joshua@sonofone.net> | 2016-07-30 08:41:22 -0500 |
| commit | e9a501d4477981da878294a630431ed76716c57e (patch) | |
| tree | 5c6c6a381e21f3d8f2bba223438d7528da717962 /doc | |
| parent | 5607b716ba0ec7002f29244f24aa8999b9511061 (diff) | |
| parent | 7775f3e4b3309f3102bf9d887a79514a67d18da6 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/TMK_README.md | 2 | ||||
| -rw-r--r-- | doc/VAGRANT_GUIDE.md | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/doc/TMK_README.md b/doc/TMK_README.md index 6164dacd3c..f3d96717a8 100644 --- a/doc/TMK_README.md +++ b/doc/TMK_README.md @@ -34,7 +34,7 @@ You can find some keyboard specific projects under `converter` and `keyboard` di * [atomic](keyboards/atomic/) - [Atomic] Ortholinear 60% keyboard ### Ergodox EZ -* [ergodox_ez](keyboards/ergodox_ez) - [Ergodox_EZ] Assembled split keyboard +* [ergodox_ez](keyboards/ergodox/ez) - [Ergodox_EZ] Assembled split keyboard ## Other projects diff --git a/doc/VAGRANT_GUIDE.md b/doc/VAGRANT_GUIDE.md index 62044b7f72..c9958e16b5 100644 --- a/doc/VAGRANT_GUIDE.md +++ b/doc/VAGRANT_GUIDE.md @@ -20,7 +20,7 @@ See [/doc/keymap.md](/doc/keymap.md). ## Flashing the firmware -The "easy" way to flash the firmware is using a tool from your host OS like the Teensy programming app. [ErgoDox EZ](/keyboards/ergodox_ez/readme.md) gives a great example. +The "easy" way to flash the firmware is using a tool from your host OS like the Teensy programming app. [ErgoDox EZ](/keyboards/ergodox/readme.md) gives a great example. If you want to program via the command line you can uncomment the ['modifyvm'] lines in the Vagrantfile to enable the USB passthrough into Linux and then program using the command line tools like dfu-util/dfu-programmer or you can install the Teensy CLI version. -
\ No newline at end of file + |