From f8195c41e0019b77a56a2eb96c346b601a6c8b89 Mon Sep 17 00:00:00 2001 From: Peter Tripp Date: Fri, 20 Sep 2024 11:52:57 -0400 Subject: [PATCH] docs: Switch proxy example to socks5h not socks5 (#18142) Very rarely when you have a SOCKS proxy configured do you want local DNS. `socks5` does local DNS. `socks5h` does remote DNS. --- assets/settings/default.json | 2 +- docs/src/configuring-zed.md | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/assets/settings/default.json b/assets/settings/default.json index a9e1865258..537ad12082 100644 --- a/assets/settings/default.json +++ b/assets/settings/default.json @@ -1029,7 +1029,7 @@ // environment variables. // // Examples: - // - "proxy": "socks5://localhost:10808" + // - "proxy": "socks5h://localhost:10808" // - "proxy": "http://127.0.0.1:10809" "proxy": null, // Set to configure aliases for the command palette. diff --git a/docs/src/configuring-zed.md b/docs/src/configuring-zed.md index 1befa7d93a..de7433bf5d 100644 --- a/docs/src/configuring-zed.md +++ b/docs/src/configuring-zed.md @@ -1127,10 +1127,10 @@ The following URI schemes are supported: - `http` - `https` -- `socks4` -- `socks4a` -- `socks5` -- `socks5h` +- `socks4` - SOCKS4 proxy with local DNS +- `socks4a` - SOCKS4 proxy with remote DNS +- `socks5` - SOCKS5 proxy with local DNS +- `socks5h` - SOCKS5 proxy with remote DNS `http` will be used when no scheme is specified. @@ -1148,7 +1148,7 @@ Or to set a `socks5` proxy: ```json { - "proxy": "socks5://localhost:10808" + "proxy": "socks5h://localhost:10808" } ```