From 851f9769dc87e0232de9f6b17a46804cb2cbd699 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Tue, 20 Jun 2023 13:52:44 +0100 Subject: [PATCH] network setting clarity (#17572) * network setting clarity * review comments * review comments --------- Co-authored-by: aevesdocker --- _includes/desktop-network-setting.md | 1 + desktop/settings/linux.md | 2 +- desktop/settings/mac.md | 2 +- desktop/settings/windows.md | 4 ++-- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 _includes/desktop-network-setting.md diff --git a/_includes/desktop-network-setting.md b/_includes/desktop-network-setting.md new file mode 100644 index 0000000000..16af8f7c95 --- /dev/null +++ b/_includes/desktop-network-setting.md @@ -0,0 +1 @@ +Docker Desktop uses a private IPv4 network for internal services such as a DNS server and an HTTP proxy. In case Docker Desktop's choice of subnet clashes with IPs in your environment, you can specify a custom subnet using the **Network** setting. \ No newline at end of file diff --git a/desktop/settings/linux.md b/desktop/settings/linux.md index 14ad125740..5080840582 100644 --- a/desktop/settings/linux.md +++ b/desktop/settings/linux.md @@ -111,7 +111,7 @@ To prevent developers from accidentally changing the proxy settings, see ### Network -Docker Desktop uses a private IPv4 network for internal services such as a DNS server and an HTTP proxy. In case the choice of subnet clashes with something in your environment, specify a custom subnet using the **Network** setting. +{% include desktop-network-setting.md %} ## Docker Engine diff --git a/desktop/settings/mac.md b/desktop/settings/mac.md index 1badbe3d79..6b814b1c91 100644 --- a/desktop/settings/mac.md +++ b/desktop/settings/mac.md @@ -176,7 +176,7 @@ The HTTPS proxy settings used for scanning images are set using the `HTTPS_PROXY ### Network -You can configure Docker Desktop networking to work on a virtual private network (VPN). Specify a network address translation (NAT) prefix and subnet mask to enable Internet connectivity. +{% include desktop-network-setting.md %} ## Docker Engine diff --git a/desktop/settings/windows.md b/desktop/settings/windows.md index fe4e995e8a..55bd4a0191 100644 --- a/desktop/settings/windows.md +++ b/desktop/settings/windows.md @@ -186,10 +186,10 @@ This is useful when a corporate proxy that requires authentication is manually c > **Note** > -> The Network tab is not available in the Windows container mode because +> The **Network** tab isn't available in the Windows container mode because > Windows manages networking. -You can configure Docker Desktop networking to work on a virtual private network (VPN). Specify a network address translation (NAT) prefix and subnet mask to enable Internet connectivity. +{% include desktop-network-setting.md %} ### WSL Integration