From d9a10229ab9f1e97321ef527a77c5ada38776967 Mon Sep 17 00:00:00 2001 From: peepeetee Date: Tue, 14 Dec 2021 14:57:10 +0800 Subject: [PATCH 1/4] bugfixes included in @epicskandar's #14924, authored by @epicskandar --- docs/configurator_step_by_step.md | 2 +- docs/contributing.md | 4 ++-- docs/driver_installation_zadig.md | 6 +++--- docs/easy_maker.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/configurator_step_by_step.md b/docs/configurator_step_by_step.md index 965012a907e3..c3cc2bfcdbcb 100644 --- a/docs/configurator_step_by_step.md +++ b/docs/configurator_step_by_step.md @@ -43,7 +43,7 @@ Keycode Entry is accomplished in one of 3 ways: ## Step 5: Save Your Keymap for Future Changes -When you're satisfied with your keymap or just want to work on it later, press the `Export Keymap` button. It will save your keymap to your computer. You can then load this .json file in the future by pressing the `Import Keymap` button. +When you're satisfied with your keymap or just want to work on it later, press the `Download this QMK Keymap JSON File` button. It will save your keymap to your computer. You can then load this .json file in the future by pressing the `Upload a QMK Keymap JSON File` button. !> **CAUTION:** This is not the same type of .json file used for kbfirmware.com or any other tool. If you try to use this for those tools, or the .json from those tools with QMK Configurator, you will encounter problems. diff --git a/docs/contributing.md b/docs/contributing.md index eb033d167fd2..91833e30df8b 100644 --- a/docs/contributing.md +++ b/docs/contributing.md @@ -109,7 +109,7 @@ Before opening a pull request, you can preview your changes if you have set up t or if you only have Python 3 installed: - python3 -m http.server 8936 + python3 -m http.server 8936 --directory docs and navigating to `http://localhost:8936/`. @@ -165,4 +165,4 @@ To maintain a clear vision of how things are laid out in QMK we try to plan out # What Does the Code of Conduct Mean for Me? -Our [Code of Conduct](https://github.com/qmk/qmk_firmware/blob/master/CODE_OF_CONDUCT.md) means that you are responsible for treating everyone on the project with respect and courtesy regardless of their identity. If you are the victim of any inappropriate behavior or comments as described in our Code of Conduct, we are here for you and will do the best to ensure that the abuser is reprimanded appropriately, per our code. +Our [Code of Conduct](https://qmk.fm/coc/) means that you are responsible for treating everyone on the project with respect and courtesy regardless of their identity. If you are the victim of any inappropriate behavior or comments as described in our Code of Conduct, we are here for you and will do the best to ensure that the abuser is reprimanded appropriately, per our code. diff --git a/docs/driver_installation_zadig.md b/docs/driver_installation_zadig.md index 003629ba9a00..dbd7a54e47a7 100644 --- a/docs/driver_installation_zadig.md +++ b/docs/driver_installation_zadig.md @@ -52,15 +52,15 @@ Find the `Inf name` value in the Details tab of the device properties. This shou ![Device properties showing the Inf name value](https://i.imgur.com/Bu4mk9m.png) -Then, open a new Command Prompt window as an Administrator (type in `cmd` into the Start menu and press Ctrl+Shift+Enter). Run `pnputil /enum-drivers` to verify the `Inf name` matches the `Published Name` field of one of the entries: +Then, open a new Command Prompt window as an Administrator (type in `cmd` into the Start menu and press Ctrl+Shift+Enter). Run `pnputil /enum-drivers`(`pnputil -e` for Windows 7 and later) to verify the `Inf name` matches the `Published Name` field of one of the entries: ![pnputil output with matching driver highlighted](https://i.imgur.com/3RrSjzW.png) -Run `pnputil /delete-driver oemXX.inf /uninstall`. This will delete the driver and remove it from any devices using it. Note that this will not uninstall the device itself. +Run `pnputil /delete-driver oemXX.inf /uninstall`(`pnputil -d oemXX.inf` for Windows 7 and later). This will delete the driver and remove it from any devices using it. Note that this will not uninstall the device itself. As with the previous section, this process may need to be repeated multiple times, as multiple drivers can be applicable to the same device. -!> **WARNING:** Be *extremely careful* when doing this! You could potentially uninstall the driver for some other critical device. If you are unsure, double check the output of `/enum-drivers`, and omit the `/uninstall` flag when running `/delete-driver`. +!> **WARNING:** Be *extremely careful* when doing this! You could potentially uninstall the driver for some other critical device. If you are unsure, double check the output of `/enum-drivers`, and omit the `/uninstall` flag when running `/delete-driver`(before Windows 7 only). ## List of Known Bootloaders diff --git a/docs/easy_maker.md b/docs/easy_maker.md index dc9727233383..6af647381579 100644 --- a/docs/easy_maker.md +++ b/docs/easy_maker.md @@ -7,7 +7,7 @@ There are different styles of Easy Maker available depending on your needs: * [Direct Pin](https://config.qmk.fm/#/?filter=ez_maker/direct) - Connect a single switch to a single pin * Direct Pin + Backlight (Coming Soon) - Like Direct Pin but dedicates a single pin to [Backlight](feature_backlight.md) control * Direct Pin + Numlock (Coming Soon) - Like Direct Pin but dedicates a single pin to the Numlock LED -* Direct Pin + Capslock (Coming Soon) - Like Direct Pin but dedicates a single pin to the Numlock LED +* Direct Pin + Capslock (Coming Soon) - Like Direct Pin but dedicates a single pin to the Capslock LED * Direct Pin + Encoder (Coming Soon) - Like Direct Pin but uses 2 pins to add a single rotary encoder ## Quickstart From 6835aae5356d0e720616f2369e9e63a5decd2786 Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Tue, 14 Dec 2021 15:13:33 +0800 Subject: [PATCH 2/4] Update docs/driver_installation_zadig.md Co-authored-by: Ryan --- docs/driver_installation_zadig.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/driver_installation_zadig.md b/docs/driver_installation_zadig.md index dbd7a54e47a7..d815cf700322 100644 --- a/docs/driver_installation_zadig.md +++ b/docs/driver_installation_zadig.md @@ -52,7 +52,7 @@ Find the `Inf name` value in the Details tab of the device properties. This shou ![Device properties showing the Inf name value](https://i.imgur.com/Bu4mk9m.png) -Then, open a new Command Prompt window as an Administrator (type in `cmd` into the Start menu and press Ctrl+Shift+Enter). Run `pnputil /enum-drivers`(`pnputil -e` for Windows 7 and later) to verify the `Inf name` matches the `Published Name` field of one of the entries: +Then, open a new Command Prompt window as an Administrator (type in `cmd` into the Start menu and press Ctrl+Shift+Enter). Run `pnputil /enum-drivers` to verify the `Inf name` matches the `Published Name` field of one of the entries: ![pnputil output with matching driver highlighted](https://i.imgur.com/3RrSjzW.png) From ec9556c2ec35a0c381e4dd4666bed4b53f732bf3 Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Tue, 14 Dec 2021 15:13:57 +0800 Subject: [PATCH 3/4] Update docs/driver_installation_zadig.md Co-authored-by: Ryan --- docs/driver_installation_zadig.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/driver_installation_zadig.md b/docs/driver_installation_zadig.md index d815cf700322..c14aae08029a 100644 --- a/docs/driver_installation_zadig.md +++ b/docs/driver_installation_zadig.md @@ -56,7 +56,7 @@ Then, open a new Command Prompt window as an Administrator (type in `cmd` into t ![pnputil output with matching driver highlighted](https://i.imgur.com/3RrSjzW.png) -Run `pnputil /delete-driver oemXX.inf /uninstall`(`pnputil -d oemXX.inf` for Windows 7 and later). This will delete the driver and remove it from any devices using it. Note that this will not uninstall the device itself. +Run `pnputil /delete-driver oemXX.inf /uninstall`. This will delete the driver and remove it from any devices using it. Note that this will not uninstall the device itself. As with the previous section, this process may need to be repeated multiple times, as multiple drivers can be applicable to the same device. From 722d13b524a19ed70c60c8e7d5d679832690f73c Mon Sep 17 00:00:00 2001 From: peepeetee <43021794+peepeetee@users.noreply.github.com> Date: Tue, 14 Dec 2021 15:14:39 +0800 Subject: [PATCH 4/4] Update docs/driver_installation_zadig.md Co-authored-by: Ryan --- docs/driver_installation_zadig.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/driver_installation_zadig.md b/docs/driver_installation_zadig.md index c14aae08029a..003629ba9a00 100644 --- a/docs/driver_installation_zadig.md +++ b/docs/driver_installation_zadig.md @@ -60,7 +60,7 @@ Run `pnputil /delete-driver oemXX.inf /uninstall`. This will delete the driver a As with the previous section, this process may need to be repeated multiple times, as multiple drivers can be applicable to the same device. -!> **WARNING:** Be *extremely careful* when doing this! You could potentially uninstall the driver for some other critical device. If you are unsure, double check the output of `/enum-drivers`, and omit the `/uninstall` flag when running `/delete-driver`(before Windows 7 only). +!> **WARNING:** Be *extremely careful* when doing this! You could potentially uninstall the driver for some other critical device. If you are unsure, double check the output of `/enum-drivers`, and omit the `/uninstall` flag when running `/delete-driver`. ## List of Known Bootloaders