Skip to content

Commit 6232a08

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into jit-aws
2 parents 2397165 + 06cb5c5 commit 6232a08

File tree

872 files changed

+17788
-6967
lines changed

Some content is hidden

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

872 files changed

+17788
-6967
lines changed

.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@
3535
"redirect_url": "/azure/azure-monitor/change/change-analysis-visualizations",
3636
"redirect_document_id": false
3737
},
38+
{
39+
"source_path_from_root": "/articles/azure-monitor/azure-monitor-app-hub.yml",
40+
"redirect_url": "/azure/azure-monitor/",
41+
"redirect_document_id": false
42+
},
3843
{
3944
"source_path_from_root": "/articles/azure-monitor/app/troubleshoot-portal-connectivity.md",
4045
"redirect_url": "https://docs.microsoft.com/troubleshoot/azure/azure-monitor/app-insights/troubleshoot-portal-connectivity",

.openpublishing.redirection.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37035,12 +37035,7 @@
3703537035
},
3703637036
{
3703737037
"source_path_from_root": "/articles/cognitive-services/Speech-Service/how-to-customize-speech-models.md",
37038-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-custom-speech-train-model",
37039-
"redirect_document_id": false
37040-
},
37041-
{
37042-
"source_path_from_root": "/articles/cognitive-services/speech-service/how-to-custom-speech-deploy-model.md",
37043-
"redirect_url": "/azure/cognitive-services/speech-service/how-to-custom-speech-train-model",
37038+
"redirect_url": "/azure/cognitive-services/speech-service/how-to-custom-speech-choose-model",
3704437039
"redirect_document_id": false
3704537040
},
3704637041
{

articles/active-directory-b2c/custom-domain.md

Lines changed: 95 additions & 117 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/identity-provider-google.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ To enable sign-in for users with a Google account in Azure Active Directory B2C
4343
1. In the upper-left corner of the page, select the project list, and then select **New Project**.
4444
1. Enter a **Project Name**, select **Create**.
4545
1. Make sure you are using the new project by selecting the project drop-down in the top-left of the screen. Select your project by name, then select **Open**.
46-
1. In the left menu, select **OAuth consent screen**, select **External**, and then select **Create**.
46+
1. In the left menu, select **APIs and services** and then **OAuth consent screen**. Select **External** and then select **Create**.
4747
1. Enter a **Name** for your application.
4848
1. Select a **User support email**.
49+
1. In the **App domain** section, enter a link to your **Application home page**, a link to your **Application privacy policy**, and a link to your **Application terms of service**.
4950
1. In the **Authorized domains** section, enter *b2clogin.com*.
5051
1. In the **Developer contact information** section, enter comma separated emails for Google to notify you about any changes to your project.
5152
1. Select **Save**.
@@ -199,4 +200,4 @@ If the sign-in process is successful, your browser is redirected to `https://jwt
199200
- Check out the Google federation [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/Identity-providers#google), and how to pass Google access token [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/Identity-providers#google-with-access-token)
200201

201202

202-
::: zone-end
203+
::: zone-end
139 KB
Loading
139 KB
Loading

articles/active-directory-domain-services/policy-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Built-in policy definitions for Azure Active Directory Domain Services
33
description: Lists Azure Policy built-in policy definitions for Azure Active Directory Domain Services. These built-in policy definitions provide common approaches to managing your Azure resources.
4-
ms.date: 03/08/2022
4+
ms.date: 05/11/2022
55
ms.service: active-directory
66
ms.subservice: domain-services
77
author: justinha

articles/active-directory/conditional-access/howto-conditional-access-apis.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ Many of the following examples use tools like [Managed Identities](../managed-id
3131

3232
### PowerShell
3333

34+
> [!IMPORTANT]
35+
> Due to the planned deprecation of PowerShell modules (MSOL & AAD) after December 2022, no further updates are planned for these modules to support new Conditional Access features. See recent announcements for more information: https://aka.ms/AzureADPowerShellDeprecation. New Conditional Access features may not be available or may not be functional within these PowerShell modules as a result of this announcement. Please consider [migrating to Microsoft Graph PowerShell](https://aka.ms/MigrateMicrosoftGraphPowerShell). Additional guidance and examples will be released soon.
36+
3437
For many administrators, PowerShell is already an understood scripting tool. The following example shows how to use the [Azure AD PowerShell module](https://www.powershellgallery.com/packages/AzureAD) to manage Conditional Access policies.
3538

3639
- [Configure Conditional Access policies with Azure AD PowerShell commands](https://github.com/Azure-Samples/azure-ad-conditional-access-apis/tree/main/01-configure/powershell)

articles/active-directory/develop/TOC.yml

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -233,23 +233,7 @@
233233
- name: Remove an app registration
234234
href: ./howto-remove-app.md
235235
- name: Restore or remove a deleted app registration
236-
href: ./howto-restore-app.md
237-
- name: Multi-service tutorials
238-
items:
239-
- name: Secure web app accesses storage and Microsoft Graph
240-
items:
241-
- name: Overview
242-
href: multi-service-web-app-overview.md
243-
- name: Set up App Service authentication
244-
href: multi-service-web-app-authentication-app-service.md
245-
- name: Access storage as the app
246-
href: multi-service-web-app-access-storage.md
247-
- name: Access Microsoft Graph as the user
248-
href: multi-service-web-app-access-microsoft-graph-as-user.md
249-
- name: Access Microsoft Graph as the app
250-
href: multi-service-web-app-access-microsoft-graph-as-app.md
251-
- name: Clean up resources
252-
href: multi-service-web-app-clean-up-resources.md
236+
href: ./howto-restore-app.md
253237
- name: Single-page app (SPA)
254238
items:
255239
- name: SPA authentication documentation
@@ -340,6 +324,20 @@
340324
href: tutorial-blazor-server.md
341325
- name: Node.js
342326
href: tutorial-v2-nodejs-webapp-msal.md
327+
- name: Secure web app accesses storage and Microsoft Graph
328+
items:
329+
- name: Overview
330+
href: multi-service-web-app-overview.md
331+
- name: Set up App Service authentication
332+
href: multi-service-web-app-authentication-app-service.md
333+
- name: Access storage as the app
334+
href: multi-service-web-app-access-storage.md
335+
- name: Access Microsoft Graph as the user
336+
href: multi-service-web-app-access-microsoft-graph-as-user.md
337+
- name: Access Microsoft Graph as the app
338+
href: multi-service-web-app-access-microsoft-graph-as-app.md
339+
- name: Clean up resources
340+
href: multi-service-web-app-clean-up-resources.md
343341
- name: Samples
344342
displayName: code samples, example code, code snippets
345343
href: sample-v2-code.md#web-applications
@@ -372,7 +370,7 @@
372370
- name: Call a web API
373371
href: scenario-web-app-call-api-call-api.md
374372
- name: Move to production
375-
href: scenario-web-app-call-api-production.md
373+
href: scenario-web-app-call-api-production.md
376374
- name: Web API
377375
items:
378376
- name: Web API authentication documentation

articles/active-directory/develop/index-web-app.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,20 @@ landingContent:
4242
url: tutorial-blazor-webassembly.md
4343
- text: Node.js with Express
4444
url: tutorial-v2-nodejs-webapp-msal.md
45-
- title: "Scenarios in depth"
45+
- title: "Web apps in depth"
4646
linkLists:
4747
- linkListType: how-to-guide
4848
links:
4949
- text: Web app that signs in users
5050
url: scenario-web-app-sign-user-overview.md
5151
- text: Web app that calls a web API
5252
url: scenario-web-app-call-api-overview.md
53+
- title: "Scenarios in depth"
54+
linkLists:
55+
- linkListType: tutorial
56+
links:
57+
- text: Secure web app accesses storage and Microsoft Graph
58+
url: multi-service-web-app-overview.md
5359
## ROW ################################################### ROW 2 ##
5460
# - title: $CARD_TITLE
5561
# linkLists:

0 commit comments

Comments
 (0)