From ac9fdaa1dad22e67731315f972177d860278600f Mon Sep 17 00:00:00 2001
From: Peter Tripp <peter@zed.dev>
Date: Fri, 22 Aug 2025 11:51:01 -0400
Subject: [PATCH] onboarding: Improve Windows/Linux keyboard shortcuts; example
 ligature (#36712)

Small fixes to onboarding.
Correct ligature example.
Replace`ctrl-escape` and `alt-tab` since they are reserved on windows
(and often on linux) and so are caught by the OS.

Release Notes:

- N/A
---
 assets/keymaps/default-linux.json     | 5 ++---
 crates/onboarding/src/editing_page.rs | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/assets/keymaps/default-linux.json b/assets/keymaps/default-linux.json
index 955e68f5a9..fdc1403eb8 100644
--- a/assets/keymaps/default-linux.json
+++ b/assets/keymaps/default-linux.json
@@ -16,7 +16,6 @@
       "up": "menu::SelectPrevious",
       "enter": "menu::Confirm",
       "ctrl-enter": "menu::SecondaryConfirm",
-      "ctrl-escape": "menu::Cancel",
       "ctrl-c": "menu::Cancel",
       "escape": "menu::Cancel",
       "alt-shift-enter": "menu::Restart",
@@ -1195,8 +1194,8 @@
       "ctrl-1": "onboarding::ActivateBasicsPage",
       "ctrl-2": "onboarding::ActivateEditingPage",
       "ctrl-3": "onboarding::ActivateAISetupPage",
-      "ctrl-escape": "onboarding::Finish",
-      "alt-tab": "onboarding::SignIn",
+      "ctrl-enter": "onboarding::Finish",
+      "alt-shift-l": "onboarding::SignIn",
       "alt-shift-a": "onboarding::OpenAccount"
     }
   }
diff --git a/crates/onboarding/src/editing_page.rs b/crates/onboarding/src/editing_page.rs
index 8fae695854..47dfd84894 100644
--- a/crates/onboarding/src/editing_page.rs
+++ b/crates/onboarding/src/editing_page.rs
@@ -606,7 +606,7 @@ fn render_popular_settings_section(
     cx: &mut App,
 ) -> impl IntoElement {
     const LIGATURE_TOOLTIP: &str =
-        "Font ligatures combine two characters into one. For example, turning =/= into ≠.";
+        "Font ligatures combine two characters into one. For example, turning != into ≠.";
 
     v_flex()
         .pt_6()