Skip to content

Commit

Permalink
ENGDOCS-2068 (#19821)
Browse files Browse the repository at this point in the history
* ENGDOCS-2068

* tweak step

* edit
  • Loading branch information
aevesdocker authored Apr 19, 2024
1 parent 747a557 commit 007ac90
Show file tree
Hide file tree
Showing 11 changed files with 28 additions and 31 deletions.
2 changes: 1 addition & 1 deletion content/compose/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion content/compose/compose-application-model.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
6 changes: 3 additions & 3 deletions content/compose/compose-file/04-version-and-name.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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.

Expand Down
11 changes: 2 additions & 9 deletions content/compose/compose-file/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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 >}}
2 changes: 1 addition & 1 deletion content/compose/gettingstarted.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion content/compose/intro/features-uses.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
2 changes: 1 addition & 1 deletion content/compose/reference/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ You can use Docker Compose binary, `docker compose [-f <arg>...] [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)
Expand Down
2 changes: 1 addition & 1 deletion content/desktop/extensions/_index.md
Original file line number Diff line number Diff line change
@@ -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
---
Expand Down
6 changes: 5 additions & 1 deletion content/desktop/extensions/private-marketplace.md
Original file line number Diff line number Diff line change
Expand Up @@ -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. 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" >}}
Expand Down
4 changes: 2 additions & 2 deletions content/support.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
20 changes: 10 additions & 10 deletions data/toc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1113,28 +1113,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
Expand Down Expand Up @@ -1261,7 +1261,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/
Expand Down Expand Up @@ -1987,7 +1987,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
Expand Down

0 comments on commit 007ac90

Please sign in to comment.