Skip to content

Commit 3ea0cd7

Browse files
authored
ENGDOCS-2283 (#21329)
<!--Delete sections as needed --> ## Description Tidy up of DD IA. Creates a 'setup' folder and moves relevant pages within it. First PR of a few ## Related issues or tickets <!-- Related issues, pull requests, or Jira tickets --> ## Reviews <!-- Notes for reviewers here --> <!-- List applicable reviews (optionally @tag reviewers) --> - [ ] Technical review - [ ] Editorial review - [ ] Product review
1 parent 48f3bcc commit 3ea0cd7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+116
-84
lines changed

content/get-started/get-docker.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ section and choose the best installation path for you.
3434
{{< card
3535
title="Docker Desktop for Mac"
3636
description="A native application using the macOS sandbox security model that delivers all Docker tools to your Mac."
37-
link="/desktop/install/mac-install/"
37+
link="/desktop/setup/install/mac-install/"
3838
icon="/assets/images/apple_48.svg" >}}
3939

4040
<br>
4141

4242
{{< card
4343
title="Docker Desktop for Windows"
4444
description="A native Windows application that delivers all Docker tools to your Windows computer."
45-
link="/desktop/install/windows-install/"
45+
link="/desktop/setup/install/windows-install/"
4646
icon="/assets/images/windows_48.svg" >}}
4747

4848
<br>

content/get-started/introduction/get-docker-desktop.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ This guide will walk you through the installation process, enabling you to exper
2828
2929
{{< card
3030
title="Docker Desktop for Mac"
31-
description="[Download (Apple Silicon)](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64) | [Download (Intel)](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64) | [Install instructions](/desktop/install/mac-install)"
31+
description="[Download (Apple Silicon)](https://desktop.docker.com/mac/main/arm64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-arm64) | [Download (Intel)](https://desktop.docker.com/mac/main/amd64/Docker.dmg?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-mac-amd64) | [Install instructions](/desktop/setup/install/mac-install)"
3232
icon="/assets/images/apple_48.svg" >}}
3333

3434
<br>
3535

3636
{{< card
3737
title="Docker Desktop for Windows"
38-
description="[Download](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-windows) | [Install instructions](/desktop/install/windows-install)"
38+
description="[Download](https://desktop.docker.com/win/main/amd64/Docker%20Desktop%20Installer.exe?utm_source=docker&utm_medium=webreferral&utm_campaign=docs-driven-download-windows) | [Install instructions](/desktop/setup/install/windows-install)"
3939
icon="/assets/images/windows_48.svg" >}}
4040

4141
<br>

content/guides/rust/develop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ aliases:
1212
## Prerequisites
1313

1414
- You have installed the latest version of [Docker Desktop](/get-started/get-docker.md).
15-
- You have completed the walkthroughs in the Docker Desktop [Learning Center](/manuals/desktop/get-started.md) to learn about Docker concepts.
15+
- You have completed the walkthroughs in the Docker Desktop [Learning Center](/manuals/desktop/use-desktop/_index.md) to learn about Docker concepts.
1616
- You have a [git client](https://git-scm.com/downloads). The examples in this section use a command-line based git client, but you can use any client.
1717

1818
## Overview

content/manuals/compose/install/_index.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ The easiest and recommended way to get Docker Compose is to install Docker Deskt
2424
includes Docker Compose along with Docker Engine and Docker CLI which are Compose prerequisites.
2525

2626
Docker Desktop is available on:
27-
- [Linux](/manuals/desktop/install/linux/_index.md)
28-
- [Mac](/manuals/desktop/install/mac-install.md)
29-
- [Windows](/manuals/desktop/install/windows-install.md)
27+
- [Linux](/manuals/desktop/setup/install/linux/_index.md)
28+
- [Mac](/manuals/desktop/setup/install/mac-install.md)
29+
- [Windows](/manuals/desktop/setup/install/windows-install.md)
3030

3131
If you have already installed Docker Desktop, you can check which version of Compose you have by selecting **About Docker Desktop** from the Docker menu {{< inline-image src="../../desktop/images/whale-x.svg" alt="whale menu" >}}.
3232

content/manuals/compose/releases/release-notes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3848,7 +3848,7 @@ The highlights:
38483848

38493849
This means the GitHub repository has moved to [https://github.com/docker/fig](https://github.com/docker/fig) and our IRC channel is now #docker-fig on Freenode.
38503850

3851-
- Fig can be used with the [official Docker OS X installer](/manuals/desktop/install/mac-install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected.
3851+
- Fig can be used with the [official Docker OS X installer](/manuals/desktop/setup/install/mac-install.md). Boot2Docker will mount the home directory from your host machine so volumes work as expected.
38523852

38533853
- Fig supports Docker 1.3.
38543854

content/manuals/desktop/_index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ grid:
99
- title: Install Docker Desktop
1010
description: |
1111
Install Docker Desktop on
12-
[Mac](/desktop/install/mac-install/),
13-
[Windows](/desktop/install/windows-install/), or
12+
[Mac](/desktop/setup/install/mac-install/),
13+
[Windows](/desktop/setup/install/windows-install/), or
1414
[Linux](/desktop/install/linux/).
1515
icon: download
1616
- title: Explore Docker Desktop

content/manuals/desktop/previous-versions/2.x-windows.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ Docker Desktop 2.4.0.0 contains a Kubernetes upgrade. Your local Kubernetes clus
189189

190190
### New
191191

192-
- Windows 10 Home users can now use Docker Desktop through WSL 2. This requires Windows 10, version 2004 or higher. For more information, see [Install Docker Desktop on Windows](../install/windows-install.md).
192+
- Windows 10 Home users can now use Docker Desktop through WSL 2. This requires Windows 10, version 2004 or higher. For more information, see [Install Docker Desktop on Windows](/manuals/desktop/setup/install/windows-install.md).
193193
- Docker Desktop introduces a new onboarding tutorial upon first startup. The Quick Start tutorial guides users to get started with Docker in a few easy steps. It includes a simple exercise to build an example Docker image, run it as a container, push and save the image to Docker Hub.
194194
- Docker Desktop now allows sharing individual folders, rather than whole drives, giving more control to users over what is being shared.
195195

content/manuals/desktop/previous-versions/3.x-mac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ This page contains release notes for Docker Desktop for Mac 3.x.
202202

203203
### New
204204

205-
Docker Desktop is now available for Apple silicon as well as Intel chips. This enables developers with their choice of local development environments, and extends development pipelines for ARM-based applications. For more information, see [Docker Desktop for Apple silicon](../install/mac-install.md).
205+
Docker Desktop is now available for Apple silicon as well as Intel chips. This enables developers with their choice of local development environments, and extends development pipelines for ARM-based applications. For more information, see [Docker Desktop for Apple silicon](/manuals/desktop/setup/install/mac-install.md).
206206

207207
### Bug fixes and minor changes
208208

content/manuals/desktop/previous-versions/edge-releases-mac.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ sitemap: false
1212
This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release.
1313

1414
For Docker Desktop system requirements, see
15-
[What to know before you install](../install/mac-install.md#system-requirements).
15+
[What to know before you install](/manuals/desktop/setup/install/mac-install.md#system-requirements).
1616

1717
## Docker Desktop Community 2.5.4
1818
2020-12-07
@@ -1855,7 +1855,7 @@ events or unexpected unmounts.
18551855

18561856
**New**
18571857

1858-
* Docker for Mac is now available from 2 channels: **stable** and **beta**. New features and bug fixes will go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [installation guide](../install/mac-install.md).
1858+
* Docker for Mac is now available from 2 channels: **stable** and **beta**. New features and bug fixes will go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker Engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see the [installation guide](/manuals/desktop/setup/install/mac-install.md).
18591859

18601860
**Upgrades**
18611861

content/manuals/desktop/previous-versions/edge-releases-windows.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ sitemap: false
1212
This page contains information about Docker Desktop Edge releases. Edge releases give you early access to our newest features. Note that some of the features may be experimental, and some of them may not ever reach the Stable release.
1313

1414
For Docker Desktop system requirements, see
15-
[What to know before you install](../install/windows-install.md#system-requirements).
15+
[What to know before you install](/manuals/desktop/setup/install/windows-install.md#system-requirements).
1616

1717
## Docker Desktop Community 2.5.4
1818
2020-12-07
@@ -2006,7 +2006,7 @@ Unreleased. See Beta 23 for changes.
20062006

20072007
**New**
20082008

2009-
* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see [Install Docker Desktop on Windows](../install/windows-install.md).
2009+
* Docker for Windows is now available from two channels: **stable** and **beta**. New features and bug fixes go out first in auto-updates to users in the beta channel. Updates to the stable channel are much less frequent and happen in sync with major and minor releases of the Docker Engine. Only features that are well-tested and ready for production are added to the stable channel releases. For downloads of both and more information, see [Install Docker Desktop on Windows](/manuals/desktop/setup/install/windows-install.md).
20102010

20112011
* Removed the docker host name. Containers with exported ports are reachable via localhost.
20122012

0 commit comments

Comments
 (0)