From 5e5e3afd2bfdadf860b39af464e61ede657e748d Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Thu, 23 May 2024 08:07:49 +0100 Subject: [PATCH] ENGDOCS-2104 (#20081) --- content/desktop/networking.md | 11 ++--------- content/desktop/release-notes.md | 8 ++------ content/desktop/use-desktop/container.md | 4 ++-- 3 files changed, 6 insertions(+), 17 deletions(-) diff --git a/content/desktop/networking.md b/content/desktop/networking.md index 979eaa4ca8..9bf6e10393 100644 --- a/content/desktop/networking.md +++ b/content/desktop/networking.md @@ -15,10 +15,7 @@ aliases: Docker Desktop provides several networking features to make it easier to use. -## Networking features - -{{< tabs >}} -{{< tab name="For all platforms" >}} +## Networking features for all platforms ### VPN Passthrough @@ -72,8 +69,7 @@ To enable and set up SOCKS proxy support: 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" >}} +## Networking features for Mac and Linux ### SSH agent forwarding @@ -105,9 +101,6 @@ services: - SSH_AUTH_SOCK=/run/host-services/ssh-auth.sock ``` -{{< /tab >}} -{{< /tabs >}} - ## Known limitations ### Changing internal IP addresses diff --git a/content/desktop/release-notes.md b/content/desktop/release-notes.md index 69f154f653..b8dc42a8c9 100644 --- a/content/desktop/release-notes.md +++ b/content/desktop/release-notes.md @@ -15,16 +15,12 @@ aliases: - /mackit/release-notes/ --- -This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. +This page contains information about the new features, improvements, known issues, and bug fixes in Docker Desktop releases. For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/releases.md). -> **Note** -> -> The information below is applicable to all platforms, unless stated otherwise. +Docker Desktop versions older than 6 months from the latest release are not available for download. Take a look at the [Docker Public Roadmap](https://github.com/docker/roadmap/projects/1) to see what's coming next. -For frequently asked questions about Docker Desktop releases, see [FAQs](faqs/releases.md). - ## 4.30.0 {{< release-date date="2024-05-06" >}} diff --git a/content/desktop/use-desktop/container.md b/content/desktop/use-desktop/container.md index a152bcbd98..cb36993b1e 100644 --- a/content/desktop/use-desktop/container.md +++ b/content/desktop/use-desktop/container.md @@ -77,7 +77,7 @@ The integrated terminal: To open the integrated terminal, either: -- Hover over your running container and select the **Show container actions** +- Hover over your running container and under the **Actions** column, select the **Show container actions** menu. From the drop-down menu, select **Open in terminal**. - Or, select the container and then select the **Exec** tab. @@ -104,7 +104,7 @@ To open the integrated terminal in debug mode: subscription. 2. After you're signed in, either: - - Hover over your running container and select the **Show container actions** + - Hover over your running container and under the **Actions** column, select the **Show container actions** menu. From the drop-down menu, select **Use Docker Debug**. - Or, select the container and then select the **Debug** tab. If the **Debug** tab isn't visible, select the **Exec** tab and then enable the