Skip to content
Closed
6 changes: 3 additions & 3 deletions articles/bot-service-build-continuous-deployment.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ monikerRange: 'azure-bot-service-4.0'

[!INCLUDE [applies-to](./includes/applies-to.md)]

This article shows you how to configure continuous deployment for your bot. You can enable continuous deployment to automatically deploy code changes from your source repository to Azure. In this topic, we'll cover setting up continuous deployment for GitHub. For information on setting up continous deployment with other source control systems, see the additional resource section at the bottom of this page.
This article shows you how to configure continuous deployment for your bot. You can enable continuous deployment to automatically deploy code changes from your source repository to Azure. In this topic, we'll cover setting up continuous deployment for GitHub. For information on setting up continuous deployment with other source control systems, see the additional resource section at the bottom of this page.

## Prerequisites
- If you don't have an Azure subscription, create a [free account](http://portal.azure.com) before you begin.
- You **must** [deploy your bot to Azure](bot-builder-deploy-az-cli.md) before enabling continous deployment.
- You **must** [deploy your bot to Azure](bot-builder-deploy-az-cli.md) before enabling continuous deployment.

## Prepare your repository
Make sure that your repository root has the correct files in your project. This will allow you to get automatic builds from the Azure App Service Kudu build server.
Expand Down Expand Up @@ -64,6 +64,6 @@ To disable continuous deployment, do the following:
1. Click **Disconnect** to disable continuous deployment. To re-enable continuous deployment, repeat the steps from the appropriate sections above.

