diff --git a/_includes/head.html b/_includes/head.html index 4e448bd56a..42ca642ea9 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -33,7 +33,7 @@ {%- if site.onetrust_id != '' -%}{%- include analytics/onetrust.html ONETRUST_ID=site.onetrust_id -%}{%- endif -%} {%- if site.google_analytics != '' -%}{%- include analytics/google_analytics.html GOOGLE_ID=site.google_analytics -%}{%- endif -%} {%- endif -%} - {{ page.title | default: page_title }} | Docker Documentation + {{ page.title | default: page_title }} diff --git a/compose/environment-variables/envvars-precedence.md b/compose/environment-variables/envvars-precedence.md index 0f85be8dcc..e43ca3dfb5 100644 --- a/compose/environment-variables/envvars-precedence.md +++ b/compose/environment-variables/envvars-precedence.md @@ -78,8 +78,7 @@ Each row represents a combination of contexts where `TAG` is set, substituted, o | 7 | - |`TAG` | - | `TAG=1.5` |`TAG=1.4` | `TAG=1.3` ||**`TAG=1.4`** | | 8 |`TAG` | `TAG=1.7` | - | `TAG=1.5` |`TAG=1.4` | `TAG=1.3` ||**`TAG=1.4`** | | 9 |`TAG=1.8` | `TAG=1.7` | - | `TAG=1.5` | `TAG=1.4` | `TAG=1.3` ||**`TAG=1.8`** | -| 10 | - |`TAG` | - | `TAG=1.5` |`TAG=1.4` | `TAG=1.3` ||**`TAG=1.4`** | -| 11 |`TAG=1.8` | - | `TAG=1.6` | `TAG=1.5` | `TAG=1.4` | `TAG=1.3` ||**`TAG=1.8`** | -| 12 |`TAG=1.8` | `TAG=1.7` | `TAG=1.6` | `TAG=1.5` | `TAG=1.4` | `TAG=1.3` ||**`TAG=1.8`** | -| 13 | - | - |`TAG=1.6` | `TAG=1.5` | `TAG=1.4` | - ||**`TAG=1.6`** | -| 14 | - |`TAG=1.7` | - | `TAG=1.5` | `TAG=1.4` | - ||**`TAG=1.7`** | +| 10 |`TAG=1.8` | - | `TAG=1.6` | `TAG=1.5` | `TAG=1.4` | `TAG=1.3` ||**`TAG=1.8`** | +| 11 |`TAG=1.8` | `TAG=1.7` | `TAG=1.6` | `TAG=1.5` | `TAG=1.4` | `TAG=1.3` ||**`TAG=1.8`** | +| 12 | - | - |`TAG=1.6` | `TAG=1.5` | `TAG=1.4` | - ||**`TAG=1.6`** | +| 13 | - |`TAG=1.7` | - | `TAG=1.5` | `TAG=1.4` | - ||**`TAG=1.7`** |