From ba09fac0b9e21e0ec3bfc90943667bf934614fa6 Mon Sep 17 00:00:00 2001
From: Frank Lemanschik <frank@dspeed.eu>
Date: Thu, 14 Feb 2019 08:30:48 +0100
Subject: [PATCH 01/16] Update index.md

Updated ARGS section to point out that args defined befor FROM in Dockerfiles do not get regonized after FROM without explicit redeclartion
---
 compose/compose-file/index.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index 4a736aaaa2..1a5bfb41d9 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -267,6 +267,10 @@ or a list:
         - buildno=1
         - gitcommithash=cdc3b19
 
+> **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction 
+> then the `ARG` will not be available in the buld instructions under `FROM`
+> if you need a argument in both places simply place it again under the `FROM` instruction
+
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.
 

From f314f2cd5162d23759a3737cbf50b33af26af98b Mon Sep 17 00:00:00 2001
From: Frank Lemanschik <frank@github.dspeed.eu>
Date: Thu, 14 Feb 2019 08:33:45 +0100
Subject: [PATCH 02/16] Update compose-file-v2.md

Updated Documentation section ARGS added a note about the fact that ARG defined befor FROM is not there after FROM without explicit adding it again after FROM
---
 compose/compose-file/compose-file-v2.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md
index f6c356dab2..7f39f2d956 100644
--- a/compose/compose-file/compose-file-v2.md
+++ b/compose/compose-file/compose-file-v2.md
@@ -196,6 +196,10 @@ or a list:
       args:
         - buildno=1
         - gitcommithash=cdc3b19
+        
+> **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction 
+> then the `ARG` will not be available in the buld instructions under `FROM`
+> if you need a argument in both places simply place it again under the `FROM` instruction
 
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.

From d91394624621b7f986d6be0c1b7e4372e4cf5fee Mon Sep 17 00:00:00 2001
From: Frank Lemanschik <frank@github.dspeed.eu>
Date: Thu, 14 Feb 2019 08:49:56 +0100
Subject: [PATCH 03/16] Update compose-file-v2.md

corrected typo buld => build
---
 compose/compose-file/compose-file-v2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md
index 7f39f2d956..30041cf136 100644
--- a/compose/compose-file/compose-file-v2.md
+++ b/compose/compose-file/compose-file-v2.md
@@ -198,7 +198,7 @@ or a list:
         - gitcommithash=cdc3b19
         
 > **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction 
-> then the `ARG` will not be available in the buld instructions under `FROM`
+> then the `ARG` will not be available in the build instructions under `FROM`
 > if you need a argument in both places simply place it again under the `FROM` instruction
 
 You can omit the value when specifying a build argument, in which case its value

From 3a553b9e3fa48c75f9b09f108d5a0f254d8f696d Mon Sep 17 00:00:00 2001
From: Frank Lemanschik <frank@github.dspeed.eu>
Date: Thu, 14 Feb 2019 08:50:24 +0100
Subject: [PATCH 04/16] Update index.md

corrected typo buld => build
---
 compose/compose-file/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index 1a5bfb41d9..b86d8f9820 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -268,7 +268,7 @@ or a list:
         - gitcommithash=cdc3b19
 
 > **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction 
-> then the `ARG` will not be available in the buld instructions under `FROM`
+> then the `ARG` will not be available in the build instructions under `FROM`
 > if you need a argument in both places simply place it again under the `FROM` instruction
 
 You can omit the value when specifying a build argument, in which case its value

From 580312e771f979b9c3b0f763f6ff63fa2a0f59b7 Mon Sep 17 00:00:00 2001
From: Marcel Partap <mpartap@gmx.net>
Date: Mon, 4 Mar 2019 17:29:31 +0100
Subject: [PATCH 05/16] stop_signal supported with docker stack deploy

