From 45540619f58cb00205c83420de1406d9851d4363 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jeffdm@users.noreply.github.com>
Date: Mon, 13 Jul 2015 16:13:13 -0700
Subject: [PATCH 1/3] Create VERSION

---
 VERSION | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 VERSION

diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000000..bd8bf882d0
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+1.7.0

From efd6e4dfa839a8d57f4ab2d596191ca10a6033a6 Mon Sep 17 00:00:00 2001
From: Michael Chiang <mchiang@docker.com>
Date: Mon, 13 Jul 2015 16:53:52 -0700
Subject: [PATCH 2/3] Adding Kitematic to the install info.

- Adding KM
---
 osx/mpkg/Resources/en.lproj/Welcome.html | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/osx/mpkg/Resources/en.lproj/Welcome.html b/osx/mpkg/Resources/en.lproj/Welcome.html
index 8e5c585dcb..e86b5a3923 100644
--- a/osx/mpkg/Resources/en.lproj/Welcome.html
+++ b/osx/mpkg/Resources/en.lproj/Welcome.html
@@ -8,16 +8,17 @@
 
     <p>
         This installer guides you through an installation of
-        <b>Docker Toolbox for Mac OS X v%INSTALLER_VERSION%</b>.
+        <strong>Docker Toolbox for Mac OS X v%INSTALLER_VERSION%</strong>.
    </p>
    <p>
         The Docker Toolbox installer includes the following:
     </p>
     <ul>
-      <li>the Docker Engine <code>docker</code> binary
-      <li>the Docker Machine <code>docker-machine</code> binary
-      <li>the Docker Compose <code>docker-compose</code> binary
-      <li>a shell preconfigured as a Docker command line environment
+      <li>Docker Engine <code>docker</code> binary </li>
+      <li>Docker Machine <code>docker-machine</code> binary </li>
+      <li>Docker Compose <code>docker-compose</code> binary </li>
+      <li>Kitematic - Desktop GUI for Docker </li>
+      <li>a shell preconfigured as a Docker command line environment </li>
     </ul>
     <br/>
   <p>
@@ -25,7 +26,7 @@
 	</p>
 
     <p>
-        To continue, click <b>Continue</b>.
+        To continue, click <strong>Continue</strong>.
     </p>
 </body>
 </html>

From 0bec920046ada379d6c288ebb2b088a276d326e1 Mon Sep 17 00:00:00 2001
From: Jeffrey Morgan <jmorganca@gmail.com>
Date: Mon, 13 Jul 2015 17:29:35 -0700
Subject: [PATCH 3/3] set -e on windows

---
 windows/start.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/windows/start.sh b/windows/start.sh
index 14026ae83f..de40a7d84d 100644
--- a/windows/start.sh
+++ b/windows/start.sh
@@ -1,4 +1,7 @@
 #!/bin/bash
+
+set -e
+
 ISO=$HOME/.docker/machine/cache/boot2docker.iso
 VM=dev
 DOCKER_MACHINE=./docker-machine.exe
@@ -9,10 +12,10 @@ if [ ! -f $ISO ]; then
 	cp ./boot2docker.iso "$ISO"
 fi
 
-machine=$($DOCKER_MACHINE ls -q | grep "^$VM$")
+machine=$($DOCKER_MACHINE ls -q | grep "^$VM$") || :
 if [ -z $machine ]; then
   echo "Creating Machine $VM..."
-   $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
+  $DOCKER_MACHINE create -d virtualbox --virtualbox-memory 2048 $VM
 else
   echo "Machine $VM already exists."
 fi
@@ -26,8 +29,8 @@ echo "Setting environment variables for machine $VM..."
 eval "$(./docker-machine.exe env $VM 2>/dev/null | sed  's,\\,\\\\,g')"
 
 cd
-clear
 
+clear
 cat << EOF