From e620711f0cda405e2084f56992b42a0645d8e225 Mon Sep 17 00:00:00 2001 From: aevesdocker Date: Wed, 17 Apr 2024 15:04:17 +0100 Subject: [PATCH 1/3] ENGDOCS-2068 --- .../compose-file/04-version-and-name.md | 6 +++--- content/compose/compose-file/_index.md | 11 ++-------- content/compose/gettingstarted.md | 2 +- content/desktop/extensions/_index.md | 2 +- .../desktop/extensions/private-marketplace.md | 2 +- content/support.md | 4 ++-- data/toc.yaml | 20 +++++++++---------- 7 files changed, 20 insertions(+), 27 deletions(-) diff --git a/content/compose/compose-file/04-version-and-name.md b/content/compose/compose-file/04-version-and-name.md index e5ef762535c3..2f7fbed69589 100644 --- a/content/compose/compose-file/04-version-and-name.md +++ b/content/compose/compose-file/04-version-and-name.md @@ -4,9 +4,9 @@ description: Understand when and if to set the version and name top-level elemen keywords: compose, compose specification, services, compose file reference --- -## Version top-level element (optional) +## Version top-level element (obsolete) -The top-level `version` property is defined by the Compose Specification for backward compatibility. It is only informative. +The top-level `version` property is defined by the Compose Specification for backward compatibility. It is only informative and you'll receive a warning message that it is obsolete if used. Compose doesn't use `version` to select an exact schema to validate the Compose file, but prefers the most recent schema when it's implemented. @@ -16,7 +16,7 @@ because the Compose file was written with fields defined by a newer version of t ## Name top-level element -The top-level `name` property is defined by the Specification as the project name to be used if you don't set one explicitly. +The top-level `name` property is defined by the Compose Specification as the project name to be used if you don't set one explicitly. Compose offers a way for you to override this name, and sets a default project name to be used if the top-level `name` element is not set. diff --git a/content/compose/compose-file/_index.md b/content/compose/compose-file/_index.md index 909759b35743..f793b83da595 100644 --- a/content/compose/compose-file/_index.md +++ b/content/compose/compose-file/_index.md @@ -37,9 +37,9 @@ aliases: - /compose/compose-file/compose-file-v1/ --- ->**New to Compose?** +>**New to Docker Compose?** > -> Find more information about the [key features and use cases of Docker Compose](../intro/features-uses.md) or [try the get started guide](../gettingstarted.md). +> Find more information about the [key features and use cases of Docker Compose](../intro/features-uses.md) or [try the quickstart guide](../gettingstarted.md). { .tip } The Compose Specification is the latest and recommended version of the Compose file format. It helps you define a [Compose file](../compose-application-model.md) which is used to configure your Docker application’s services, networks, volumes, and more. @@ -48,13 +48,6 @@ Legacy versions 2.x and 3.x of the Compose file format were merged into the Comp The Compose Specification on Docker Docs is the Docker Compose implementation. If you wish to implement your own version of the Compose Specification, see the [Compose Specification repository](https://github.com/compose-spec/compose-spec). -> **Note** -> -> Compose V1 no longer receives updates and is not available in new releases of Docker Desktop. -> -> Compose V2 is included with all currently supported versions of Docker Desktop. -> For more information, see [Migrate to Compose V2](/compose/migrate). - Use the following links to navigate key sections of the Compose Specification. {{< grid >}} diff --git a/content/compose/gettingstarted.md b/content/compose/gettingstarted.md index d74c62f0c696..8f8b08c12713 100644 --- a/content/compose/gettingstarted.md +++ b/content/compose/gettingstarted.md @@ -5,7 +5,7 @@ keywords: docker compose example, docker compose tutorial, how to use docker com running docker compose, how to run docker compose, docker compose build image, docker compose command example, run docker compose file, how to create a docker compose file, run a docker compose file -title: Try Docker Compose +title: Docker Compose Quickstart --- This tutorial aims to introduce fundamental concepts of Docker Compose by guiding you through the development of a basic Python web application. diff --git a/content/desktop/extensions/_index.md b/content/desktop/extensions/_index.md index 4f13fbcff778..4fb87cc53bfd 100644 --- a/content/desktop/extensions/_index.md +++ b/content/desktop/extensions/_index.md @@ -1,7 +1,7 @@ --- description: Extensions keywords: Docker Extensions, Docker Desktop, Linux, Mac, Windows -title: What are Docker Extensions? +title: Overview of Docker Extensions toc_min: 1 toc_max: 2 --- diff --git a/content/desktop/extensions/private-marketplace.md b/content/desktop/extensions/private-marketplace.md index 36669e94155e..717fc9e7c0af 100644 --- a/content/desktop/extensions/private-marketplace.md +++ b/content/desktop/extensions/private-marketplace.md @@ -143,7 +143,7 @@ The marketplace content is generated from extension image information as image l It's recommended that you try the private marketplace on your Docker Desktop installation. -1. Copy the relevant generated files to the location where Docker Desktop reads its configuration files. +1. Use the following command,copy the relevant generated files to the location where Docker Desktop reads its configuration files. {{< tabs group="os_version" >}} {{< tab name="Mac" >}} diff --git a/content/support.md b/content/support.md index 1ad7878dad18..b8caa18f53b7 100644 --- a/content/support.md +++ b/content/support.md @@ -6,11 +6,11 @@ aliases: - /desktop/support/ --- -Find information on how to get support, and the scope of Docker support. +Find information on how to get support, and the scope of support. ## How do I get support? -If you have a paid Docker subscription, raise a ticket through [Docker support](https://hub.docker.com/support/contact/). +If you have a paid Docker subscription, you can [contact the Support team](https://hub.docker.com/support/contact/). All Docker users can seek support through the following resources, where Docker or the community respond on a best effort basis. - [Docker Desktop for Windows GitHub repo](https://github.com/docker/for-win) diff --git a/data/toc.yaml b/data/toc.yaml index 851927a76c18..64e3aa79a85d 100644 --- a/data/toc.yaml +++ b/data/toc.yaml @@ -1101,28 +1101,28 @@ Manuals: section: - path: /desktop/ title: Overview - - sectiontitle: Install Docker Desktop + - sectiontitle: Install section: - path: /desktop/install/mac-install/ - title: Install on Mac + title: Mac - path: /desktop/mac/permission-requirements/ title: Understand permission requirements for Mac - path: /desktop/install/windows-install/ - title: Install on Windows + title: Windows - path: /desktop/windows/permission-requirements/ title: Understand permission requirements for Windows - path: /desktop/install/linux-install/ - title: Install on Linux + title: Linux - sectiontitle: Installation per Linux distro section: - path: /desktop/install/ubuntu/ - title: Install on Ubuntu + title: Ubuntu - path: /desktop/install/debian/ - title: Install on Debian + title: Debian - path: /desktop/install/fedora/ - title: Install on Fedora + title: Fedora - path: /desktop/install/archlinux/ - title: Install on Arch + title: Arch - path: /desktop/get-started/ title: Sign in - sectiontitle: Explore Docker Desktop @@ -1249,7 +1249,7 @@ Manuals: - sectiontitle: Docker Extensions section: - path: /desktop/extensions/ - title: What are Docker Extensions? + title: Overview - sectiontitle: Extensions on Docker Desktop section: - path: /desktop/extensions/marketplace/ @@ -1975,7 +1975,7 @@ Manuals: - path: /compose/compose-application-model/ title: How Compose works - path: /compose/gettingstarted/ - title: Try Compose + title: Quickstart - path: /compose/project-name/ title: Specify a project name - sectiontitle: Environment variables From fe8198c58b397e032117358162397e88a1fff411 Mon Sep 17 00:00:00 2001 From: aevesdocker Date: Thu, 18 Apr 2024 09:17:08 +0100 Subject: [PATCH 2/3] tweak step --- content/desktop/extensions/private-marketplace.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/content/desktop/extensions/private-marketplace.md b/content/desktop/extensions/private-marketplace.md index 717fc9e7c0af..b05b83b32858 100644 --- a/content/desktop/extensions/private-marketplace.md +++ b/content/desktop/extensions/private-marketplace.md @@ -143,7 +143,11 @@ The marketplace content is generated from extension image information as image l It's recommended that you try the private marketplace on your Docker Desktop installation. -1. Use the following command,copy the relevant generated files to the location where Docker Desktop reads its configuration files. +1. Run the following command in your terminal. This command automatically copies the generated files to the location where Docker Desktop reads the configuration files. Depending on your operating system, the location is: + + - Mac: `/Library/Application\ Support/com.docker.docker` + - Windows: `C:\ProgramData\DockerDesktop` + - Linux: `/usr/share/docker-desktop` {{< tabs group="os_version" >}} {{< tab name="Mac" >}} From 850d8407a1d01be2679a2ece8273ef885d298671 Mon Sep 17 00:00:00 2001 From: aevesdocker Date: Thu, 18 Apr 2024 09:20:26 +0100 Subject: [PATCH 3/3] edit --- content/compose/_index.md | 2 +- content/compose/compose-application-model.md | 2 +- content/compose/intro/features-uses.md | 2 +- content/compose/reference/_index.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/content/compose/_index.md b/content/compose/_index.md index 5ccfe23032b7..eba27aade41a 100644 --- a/content/compose/_index.md +++ b/content/compose/_index.md @@ -18,7 +18,7 @@ grid: description: Follow the instructions on how to install Docker Compose. icon: download link: /compose/install -- title: Try Compose +- title: Quickstart description: Learn the key concepts of Docker Compose whilst building a simple Python web application. icon: explore diff --git a/content/compose/compose-application-model.md b/content/compose/compose-application-model.md index 82bd86a21905..9d478f01c3fa 100644 --- a/content/compose/compose-application-model.md +++ b/content/compose/compose-application-model.md @@ -118,6 +118,6 @@ networks: ## What's next -- [Try Compose](gettingstarted.md) +- [Quickstart](gettingstarted.md) - [Explore some sample applications](samples-for-compose.md) - [Familiarize yourself with the Compose Specification](compose-file/_index.md) \ No newline at end of file diff --git a/content/compose/intro/features-uses.md b/content/compose/intro/features-uses.md index c305b5461a4d..b49f877a4e0d 100644 --- a/content/compose/intro/features-uses.md +++ b/content/compose/intro/features-uses.md @@ -66,4 +66,4 @@ For details on using production-oriented features, see - [Learn about the history of Compose](history.md) - [Understand how Compose works](../compose-application-model.md) -- [Try Compose](../gettingstarted.md) +- [Quickstart](../gettingstarted.md) diff --git a/content/compose/reference/_index.md b/content/compose/reference/_index.md index e3bbf1e0d3ab..d2a63290efa6 100644 --- a/content/compose/reference/_index.md +++ b/content/compose/reference/_index.md @@ -74,7 +74,7 @@ You can use Docker Compose binary, `docker compose [-f ...] [options] ## Useful resources - [How Compose works](../compose-application-model.md) -- [Try Compose](../gettingstarted.md) +- [Quickstart](../gettingstarted.md) - [Specify a project name](../project-name.md) - [Using environment variables](../environment-variables/_index.md) - [Working with multiple Compose files](../multiple-compose-files/_index.md)