Engdocs 2076

content/desktop/networking.md

@@ -53,21 +53,24 @@ See:
 - [Proxies on Mac](settings/mac.md#proxies)
 - [Proxies on Windows](settings/windows.md#proxies)
 
-### SOCKS5 proxy support (Beta)
+### SOCKS5 proxy support 
 
-SOCKS (Socket Secure) is a protocol that facilitates the routing of network packets between a client and a server through a proxy server. It provides a way to enhance privacy, security, and network performance for users and applications.
+{{< introduced desktop 4.28.0 "release-notes.md#4280" >}}
 
-With Docker Desktop 4.28 and later, you can enable SOCKS proxy support to allow outgoing requests, such as pulling images, and access Linux container backend IPs from the host. 
+> **Note**
+>
+> Requires a Business subscription.
 
-To enable and set up SOCKS proxy support:
+SOCKS (Socket Secure) is a protocol that facilitates the routing of network packets between a client and a server through a proxy server. It provides a way to enhance privacy, security, and network performance for users and applications. 
+
+You can enable SOCKS proxy support to allow outgoing requests, such as pulling images, and access Linux container backend IPs from the host. 
 
-1. Navigate to **Settings** in Docker Desktop. 
-2. Go to **Features in development** and then on the **Beta** tab check the **Enable SOCKS proxy support** option. 
-3. Select **Apply & restart**.
-4. Go to the **Resources** tab and from the dropdown menu select **Proxies**
-5. Switch on the **Manual proxy configuration** toggle. 
-6. In the **Secure Web Server HTTPS** box, paste your `socks5://host:port` URL.
+To enable and set up SOCKS proxy support:
 
+1. Navigate to the **Resources** tab in **Settings**. 
+2. From the dropdown menu select **Proxies**.
+3. Switch on the **Manual proxy configuration** toggle. 
+4. In the **Secure Web Server HTTPS** box, paste your `socks5://host:port` URL.
 
 {{< /tab >}}
 {{< tab name="For Mac and Linux" >}}

content/desktop/settings/linux.md

@@ -135,17 +135,35 @@ File share settings are:
 
 ### Proxies
 
-To configure HTTP proxies, switch on the **Manual proxy configuration** setting.
-This setting is used for logging into Docker, for pulling and pushing images, and for
+HTTP/HTTPS proxies can be used when:
+
+- Signing in to Docker
+- Pulling or pushing images
+- Fetching artifacts during image builds
+- Containers interact with the external network
+- Scanning images
+
+If the host uses a HTTP/HTTPS proxy configuration (static or via Proxy Auto-Configuration), Docker Desktop reads
+this configuration
+and automatically uses these settings for signing in to Docker, for pulling and pushing images, and for
 container Internet access. If the proxy requires authorization then Docker Desktop dynamically asks
 the developer for a username and password. All passwords are stored securely in the OS credential store.
 Note that only the `Basic` proxy authentication method is supported so we recommend using an `https://`
 URL for your HTTP/HTTPS proxies to protect passwords while in transit on the network. Docker Desktop
 supports TLS 1.3 when communicating with proxies.
 
+To set a different proxy for Docker Desktop, turn on **Manual proxy configuration** and enter a single
+upstream proxy URL of the form `http://proxy:port` or `https://proxy:port`.
+
 To prevent developers from accidentally changing the proxy settings, see
 [Settings Management](../hardened-desktop/settings-management/index.md#what-features-can-i-configure-with-settings-management).
 
+The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY` environment variable.
+
+> **Note**
+>
+> Docker Desktop also supports the use of [SOCKS5 proxies](../networking.md#socks5-proxy-support).
+
 ### Network
 
 {{< include "desktop-network-setting.md" >}}

content/desktop/settings/mac.md

@@ -199,6 +199,10 @@ To prevent developers from accidentally changing the proxy settings, see
 
 The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY` environment variable.
 
+> **Note**
+>
+> Docker Desktop also supports the use of [SOCKS5 proxies](../networking.md#socks5-proxy-support).
+
 ### Network
 
 {{< include "desktop-network-setting.md" >}}

content/desktop/settings/windows.md

@@ -216,6 +216,10 @@ The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY
 If you are running Windows containers in Docker, you can allow the Windows Docker daemon to use Docker Desktop's internal proxy, with the **Use proxy for Windows Docker daemon** setting.
 This is useful when a corporate proxy that requires authentication is manually configured or set at the system level. If you are an admin for your organization and have a Docker Business subscription, you can control this setting with [Settings management](../hardened-desktop/settings-management/configure.md) using the `windowsDockerdPort` parameter.
 
+> **Note**
+>
+> Docker Desktop also supports the use of [SOCKS5 proxies](../networking.md#socks5-proxy-support).
+
 ### Network
 
 > **Note**