diff --git a/crates/gpui/src/app/entity_map.rs b/crates/gpui/src/app/entity_map.rs index 02b696292d..786631405f 100644 --- a/crates/gpui/src/app/entity_map.rs +++ b/crates/gpui/src/app/entity_map.rs @@ -585,7 +585,7 @@ impl AnyWeakEntity { // Safety: // Docs say this is safe but can be unspecified if slotmap changes the representation // after `1.0.7`, that said, providing a valid entity_id here is not necessary as long - // as we guarantee that that `entity_id` is never used if `entity_ref_counts` equals + // as we guarantee that `entity_id` is never used if `entity_ref_counts` equals // to `Weak::new()` (that is, it's unable to upgrade), that is the invariant that // actually needs to be hold true. // diff --git a/crates/remote_server/src/unix.rs b/crates/remote_server/src/unix.rs index 872e848ccd..be551c44ce 100644 --- a/crates/remote_server/src/unix.rs +++ b/crates/remote_server/src/unix.rs @@ -257,7 +257,7 @@ fn start_server( log_rx: Receiver>, cx: &mut App, ) -> Arc { - // This is the server idle timeout. If no connection comes in in this timeout, the server will shut down. + // This is the server idle timeout. If no connection comes in this timeout, the server will shut down. const IDLE_TIMEOUT: std::time::Duration = std::time::Duration::from_secs(10 * 60); let (incoming_tx, incoming_rx) = mpsc::unbounded::(); diff --git a/docs/src/key-bindings.md b/docs/src/key-bindings.md index da9a207216..c80953aab5 100644 --- a/docs/src/key-bindings.md +++ b/docs/src/key-bindings.md @@ -62,7 +62,7 @@ Each keypress is a sequence of modifiers followed by a key. The modifiers are: - `fn-` The function key - `secondary-` Equivalent to `cmd` when Zed is running on macOS and `ctrl` when on Windows and Linux -The keys can be any single unicode codepoint that your keyboard generates (for example `a`, `0`, `£` or `ç`), or any named key (`tab`, `f1`, `shift`, or `cmd`). If you are using a non-Latin layout (e.g. Cyrillic), you can bind either to the cyrillic character, or the latin character that that key generates with `cmd` pressed. +The keys can be any single unicode codepoint that your keyboard generates (for example `a`, `0`, `£` or `ç`), or any named key (`tab`, `f1`, `shift`, or `cmd`). If you are using a non-Latin layout (e.g. Cyrillic), you can bind either to the cyrillic character, or the latin character that key generates with `cmd` pressed. A few examples: