Skip to content

Commit 9b0422e

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into asc-melvyn-quickfixFriday
2 parents 2542b0f + e9e82dd commit 9b0422e

25 files changed

+75
-56
lines changed

articles/analysis-services/analysis-services-service-principal.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ description: Learn how to create a service principal for automating Azure Analys
44
author: minewiskan
55
ms.service: azure-analysis-services
66
ms.topic: conceptual
7-
ms.date: 05/19/2020
7+
ms.date: 05/26/2020
88
ms.author: owend
99
ms.reviewer: minewiskan
1010

@@ -106,5 +106,7 @@ db.Model.SaveChanges();
106106

107107
## Next steps
108108
[Sign in with Azure PowerShell](https://docs.microsoft.com/powershell/azure/authenticate-azureps)
109+
[Refresh with Logic Apps](analysis-services-refresh-logic-app.md)
110+
[Refresh with Azure Automation](analysis-services-refresh-azure-automation.md)
109111
[Add a service principal to the server administrator role](analysis-services-addservprinc-admins.md)
110112
[Automate Power BI Premium workspace and dataset tasks with service principals](https://docs.microsoft.com/power-bi/admin/service-premium-service-principal)

articles/application-gateway/configure-keyvault-ps.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ services: application-gateway
66
author: vhorne
77
ms.service: application-gateway
88
ms.topic: article
9-
ms.date: 02/27/2020
9+
ms.date: 05/26/2020
1010
ms.author: victorh
1111
---
1212

13-
# Configure TLS termination with Key Vault certificates by using Azure PowerShell
13+
# Configure TLS termination with Key Vault certificates using Azure PowerShell
1414

1515
[Azure Key Vault](../key-vault/general/overview.md) is a platform-managed secret store that you can use to safeguard secrets, keys, and TLS/SSL certificates. Azure Application Gateway supports integration with Key Vault for server certificates that are attached to HTTPS-enabled listeners. This support is limited to the Application Gateway v2 SKU.
1616

@@ -39,9 +39,11 @@ Select-AzSubscription -Subscription <your subscription>
3939
```azurepowershell
4040
$rgname = "KeyVaultTest"
4141
$location = "East US"
42-
$kv = "TestKeyVaultAppGw"
42+
$kv = "<your key vault name>"
4343
$appgwName = "AppGwKVIntegration"
4444
```
45+
> [!IMPORTANT]
46+
> The key vault name must be universally unique.
4547
4648
### Create a resource group and a user-managed identity
4749

articles/cognitive-services/Bing-Image-Search/quickstarts/java.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,12 @@ The source code for this sample is available [on GitHub](https://github.com/Azur
5555

5656
Use the variables from the previous step to format a search URL for the API request. URL-encode the search term before you appended it to the request.
5757

58-
```java
59-
// construct the search request URL (in the form of endpoint + query string)
60-
URL url = new URL(host + path + "?q=" + URLEncoder.encode(searchQuery, "UTF-8"));
61-
HttpsURLConnection connection = (HttpsURLConnection)url.openConnection();
62-
connection.setRequestProperty("Ocp-Apim-Subscription-Key", subscriptionKey);
63-
```
58+
```java
59+
// construct the search request URL (in the form of endpoint + query string)
60+
URL url = new URL(host + path + "?q=" + URLEncoder.encode(searchQuery, "UTF-8"));
61+
HttpsURLConnection connection = (HttpsURLConnection)url.openConnection();
62+
connection.setRequestProperty("Ocp-Apim-Subscription-Key", subscriptionKey);
63+
```
6464

6565
## Receive and process the JSON response
6666

articles/cognitive-services/Bing-Image-Search/quickstarts/python.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ ms.custom: seodec2018
1717

1818
Use this quickstart to learn how to send search requests to the Bing Image Search API. This Python application sends a search query to the API, and displays the URL of the first image in the results. Although this application is written in Python, the API is a RESTful web service compatible with most programming languages.
1919

20-
To run this example as a Jupyter notebook on [MyBinder](https://mybinder.org), select the launch Binder badge:
20+
To run this example as a Jupyter notebook on [MyBinder](https://mybinder.org), select the **launch binder** badge:
2121

2222
[![Binder](https://mybinder.org/badge.svg)](https://mybinder.org/v2/gh/Microsoft/cognitive-services-notebooks/master?filepath=BingImageSearchAPI.ipynb)
2323

articles/cognitive-services/QnAMaker/Overview/overview.md

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
---
22
title: What is QnA Maker service?
3-
titleSuffix: Azure Cognitive Services
43
description: QnA Maker is a cloud-based NLP service that easily creates a natural conversational layer over your data. It can be used to find the most appropriate answer for any given natural language input, from your custom knowledge base (KB) of information.
5-
services: cognitive-services
6-
author: diberry
7-
manager: nitinme
8-
ms.service: cognitive-services
9-
ms.subservice: qna-maker
104
ms.topic: overview
11-
ms.date: 02/21/2020
12-
ms.author: diberry
13-
#customer intent: As a developer, I want to know how to use QnA Maker for my FAQs and product manuals so that I can enable conversational question and answer sessions for my customers.
5+
ms.date: 05/26/2020
146
---
157

168
# What is the QnA Maker service?

articles/cognitive-services/QnAMaker/Quickstarts/add-question-metadata-portal.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
---
22
title: "Quickstart: Add questions and answer in QnA Maker portal"
33
description: This quickstart shows how to add question and answer sets with metadata so your users can find the right answer to their question.
4-
services: cognitive-services
5-
author: diberry
6-
manager: nitinme
7-
ms.service: cognitive-services
8-
ms.subservice: qna-maker
94
ms.topic: quickstart
10-
ms.date: 02/08/2020
11-
ms.author: diberry
5+
ms.date: 05/26/2020
126
---
137

148
# Quickstart: Add questions and answer with QnA Maker portal

articles/cognitive-services/QnAMaker/Quickstarts/batch-testing.md

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
---
22
title: "Quickstart: Test knowledge base with batch questions"
3-
titleSuffix: Azure Cognitive Services
4-
description:
5-
services: cognitive-services
6-
author: diberry
7-
manager: nitinme
8-
ms.service: cognitive-services
9-
ms.subservice: qna-maker
3+
description: Use the QnA Maker batch testing tool to test the knowledge bases in your QnA Maker resource for expected answers, confidence scores, and multi-turn prompts.
104
ms.topic: quickstart
11-
ms.date: 02/08/2020
12-
ms.author: diberry
5+
ms.date: 05/26/2020
136
---
147

158
# Quickstart: Test knowledge base with batch questions and expected answers

articles/cognitive-services/QnAMaker/Quickstarts/create-publish-knowledge-base.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Quickstart: Create, train, and publish knowledge base - QnA Maker"
33
description: You can create a QnA Maker knowledge base (KB) from your own content, such as FAQs or product manuals. This article includes an example of creating a QnA Maker knowledge base from a simple FAQ webpage, to answer questions QnA Maker.
44
ms.topic: conceptual
5-
ms.date: 02/08/2020
5+
ms.date: 05/26/2020
66

77
---
88

@@ -30,8 +30,8 @@ You can create a QnA Maker knowledge base (KB) from your own content, such as FA
3030

3131
1. In **Step 3**, select your Active directory, subscription, service (resource), and the language for all knowledge bases created in the service.
3232

33-
![Screenshot of selecting a QnA Maker service knowledge base](../media/qnamaker-quickstart-kb/qnaservice-selection.png)
34-
33+
:::image type="content" source="../media/qnamaker-create-publish-knowledge-base/qnaservice-selection.png" alt-text="Screenshot of selecting a QnA Maker service knowledge base":::
34+
3535
1. In **Step 3**, name your knowledge base **My Sample QnA KB**.
3636

3737
1. In **Step 4**, configure the settings with the following table:
@@ -60,7 +60,7 @@ You can create a QnA Maker knowledge base (KB) from your own content, such as FA
6060

6161
` * Azure QnA Maker service\n* Azure Cognitive Search\n* Azure web app\n* Azure app plan`
6262

63-
![ Add the question as text and the answer formatted with markdown.](../media/qnamaker-create-publish-knowledge-base/add-question-and-answer.png)
63+
:::image type="content" source="../media/qnamaker-create-publish-knowledge-base/add-question-and-answer.png" alt-text="Add the question as text and the answer formatted with markdown.":::
6464

6565
The markdown symbol, `*`, is used for bullet points. The `\n` is used for a new line.
6666

@@ -77,7 +77,7 @@ In the upper right, select **Save and train** to save your edits and train QnA M
7777

7878
`How many Azure services are used by a knowledge base?`
7979

80-
![ Enter an example user query in the textbox. ](../media/qnamaker-create-publish-knowledge-base/test-panel-in-qna-maker.png)
80+
:::image type="content" source="../media/qnamaker-create-publish-knowledge-base/test-panel-in-qna-maker.png" alt-text="Enter an example user query in the textbox.":::
8181

8282
1. Select **Inspect** to examine the response in more detail. The test window is used to test your changes to the knowledge base before publishing your knowledge base.
8383

@@ -127,7 +127,7 @@ When you make changes to the knowledge base and republish, you don't need to tak
127127

128128
The chat bot responds with an answer from your knowledge base.
129129

130-
![Enter a user query into the test web chat.](../media/qnamaker-create-publish-knowledge-base/test-web-chat.png)
130+
:::image type="content" source="../media/qnamaker-create-publish-knowledge-base/test-web-chat.png" alt-text="Enter a user query into the test web chat.":::
131131

132132
## What did you accomplish?
133133

7.98 KB
Loading
26.9 KB
Loading

0 commit comments

Comments
 (0)