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:docker/toolbox

This commit is contained in:
Jeffrey Morgan 2015-08-04 17:02:41 -07:00
parent c0314d3dc2 7037c1cc43
commit 959e3f2883
5 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
LICENSE → LICENSE/LICENSE
View File

2
ORACLE_VIRTUALBOX_LICENSE → LICENSE/ORACLE_VIRTUALBOX_LICENSE
View File

@ -1,5 +1,3 @@
Oracle VirtualBox – A powerful virtualization product for enterprise as well as home use. Copyright (C) 2004-2015 Oracle Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
GNU GENERAL PUBLIC LICENSE
Version 2, June 1991

9
LICENSE/README.md Normal file
View File

@ -0,0 +1,9 @@
## License
Docker Toolbox code is licensed under the Apache License, Version 2.0. See [LICENSE](https://github.com/docker/toolbox/blob/master/LICENSE/LICENSE) for the full license text.
Docker Toolbox Logo and all other related Docker artwork © Docker, Inc. 2015. All rights reserved; not licensed for third party use.
Oracle VirtualBox – A powerful virtualization product for enterprise as well as home use. Copyright (C) 2004-2015 Oracle Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
Oracle VirtualBox is licensed under GPL 2.0 license. See [ORACLE VIRTUALBOX LICENSE](https://github.com/docker/toolbox/blob/master/LICENSE/ORACLE_VIRTUALBOX_LICENSE) for the full license text.

16
README.md
View File

@ -18,19 +18,15 @@ Docker on Mac OS X and Windows, including:
## Installation and documentation
Full documentation [is available
here](https://docs.docker.com/installation/mac/).
Documentation for Mac [is available
here](https://docs.docker.com/mac/started/).
Documentation for Windows [is available] here](https://docs.docker.com/windows/started/).
Toolbox is currently unavailable for Linux; To get started with Docker on Linux, please follow the Linux [Getting Started Guide](https://docs.docker.com/linux/started/).
## Frequently Asked Questions
**Do I have to install VirtualBox?**
No, you can deselect VirtualBox during installation. It is bundled in case you want to have a working environment for free.
## License
Docker Toolbox code is licensed under the Apache License, Version 2.0. See [LICENSE](https://github.com/docker/toolbox/blob/master/LICENSE) for the full license text.
Docker Toolbox Logo and all other related Docker artwork © Docker, Inc. 2015. All rights reserved; not licensed for third party use.
No modifications have been made to the Oracle VirtualBox source code. Oracle VirtualBox is licensed under GPL 2.0 license. See [ORACLE VIRTUALBOX LICENSE](https://github.com/docker/toolbox/blob/master/ORACLE_VIRTUALBOX_LICENSE) for the full license text.

2
VERSION
View File

@ -1 +1 @@
1.8.0-rc3
1.8.0-rc4