From f3973abad26133c96151186707da0a15e7f8183a Mon Sep 17 00:00:00 2001
From: Julien Maitrehenry <julien.maitrehenry@me.com>
Date: Fri, 21 Apr 2017 17:59:51 -0500
Subject: [PATCH] Improve semantic versioning table (#2974)

* Fix #2285

Try to add a simplier table about semantic versioning upgrade.
Base on https://github.com/docker/docker.github.io/pull/2869

* Simplify dtr upgrade table
---
 datacenter/dtr/2.2/guides/admin/upgrade.md | 28 ++++++++++------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/datacenter/dtr/2.2/guides/admin/upgrade.md b/datacenter/dtr/2.2/guides/admin/upgrade.md
index d6529f041b..5c96ecee47 100644
--- a/datacenter/dtr/2.2/guides/admin/upgrade.md
+++ b/datacenter/dtr/2.2/guides/admin/upgrade.md
@@ -18,22 +18,18 @@ support upgrades according to the following rules:
   version. We also strongly recommend upgrading to the latest minor/patch
   version for your major version first.
 
-|From| To| Description| Supported|
-|:----|:---|:------------|----------|
-| 2.2.0 | 2.2.1 | patch upgrade | yes |
-| 2.2.0 | 2.2.2 | skip patch version | yes |
-| 2.2.2 | 2.2.1 | patch downgrade | no |
-| 2.1.0 | 2.2.0 | minor upgrade | yes |
-| 2.1.1 | 2.2.0 | minor upgrade | yes |
-| 2.1.2 | 2.2.2 | minor upgrade | yes |
-| 2.0.1 | 2.2.0 | skip minor version | no |
-| 2.2.0 | 2.1.0 | minor downgrade | no |
-| 1.4.3 | 2.0.0 | major upgrade | yes |
-| 1.4.3 | 2.0.3 | major upgrade | yes |
-| 1.4.3 | 3.0.0 | skip major version | no |
-| 1.4.1 | 2.0.3 | major upgrade from an old version | no |
-| 1.4.3 | 2.1.0 | major upgrade skipping minor version | no |
-| 2.0.0 | 1.4.3 | major downgrade | no |
+| Description                          | From  | To        | Supported |
+|:-------------------------------------|:------|:----------|-----------|
+| patch upgrade                        | x.y.0 | x.y.1     | yes       |
+| skip patch version                   | x.y.0 | x.y.2     | yes       |
+| patch downgrade                      | x.y.2 | x.y.1     | no        |
+| minor upgrade                        | x.y.* | x.y+1.*   | yes       |
+| skip minor version                   | x.y.* | x.y+2.*   | no        |
+| minor downgrade                      | x.y.* | x.y-1.*   | no        |
+| skip major version                   | x.*.* | x+2.*.*   | no        |
+| major downgrade                      | x.*.* | x-1.*.*   | no        |
+| major upgrade                        | x.y.z | x+1.0.0   | yes       |
+| major upgrade skipping minor version | x.y.z | x+1.y+1.z | no        |
 
 There may be at most a few seconds of interruption during the upgrade of a
 DTR cluster. Schedule the upgrade to take place outside business peak hours