## Additional resources
- To enable continuous deployment from BitBucket and Azure DevOps Services, see [continous deployment using Azure App Service](https://docs.microsoft.com/azure/app-service/deploy-continuous-deployment).
- To enable continuous deployment from BitBucket and Azure DevOps Services, see [continuous deployment using Azure App Service](https://docs.microsoft.com/azure/app-service/deploy-continuous-deployment).


Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ The preview NuGet packages needed to create a C# Direct line client can be found

## Create a C# Direct Line Client

Interactions with the direct line app service extension happen differently than traditional Direct Line becuase most communication happens over a *WebSocket*. The updated direct line client includes helper classes for opening and closing a *WebSocket*, sending commands through the WebSocket, and receiving Activities back from the bot. This section describes how to create a simple C# client to interact with a bot.
Interactions with the direct line app service extension happen differently than traditional Direct Line because most communication happens over a *WebSocket*. The updated direct line client includes helper classes for opening and closing a *WebSocket*, sending commands through the WebSocket, and receiving Activities back from the bot. This section describes how to create a simple C# client to interact with a bot.

1. Create a new .NET Core 2.2 console application project in Visual Studio.
1. Add the **DirectLine client NuGet** to your project
Expand Down
2 changes: 1 addition & 1 deletion articles/channel-connect-teams.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ After adding the Teams channel, go to the **Channels** page and click on **Get b

- Copy the _https_ part of the code that is showin in the **Get bot embed code** dialog. For example, `https://teams.microsoft.com/l/chat/0/0?users=28:b8a22302e-9303-4e54-b348-343232`.

- In the browser, paste this address and then choose the Microsoft Teams app (client or web) that you use to add the bot to Teams. You should be able to see the bot listed as a contact that you can send messages to and recieves messages from in Microsoft Teams.
- In the browser, paste this address and then choose the Microsoft Teams app (client or web) that you use to add the bot to Teams. You should be able to see the bot listed as a contact that you can send messages to and receives messages from in Microsoft Teams.

> [!IMPORTANT]
> Adding a bot by GUID, for anything other than testing purposes, is not recommended. Doing so severely limits the functionality of a bot. Bots in production should be added to Teams as part of an app. See [Create a bot](https://docs.microsoft.com/microsoftteams/platform/concepts/bots/bots-create) and [Test and debug your Microsoft Teams bot](https://docs.microsoft.com/microsoftteams/platform/concepts/bots/bots-test).
Expand Down
2 changes: 1 addition & 1 deletion articles/dotnet/bot-builder-dotnet-dialogs.md
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ Sending and receiving messages through the dialog context ensures that the `Inte
### Internals.IDialogStack

`Internals.IDialogStack` provides methods to manage the [dialog stack](../bot-service-design-conversation-flow.md#dialog-stack). Most of the time, the dialog stack will
automatically be managed for you. However, there may be cases where you want to explictly manage the stack.
automatically be managed for you. However, there may be cases where you want to explicitly manage the stack.
For example, you might want to call a child dialog and add it to the
top of the dialog stack, mark the current dialog as complete (thereby removing it from the dialog stack and returning the result to the prior dialog in the stack),
suspend the current dialog until a message from the user arrives, or even reset the dialog stack altogether.
Expand Down
2 changes: 1 addition & 1 deletion articles/includes/snippet-deploy-without-bot.md
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ Open a command-prompt, and navigate to the project folder. Run the following com

**JS Bot:**
1. Download web.config from [here](https://github.com/projectkudu/kudu/wiki/Using-a-custom-web.config-for-Node-apps) and save it into your project folder.
1. Edit the file and replace all occurances of "server.js" with "index.js".
1. Edit the file and replace all occurrences of "server.js" with "index.js".
1. Save the file.

Open a command-prompt, and navigate to the project folder. Run the following commands from the command line.
Expand Down
2 changes: 1 addition & 1 deletion articles/v4sdk/abs-quickstart.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,4 +81,4 @@ You can download the code to work on it locally.
1. [!INCLUDE [download keys snippet](../includes/snippet-abs-key-download.md)]

## Next steps
After you download the code, you can continue to develop the bot locally on your machine. Once you test your bot and are ready to upload the bot code to the Azure portal, follow the instructions listed under [set up continous deployment](../bot-service-build-continuous-deployment.md) topic to automatically update code after you make changes.
After you download the code, you can continue to develop the bot locally on your machine. Once you test your bot and are ready to upload the bot code to the Azure portal, follow the instructions listed under [set up continuous deployment](../bot-service-build-continuous-deployment.md) topic to automatically update code after you make changes.
2 changes: 1 addition & 1 deletion articles/v4sdk/bot-builder-howto-add-media-attachments.md
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ For detailed information on the schema, see the [Bot Framework card schema](http
### Code sample for processing Adaptive Card input

This sample code shows one way to use Adaptive Card inputs within a bot dialog class.
It extends the current sample 06.using-cards by validating the input recieved in the text field from the responding client.
It extends the current sample 06.using-cards by validating the input received in the text field from the responding client.
We first added text input and button functionality to the existing adaptive card by adding the following code just before the final bracket of adaptiveCard.json, found in the resources folder:

```json
Expand Down
2 changes: 1 addition & 1 deletion articles/v4sdk/bot-builder-howto-qna.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ monikerRange: 'azure-bot-service-4.0'

[!INCLUDE[applies-to](../includes/applies-to.md)]

QnA Maker provides a conversational question and answer layer over your data. This allows your bot to send QnA Maker a question and recieve an answer without you needing to parse and interpret the intent of their question.
QnA Maker provides a conversational question and answer layer over your data. This allows your bot to send QnA Maker a question and receive an answer without you needing to parse and interpret the intent of their question.

One of the basic requirements in creating your own QnA Maker service is to seed it with questions and answers. In many cases, the questions and answers already exist in content like FAQs or other documentation; other times, you may want to customize your answers to questions in a more natural, conversational way.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ The Virtual Assistant solution is built on the Azure Bot Service, Language Under
In addition, Language Understanding support is provided by the LUIS Cognitive Service which supports a broad set of languages [listed here](https://docs.microsoft.com/azure/cognitive-services/luis/luis-supported-languages). The [Translator Cognitive Service](https://azure.microsoft.com/services/cognitive-services/translator-text-api/) provides additional machine translation capabilities to extend the reach of your Virtual Assistant even further.

### Integrated and Context Aware
Your Virtual Assistant can be incoroporated into your device and ecosystem, enabling a truly integrated and intelligent experience. Through this contextual awareness more intelligent experiences can be developed and deliver further personalization than otherwise possible.
Your Virtual Assistant can be incorporated into your device and ecosystem, enabling a truly integrated and intelligent experience. Through this contextual awareness more intelligent experiences can be developed and deliver further personalization than otherwise possible.

### 3rd Party assistant integration
The Virtual Assistant enables you to deliver your own unique experience but also hand-off to the end-users chosen Digital Assistant for certain types of questions.
Expand Down
2 changes: 1 addition & 1 deletion articles/v4sdk/bot-builder-webchat-customization.md
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ userAvatarInitials: 'WC'

## Custom rendering activity or attachment

With the latest version of Web Chat, you can also render activities or attachments that Web Chat does not support out-of-the-box. Activities and attachments render are sent thru a customizable pipeline that modeled after [Redux middleware](https://redux.js.org/api/applymiddleware). The pipeline is flexible enough that you can do the following tasks easily:
With the latest version of Web Chat, you can also render activities or attachments that Web Chat does not support out-of-the-box. Activities and attachments render are sent through a customizable pipeline that modeled after [Redux middleware](https://redux.js.org/api/applymiddleware). The pipeline is flexible enough that you can do the following tasks easily:

- Decorate existing activities/attachments
- Add new activities/attachments
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ session.dialogData.destination = results.response;
stepContext.values.destination = destination;
```

## To write changes in state to the persistance layer
## To write changes in state to the persistence layer

### v3

Expand Down
4 changes: 2 additions & 2 deletions articles/v4sdk/migration/net-migration-quickreference.md
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ All dialogs, and their fields, were auto-serialized in V3.
stepContext.values.destination = destination;
```

## To write changes in state to the persistance layer
## To write changes in state to the persistence layer

### v3

Expand Down Expand Up @@ -300,7 +300,7 @@ public class DialogBot : ActivityHandler
{
await base.OnTurnAsync(turnContext, cancellationToken);

// Save any state changes that might have ocurred during the turn.
// Save any state changes that might have occurred during the turn.
await ConversationState.SaveChangesAsync(turnContext, false, cancellationToken);
await UserState.SaveChangesAsync(turnContext, false, cancellationToken);
}
Expand Down
4 changes: 2 additions & 2 deletions contributor-guide/create-images-markdown.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Use the following guidelines when creating and including art files:

![This is an example of a red square used as a callout.](./media/create-images-markdown/gs13noauth.png)
* When it makes sense, feel free to crop images so the UI elements will be displayed in full size. Make sure that the context is clear to users, though.
* Avoid whitespace on edges of screenshots. If you crop a screenshot in a way that leaves white background at the edges, add a single pixel gray border around the image. If using Paint, use the lighter gray in the default color pallete (0xC3C3C3). If using some other graphic app, the RGB color is R195, G195, 195. You can easily add a gray border around an image in Visio--to do this, select the image, select Line, and ensure the correct color is set, and then change the line weight to 1 1/2 pt. Screenshots should have a 1-pixel-wide gray border so that white areas of the screenshot do not blur into the web page.
* Avoid whitespace on edges of screenshots. If you crop a screenshot in a way that leaves white background at the edges, add a single pixel gray border around the image. If using Paint, use the lighter gray in the default color palette (0xC3C3C3). If using some other graphic app, the RGB color is R195, G195, 195. You can easily add a gray border around an image in Visio--to do this, select the image, select Line, and ensure the correct color is set, and then change the line weight to 1 1/2 pt. Screenshots should have a 1-pixel-wide gray border so that white areas of the screenshot do not blur into the web page.

Example:

Expand All @@ -70,7 +70,7 @@ Use the following guidelines when creating and including art files:
![This is an example of a browser window screenshot.](./media/create-images-markdown/helloworldlocal.png)
* Use caution with what information is revealed in screenshots. Do not reveal internal company information or personal information.
* In conceptual art or diagrams, use the official icons in the Cloud and Enterprise symbol and icon set. A public set is available at https://aka.ms/CnESymbols.
* Replace personal or private information in screenshots with placeholder text enclosed in angle brackets. This includes user names, subscription IDs, and other related info. Personal names can be replaced with an [approved fictious name](https://aka.ms/ficticiousnames)(Employee-only link). Do not use the crayon or marker tip in Paint to obscure or blur personal or private information.
* Replace personal or private information in screenshots with placeholder text enclosed in angle brackets. This includes user names, subscription IDs, and other related info. Personal names can be replaced with an [approved fictitious name](https://aka.ms/ficticiousnames)(Employee-only link). Do not use the crayon or marker tip in Paint to obscure or blur personal or private information.

The following image has been correctly updated to replace the actual **subscription ID** with placeholder information:

Expand Down
2 changes: 1 addition & 1 deletion styleguide/ref-guide/typescript.md
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ back to [top](#top) > [Markup and boilerplate](#markup-and-boilerplate)

Fenced code blocks default to JavaScript syntax highlighting, but it doesn't hurt to be explicit.

Add short code examples as desireable to the @remarks section.
Add short code examples as desirable to the @remarks section.

- Introduce each example, even if it is just with the phrase, "For example:".
- At the type-level (class, interface, object, enum, and so on), include a code example that will apply to the most common use cases.
Expand Down