From ddf8543d282487b2179cdec7692cb3e05530f4e0 Mon Sep 17 00:00:00 2001 From: Usha Mandya Date: Tue, 16 Mar 2021 13:41:11 +0000 Subject: [PATCH] Fix comment from Chris and update a note format Signed-off-by: Usha Mandya --- compose/compose-file/compose-file-v2.md | 15 +-------------- compose/compose-file/compose-versioning.md | 11 ++++++----- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/compose/compose-file/compose-file-v2.md b/compose/compose-file/compose-file-v2.md index 8f257e087a..62e0cfff2f 100644 --- a/compose/compose-file/compose-file-v2.md +++ b/compose/compose-file/compose-file-v2.md @@ -997,8 +997,6 @@ options: ### network_mode > Changed in [version 2](compose-versioning.md#version-2) file format. -> -> The `network_mode` option replaces the Compose file version 1 net option. Network mode. Use the same values as the docker client `--network` parameter, plus the special form `service:[service name]`. @@ -1022,8 +1020,6 @@ network_mode: "container:[container name/id]" ### networks > Changed in [version 2](compose-versioning.md#version-2) file format. -> -> The `networks` option replaces the Compose file version 1 net option. Networks to join, referencing entries under the [top-level `networks` key](#network-configuration-reference). @@ -1534,15 +1530,6 @@ volumes_from: ``` > Changed in [version 2](compose-versioning.md#version-2) file format. -> -> The `container:...` formats are only supported in the [version 2](compose-versioning.md#version-2) -> file format. In [version 1](compose-versioning.md#version-1), you can use container -> names without marking them as such: -> -> - `service_name` -> - `service_name:ro` -> - `container_name` -> - `container_name:rw` ### restart @@ -1817,7 +1804,7 @@ driver: overlay > Changed in [version 2.1](compose-versioning.md#version-21) file format. > -> Starting in Compose file format 2.1, overlay networks are always created as +> Starting with Compose file format 2.1, overlay networks are always created as > `attachable`, and this is not configurable. This means that standalone > containers can connect to overlay networks. diff --git a/compose/compose-file/compose-versioning.md b/compose/compose-file/compose-versioning.md index c22f2da70a..6e71ea5a46 100644 --- a/compose/compose-file/compose-versioning.md +++ b/compose/compose-file/compose-versioning.md @@ -128,17 +128,18 @@ discoverable at a hostname that's the same as the service name. This means [links](compose-file-v2.md#links) are largely unnecessary. For more details, see [Networking in Compose](../networking.md). -> **Note**: When specifying the Compose file version to use, make sure to +> **Note** +> +> When specifying the Compose file version to use, make sure to > specify both the _major_ and _minor_ numbers. If no minor version is given, -> `0` is used by default and not the latest minor version. As a result, features added in -> later versions will not be supported. For example: +> `0` is used by default and not the latest minor version. As a result, features added in later versions will not be supported. For example: > > ```yaml > version: "2" > ``` -> +> > is equivalent to: -> +> > ```yaml > version: "2.0" > ```