docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:kitematic/kitematic

This commit is contained in:
Jeffrey Morgan 2015-08-15 17:43:59 -07:00
parent 9dccc76882 01d5c5298f
commit 429a658884
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/index.md
View File

@ -11,6 +11,6 @@ weight=2
# Kitematic
Kitematic, the Docker GUI, runs on Mac OS X and Windows operating systems. Beginning with the 1.8 Docker release, you use the Docker Toolbox to install Kitematic. See the [Mac OS X installation guide]({{% thebaseurl %}}mac) or the [Windows installation guide]({{% thebaseurl %}}installation/windows) for details on installing with Docker Toolbox.
Kitematic, the Docker GUI, runs on Mac OS X and Windows operating systems. Beginning with the 1.8 Docker release, you use the Docker Toolbox to install Kitematic. See the [Mac OS X installation guide](https://docs.docker.com/mac) or the [Windows installation guide](https://docs.docker.com/installation/windows) for details on installing with Docker Toolbox.
For information about using Kitematic, take a look at the [User Guide](userguide).

2
src/components/AccountLogin.react.js
View File

@ -60,7 +60,7 @@ module.exports = React.createClass({
},
handleClickForgotPassword: function () {
shell.openExternal('https://hub.docker.com/account/forgot-password/');
shell.openExternal('https://hub.docker.com/reset-password/');
},
render: function () {