docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix comment from Chris and update a note format 

Signed-off-by: Usha Mandya <usha.mandya@docker.com>
This commit is contained in:
Usha Mandya 2021-03-16 13:41:11 +00:00
parent dacfbd27e3
commit ddf8543d28
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
compose/compose-file/compose-file-v2.md
View File

@ -997,8 +997,6 @@ options:
### network_mode ### network_mode
> Changed in [version 2](compose-versioning.md#version-2) file format. > 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 Network mode. Use the same values as the docker client `--network` parameter, plus
the special form `service:[service name]`. the special form `service:[service name]`.
@ -1022,8 +1020,6 @@ network_mode: "container:[container name/id]"
### networks ### networks
> Changed in [version 2](compose-versioning.md#version-2) file format. > 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 Networks to join, referencing entries under the
[top-level `networks` key](#network-configuration-reference). [top-level `networks` key](#network-configuration-reference).
@ -1534,15 +1530,6 @@ volumes_from:
``` ```
> Changed in [version 2](compose-versioning.md#version-2) file format. > 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 ### restart
@ -1817,7 +1804,7 @@ driver: overlay
> Changed in [version 2.1](compose-versioning.md#version-21) file format. > 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 > `attachable`, and this is not configurable. This means that standalone
> containers can connect to overlay networks. > containers can connect to overlay networks.

11
compose/compose-file/compose-versioning.md
View File

@ -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 [links](compose-file-v2.md#links) are largely unnecessary. For more details, see
[Networking in Compose](../networking.md). [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, > 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 > `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:
> later versions will not be supported. For example:
> >
> ```yaml > ```yaml
> version: "2" > version: "2"
> ``` > ```
> >
> is equivalent to: > is equivalent to:
> >
> ```yaml > ```yaml
> version: "2.0" > version: "2.0"
> ``` > ```