Skip to content

Commit 4f3f502

Browse files
authored
Merge pull request #90336 from MicrosoftDocs/master
Merge Master to Live, 3 AM
2 parents a19f4b3 + 2c321cc commit 4f3f502

File tree

139 files changed

+2576
-651
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+2576
-651
lines changed

articles/active-directory-b2c/active-directory-b2c-devquickstarts-graph-dotnet.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ To use the Azure AD Graph API with your B2C tenant, you need to register an appl
4949

5050
### Create client secret
5151

52-
1. Under **API ACCESS**, select **Keys**.
53-
1. Enter a description for the key in the **Key description** box. For example, *Management Key*.
54-
1. Select a validity **Duration** and then select **Save**.
55-
1. Record the key's **VALUE**. You use this value for configuration in a later step.
52+
[!INCLUDE [active-directory-b2c-client-secret](../../includes/active-directory-b2c-client-secret.md)]
5653

5754
You now have an application that has permission to *create*, *read*, and *update* users in your Azure AD B2C tenant. Continue to the next section to add user *delete* and *password update* permissions.
5855

articles/active-directory-b2c/active-directory-b2c-reference-audit-logs.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,10 +108,7 @@ Follow these steps register an application, grant it the required Microsoft Grap
108108

109109
### Create client secret
110110

111-
1. Under **API ACCESS**, select **Keys**.
112-
1. Enter a description for the key in the **Key description** box. For example, *Audit Log Key*.
113-
1. Select a validity **Duration**, then select **Save**.
114-
1. Record the key's **VALUE**. You need this value for authentication in automation scripts like the example PowerShell script shown in a later section.
111+
[!INCLUDE [active-directory-b2c-client-secret](../../includes/active-directory-b2c-client-secret.md)]
115112

116113
You now have an application with the required API access, an application ID, and a key that you can use in your automation scripts. See the PowerShell script section later in this article for an example of how you can get activity events with a script.
117114

articles/active-directory-b2c/active-directory-b2c-user-migration.md

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,7 @@ Next, grant the application the Azure AD Graph API permissions required for writ
6161

6262
Create a client secret (key) for use by the user migration application that you configure in a later step.
6363

64-
1. In the **Registered app** page, select **Settings**.
65-
1. Select **Keys**.
66-
1. Under **Passwords**, add a new key (also known as a client secret) named *MyClientSecret* or another name of your choosing, select an expiration window, select **Save**, and then copy the key value for later use.
67-
68-
![Application ID value and Keys menu item highlighted in Azure portal](media/active-directory-b2c-user-migration/pre-migration-app-id-and-key.png)
64+
[!INCLUDE [active-directory-b2c-client-secret](../../includes/active-directory-b2c-client-secret.md)]
6965

7066
Now you have an application with permissions to create, read, and update users in your Azure AD B2C tenant.
7167

articles/active-directory/manage-apps/use-scim-to-provision-users-and-groups.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.workload: identity
1212
ms.tgt_pltfrm: na
1313
ms.devlang: na
1414
ms.topic: conceptual
15-
ms.date: 07/31/2019
15+
ms.date: 10/01/2019
1616
ms.author: mimart
1717
ms.reviewer: arvinh
1818
ms.custom: aaddev;it-pro;seohack1

articles/azure-government/documentation-government-services-aiandcognitiveservices.md

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.devlang: na
1111
ms.topic: article
1212
ms.tgt_pltfrm: na
1313
ms.workload: azure-government
14-
ms.date: 10/23/2018
14+
ms.date: 10/01/2019
1515
ms.author: jglixon
1616

1717
---
@@ -28,6 +28,7 @@ The following AI and Cognitive Services are generally available in Azure Governm
2828
- Speech
2929
- Translator Text
3030
- Language Understanding
31+
- QnA Maker
3132
- Azure Bot Service
3233

3334
> [!IMPORTANT]
@@ -129,6 +130,16 @@ Variations in Azure Government:
129130

130131
For more information, see [global Azure documentation](../cognitive-services/luis/what-is-luis.md) for Language Understanding.
131132

133+
### QnA Maker
134+
135+
Variations in Azure Government:
136+
137+
- Endpoint: https://virginia.api.cognitive.microsoft.us/qnamaker/v4.0
138+
- QnA Maker portal: https://qnamaker.azure.us
139+
- Available SKUs: S0
140+
141+
For more information, see [global Azure documentation](../cognitive-services/QnAMaker/Overview/overview.md) for QnA Maker.
142+
132143
## Azure Bot Service
133144

134145
Variations in Azure Government:
@@ -158,8 +169,7 @@ Some Bot Service features available in the public cloud are not yet available in
158169
Commonly used services in bot applications that are currently unavailable in Azure Government:
159170
- Application Insights
160171
- Azure Search
161-
- QnA Maker Cognitive Service
162-
- Speech Services Cognitive Service
172+
- Speech Services
163173

164174
For more information, see [global Azure documentation](https://aka.ms/botdocs/) for Bot Service.
165175

23.8 KB
Loading
12.1 KB
Loading
13.8 KB
Loading
315 KB
Loading

0 commit comments

Comments
 (0)