diff --git a/LICENSE-CODE b/LICENSE-CODE deleted file mode 100644 index b17b032..0000000 --- a/LICENSE-CODE +++ /dev/null @@ -1,17 +0,0 @@ -The MIT License (MIT) -Copyright (c) Microsoft Corporation - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and -associated documentation files (the "Software"), to deal in the Software without restriction, -including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial -portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT -NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/LICENSE b/LICENSE-DOCS similarity index 100% rename from LICENSE rename to LICENSE-DOCS diff --git a/README.md b/README.md index 127b76f..823d2fe 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ # Source Code -Microsoft plans to open source the Confidential Consortium Blockchain Framework code in 2018. +The Confidential Consortium Framework (CCF, formerly coco) source code and license can be found at +https://github.com/Microsoft/CCF # Contributing @@ -21,8 +22,7 @@ contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additio Microsoft and any contributors grant you a license to the Microsoft documentation and other content in this repository under the [Creative Commons Attribution 4.0 International Public License](https://creativecommons.org/licenses/by/4.0/legalcode), -see the [LICENSE](LICENSE) file, and grant you a license to any code in the repository under the [MIT License](https://opensource.org/licenses/MIT), see the -[LICENSE-CODE](LICENSE-CODE) file. +see the [LICENSE-DOCS](LICENSE-DOCS) file. Microsoft, Windows, Microsoft Azure and/or other Microsoft products and services referenced in the documentation may be either trademarks or registered trademarks of Microsoft in the United States and/or other countries. diff --git a/docs/Coco Framework whitepaper.pdf b/docs/Coco Framework whitepaper.pdf index 950660b..f1f5a1d 100644 Binary files a/docs/Coco Framework whitepaper.pdf and b/docs/Coco Framework whitepaper.pdf differ