centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-27 14:28:47 +07:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge artifacts in vnext branch

Browse Source 
Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F
2018-04-10 13:23:26 -07:00
committed by Gwendolynne Barr
parent 6e5c7587f5
commit d4e7eee27e
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,23 +441,12 @@ All other keys are ignored and produce a warning if present. You can review
the configuration that will be used to deploy by using the `--compatibility`
flag with the `config` command.
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b3a1eb7... Use updated notes format
> Do not use this in production!
>
> We recommend against using `--compatibility` mode in production. Because the
> resulting configuration is only an approximate using non-Swarm mode
> properties, it may produce unexpected results.
<<<<<<< HEAD
=======
> **Note:** We recommend against using `--compatibility` mode in production.
> Because the resulting configuration is only an approximate using non-Swarm
> mode properties, it may produce unexpected results.
>>>>>>> 93426bb... Document compatibility mode
=======
>>>>>>> b3a1eb7... Use updated notes format
## Compose file format references