From 3fc8c881a99693dae30c29d181a1ede6d8e5cb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafael=20Cort=C3=AAs?= <mrfyda@gmail.com>
Date: Sun, 22 Oct 2017 12:00:36 +0100
Subject: [PATCH] Update documentation

---
 src/sphinx/formats/docker.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/sphinx/formats/docker.rst b/src/sphinx/formats/docker.rst
index 6a03e3f64..8ce5a8ae0 100644
--- a/src/sphinx/formats/docker.rst
+++ b/src/sphinx/formats/docker.rst
@@ -114,6 +114,9 @@ Environment Settings
     Overrides the default entrypoint for docker-specific service discovery tasks before running the application.
     Defaults to the bash executable script, available at ``bin/<script name>`` in the current ``WORKDIR`` of ``/opt/docker``.
 
+  ``dockerVersion``
+    The docker server version. Used to leverage new docker features while maintaining backwards compatibility.
+
 Publishing Settings
 ~~~~~~~~~~~~~~~~~~~
 
@@ -121,7 +124,7 @@ Publishing Settings
     The repository to which the image is pushed when the ``docker:publish`` task is run. This should be of the form  ``[repository.host[:repository.port]]`` (assumes use of the ``index.docker.io`` repository) or ``[repository.host[:repository.port]][/username]`` (discouraged, but available for backwards compatibilty.).
 
   ``dockerUsername``
-    The username or orgranization to which the image is pushed when the ``docker:publish`` task is run. This should be of the form ``[username]`` or ``[organization]``.
+    The username or organization to which the image is pushed when the ``docker:publish`` task is run. This should be of the form ``[username]`` or ``[organization]``.
 
   ``dockerUpdateLatest``
     The flag to automatic update the latest tag when the ``docker:publish`` task is run. Default value is ``FALSE``.  In order to use this setting, the minimum docker console version required is 1.10. See https://github.com/sbt/sbt-native-packager/issues/871 for a detailed explanation.