From 1fb0beb456842658690a6a9bbf0dba01811ef69b Mon Sep 17 00:00:00 2001 From: Scott Gellock Date: Thu, 27 Sep 2018 11:02:24 -0700 Subject: [PATCH] update license information (#565) update content of license file rename license file to have a markdown extension update readme to link to license file --- LICENSE => LICENSE.md | 8 +++++--- readme.md | 8 ++++---- 2 files changed, 9 insertions(+), 7 deletions(-) rename LICENSE => LICENSE.md (91%) diff --git a/LICENSE b/LICENSE.md similarity index 91% rename from LICENSE rename to LICENSE.md index dc1cf39d13..8bf4c11a45 100644 --- a/LICENSE +++ b/LICENSE.md @@ -1,6 +1,8 @@ -The MIT License (MIT) +MIT License -Copyright (c) 2016 Microsoft +Copyright (c) 2016 - present Microsoft Corporation + +All rights reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -18,4 +20,4 @@ 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. +SOFTWARE. \ No newline at end of file diff --git a/readme.md b/readme.md index 47be92e7b5..f4a5d43c40 100644 --- a/readme.md +++ b/readme.md @@ -12,7 +12,7 @@ Bot Builder provides the most comprehensive experience for building conversation - [**JS** (stable release)](https://github.com/microsoft/botbuilder-js) - [**Java** (preview release)](https://github.com/microsoft/botbuilder-java) - [**Python** (preview release)](https://github.com/microsoft/botbuilder-python). -- Bot Framework Emulator +- Bot Framework Emulator - [Bot Framework **V4 Emulator**](https://github.com/microsoft/botframework-emulator). - Bot Builder CLI tools (**stable release**) - [Chatdown CLI](https://github.com/Microsoft/botbuilder-tools/tree/master/packages/Chatdown) @@ -25,7 +25,7 @@ Bot Builder provides the most comprehensive experience for building conversation - Bot Framework webchat - [Available here](https://github.com/microsoft/botframework-webchat) -Please see [here](https://aka.ms/BotBuilderOverview) for an overview of the end-to-end bot development workflow. To get started, you can create a bot with [Azure Bot Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-service-quickstart?view=azure-bot-service-4.0). Click [here](https://account.azure.com/signup) if you need a trial Azure subscription. +Please see [here](https://aka.ms/BotBuilderOverview) for an overview of the end-to-end bot development workflow. To get started, you can create a bot with [Azure Bot Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-service-quickstart?view=azure-bot-service-4.0). Click [here](https://account.azure.com/signup) if you need a trial Azure subscription. ## Samples list @@ -38,7 +38,7 @@ To use the samples clone this GitHub repository using Git. cd BotBuilder-Samples ``` -:runner: - Indicates planned and work in progress. +:runner: - Indicates planned and work in progress. | Sample Name | Description | .NET CORE | NodeJS | .NET Web API | JS (es6) | Typescript | |-----------------------|--------------------------------------------------------------------------------|-------------|-------------|--------------|-------------|-------------| @@ -165,7 +165,7 @@ Security issues and bugs should be reported privately, via email, to the Microso Copyright (c) Microsoft Corporation. All rights reserved. -Licensed under the [MIT](https://github.com/Microsoft/vscode/blob/master/LICENSE.txt) License. +Licensed under the [MIT](/LICENSE.md) License. This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.