From da9fb959c45e4d4d8f2834d30516d66ee38dd551 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Tue, 4 Aug 2015 14:06:05 -0700 Subject: [PATCH 1/3] creating license folder. --- LICENSE => LICENSE/LICENSE | 0 .../ORACLE_VIRTUALBOX_LICENSE | 2 -- LICENSE/README.md | 9 +++++++++ README.md | 8 -------- 4 files changed, 9 insertions(+), 10 deletions(-) rename LICENSE => LICENSE/LICENSE (100%) rename ORACLE_VIRTUALBOX_LICENSE => LICENSE/ORACLE_VIRTUALBOX_LICENSE (95%) create mode 100644 LICENSE/README.md diff --git a/LICENSE b/LICENSE/LICENSE similarity index 100% rename from LICENSE rename to LICENSE/LICENSE diff --git a/ORACLE_VIRTUALBOX_LICENSE b/LICENSE/ORACLE_VIRTUALBOX_LICENSE similarity index 95% rename from ORACLE_VIRTUALBOX_LICENSE rename to LICENSE/ORACLE_VIRTUALBOX_LICENSE index 7982658b2e..9bd56be5c1 100644 --- a/ORACLE_VIRTUALBOX_LICENSE +++ b/LICENSE/ORACLE_VIRTUALBOX_LICENSE @@ -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 diff --git a/LICENSE/README.md b/LICENSE/README.md new file mode 100644 index 0000000000..ec3d8a18be --- /dev/null +++ b/LICENSE/README.md @@ -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. diff --git a/README.md b/README.md index 1b59564772..4fc17f7fef 100644 --- a/README.md +++ b/README.md @@ -26,11 +26,3 @@ here](https://docs.docker.com/installation/mac/). **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. From 5f33847e11646186265c82d1d7819d74df6fb27d Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Tue, 4 Aug 2015 14:12:18 -0700 Subject: [PATCH 2/3] Adding in Windows / Linux documentation links. --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 4fc17f7fef..cce1ef6d78 100644 --- a/README.md +++ b/README.md @@ -18,8 +18,12 @@ 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 From 7037c1cc431cc4fef4367c9d410dbfe92cebf4b9 Mon Sep 17 00:00:00 2001 From: Michael Chiang Date: Tue, 4 Aug 2015 14:14:27 -0700 Subject: [PATCH 3/3] bump ver. --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 1298ad0a15..b2a74f0f4f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.8.0-rc3 +1.8.0-rc4