From: Balz Guenat <balz.guenat@gmail.com>
Date: Sat, 12 Aug 2017 10:14:33 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=430151dd51b8b0d925850ad4d52c8bae41d3c154;hp=5ad103fa51083cb26d3516e5598b7b2a099b1521;p=qmk_firmware.git

Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	docs/faq_keymap.md
---

diff --git a/docs/faq_keymap.md b/docs/faq_keymap.md
index 3c2795816..0d24a7667 100644
--- a/docs/faq_keymap.md
+++ b/docs/faq_keymap.md
@@ -116,7 +116,7 @@ https://github.com/tekezo/Karabiner/issues/403
 
 ## Esc and `~ on a key
 
-Use `GRAVE_ESC` or `KC_GESC` in your keymap. `GUI`+`GRAVE_ESC` results in `\`` and `SHIFT`+`GRAVE_ESC` results in `~`.
+Use `GRAVE_ESC` or `KC_GESC` in your keymap. `GUI`+`GRAVE_ESC` results in `` ` `` and `SHIFT`+`GRAVE_ESC` results in `~`.
 
 Note that this will break the CTRL+SHIFT+ESC shortcut to the Windows task manager. Use `#define GRAVE_ESC_CTRL_OVERRIDE` in your `config.h` to get the shortcut back. With this option, `ESC_GRAVE` results in `ESC` if `CTRL` is held, even if `SHIFT` or `GUI` are also held.