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

Use updated notes format 

Signed-off-by: Joffrey F <joffrey@docker.com>
This commit is contained in:
Joffrey F 2018-02-28 16:04:17 -08:00 committed by Gwendolynne Barr
parent 66a461ecf5
commit 1c58771f85
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -429,16 +429,22 @@ the configuration that will be used to deploy by using the `--compatibility`
flag with the `config` command. flag with the `config` command.
<<<<<<< HEAD <<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b3a1eb7... Use updated notes format
> Do not use this in production! > Do not use this in production!
> >
> We recommend against using `--compatibility` mode in production. Because the > We recommend against using `--compatibility` mode in production. Because the
> resulting configuration is only an approximate using non-Swarm mode > resulting configuration is only an approximate using non-Swarm mode
> properties, it may produce unexpected results. > properties, it may produce unexpected results.
<<<<<<< HEAD
======= =======
> **Note:** We recommend against using `--compatibility` mode in production. > **Note:** We recommend against using `--compatibility` mode in production.
> Because the resulting configuration is only an approximate using non-Swarm > Because the resulting configuration is only an approximate using non-Swarm
> mode properties, it may produce unexpected results. > mode properties, it may produce unexpected results.
>>>>>>> 93426bb... Document compatibility mode >>>>>>> 93426bb... Document compatibility mode
=======
>>>>>>> b3a1eb7... Use updated notes format
## Compose file format references ## Compose file format references