t pMerge branch 'master' of github.com:docker/toolbox

site/layouts/index.html

@@ -51,13 +51,6 @@
           <p>Define multi-container applications. (OS X only)</p>
         </div>
       </div>
-      <div class="item">
-        <div class="info">
-          <img src="{{.Site.BaseURL}}/images/swarm.png">
-          <h3>Docker Swarm</h3>
-          <p>Host clustering and container scheduling.</p>
-        </div>
-      </div>
       <div class="item">
         <div class="info">
           <img src="{{.Site.BaseURL}}/images/kitematic.png">
@@ -92,7 +85,7 @@
           <ol>
             <li>Open a terminal or the Docker CLI on your system.</li>
             <li>Type the following command.<br>
-                <pre>docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm docker-vm</pre>
+                <pre>docker-machine create -d virtualbox --virtualbox-import-boot2docker-vm boot2docker-vm dev</pre>
             </li>
             <li>Use the <code>docker-machine</code> command to interact with the migrated VM.  </li>
           </ol>

site/static/css/main.css

@@ -290,13 +290,15 @@ table {
   -ms-flex-flow: row wrap;
   flex-flow: row wrap;
 }
+.content .items .item {
+  text-align: center;
+}
 .content .items .item img {
   width: 100px;
   height: auto;
 }
 .content .items .item .info {
-  text-align: center;
-  padding-right: 1rem;
+  padding-right: 1.5rem;
 }
 .content .documentation {
   text-align: center;
@@ -349,8 +351,8 @@ table {
 }
 @media screen and (min-width: 500px) {
   .items .item {
-    max-width: 20%;
-    min-width: 140px;
+    max-width: 25%;
+    min-width: 160px;
   }
 }
 .footer {

site/static/less/layout.less

@@ -142,13 +142,13 @@
     .flex-display();
     .flex-flow(row wrap);
     .item {
+      text-align: center;
       img {
         width: 100px;
         height: auto;
       }
       .info {
-        text-align: center;
-        padding-right: 1rem;
+        padding-right: 1.5rem;
       }
     }
   }
@@ -213,8 +213,8 @@
 @media screen and (min-width: 500px) {
   .items {
     .item {
-      max-width: 20%;
-      min-width: 140px;
+      max-width: 25%;
+      min-width: 160px;
     }
   }
 }

windows/start.sh

@@ -6,6 +6,10 @@ ISO=$HOME/.docker/machine/cache/boot2docker.iso
 VM=dev
 DOCKER_MACHINE=./docker-machine.exe
 
+BLUE='\033[1;34m'
+GREEN='\033[0;32m'
+NC='\033[0m'
+
 mkdir -p ~/.docker/machine/cache
 if [ ! -f $ISO ]; then
 	mkdir -p "$(dirname "$ISO")"
@@ -26,9 +30,7 @@ $DOCKER_MACHINE start dev
 echo "Setting environment variables for machine $VM..."
 ./docker-machine.exe env $VM | sed  's,\\,\\\\,g' # eval swallows single backslashes in windows style path
 
-eval "$(./docker-machine.exe env $VM 2>/dev/null | sed  's,\\,\\\\,g')"
-
-cd
+eval "$($DOCKER_MACHINE env $VM 2>/dev/null | sed  's,\\,\\\\,g')"
 
 clear
 cat << EOF
@@ -44,7 +46,7 @@ cat << EOF
               \____\_______/
 
 EOF
-echo "The Quick Start CLI is configured to use Docker with the $VM VM"
+echo -e "${BLUE}docker${NC} is configured to use the ${GREEN}dev${NC} machine with IP ${GREEN}$($DOCKER_MACHINE ip $VM)${NC}"
+echo "For help getting started, check out the docs at https://docs.docker.com"
 echo
-
-exec "$BASH" --login -i
+cd