Merge branch 'master' of github.com:docker/toolbox

This commit is contained in:
Jeffrey Morgan 2015-07-13 17:29:46 -07:00
commit ce6cecc080
1 changed files with 7 additions and 6 deletions

View File

@ -8,16 +8,17 @@
<p> <p>
This installer guides you through an installation of 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>
<p> <p>
The Docker Toolbox installer includes the following: The Docker Toolbox installer includes the following:
</p> </p>
<ul> <ul>
<li>the Docker Engine <code>docker</code> binary <li>Docker Engine <code>docker</code> binary </li>
<li>the Docker Machine <code>docker-machine</code> binary <li>Docker Machine <code>docker-machine</code> binary </li>
<li>the Docker Compose <code>docker-compose</code> binary <li>Docker Compose <code>docker-compose</code> binary </li>
<li>a shell preconfigured as a Docker command line environment <li>Kitematic - Desktop GUI for Docker </li>
<li>a shell preconfigured as a Docker command line environment </li>
</ul> </ul>
<br/> <br/>
<p> <p>
@ -25,7 +26,7 @@
</p> </p>
<p> <p>
To continue, click <b>Continue</b>. To continue, click <strong>Continue</strong>.
</p> </p>
</body> </body>
</html> </html>