From c070ffe8800fad5f277dcbdb534e17360bc49c96 Mon Sep 17 00:00:00 2001 From: Jacek Szubert Date: Thu, 13 Jul 2017 06:14:50 +1000 Subject: [PATCH] Remove documentation about the `--ignore-override` option (#3865) * Remove documentation about the `--ignore-override` option * changed link to full path, copyedit Signed-off-by: Victoria Bialas --- compose/extends.md | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/compose/extends.md b/compose/extends.md index ff25a7c305..0f58c8d14f 100644 --- a/compose/extends.md +++ b/compose/extends.md @@ -24,19 +24,15 @@ contains your base configuration. The override file, as its name implies, can contain configuration overrides for existing services or entirely new services. -If a service is defined in both files Compose merges the configurations using +If a service is defined in both files, Compose merges the configurations using the rules described in [Adding and overriding -configuration](extends.md#adding-and-overriding-configuration). You can turn off -the automatic use of `docker-compose.override.yml` with command-line option -`--ignore-override`. +configuration](extends.md#adding-and-overriding-configuration). To use multiple override files, or an override file with a different name, you can use the `-f` option to specify the list of files. Compose merges files in the order they're specified on the command line. See the [`docker-compose` -command reference](./reference/overview.md) for more information about -using `-f`. When using the `-f` option, the use of `--ignore-override` will -have no effect as the full list of used files is whatever you define with the `-f` -option. +command reference](/compose/reference/overview.md) for more information about +using `-f`. When you use multiple configuration files, you must make sure all paths in the files are relative to the base Compose file (the first Compose file specified