support was added nearly two years ago,
c.f. https://github.com/docker/cli/issues/370
---
 compose/compose-file/index.md | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index 4a736aaaa2..f25ec8436d 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -857,7 +857,6 @@ The following sub-options (supported for `docker-compose up` and `docker-compose
 - [network_mode](#network_mode)
 - [restart](#restart)
 - [security_opt](#security_opt)
-- [stop_signal](#stop_signal)
 - [sysctls](#sysctls)
 - [userns_mode](#userns_mode)
 
@@ -1616,10 +1615,6 @@ SIGTERM. Setting an alternative signal using `stop_signal` causes
 
     stop_signal: SIGUSR1
 
-> **Note**: This option is ignored when
-> [deploying a stack in swarm mode](/engine/reference/commandline/stack_deploy.md)
-> with a (version 3) Compose file.
-
 ### sysctls
 
 Kernel parameters to set in the container. You can use either an array or a

From cea730af578377d1ddcf95dffd66d3f34103969e Mon Sep 17 00:00:00 2001
From: Michael Pearson <mipearson@gmail.com>
Date: Thu, 14 Mar 2019 11:20:32 +1100
Subject: [PATCH 06/16] Change "Linux" limitation wording

I read the previous wording as "Only works when run from a Linux host", where what it means is "Only works when building a Linux container".

In other words, build enhancements work just fine if building Linux containers via Docker for Mac/Windows.
---
 develop/develop-images/build_enhancements.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/develop/develop-images/build_enhancements.md b/develop/develop-images/build_enhancements.md
index cfcd3a8b9b..2128707160 100644
--- a/develop/develop-images/build_enhancements.md
+++ b/develop/develop-images/build_enhancements.md
@@ -23,7 +23,7 @@ For more information on build options, see the reference guide on the [command l
 ## Limitations
 
 * BuildKit mode is incompatible with UCP and Swarm Classic
-* Only supported on Linux
+* Only supported for building Linux containers
 
 ## To enable buildkit builds
 

From 918a65fb4617cd79210a320ddf64ff7ce082c773 Mon Sep 17 00:00:00 2001
From: Frank Lemanschik <frank@github.dspeed.eu>
Date: Sat, 16 Mar 2019 03:43:19 +0100
Subject: [PATCH 07/16] Update compose-file-v2.md

---
 compose/compose-file/compose-file-v2.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md
index 30041cf136..7ca18815c4 100644
--- a/compose/compose-file/compose-file-v2.md
+++ b/compose/compose-file/compose-file-v2.md
@@ -197,9 +197,9 @@ or a list:
         - buildno=1
         - gitcommithash=cdc3b19
         
-> **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction 
-> then the `ARG` will not be available in the build instructions under `FROM`
-> if you need a argument in both places simply place it again under the `FROM` instruction
+> **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction, 
+> then the `ARG` will not be available in the build instructions under `FROM`.
+> if you need a argument in both places, simply place it again under the `FROM` instruction.
 
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.

From 0934b5baa71525aaa4adeef6a773c86d9006281f Mon Sep 17 00:00:00 2001
From: Frank Lemanschik <frank@github.dspeed.eu>
Date: Sat, 16 Mar 2019 03:43:51 +0100
Subject: [PATCH 08/16] Update index.md

---
 compose/compose-file/index.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index b86d8f9820..090200f2fa 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -267,9 +267,9 @@ or a list:
         - buildno=1
         - gitcommithash=cdc3b19
 
-> **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction 
-> then the `ARG` will not be available in the build instructions under `FROM`
-> if you need a argument in both places simply place it again under the `FROM` instruction
+> **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction, 
+> then the `ARG` will not be available in the build instructions under `FROM`.
+> if you need a argument in both places, simply place it again under the `FROM` instruction.
 
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.

From e7fc879f08535bb97bc329d41da035c4254e1a38 Mon Sep 17 00:00:00 2001
From: paigehargrave <Paige.hargrave@docker.com>
Date: Sun, 17 Mar 2019 12:44:15 -0400
Subject: [PATCH 09/16] Update compose-file-v2.md

---
 compose/compose-file/compose-file-v2.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md
index 7ca18815c4..d7902d591d 100644
--- a/compose/compose-file/compose-file-v2.md
+++ b/compose/compose-file/compose-file-v2.md
@@ -197,9 +197,9 @@ or a list:
         - buildno=1
         - gitcommithash=cdc3b19
         
-> **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction, 
-> then the `ARG` will not be available in the build instructions under `FROM`.
-> if you need a argument in both places, simply place it again under the `FROM` instruction.
+> **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction, 
+> `ARG` is not available in the build instructions under `FROM`.
+> If you need an argument in both places, alsoo specify it under the `FROM` instruction.
 
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.

From c191ecf594cd33acbd2866cc2b1ea39ed95d807d Mon Sep 17 00:00:00 2001
From: paigehargrave <Paige.hargrave@docker.com>
Date: Sun, 17 Mar 2019 12:46:01 -0400
Subject: [PATCH 10/16] Minor syntax fixes

---
 compose/compose-file/compose-file-v2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md
index d7902d591d..61438dea21 100644
--- a/compose/compose-file/compose-file-v2.md
+++ b/compose/compose-file/compose-file-v2.md
@@ -199,7 +199,7 @@ or a list:
         
 > **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction, 
 > `ARG` is not available in the build instructions under `FROM`.
-> If you need an argument in both places, alsoo specify it under the `FROM` instruction.
+> If you need an argument to be available in both places, also specify it under the `FROM` instruction.
 
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.

From a15783c694a691bcd590b193a8438276cc472853 Mon Sep 17 00:00:00 2001
From: paigehargrave <Paige.hargrave@docker.com>
Date: Sun, 17 Mar 2019 12:47:00 -0400
Subject: [PATCH 11/16] Minor syntax updates

---
 compose/compose-file/index.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index 090200f2fa..eb67687a9c 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -267,9 +267,9 @@ or a list:
         - buildno=1
         - gitcommithash=cdc3b19
 
-> **Note**: if you specify `ARG` in your Dockerfile befor the `FROM` instruction, 
-> then the `ARG` will not be available in the build instructions under `FROM`.
-> if you need a argument in both places, simply place it again under the `FROM` instruction.
+> **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction, 
+> `ARG` is not available in the build instructions under `FROM`.
+> If you need an argument to be available in both places, also specify it under the `FROM` instruction.
 
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.

From 773ff41ddd1ce8fa4b63241e385de3d3643cd2aa Mon Sep 17 00:00:00 2001
From: Maria Bermudez <bermudezmt@users.noreply.github.com>
Date: Mon, 18 Mar 2019 12:00:47 -0700
Subject: [PATCH 12/16] Link to ARG and FROM interaction section

---
 compose/compose-file/compose-file-v2.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md
index 61438dea21..fbd903d624 100644
--- a/compose/compose-file/compose-file-v2.md
+++ b/compose/compose-file/compose-file-v2.md
@@ -198,8 +198,8 @@ or a list:
         - gitcommithash=cdc3b19
         
 > **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction, 
-> `ARG` is not available in the build instructions under `FROM`.
 > If you need an argument to be available in both places, also specify it under the `FROM` instruction.
+> See [Understand how ARGS and FROM interact](/engine/reference/builder/#understand-how-arg-and-from-interact) for usage details.
 
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.

From 4d463d7c97c64eabb1ff2fe745409e2297386b5e Mon Sep 17 00:00:00 2001
From: Maria Bermudez <bermudezmt@users.noreply.github.com>
Date: Mon, 18 Mar 2019 12:01:28 -0700
Subject: [PATCH 13/16] Link to FROM and ARG interaction section

---
 compose/compose-file/index.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index eb67687a9c..1f46f2e6ff 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -270,6 +270,7 @@ or a list:
 > **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction, 
 > `ARG` is not available in the build instructions under `FROM`.
 > If you need an argument to be available in both places, also specify it under the `FROM` instruction.
+> See [Understand how ARGS and FROM interact](/engine/reference/builder/#understand-how-arg-and-from-interact) for usage details.
 
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.

From 3c3f9411e17ae8a26fe8af4b2d751e8cf31f1b31 Mon Sep 17 00:00:00 2001
From: Maria Bermudez <bermudezmt@users.noreply.github.com>
Date: Mon, 18 Mar 2019 17:24:15 -0700
Subject: [PATCH 14/16] Additional error for troubleshooting section

Addresses #8445 .
---
 .../sign-images/trust-with-remote-ucp.md              | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md b/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md
index e5eaf576bb..7539154616 100644
--- a/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md
+++ b/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md
@@ -226,6 +226,7 @@ Orchestrator as there is no SSO between cluster 2 and DTR. See the relevant
 
 ### Example Errors
 
+#### Image or trust data does not exist
 ```
 image or trust data does not exist for dtr.example.com/admin/trustdemo:1
 ```
@@ -233,6 +234,8 @@ image or trust data does not exist for dtr.example.com/admin/trustdemo:1
 This means something went wrong when initiating the repository or signing the
 image, as the tag contains no signing data. 
 
+#### Image did not meet required signing policy
+
 ```
 Error response from daemon: image did not meet required signing policy
 
@@ -243,6 +246,14 @@ This means that the image was signed correctly, however the user who signed the
 image does not meet the signing policy in cluster 2. This could be because you
 signed the image with the wrong user keys.
 
+#### DTR URL must be a registered trusted registry
+
+```
+Error response from daemon: dtr.example.com must be a registered trusted registry. See 'docker run --help'.
+```
+
+This means you have not registered DTR to work with a remote UCP instance yet, as outlined in [Registering DTR with a Remote Universal Control Plane](#registering-dtr-with-a-remote-universal-control-plane).
+
 ## Where to go next
 
 - [Learn more about Notary](/notary/advanced_usage.md)

From 38423908d4994e0542d2f3a905f139c58d0de159 Mon Sep 17 00:00:00 2001
From: Sebastiaan van Stijn <github@gone.nl>
Date: Tue, 19 Mar 2019 12:14:44 +0100
Subject: [PATCH 15/16] Add highlighting to compose-file reference

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
---
 _includes/content/compose-extfields-sub.md |    8 +-
 _includes/content/compose-var-sub.md       |   14 +-
 compose/compose-file/index.md              | 1082 ++++++++++++--------
 3 files changed, 644 insertions(+), 460 deletions(-)

diff --git a/_includes/content/compose-extfields-sub.md b/_includes/content/compose-extfields-sub.md
index c6af94c088..b415632fda 100644
--- a/_includes/content/compose-extfields-sub.md
+++ b/_includes/content/compose-extfields-sub.md
@@ -8,7 +8,7 @@ your Compose file and their name start with the `x-` character sequence.
 > (for the 2.x series), extension fields are also allowed at the root
 > of service, volume, network, config and secret definitions.
 
-```none
+```yaml
 version: '3.4'
 x-custom:
   items:
@@ -24,7 +24,7 @@ inserted in your resource definitions using [YAML anchors](http://www.yaml.org/s
 For example, if you want several of your services to use the same logging
 configuration:
 
-```none
+```yaml
 logging:
   options:
     max-size: '12m'
@@ -34,7 +34,7 @@ logging:
 
 You may write your Compose file as follows:
 
-```none
+```yaml
 version: '3.4'
 x-logging:
   &default-logging
@@ -55,7 +55,7 @@ services:
 It is also possible to partially override values in extension fields using
 the [YAML merge type](http://yaml.org/type/merge.html). For example:
 
-```none
+```yaml
 version: '3.4'
 x-volumes:
   &default-volume
diff --git a/_includes/content/compose-var-sub.md b/_includes/content/compose-var-sub.md
index 54a780c114..4c333daab5 100644
--- a/_includes/content/compose-var-sub.md
+++ b/_includes/content/compose-var-sub.md
@@ -3,8 +3,10 @@ variable values from the shell environment in which `docker-compose` is run. For
 example, suppose the shell contains `POSTGRES_VERSION=9.3` and you supply this
 configuration:
 
-    db:
-      image: "postgres:${POSTGRES_VERSION}"
+```yaml
+db:
+  image: "postgres:${POSTGRES_VERSION}"
+```
 
 When you run `docker-compose up` with this configuration, Compose looks for the
 `POSTGRES_VERSION` environment variable in the shell and substitutes its value
@@ -47,9 +49,11 @@ dollar sign. This also prevents Compose from interpolating a value, so a `$$`
 allows you to refer to environment variables that you don't want processed by
 Compose.
 
-    web:
-      build: .
-      command: "$$VAR_NOT_INTERPOLATED_BY_COMPOSE"
+```yaml
+web:
+  build: .
+  command: "$$VAR_NOT_INTERPOLATED_BY_COMPOSE"
+```
 
 If you forget and use a single dollar sign (`$`), Compose interprets the value
 as an environment variable and warns you:
diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index a326d44f93..d727fabc5f 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -181,7 +181,7 @@ Configuration options that are applied at build time.
 `build` can be specified either as a string containing a path to the build
 context:
 
-```none
+```yaml
 version: '3'
 services:
   webapp:
@@ -191,7 +191,7 @@ services:
 Or, as an object with the path specified under [context](#context) and
 optionally [Dockerfile](#dockerfile) and [args](#args):
 
-```none
+```yaml
 version: '3'
 services:
   webapp:
@@ -205,8 +205,10 @@ services:
 If you specify `image` as well as `build`, then Compose names the built image
 with the `webapp` and optional `tag` specified in `image`:
 
-    build: ./dir
-    image: webapp:tag
+```yaml
+build: ./dir
+image: webapp:tag
+```
 
 This results in an image named `webapp` and tagged `tag`, built from `./dir`.
 
@@ -225,8 +227,10 @@ sent to the Docker daemon.
 Compose builds and tags it with a generated name, and uses that image
 thereafter.
 
-    build:
-      context: ./dir
+```yaml
+build:
+  context: ./dir
+```
 
 #### dockerfile
 
@@ -235,9 +239,11 @@ Alternate Dockerfile.
 Compose uses an alternate file to build with. A build path must also be
 specified.
 
-    build:
-      context: .
-      dockerfile: Dockerfile-alternate
+```yaml
+build:
+  context: .
+  dockerfile: Dockerfile-alternate
+```
 
 #### args
 
@@ -246,26 +252,32 @@ build process.
 
 First, specify the arguments in your Dockerfile:
 
-    ARG buildno
-    ARG gitcommithash
+```Dockerfile
+ARG buildno
+ARG gitcommithash
 
-    RUN echo "Build number: $buildno"
-    RUN echo "Based on commit: $gitcommithash"
+RUN echo "Build number: $buildno"
+RUN echo "Based on commit: $gitcommithash"
+```
 
 Then specify the arguments under the `build` key. You can pass a mapping
 or a list:
 
-    build:
-      context: .
-      args:
-        buildno: 1
-        gitcommithash: cdc3b19
+```yaml
+build:
+  context: .
+  args:
+    buildno: 1
+    gitcommithash: cdc3b19
+```
 
-    build:
-      context: .
-      args:
-        - buildno=1
-        - gitcommithash=cdc3b19
+```yaml
+build:
+  context: .
+  args:
+    - buildno=1
+    - gitcommithash=cdc3b19
+```
 
 > **Note**: In your Dockerfile, if you specify `ARG` before the `FROM` instruction, 
 > `ARG` is not available in the build instructions under `FROM`.
@@ -275,9 +287,11 @@ or a list:
 You can omit the value when specifying a build argument, in which case its value
 at build time is the value in the environment where Compose is running.
 
-    args:
-      - buildno
-      - gitcommithash
+```yaml
+args:
+  - buildno
+  - gitcommithash
+```
 
 > **Note**: YAML boolean values (`true`, `false`, `yes`, `no`, `on`, `off`) must
 > be enclosed in quotes, so that the parser interprets them as strings.
@@ -288,11 +302,13 @@ at build time is the value in the environment where Compose is running.
 
 A list of images that the engine uses for cache resolution.
 
-    build:
-      context: .
-      cache_from:
-        - alpine:latest
-        - corp/web_app:3.14
+```yaml
+build:
+  context: .
+  cache_from:
+    - alpine:latest
+    - corp/web_app:3.14
+```
 
 #### labels
 
@@ -304,20 +320,23 @@ You can use either an array or a dictionary.
 We recommend that you use reverse-DNS notation to prevent your labels from conflicting with
 those used by other software.
 
-    build:
-      context: .
-      labels:
-        com.example.description: "Accounting webapp"
-        com.example.department: "Finance"
-        com.example.label-with-empty-value: ""
+```yaml
+build:
+  context: .
+  labels:
+    com.example.description: "Accounting webapp"
+    com.example.department: "Finance"
+    com.example.label-with-empty-value: ""
+```
 
-
-    build:
-      context: .
-      labels:
-        - "com.example.description=Accounting webapp"
-        - "com.example.department=Finance"
-        - "com.example.label-with-empty-value"
+```yaml
+build:
+  context: .
+  labels:
+    - "com.example.description=Accounting webapp"
+    - "com.example.department=Finance"
+    - "com.example.label-with-empty-value"
+```
 
 #### shm_size
 
@@ -327,14 +346,17 @@ Set the size of the `/dev/shm` partition for this build's containers. Specify
 as an integer value representing the number of bytes or as a string expressing
 a [byte value](#specifying-byte-values).
 
-    build:
-      context: .
-      shm_size: '2gb'
+```yaml
+build:
+  context: .
+  shm_size: '2gb'
+```
 
-
-    build:
-      context: .
-      shm_size: 10000000
+```yaml
+build:
+  context: .
+  shm_size: 10000000
+```
 
 #### target
 
@@ -344,21 +366,25 @@ Build the specified stage as defined inside the `Dockerfile`. See the
 [multi-stage build docs](/engine/userguide/eng-image/multistage-build.md) for
 details.
 
-      build:
-        context: .
-        target: prod
+```yaml
+build:
+  context: .
+  target: prod
+```
 
 ### cap_add, cap_drop
 
 Add or drop container capabilities.
 See `man 7 capabilities` for a full list.
 
-    cap_add:
-      - ALL
+```yaml
+cap_add:
+  - ALL
 
-    cap_drop:
-      - NET_ADMIN
-      - SYS_ADMIN
+cap_drop:
+  - NET_ADMIN
+  - SYS_ADMIN
+```
 
 > **Note**: These options are ignored when
 > [deploying a stack in swarm mode](/engine/reference/commandline/stack_deploy.md)
@@ -368,7 +394,9 @@ See `man 7 capabilities` for a full list.
 
 Specify an optional parent cgroup for the container.
 
-    cgroup_parent: m-executor-abcd
+```yaml
+cgroup_parent: m-executor-abcd
+```
 
 > **Note**: This option is ignored when
 > [deploying a stack in swarm mode](/engine/reference/commandline/stack_deploy.md)
@@ -378,12 +406,16 @@ Specify an optional parent cgroup for the container.
 
 Override the default command.
 
-    command: bundle exec thin -p 3000
+```yaml
+command: bundle exec thin -p 3000
+```
 
 The command can also be a list, in a manner similar to
 [dockerfile](/engine/reference/builder.md#cmd):
 
-    command: ["bundle", "exec", "thin", "-p", "3000"]
+```yaml
+command: ["bundle", "exec", "thin", "-p", "3000"]
+```
 
 ### configs
 
@@ -414,7 +446,7 @@ the stack deployment fails with a `config not found` error.
 > **Note**: `config` definitions are only supported in version 3.3 and higher
 >  of the compose file format.
 
-```none
+```yaml
 version: "3.3"
 services:
   redis:
@@ -456,7 +488,7 @@ container, sets the mode to `0440` (group-readable) and sets the user and group
 to `103`. The `redis` service does not have access to the `my_other_config`
 config.
 
-```none
+```yaml
 version: "3.3"
 services:
   redis:
@@ -483,7 +515,9 @@ short syntax. Defining a config does not imply granting a service access to it.
 
 Specify a custom container name, rather than a generated default name.
 
-    container_name: my-web-container
+```yaml
+container_name: my-web-container
+```
 
 Because Docker container names must be unique, you cannot scale a service beyond
 1 container if you have specified a custom name. Attempting to do so results in
@@ -506,8 +540,10 @@ subdirectory in the Docker data directory, which defaults to `C:\ProgramData\Doc
 on Windows. The following example loads the credential spec from a file named
 `C:\ProgramData\Docker\CredentialSpecs\my-credential-spec.json`:
 
-    credential_spec:
-      file: my-credential-spec.json
+```yaml
+credential_spec:
+  file: my-credential-spec.json
+```
 
 When using `registry:`, the credential spec is read from the Windows registry on
 the daemon's host. A registry value with the given name must be located in:
@@ -517,8 +553,10 @@ the daemon's host. A registry value with the given name must be located in:
 The following example load the credential spec from a value named `my-credential-spec`
 in the registry:
 
-    credential_spec:
-      registry: my-credential-spec
+```yaml
+credential_spec:
+  registry: my-credential-spec
+```
 
 ### depends_on
 
@@ -534,17 +572,19 @@ behaviors:
 
 Simple example:
 
-    version: '3'
-    services:
-      web:
-        build: .
-        depends_on:
-          - db
-          - redis
-      redis:
-        image: redis
-      db:
-        image: postgres
+```yaml
+version: '3'
+services:
+  web:
+    build: .
+    depends_on:
+      - db
+      - redis
+  redis:
+    image: redis
+  db:
+    image: postgres
+```
 
 > There are several things to be aware of when using `depends_on`:
 >
@@ -568,18 +608,19 @@ only takes effect when deploying to a [swarm](/engine/swarm/index.md) with
 [docker stack deploy](/engine/reference/commandline/stack_deploy.md), and is
 ignored by `docker-compose up` and `docker-compose run`.
 
-    version: '3'
-    services:
-      redis:
-        image: redis:alpine
-        deploy:
-          replicas: 6
-          update_config:
-            parallelism: 2
-            delay: 10s
-          restart_policy:
-            condition: on-failure
-
+```yaml
+version: '3'
+services:
+  redis:
+    image: redis:alpine
+    deploy:
+      replicas: 6
+      update_config:
+        parallelism: 2
+        delay: 10s
+      restart_policy:
+        condition: on-failure
+```
 
 Several sub-options are available:
 
@@ -603,7 +644,7 @@ and the client connects directly to one of these. DNS round-robin is useful
 in cases where you want to use your own load balancer, or for Hybrid
 Windows and Linux applications.
 
-```none
+```yaml
 version: "3.3"
 
 services:
@@ -652,23 +693,26 @@ mode topics.
 Specify labels for the service. These labels are *only* set on the service,
 and *not* on any containers for the service.
 
-    version: "3"
-    services:
-      web:
-        image: web
-        deploy:
-          labels:
-            com.example.description: "This label will appear on the web service"
+```yaml
+version: "3"
+services:
+  web:
+    image: web
+    deploy:
+      labels:
+        com.example.description: "This label will appear on the web service"
+```
 
 To set labels on containers instead, use the `labels` key outside of `deploy`:
 
-    version: "3"
-    services:
-      web:
-        image: web
-        labels:
-          com.example.description: "This label will appear on all containers for the web service"
-
+```yaml
+version: "3"
+services:
+  web:
+    image: web
+    labels:
+      com.example.description: "This label will appear on all containers for the web service"
+```
 
 #### mode
 
@@ -679,44 +723,50 @@ services](/engine/swarm/how-swarm-mode-works/services/#replicated-and-global-ser
 in the [swarm](/engine/swarm/) topics.)
 
 
-    version: '3'
-    services:
-      worker:
-        image: dockersamples/examplevotingapp_worker
-        deploy:
-          mode: global
+```yaml
+version: '3'
+services:
+  worker:
+    image: dockersamples/examplevotingapp_worker
+    deploy:
+      mode: global
+```
 
 #### placement
 
 Specify placement of constraints and preferences. See the docker service create documentation for a full description of the syntax and available types of [constraints](/engine/reference/commandline/service_create.md#specify-service-constraints-constraint) and [preferences](/engine/reference/commandline/service_create.md#specify-service-placement-preferences-placement-pref).
 
-    version: '3.3'
-    services:
-      db:
-        image: postgres
-        deploy:
-          placement:
-            constraints:
-              - node.role == manager
-              - engine.labels.operatingsystem == ubuntu 14.04
-            preferences:
-              - spread: node.labels.zone
+```yaml
+version: '3.3'
+services:
+  db:
+    image: postgres
+    deploy:
+      placement:
+        constraints:
+          - node.role == manager
+          - engine.labels.operatingsystem == ubuntu 14.04
+        preferences:
+          - spread: node.labels.zone
+```
 
 #### replicas
 
 If the service is `replicated` (which is the default), specify the number of
 containers that should be running at any given time.
 
-    version: '3'
-    services:
-      worker:
-        image: dockersamples/examplevotingapp_worker
-        networks:
-          - frontend
-          - backend
-        deploy:
-          mode: replicated
-          replicas: 6
+```yaml
+version: '3'
+services:
+  worker:
+    image: dockersamples/examplevotingapp_worker
+    networks:
+      - frontend
+      - backend
+    deploy:
+      mode: replicated
+      replicas: 6
+```
 
 #### resources
 
@@ -734,7 +784,7 @@ In this general example, the `redis` service is constrained to use no more than
 50M of memory and `0.50` (50% of a single core) of available processing time (CPU), 
 and has `20M` of memory and `0.25` CPU time reserved (as always available to it).
 
-```none
+```yaml
 version: '3'
 services:
   redis:
@@ -790,7 +840,7 @@ Configures if and how to restart containers when they exit. Replaces
   specified as a [duration](#specifying-durations) (default:
   decide immediately).
 
-```none
+```yaml
 version: "3"
 services:
   redis:
@@ -833,7 +883,7 @@ updates.
 > **Note**: `order` is only supported for v3.4 and higher of the compose
 file format.
 
-```none
+```yaml
 version: '3.4'
 services:
   vote:
@@ -878,8 +928,10 @@ access to the requisite volumes.
 List of device mappings.  Uses the same format as the `--device` docker
 client create option.
 
-    devices:
-      - "/dev/ttyUSB0:/dev/ttyUSB0"
+```yaml
+devices:
+  - "/dev/ttyUSB0:/dev/ttyUSB0"
+```
 
 > **Note**: This option is ignored when
 > [deploying a stack in swarm mode](/engine/reference/commandline/stack_deploy.md)
@@ -902,17 +954,19 @@ behaviors:
 
 Simple example:
 
-    version: '3'
-    services:
-      web:
-        build: .
-        depends_on:
-          - db
-          - redis
-      redis:
-        image: redis
-      db:
-        image: postgres
+```yaml
+version: '3'
+services:
+  web:
+    build: .
+    depends_on:
+      - db
+      - redis
+  redis:
+    image: redis
+  db:
+    image: postgres
+```
 
 > There are several things to be aware of when using `depends_on`:
 >
@@ -931,36 +985,47 @@ Simple example:
 
 Custom DNS servers. Can be a single value or a list.
 
-    dns: 8.8.8.8
-    dns:
-      - 8.8.8.8
-      - 9.9.9.9
+```yaml
+dns: 8.8.8.8
+dns:
+  - 8.8.8.8
+  - 9.9.9.9
+```
 
 ### dns_search
 
 Custom DNS search domains. Can be a single value or a list.
 
-    dns_search: example.com
-    dns_search:
-      - dc1.example.com
-      - dc2.example.com
+```yaml
+dns_search: example.com
+```
+
+```yaml
+dns_search:
+  - dc1.example.com
+  - dc2.example.com
+```
 
 ### entrypoint
 
 Override the default entrypoint.
 
-    entrypoint: /code/entrypoint.sh
+```yaml
+entrypoint: /code/entrypoint.sh
+```
 
 The entrypoint can also be a list, in a manner similar to
 [dockerfile](/engine/reference/builder.md#entrypoint):
 
-    entrypoint:
-        - php
-        - -d
-        - zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20100525/xdebug.so
-        - -d
-        - memory_limit=-1
-        - vendor/bin/phpunit
+```yaml
+entrypoint:
+    - php
+    - -d
+    - zend_extension=/usr/local/lib/php/extensions/no-debug-non-zts-20100525/xdebug.so
+    - -d
+    - memory_limit=-1
+    - vendor/bin/phpunit
+```
 
 > **Note**: Setting `entrypoint` both overrides any default entrypoint set
 > on the service's image with the `ENTRYPOINT` Dockerfile instruction, *and*
@@ -978,19 +1043,25 @@ Environment variables declared in the [environment](#environment) section
 _override_ these values &ndash; this holds true even if those values are
 empty or undefined.
 
-    env_file: .env
+```yaml
+env_file: .env
+```
 
-    env_file:
-      - ./common.env
-      - ./apps/web.env
-      - /opt/secrets.env
+```yaml
+env_file:
+  - ./common.env
+  - ./apps/web.env
+  - /opt/secrets.env
+```
 
 Compose expects each line in an env file to be in `VAR=VAL` format. Lines
 beginning with `#` are treated as comments and are ignored. Blank lines are
 also ignored.
 
-    # Set Rails/Rack environment
-    RACK_ENV=development
+```bash
+# Set Rails/Rack environment
+RACK_ENV=development
+```
 
 > **Note**: If your service specifies a [build](#build) option, variables
 > defined in environment files are _not_ automatically visible during the
@@ -1008,7 +1079,7 @@ list are processed from the top down. For the same variable specified in file
 listed below (after), then the value from `b.env` stands. For example, given the
 following declaration in `docker-compose.yml`:
 
-```none
+```yaml
 services:
   some-service:
     env_file:
@@ -1018,19 +1089,19 @@ services:
 
 And the following files:
 
-```none
+```bash
 # a.env
 VAR=1
 ```
 
 and
 
-```none
+```bash
 # b.env
 VAR=hello
 ```
 
-$VAR is `hello`.
+`$VAR` is `hello`.
 
 ### environment
 
@@ -1041,15 +1112,19 @@ they are not converted to True or False by the YML parser.
 Environment variables with only a key are resolved to their values on the
 machine Compose is running on, which can be helpful for secret or host-specific values.
 
-    environment:
-      RACK_ENV: development
-      SHOW: 'true'
-      SESSION_SECRET:
+```yaml
+environment:
+  RACK_ENV: development
+  SHOW: 'true'
+  SESSION_SECRET:
+```
 
-    environment:
-      - RACK_ENV=development
-      - SHOW=true
-      - SESSION_SECRET
+```yaml
+environment:
+  - RACK_ENV=development
+  - SHOW=true
+  - SESSION_SECRET
+```
 
 > **Note**: If your service specifies a [build](#build) option, variables
 > defined in `environment` are _not_ automatically visible during the
@@ -1061,9 +1136,11 @@ machine Compose is running on, which can be helpful for secret or host-specific
 Expose ports without publishing them to the host machine - they'll only be
 accessible to linked services. Only the internal port can be specified.
 
-    expose:
-     - "3000"
-     - "8000"
+```yaml
+expose:
+ - "3000"
+ - "8000"
+```
 
 ### external_links
 
@@ -1072,10 +1149,12 @@ Compose, especially for containers that provide shared or common services.
 `external_links` follow semantics similar to the legacy option `links` when
 specifying both the container name and the link alias (`CONTAINER:ALIAS`).
 
-    external_links:
-     - redis_1
-     - project_db_1:mysql
-     - project_db_1:postgresql
+```yaml
+external_links:
+ - redis_1
+ - project_db_1:mysql
+ - project_db_1:postgresql
+```
 
 > **Notes:**
 >
@@ -1091,14 +1170,18 @@ with a (version 3) Compose file.
 
 Add hostname mappings. Use the same values as the docker client `--add-host` parameter.
 
-    extra_hosts:
-     - "somehost:162.242.195.82"
-     - "otherhost:50.31.209.229"
+```yaml
+extra_hosts:
+ - "somehost:162.242.195.82"
+ - "otherhost:50.31.209.229"
+```
 
 An entry with the ip address and hostname is created in `/etc/hosts` inside containers for this service, e.g:
 
-    162.242.195.82  somehost
-    50.31.209.229   otherhost
+```none
+162.242.195.82  somehost
+50.31.209.229   otherhost
+```
 
 ### healthcheck
 
@@ -1109,12 +1192,14 @@ service are "healthy". See the docs for the
 [HEALTHCHECK Dockerfile instruction](/engine/reference/builder.md#healthcheck)
 for details on how healthchecks work.
 
-    healthcheck:
-      test: ["CMD", "curl", "-f", "http://localhost"]
-      interval: 1m30s
-      timeout: 10s
-      retries: 3
-      start_period: 40s
+```yaml
+healthcheck:
+  test: ["CMD", "curl", "-f", "http://localhost"]
+  interval: 1m30s
+  timeout: 10s
+  retries: 3
+  start_period: 40s
+```
 
 `interval`, `timeout` and `start_period` are specified as [durations](#specifying-durations).
 
@@ -1125,18 +1210,28 @@ file format.
 either `NONE`, `CMD` or `CMD-SHELL`. If it's a string, it's equivalent to
 specifying `CMD-SHELL` followed by that string.
 
-    # Hit the local web app
-    test: ["CMD", "curl", "-f", "http://localhost"]
+```yaml
+# Hit the local web app
+test: ["CMD", "curl", "-f", "http://localhost"]
+```
 
-    # As above, but wrapped in /bin/sh. Both forms below are equivalent.
-    test: ["CMD-SHELL", "curl -f http://localhost || exit 1"]
-    test: curl -f https://localhost || exit 1
+As above, but wrapped in `/bin/sh`. Both forms below are equivalent.
+
+```yaml
+test: ["CMD-SHELL", "curl -f http://localhost || exit 1"]
+```
+
+```yaml
+test: curl -f https://localhost || exit 1
+```
 
 To disable any default healthcheck set by the image, you can use `disable:
 true`. This is equivalent to specifying `test: ["NONE"]`.
 
-    healthcheck:
-      disable: true
+```yaml
+healthcheck:
+  disable: true
+```
 
 ### image
 
@@ -1161,18 +1256,21 @@ Run an init inside the container that forwards signals and reaps processes.
 Either set a boolean value to use the default `init`, or specify a path to
 a custom one.
 
-    version: '3.7'
-    services:
-      web:
-        image: alpine:latest
-        init: true
+```yaml
+version: '3.7'
+services:
+  web:
+    image: alpine:latest
+    init: true
+```
 
-
-    version: '2.2'
-    services:
-      web:
-        image: alpine:latest
-        init: /usr/libexec/docker-init
+```yaml
+version: '2.2'
+services:
+  web:
+    image: alpine:latest
+    init: /usr/libexec/docker-init
+```
 
 ### isolation
 
@@ -1188,15 +1286,19 @@ Add metadata to containers using [Docker labels](/engine/userguide/labels-custom
 
 It's recommended that you use reverse-DNS notation to prevent your labels from conflicting with those used by other software.
 
-    labels:
-      com.example.description: "Accounting webapp"
-      com.example.department: "Finance"
-      com.example.label-with-empty-value: ""
+```yaml
+labels:
+  com.example.description: "Accounting webapp"
+  com.example.department: "Finance"
+  com.example.label-with-empty-value: ""
+```
 
-    labels:
-      - "com.example.description=Accounting webapp"
-      - "com.example.department=Finance"
-      - "com.example.label-with-empty-value"
+```yaml
+labels:
+  - "com.example.description=Accounting webapp"
+  - "com.example.department=Finance"
+  - "com.example.label-with-empty-value"
+```
 
 ### links
 
@@ -1213,11 +1315,13 @@ containers in a more controlled way.
 Link to containers in another service. Either specify both the service name and
 a link alias (`SERVICE:ALIAS`), or just the service name.
 
-    web:
-      links:
-       - db
-       - db:database
-       - redis
+```yaml
+web:
+  links:
+   - db
+   - db:database
+   - redis
+```
 
 Containers for the linked service are reachable at a hostname identical to
 the alias, or the service name if no alias was specified.
@@ -1243,10 +1347,12 @@ Links also express dependency between services in the same way as
 
 Logging configuration for the service.
 
-    logging:
-      driver: syslog
-      options:
-        syslog-address: "tcp://192.168.0.42:123"
+```yaml
+logging:
+  driver: syslog
+  options:
+    syslog-address: "tcp://192.168.0.42:123"
+```
 
 The `driver`  name specifies a logging driver for the service's
 containers, as with the ``--log-driver`` option for docker run
@@ -1266,15 +1372,19 @@ Specify logging options for the logging driver with the ``options`` key, as with
 
 Logging options are key-value pairs. An example of `syslog` options:
 
-    driver: "syslog"
-    options:
-      syslog-address: "tcp://192.168.0.42:123"
+```yaml
+driver: "syslog"
+options:
+  syslog-address: "tcp://192.168.0.42:123"
+```
 
 The default driver [json-file](/engine/admin/logging/overview.md#json-file), has options to limit the amount of logs stored. To do this, use a key-value pair for maximum storage size and maximum number of files:
 
-    options:
-      max-size: "200k"
-      max-file: "10"
+```yaml
+options:
+  max-size: "200k"
+  max-file: "10"
+```
 
 The example shown above would store log files until they reach a `max-size` of
 200kB, and then rotate them. The amount of individual log files stored is
@@ -1283,14 +1393,17 @@ files are removed to allow storage of new logs.
 
 Here is an example `docker-compose.yml` file that limits logging storage:
 
-    services:
-      some-service:
-        image: some-service
-        logging:
-          driver: "json-file"
-          options:
-            max-size: "200k"
-            max-file: "10"
+```yaml
+version: '3.7'
+services:
+  some-service:
+    image: some-service
+    logging:
+      driver: "json-file"
+      options:
+        max-size: "200k"
+        max-file: "10"
+```
 
 > Logging options available depend on which logging driver you use
 >
@@ -1325,11 +1438,13 @@ the special form `service:[service name]`.
 Networks to join, referencing entries under the
 [top-level `networks` key](#network-configuration-reference).
 
-    services:
-      some-service:
-        networks:
-         - some-network
-         - other-network
+```yaml
+services:
+  some-service:
+    networks:
+     - some-network
+     - other-network
+```
 
 #### aliases
 
@@ -1341,48 +1456,52 @@ Since `aliases` is network-scoped, the same service can have different aliases o
 
 The general format is shown here.
 
-    services:
-      some-service:
-        networks:
-          some-network:
-            aliases:
-             - alias1
-             - alias3
-          other-network:
-            aliases:
-             - alias2
+```yaml
+services:
+  some-service:
+    networks:
+      some-network:
+        aliases:
+         - alias1
+         - alias3
+      other-network:
+        aliases:
+         - alias2
+```
 
 In the example below, three services are provided (`web`, `worker`, and `db`),
 along with two networks (`new` and `legacy`). The `db` service is reachable at
 the hostname `db` or `database` on the `new` network, and at `db` or `mysql` on
 the `legacy` network.
 
-    version: '2'
+```yaml
+version: '2'
 
-    services:
-      web:
-        build: ./web
-        networks:
-          - new
+services:
+  web:
+    build: ./web
+    networks:
+      - new
 
-      worker:
-        build: ./worker
-        networks:
-          - legacy
-
-      db:
-        image: mysql
-        networks:
-          new:
-            aliases:
-              - database
-          legacy:
-            aliases:
-              - mysql
+  worker:
+    build: ./worker
+    networks:
+      - legacy
 
+  db:
+    image: mysql
     networks:
       new:
+        aliases:
+          - database
       legacy:
+        aliases:
+          - mysql
+
+networks:
+  new:
+  legacy:
+```
 
 #### ipv4_address, ipv6_address
 
@@ -1448,15 +1567,17 @@ port (an ephemeral host port is chosen).
 > parses numbers in the format `xx:yy` as a base-60 value. For this reason,
 > we recommend always explicitly specifying your port mappings as strings.
 
-    ports:
-     - "3000"
-     - "3000-3005"
-     - "8000:8000"
-     - "9090-9091:8080-8081"
-     - "49100:22"
-     - "127.0.0.1:8001:8001"
-     - "127.0.0.1:5000-5010:5000-5010"
-     - "6060:6060/udp"
+```yaml
+ports:
+ - "3000"
+ - "3000-3005"
+ - "8000:8000"
+ - "9090-9091:8080-8081"
+ - "49100:22"
+ - "127.0.0.1:8001:8001"
+ - "127.0.0.1:5000-5010:5000-5010"
+ - "6060:6060/udp"
+```
 
 #### Long syntax
 
@@ -1469,13 +1590,12 @@ expressed in the short form.
 - `mode`: `host` for publishing a host port on each node, or `ingress` for a swarm
    mode port to be load balanced.
 
-```none
+```yaml
 ports:
   - target: 80
     published: 8080
     protocol: tcp
     mode: host
-
 ```
 
 > **Note**: The long syntax is new in v3.2
@@ -1522,7 +1642,7 @@ already been defined in Docker, either by running the `docker secret create`
 command or by another stack deployment. If the external secret does not exist,
 the stack deployment fails with a `secret not found` error.
 
-```none
+```yaml
 version: "3.1"
 services:
   redis:
@@ -1565,7 +1685,7 @@ container, sets the mode to `0440` (group-readable) and sets the user and group
 to `103`. The `redis` service does not have access to the `my_other_secret`
 secret.
 
-```none
+```yaml
 version: "3.1"
 services:
   redis:
@@ -1592,9 +1712,11 @@ short syntax. Defining a secret does not imply granting a service access to it.
 
 Override the default labeling scheme for each container.
 
-    security_opt:
-      - label:user:USER
-      - label:role:ROLE
+```yaml
+security_opt:
+  - label:user:USER
+  - label:role:ROLE
+```
 
 > **Note**: This option is ignored when
 > [deploying a stack in swarm mode](/engine/reference/commandline/stack_deploy.md)
@@ -1619,7 +1741,9 @@ Sets an alternative signal to stop the container. By default `stop` uses
 SIGTERM. Setting an alternative signal using `stop_signal` causes
 `stop` to send that signal instead.
 
-    stop_signal: SIGUSR1
+```yaml
+stop_signal: SIGUSR1
+```
 
 > **Note**: This option is ignored when
 > [deploying a stack in swarm mode](/engine/reference/commandline/stack_deploy.md)
@@ -1630,13 +1754,17 @@ SIGTERM. Setting an alternative signal using `stop_signal` causes
 Kernel parameters to set in the container. You can use either an array or a
 dictionary.
 
-    sysctls:
-      net.core.somaxconn: 1024
-      net.ipv4.tcp_syncookies: 0
+```yaml
+sysctls:
+  net.core.somaxconn: 1024
+  net.ipv4.tcp_syncookies: 0
+```
 
-    sysctls:
-      - net.core.somaxconn=1024
-      - net.ipv4.tcp_syncookies=0
+```yaml
+sysctls:
+  - net.core.somaxconn=1024
+  - net.ipv4.tcp_syncookies=0
+```
 
 > **Note**: This option is ignored when
 > [deploying a stack in swarm mode](/engine/reference/commandline/stack_deploy.md)
@@ -1648,10 +1776,15 @@ dictionary.
 
 Mount a temporary file system inside the container. Can be a single value or a list.
 
-    tmpfs: /run
-    tmpfs:
-      - /run
-      - /tmp
+```yaml
+tmpfs: /run
+```
+
+```yaml
+tmpfs:
+  - /run
+  - /tmp
+```
 
 > **Note**: This option is ignored when
 > [deploying a stack in swarm mode](/engine/reference/commandline/stack_deploy.md)
@@ -1662,10 +1795,12 @@ Mount a temporary file system inside the container. Can be a single value or a l
 Mount a temporary file system inside the container. Size parameter specifies the size
 of the tmpfs mount in bytes. Unlimited by default.
 
-     - type: tmpfs
-         target: /app
-         tmpfs:
-           size: 1000
+```yaml
+ - type: tmpfs
+     target: /app
+     tmpfs:
+       size: 1000
+```
 
 ### ulimits
 
@@ -1673,15 +1808,19 @@ Override the default ulimits for a container. You can either specify a single
 limit as an integer or soft/hard limits as a mapping.
 
 
-    ulimits:
-      nproc: 65535
-      nofile:
-        soft: 20000
-        hard: 40000
+```yaml
+ulimits:
+  nproc: 65535
+  nofile:
+    soft: 20000
+    hard: 40000
+```
 
 ### userns_mode
 
-    userns_mode: "host"
+```yaml
+userns_mode: "host"
+```
 
 Disables the user namespace for this service, if Docker daemon is configured with user namespaces.
 See [dockerd](/engine/reference/commandline/dockerd.md#disable-user-namespace-for-a-container) for
@@ -1715,7 +1854,7 @@ path under `db` service `volumes`), but defines it using the old string format
 for mounting a named volume. Named volumes must be listed under the top-level
 `volumes` key, as shown.
 
-```none
+```yaml
 version: "3.2"
 services:
   web:
@@ -1754,22 +1893,23 @@ You can mount a relative path on the host, that expands relative to
 the directory of the Compose configuration file being used. Relative paths
 should always begin with `.` or `..`.
 
-    volumes:
-      # Just specify a path and let the Engine create a volume
-      - /var/lib/mysql
+```yaml
+volumes:
+  # Just specify a path and let the Engine create a volume
+  - /var/lib/mysql
 
-      # Specify an absolute path mapping
-      - /opt/data:/var/lib/mysql
+  # Specify an absolute path mapping
+  - /opt/data:/var/lib/mysql
 
-      # Path on the host, relative to the Compose file
-      - ./cache:/tmp/cache
+  # Path on the host, relative to the Compose file
+  - ./cache:/tmp/cache
 
-      # User-relative path
-      - ~/configs:/etc/configs/:ro
-
-      # Named volume
-      - datavolume:/var/lib/mysql
+  # User-relative path
+  - ~/configs:/etc/configs/:ro
 
+  # Named volume
+  - datavolume:/var/lib/mysql
+```
 
 #### Long syntax
 
@@ -1791,7 +1931,7 @@ expressed in the short form.
   - `size`: the size for the tmpfs mount in bytes
 - `consistency`: the consistency requirements of the mount, one of `consistent` (host and container have identical view), `cached` (read cache, host view is authoritative) or `delegated` (read-write cache, container's view is authoritative)
 
-```none
+```yaml
 version: "3.2"
 services:
   web:
@@ -1839,7 +1979,7 @@ Labs](https://github.com/docker/labs/blob/master/beginner/chapters/votingapp.md)
 configured as a named volume to persist the data on the swarm,
 _and_ is constrained to run only on `manager` nodes. Here is the relevant snip-it from that file:
 
-```none
+```yaml
 version: "3"
 services:
   db:
@@ -1875,7 +2015,7 @@ are visible on the host.
 
 Here is an example of configuring a volume as `cached`:
 
-```none
+```yaml
 version: '3'
 services:
   php:
@@ -1895,22 +2035,23 @@ volume mounts (shared filesystems)](/docker-for-mac/osxfs-caching.md).
 Each of these is a single value, analogous to its
 [docker run](/engine/reference/run.md) counterpart. Note that `mac_address` is a legacy option.
 
-    user: postgresql
-    working_dir: /code
+```yaml
+user: postgresql
+working_dir: /code
 
-    domainname: foo.com
-    hostname: foo
-    ipc: host
-    mac_address: 02:42:ac:11:65:43
+domainname: foo.com
+hostname: foo
+ipc: host
+mac_address: 02:42:ac:11:65:43
 
-    privileged: true
+privileged: true
 
 
-    read_only: true
-    shm_size: 64M
-    stdin_open: true
-    tty: true
-
+read_only: true
+shm_size: 64M
+stdin_open: true
+tty: true
+```
 
 ## Specifying durations
 
@@ -1959,20 +2100,22 @@ Here's an example of a two-service setup where a database's data directory is
 shared with another service as a volume so that it can be periodically backed
 up:
 
-    version: "3"
-
-    services:
-      db:
-        image: db
-        volumes:
-          - data-volume:/var/lib/db
-      backup:
-        image: backup-service
-        volumes:
-          - data-volume:/var/lib/backup/data
+```yaml
+version: "3"
 
+services:
+  db:
+    image: db
     volumes:
-      data-volume:
+      - data-volume:/var/lib/db
+  backup:
+    image: backup-service
+    volumes:
+      - data-volume:/var/lib/backup/data
+
+volumes:
+  data-volume:
+```
 
 An entry under the top-level `volumes` key can be empty, in which case it
 uses the default driver configured by the Engine (in most cases, this is the
@@ -1985,7 +2128,9 @@ driver the Docker Engine has been configured to use, which in most cases is
 `local`. If the driver is not available, the Engine returns an error when
 `docker-compose up` tries to create the volume.
 
-     driver: foobar
+```yaml
+driver: foobar
+```
 
 ### driver_opts
 
@@ -1993,12 +2138,14 @@ Specify a list of options as key-value pairs to pass to the driver for this
 volume. Those options are driver-dependent - consult the driver's
 documentation for more information. Optional.
 
-    volumes:
-      example:
-        driver_opts:
-          type: "nfs"
-          o: "addr=10.40.0.199,nolock,soft,rw"
-          device: ":/docker/example"
+```yaml
+volumes:
+  example:
+    driver_opts:
+      type: "nfs"
+      o: "addr=10.40.0.199,nolock,soft,rw"
+      device: ":/docker/example"
+```
 
 ### external
 
@@ -2015,17 +2162,19 @@ In the example below, instead of attempting to create a volume called
 `[projectname]_data`, Compose looks for an existing volume simply
 called `data` and mount it into the `db` service's containers.
 
-    version: '3'
-
-    services:
-      db:
-        image: postgres
-        volumes:
-          - data:/var/lib/postgresql/data
+```yaml
+version: '3'
 
+services:
+  db:
+    image: postgres
     volumes:
-      data:
-        external: true
+      - data:/var/lib/postgresql/data
+
+volumes:
+  data:
+    external: true
+```
 
 > [external.name was deprecated in version 3.4 file format](compose-versioning.md#version-34)
 > use `name` instead.
@@ -2033,10 +2182,12 @@ called `data` and mount it into the `db` service's containers.
 You can also specify the name of the volume separately from the name used to
 refer to it within the Compose file:
 
-    volumes:
-      data:
-        external:
-          name: actual-name-of-volume
+```yaml
+volumes:
+  data:
+    external:
+      name: actual-name-of-volume
+```
 
 > External volumes are always created with docker stack deploy
 >
@@ -2058,15 +2209,19 @@ an array or a dictionary.
 It's recommended that you use reverse-DNS notation to prevent your labels from
 conflicting with those used by other software.
 
-    labels:
-      com.example.description: "Database volume"
-      com.example.department: "IT/Ops"
-      com.example.label-with-empty-value: ""
+```yaml
+labels:
+  com.example.description: "Database volume"
+  com.example.department: "IT/Ops"
+  com.example.label-with-empty-value: ""
+```
 
-    labels:
-      - "com.example.description=Database volume"
-      - "com.example.department=IT/Ops"
-      - "com.example.label-with-empty-value"
+```yaml
+labels:
+  - "com.example.description=Database volume"
+  - "com.example.department=IT/Ops"
+  - "com.example.label-with-empty-value"
+```
 
 ### name
 
@@ -2076,18 +2231,22 @@ Set a custom name for this volume. The name field can be used to reference
 volumes that contain special characters. The name is used as is
 and will **not** be scoped with the stack name.
 
-    version: '3.4'
-    volumes:
-      data:
-        name: my-app-data
+```yaml
+version: '3.4'
+volumes:
+  data:
+    name: my-app-data
+```
 
 It can also be used in conjunction with the `external` property:
 
-    version: '3.4'
-    volumes:
-      data:
-        external: true
-        name: my-app-data
+```yaml
+version: '3.4'
+volumes:
+  data:
+    external: true
+    name: my-app-data
+```
 
 ## Network configuration reference
 
@@ -2111,7 +2270,9 @@ Swarm.
 
 The Docker Engine returns an error if the driver is not available.
 
-    driver: overlay
+```yaml
+driver: overlay
+```
 
 #### bridge
 
@@ -2147,9 +2308,10 @@ Docker has already created automatically) and an alias that Compose can use
 network, using the alias.
 
 ```yaml
+version: '3.7'
 services:
   web:
-    ...
+    # ...
     networks:
       hostnet: {}
 
@@ -2162,7 +2324,7 @@ networks:
 ```yaml
 services:
   web:
-    ...
+    # ...
     networks:
       nonet: {}
 
@@ -2178,9 +2340,11 @@ Specify a list of options as key-value pairs to pass to the driver for this
 network. Those options are driver-dependent - consult the driver's
 documentation for more information. Optional.
 
-      driver_opts:
-        foo: "bar"
-        baz: 1
+```yaml
+driver_opts:
+  foo: "bar"
+  baz: 1
+```
 
 ### attachable
 
@@ -2221,10 +2385,12 @@ which is optional:
 
 A full example:
 
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.28.0.0/16
+```yaml
+ipam:
+  driver: default
+  config:
+    - subnet: 172.28.0.0/16
+```
 
 > **Note**: Additional IPAM configurations, such as `gateway`, are only honored for version 2 at the moment.
 
@@ -2243,15 +2409,19 @@ an array or a dictionary.
 It's recommended that you use reverse-DNS notation to prevent your labels from
 conflicting with those used by other software.
 
-    labels:
-      com.example.description: "Financial transaction network"
-      com.example.department: "Finance"
-      com.example.label-with-empty-value: ""
+```yaml
+labels:
+  com.example.description: "Financial transaction network"
+  com.example.department: "Finance"
+  com.example.label-with-empty-value: ""
+```
 
-    labels:
-      - "com.example.description=Financial transaction network"
-      - "com.example.department=Finance"
-      - "com.example.label-with-empty-value"
+```yaml
+labels:
+  - "com.example.description=Financial transaction network"
+  - "com.example.department=Finance"
+  - "com.example.label-with-empty-value"
+```
 
 ### external
 
@@ -2269,23 +2439,24 @@ attempting to create a network called `[projectname]_outside`, Compose
 looks for an existing network simply called `outside` and connect the `proxy`
 service's containers to it.
 
-    version: '3'
-
-    services:
-      proxy:
-        build: ./proxy
-        networks:
-          - outside
-          - default
-      app:
-        build: ./app
-        networks:
-          - default
+```yaml
+version: '3'
 
+services:
+  proxy:
+    build: ./proxy
     networks:
-      outside:
-        external: true
+      - outside
+      - default
+  app:
+    build: ./app
+    networks:
+      - default
 
+networks:
+  outside:
+    external: true
+```
 
 > [external.name was deprecated in version 3.5 file format](compose-versioning.md#version-35)
 > use `name` instead.
@@ -2293,10 +2464,13 @@ service's containers to it.
 You can also specify the name of the network separately from the name used to
 refer to it within the Compose file:
 
-    networks:
-      outside:
-        external:
-          name: actual-name-of-network
+```yaml
+version: '3.5'
+networks:
+  outside:
+    external:
+      name: actual-name-of-network
+```
 
 ### name
 
@@ -2306,18 +2480,22 @@ Set a custom name for this network. The name field can be used to reference
 networks which contain special characters. The name is used as is
 and will **not** be scoped with the stack name.
 
-    version: '3.5'
-    networks:
-      network1:
-        name: my-app-net
+```yaml
+version: '3.5'
+networks:
+  network1:
+    name: my-app-net
+```
 
 It can also be used in conjunction with the `external` property:
 
-    version: '3.5'
-    networks:
-      network1:
-        external: true
-        name: my-app-net
+```yaml
+version: '3.5'
+networks:
+  network1:
+    external: true
+    name: my-app-net
+```
 
 ## configs configuration reference
 
@@ -2339,7 +2517,7 @@ In this example, `my_first_config` is created (as
 `<stack_name>_my_first_config)`when the stack is deployed,
 and `my_second_config` already exists in Docker.
 
-```none
+```yaml
 configs:
   my_first_config:
     file: ./config_data
@@ -2352,7 +2530,7 @@ is different from the name that exists within the service. The following
 example modifies the previous one to use the external config called
 `redis_config`.
 
-```none
+```yaml
 configs:
   my_first_config:
     file: ./config_data
@@ -2386,7 +2564,7 @@ In this example, `my_first_secret` is created as
 `<stack_name>_my_first_secret `when the stack is deployed,
 and `my_second_secret` already exists in Docker.
 
-```none
+```yaml
 secrets:
   my_first_secret:
     file: ./secret_data
@@ -2400,7 +2578,8 @@ example modifies the previous one to use the external secret called
 `redis_secret`.
 
 ### Compose File v3.5 and above
-```none
+
+```yaml
 secrets:
   my_first_secret:
     file: ./secret_data
@@ -2410,7 +2589,8 @@ secrets:
 ```
 
 ### Compose File v3.4 and under
-```none    
+
+```yaml
   my_second_secret:
     external:
       name: redis_secret

From 65a8901f505c7b1948c5cc8d46f34f709747e1f5 Mon Sep 17 00:00:00 2001
From: Maria Bermudez <bermudezmt@users.noreply.github.com>
Date: Tue, 19 Mar 2019 11:32:54 -0700
Subject: [PATCH 16/16] Remove extraneous info

---
 ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md b/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md
index 7539154616..3d15f2cb79 100644
--- a/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md
+++ b/ee/dtr/user/manage-images/sign-images/trust-with-remote-ucp.md
@@ -249,7 +249,7 @@ signed the image with the wrong user keys.
 #### DTR URL must be a registered trusted registry
 
 ```
-Error response from daemon: dtr.example.com must be a registered trusted registry. See 'docker run --help'.
+Error response from daemon: dtr.example.com must be a registered trusted registry.
 ```
 
 This means you have not registered DTR to work with a remote UCP instance yet, as outlined in [Registering DTR with a Remote Universal Control Plane](#registering-dtr-with-a-remote-universal-control-plane).