summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-10-26 23:55:39 +0000
committerQMK Bot <hello@qmk.fm>2021-10-26 23:55:39 +0000
commita2f3d050f4fd7805190a782132eea9d8ccc3f27d (patch)
treecd137305603fd73f019173b19aab420bdfffb29a
parent9db21f522e515c7ff1730a12efee119f06d733b9 (diff)
parent312b1b95a88e1b4b6d0642e1f788bcbd3d8d589b (diff)
Merge remote-tracking branch 'origin/master' into develop
-rw-r--r--docs/config_options.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/config_options.md b/docs/config_options.md
index dbf3d3da2e..cfbe39f0d3 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -404,6 +404,8 @@ However, this will automatically disable the legacy TMK Macros and Functions fea
Use these to enable or disable building certain features. The more you have enabled the bigger your firmware will be, and you run the risk of building a firmware too large for your MCU.
+* `MAGIC_ENABLE`
+ * MAGIC actions (BOOTMAGIC without the boot)
* `BOOTMAGIC_ENABLE`
* Virtual DIP switch configuration
* `MOUSEKEY_ENABLE`