merged in master

Author: lauren-mills

.github/CODEOWNERS

@@ -0,0 +1 @@
+samples/android/clients/ @dargilco @olmidy

docs/_docs/skills/handbook/add-skills-to-a-virtual-assistant.md

@@ -46,12 +46,13 @@ See the [Skills Overview]({{site.baseurl}}/overview/skills) section for details
 
 Run the following command to add each Skill to your Virtual Assistant. This assumes you are running the CLI within the project directory and have created your Bot through the template and therefore have a `appsettings.json` file present in the working folder.
 
-The `--luisFolder` parameter can be used to point the Skill CLI at the source LU files for trigger utterances. For Skills provided within this repo these can be found in the `Deployment/Resources/LU` folder of each Skill. The CLI will automatically traverse locale folder hierarchies. This can be omitted for any of the skills we provide as the LU files are provided locally. Also, you have to specify the `--cs` (for C#) or `--ts` (for TypeScript) argument for determining the coding language of your assistant, since each language takes different folder structures that need to be taken into consideration.
-
 ```bash
 botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
 ```
 
+The `--luisFolder` parameter can be used to point the Skill CLI at the source LU files for trigger utterances. For Skills provided within this repo these can be found in the `Deployment/Resources/LU` folder of each Skill. The CLI will automatically traverse locale folder hierarchies. This can be omitted for any of the skills we provide as the LU files are provided locally. Also, you have to specify the `--cs` (for C#) or `--ts` (for TypeScript) argument for determining the coding language of your assistant, since each language takes different folder structures that need to be taken into consideration.
+
+
 Once the connect command finish successfully, you can see under the `botFrameworkSkills` property of your Virtual Assistant's appsettings.json file that the following structure was added with the information provided in the Skill manifest.
 
 ```json
@@ -62,7 +63,7 @@ Once the connect command finish successfully, you can see under the `botFramewor
         "name": "<SKILL_NAME>",
         "description": "<SKILL_DESCRIPTION>"
     },
-    "skillHostEndpoint": "<VA-SKILL_ENDPOINT>"
+    "skillHostEndpoint": "<VA_SKILL_ENDPOINT>"
 ```
 
 See the [Skill CLI documentation]({{site.baseurl}}/skills/handbook/botskills) for detailed CLI documentation.
@@ -87,13 +88,14 @@ To update a Skill to your assistant/Bot we provide a `botskills` command line to
 
 Run the following command to update a Skill to your Virtual Assistant. This assumes you are running the CLI within the project directory and have created your Bot through the template and therefore have a `appsettings.json` file present in the working folder.
 
-The `--luisFolder` parameter can be used to point the Skill CLI at the source LU files for trigger utterances. For Skills provided within this repo these can be found in the `Deployment/Resources/LU` folder of each Skill. The CLI will automatically traverse locale folder hierarchies. This can be omitted for any of the skills we provide as the LU files are provided locally. Also, you have to specify the `--cs` (for C#) or `--ts` (for TypeScript) argument for determining the coding language of your assistant, since each language takes different folder structures that need to be taken into consideration.
-
 ```bash
-botskills update --botName YOUR_BOT_NAME --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
+botskills update --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
 ```
 
+The `--luisFolder` parameter can be used to point the Skill CLI at the source LU files for trigger utterances. For Skills provided within this repo these can be found in the `Deployment/Resources/LU` folder of each Skill. The CLI will automatically traverse locale folder hierarchies. This can be omitted for any of the skills we provide as the LU files are provided locally. Also, you have to specify the `--cs` (for C#) or `--ts` (for TypeScript) argument for determining the coding language of your assistant, since each language takes different folder structures that need to be taken into consideration.
+
 ## Refresh Connected Skills
+
 To refresh the dispatch model with any changes made to connected skills use the following command, specifying the `--cs` (for C#) or `--ts` (for TypeScript) argument for determining the coding language of your assistant, since each language takes different folder structures that need to be taken into consideration. 
 
 ```bash

docs/_docs/skills/handbook/botskills.md

@@ -41,7 +41,7 @@ The `connect` command allows you to connect a Skill, be it local or remote, to y
 
 Here is an example:
 ```bash
-botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --luisFolder "<YOUR-SKILL_PATH>\Deployment\Resources\LU" --languages "en-us" --cs
+botskills connect --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
 ```
 
 *Remember to re-publish your Assistant to Azure after you've added a Skill unless you plan on testing locally only*
@@ -69,7 +69,7 @@ The `update` command allows you to update a Skill, be it local or remote, to you
 
 Here is an example:
 ```bash
-botskills update --botName <YOUR_BOT_NAME> --remoteManifest "{{site.data.urls.SkillManifest}}" --luisFolder <YOUR_LUIS_FOLDER_PATH> --cs
+botskills update --remoteManifest "{{site.data.urls.SkillManifest}}" --cs
 ```
 
 For further information, see the [Update command documentation]({{site.repo}}/tree/master/tools/botskills/docs/commands/update.md).

docs/_docs/skills/samples/bing-search.md

@@ -11,7 +11,7 @@ toc: true
 # {{ page.title }}
 {:.no_toc}
 
-The [Bing Search Skill]({{site.repo}}/tree/master/skills/csharp/experimental/bingsearchskill) provides a simple Skill that integrates with the [Bing Search Cognitive Service](https://azure.microsoft.com/en-us/services/cognitive-services/bing-web-search-api/).
+The [Bing Search Skill](https://github.com/microsoft/botframework-skills/tree/master/skills/csharp/experimental/bingsearchskill) provides a simple Skill that integrates with the [Bing Search Cognitive Service](https://azure.microsoft.com/en-us/services/cognitive-services/bing-web-search-api/).
 
 This skill has a very limited LUIS model (available in English, French, Italian, German, Spanish and Chinese) and demonstrates three simple scenarios:
 
@@ -35,4 +35,4 @@ Learn how to [provision your Azure resources]({{site.baseurl}}/skills/tutorials/
 ```
 "BingSearchKey": "{YOUR_BING_SEARCH_COGNITIVE_SERVICES_KEY}",
 "BingAnswerSearchKey": "{YOUR_PROJECT_ANSWER_SEARCH_KEY}"
-```
+```

docs/_docs/skills/samples/hospitality.md

@@ -10,12 +10,12 @@ order: 5
 # {{ page.title }}
 {:.no_toc}
 
-The [Hospitality Skill]({{site.repo}}/tree/master/skills/csharp/experimental/hospitalityskill) demonstrates experiences that would be useful in a hospitality specific scenario, such as being able to check out of a hotel, ordering room service, and requesting hotel amenities. This skill does not integrate a hotel service at this time, and is instead simulated with static data for testing purposes.
+The [Hospitality Skill](https://github.com/microsoft/botframework-skills/tree/master/skills/csharp/experimental/hospitalityskill) demonstrates experiences that would be useful in a hospitality specific scenario, such as being able to check out of a hotel, ordering room service, and requesting hotel amenities. This skill does not integrate a hotel service at this time, and is instead simulated with static data for testing purposes.
 
 This skill demonstrates the following scenarios:
 - Show reservation: *What is my current check out date?*
 - Extend reservation: *Can I extend my stay?*
-- Request late check-out: *I want a late check out time* 
+- Request late check-out: *I want a late check out time*
 - Request amenities: *Can you bring me a toothbrush and toothpaste?*
 - Room service: *I want to see a room service menu*
 - Check out: *Can I check out now?*
@@ -28,4 +28,4 @@ The [Hospitality Sample VA]({{site.baseurl}}/solution-accelerators/assistants/ho
 
 ## Deployment
 {:.no_toc}
-Learn how to [provision your Azure resources]({{site.baseurl}}/skills/tutorials/create-skill/csharp/4-provision-your-azure-resources/) in the Create a Skill tutorial.
+Learn how to [provision your Azure resources]({{site.baseurl}}/skills/tutorials/create-skill/csharp/4-provision-your-azure-resources/) in the Create a Skill tutorial.

docs/_docs/skills/samples/itsm.md

@@ -11,7 +11,7 @@ toc: true
 # {{ page.title }}
 {:.no_toc}
 
-The [IT Service Management skill]({{site.repo}}/tree/master/skills/csharp/experimental/itsmskill) provides a basic skill that provides ticket and knowledge base related capabilities and supports SerivceNow.
+The [IT Service Management skill](https://github.com/microsoft/botframework-skills/tree/master/skills/csharp/experimental/itsmskill) provides a basic skill that provides ticket and knowledge base related capabilities and supports SerivceNow.
 
 This skill demonstrates the following scenarios:
 - Create a ticket: *Create a ticket for my broken laptop*
@@ -49,4 +49,4 @@ To test this skill you will need to follow the ServiceNow configuration steps sh
 
 To test this skill with your Virtual Assistant one manual step is required over and above the usual skill connection steps.
 
-- Add OAuth Connection to your Virtual Assistant manually as per the step above. This connection type cannot be automatically configured as part of botskills.
+- Add OAuth Connection to your Virtual Assistant manually as per the step above. This connection type cannot be automatically configured as part of botskills.

docs/_docs/skills/samples/music.md

@@ -11,7 +11,7 @@ toc: true
 # {{ page.title }}
 {:.no_toc}
 
-The [Music skill]({{site.repo}}/tree/master/skills/csharp/experimental/musicskill) integrates with [Spotify](https://developer.spotify.com/documentation/web-api/libraries/) to look up playlists and artists and open the Spotify app via URI.
+The [Music skill](https://github.com/microsoft/botframework-skills/tree/master/skills/csharp/experimental/musicskill) integrates with [Spotify](https://developer.spotify.com/documentation/web-api/libraries/) to look up playlists and artists and open the Spotify app via URI.
 This is dependent on the [SpotifyAPI-NET](https://github.com/JohnnyCrazy/SpotifyAPI-NET) wrapper for the Spotify Web API.
 
 ## Deployment
@@ -27,4 +27,4 @@ Learn how to [provision your Azure resources]({{site.baseurl}}/skills/tutorials/
 ```
   "spotifyClientId": "{YOUR_SPOTIFY_CLIENT_ID}",
   "spotifyClientSecret": "{YOUR_SPOTIFY_CLIENT_SECRET}"
-```
+```

docs/_docs/skills/samples/news.md

@@ -11,7 +11,7 @@ toc: true
 # {{ page.title }}
 {:.no_toc}
 
-The [News skill]({{site.repo}}/tree/master/skills/csharp/experimental/newsskill) provides a simple Skill that integrates with the Bing News Cognitive Service to demonstrate how a news experience can be integrated into a Virtual Assistant.
+The [News skill](https://github.com/microsoft/botframework-skills/tree/master/skills/csharp/experimental/newsskill) provides a simple Skill that integrates with the Bing News Cognitive Service to demonstrate how a news experience can be integrated into a Virtual Assistant.
 
 Once deployed create a [Bing News Cognitive Services Key](https://azure.microsoft.com/en-us/services/cognitive-services/bing-news-search-api/) and update the appropriate configuration within appSettings.config.
 

docs/_docs/skills/samples/restaurant-booking.md

@@ -11,12 +11,12 @@ toc: true
 # {{ page.title }}
 {:.no_toc}
 
-The [Restaurant Booking skill]({{site.repo}}/tree/master/skills/csharp/experimental/restaurantbookingskill) provides a simple restaurant booking experience guiding the user through booking a table and leverages Adaptive Cards throughout to demonstrate how Speech, Text and UX can be combined for a compelling user experience. No integration to restaurant booking services exists at this time so is simulated with static data for testing purposes.
+The [Restaurant Booking skill](https://github.com/microsoft/botframework-skills/tree/master/skills/csharp/experimental/restaurantbookingskill) provides a simple restaurant booking experience guiding the user through booking a table and leverages Adaptive Cards throughout to demonstrate how Speech, Text and UX can be combined for a compelling user experience. No integration to restaurant booking services exists at this time so is simulated with static data for testing purposes.
 
 An example transcript file demonstrating the Skill in action can be found [here]({{site.baseurl}}/assets/transcripts/skills-restaurantbooking.transcript), you can use the Bot Framework Emulator to open transcripts.
 
 ![Restaurant Example]({{site.baseurl}}/assets/images/skills-restaurant-transcript.png)
 
 ## Deployment
 {:.no_toc}
-Learn how to [provision your Azure resources]({{site.baseurl}}/skills/tutorials/create-skill/csharp/4-provision-your-azure-resources/) in the Create a Skill tutorial.
+Learn how to [provision your Azure resources]({{site.baseurl}}/skills/tutorials/create-skill/csharp/4-provision-your-azure-resources/) in the Create a Skill tutorial.

docs/_docs/skills/samples/weather.md

@@ -11,7 +11,7 @@ toc: true
 # {{ page.title }}
 {:.no_toc}
 
-The [Weather skill]({{site.repo}}/tree/master/skills/csharp/experimental/weatherskill) provides a basic Skill that integrates with [Azure Maps](https://azure.microsoft.com/en-us/services/azure-maps/) to demonstrate how a weather experience can be integrated into a Virtual Assistant.
+The [Weather skill](https://github.com/microsoft/botframework-skills/tree/master/skills/csharp/experimental/weatherskill) provides a basic Skill that integrates with [Azure Maps](https://azure.microsoft.com/en-us/services/azure-maps/) to demonstrate how a weather experience can be integrated into a Virtual Assistant.
 
 ## Deployment
 {:.no_toc}
@@ -30,4 +30,4 @@ Learn how to [provision your Azure resources]({{site.baseurl}}/skills/tutorials/
 
 ```
 "WeatherApiKey": "{YOUR_AzureMaps_KEY}"
-```
+```