diff --git a/_includes/content/compose-matrix.md b/_includes/content/compose-matrix.md
index 4c92e2d95c..0c2df360e3 100644
--- a/_includes/content/compose-matrix.md
+++ b/_includes/content/compose-matrix.md
@@ -2,6 +2,8 @@ This table shows which Compose file versions support specific Docker releases.
 
 | **Compose file format** | **Docker Engine release** |
 |  -------------------    |    ------------------     |
+|      3.6                |       18.02.0+            |
+|      3.5                |       17.12.0+            |
 |      3.4                |       17.09.0+            |
 |      3.3                |       17.06.0+            |
 |      3.2                |       17.04.0+            |
diff --git a/compose/compose-file/compose-versioning.md b/compose/compose-file/compose-versioning.md
index f59f5de27e..e67af570f4 100644
--- a/compose/compose-file/compose-versioning.md
+++ b/compose/compose-file/compose-versioning.md
@@ -281,12 +281,11 @@ Introduces the following additional parameters:
 ### Version 3.6
 
 An upgrade of [version 3](#version-3) that introduces new parameters. It is
-only available with Docker Engine version **17.12.0** and higher.
+only available with Docker Engine version **18.02.0** and higher.
 
 Introduces the following additional parameters:
 
-- [`tmpfs`](index.md#tmpfs) in volume definitions using the [Long Syntax](index.md#long-syntax-3)
-- `size` optional parameter for a tmpfs volume
+- [`tmpfs` size](index.md#long-syntax-3) for `tmpfs`-type mounts
 
 ## Upgrading
 
diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md
index c41d193357..df807479d8 100644
--- a/compose/compose-file/index.md
+++ b/compose/compose-file/index.md
@@ -1676,7 +1676,8 @@ expressed in the short form.
 - `volume`: configure additional volume options
   - `nocopy`: flag to disable copying of data from a container when a volume is
     created
-
+- `tmpfs`: configure additional tmpfs options
+  - `size`: the size for the tmpfs mount in bytes
 
 ```none
 version: "3.2"