From 1c58771f856acd3610d9263d8a3a87970a123035 Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Wed, 28 Feb 2018 16:04:17 -0800 Subject: [PATCH] Use updated notes format Signed-off-by: Joffrey F --- compose/compose-file/compose-versioning.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/compose/compose-file/compose-versioning.md b/compose/compose-file/compose-versioning.md index 017694faf2..3cb604becf 100644 --- a/compose/compose-file/compose-versioning.md +++ b/compose/compose-file/compose-versioning.md @@ -429,16 +429,22 @@ 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