Skip to content

Commit e3f7268

Browse files
committed
Merge branch 'main' into release-functions-bindings-refactor
2 parents eb6225b + 9f983a4 commit e3f7268

File tree

661 files changed

+5655
-2838
lines changed

Some content is hidden

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

661 files changed

+5655
-2838
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
],
3535
"branches_to_filter": [],
3636
"git_repository_url_open_to_public_contributors": "https://github.com/MicrosoftDocs/azure-docs",
37-
"git_repository_branch_open_to_public_contributors": "master",
37+
"git_repository_branch_open_to_public_contributors": "main",
3838
"skip_source_output_uploading": false,
3939
"need_preview_pull_request": true,
4040
"contribution_branch_mappings": {},
@@ -901,4 +901,4 @@
901901
"articles/container-apps/.openpublishing.redirection.container-apps.json",
902902
"articles/spring-cloud/.openpublishing.redirection.spring-cloud.json"
903903
]
904-
}
904+
}

.openpublishing.redirection.active-directory.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3483,7 +3483,7 @@
34833483
{
34843484
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-enable.md",
34853485
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
3486-
"redirect_document_id": true
3486+
"redirect_document_id": false
34873487
},
34883488
{
34893489
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-faqs.md",
@@ -3498,7 +3498,7 @@
34983498
{
34993499
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-overview.md",
35003500
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-overview",
3501-
"redirect_document_id": true
3501+
"redirect_document_id": false
35023502
},
35033503
{
35043504
"source_path_from_root": "/articles/active-directory/active-directory-windows-enterprise-state-roaming-troubleshooting.md",
@@ -3510,6 +3510,11 @@
35103510
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-windows-settings-reference",
35113511
"redirect_document_id": true
35123512
},
3513+
{
3514+
"source_path_from_root": "/articles/active-directory/devices/enterprise-state-roaming-overview.md",
3515+
"redirect_url": "/azure/active-directory/devices/enterprise-state-roaming-enable",
3516+
"redirect_document_id": true
3517+
},
35133518
{
35143519
"source_path_from_root": "/articles/active-directory/device-management-faq.md",
35153520
"redirect_url": "/azure/active-directory/devices/faq",

.openpublishing.redirection.json

Lines changed: 10 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32794,6 +32794,11 @@
3279432794
"redirect_url": "tutorial-app-containerization-java-kubernetes",
3279532795
"redirect_document_id": false
3279632796
},
32797+
{
32798+
"source_path_from_root": "/articles/migrate/migrate-appliance-architecture.md",
32799+
"redirect_url": "discovered-metadata",
32800+
"redirect_document_id": false
32801+
},
3279732802
{
3279832803
"source_path_from_root": "/articles/storage/common/storage-access-blobs-queues-portal.md",
3279932804
"redirect_url": "articles/storage/blobs/authorize-blob-access-portal",
@@ -38689,6 +38694,11 @@
3868938694
"redirect_url": "/azure/cognitive-services/Speech-Service/language-identification",
3869038695
"redirect_document_id": true
3869138696
},
38697+
{
38698+
"source_path_from_root": "/articles/cognitive-services/Speech-Service/phone-sets.md",
38699+
"redirect_url": "/azure/cognitive-services/Speech-Service/customize-pronunciation",
38700+
"redirect_document_id": true
38701+
},
3869238702
{
3869338703
"source_path_from_root": "/articles/cognitive-services/entitylinking/GettingStarted.md",
3869438704
"redirect_url": "/azure/cognitive-services/text-analytics",
@@ -43928,25 +43938,6 @@
4392843938
"source_path_from_root": "/articles/governance/policy/how-to/guest-configuration-create-group-policy.md",
4392943939
"redirect_url": "/azure/governance/policy/how-to/guest-configuration-create",
4393043940
"redirect_document_id": false
43931-
},
43932-
{ "source_path_from_root": "/articles/azure/marketplace/co-sell-requirements.md",
43933-
"redirect_url": "/partner-center/co-sell-requirements",
43934-
"redirect_document_id": false
43935-
},
43936-
{
43937-
"source_path_from_root": "/articles/azure/marketplace/co-sell-status.md",
43938-
"redirect_url": "/partner-center/co-sell-status",
43939-
"redirect_document_id": false
43940-
},
43941-
{
43942-
"source_path_from_root": "/articles/azure/marketplace/co-sell-configure.md",
43943-
"redirect_url": "/partner-center/co-sell-configure",
43944-
"redirect_document_id": false
43945-
},
43946-
{
43947-
"source_path_from_root": "/articles/azure/marketplace/co-sell-overview.md",
43948-
"redirect_url": "/partner-center/co-sell-overview",
43949-
"redirect_document_id": false
4395043941
}
4395143942
]
4395243943
}

.vscode/settings.json

Lines changed: 0 additions & 8 deletions
This file was deleted.

articles/active-directory-b2c/add-password-reset-policy.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -342,3 +342,5 @@ Your application needs to handle certain errors coming from Azure B2C service. L
342342
## Next steps
343343

344344
Set up a [force password reset](force-password-reset.md).
345+
346+
[Sign-up and Sign-in with embedded password reset](https://github.com/azure-ad-b2c/samples/tree/master/policies/embedded-password-reset).

articles/active-directory-b2c/azure-ad-external-identities-videos.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ titleSuffix: Azure AD B2C
44
description: Microsoft Azure Active Directory B2C Video Series
55
services: active-directory-b2c
66
author: gargi-sinha
7-
manager: martinco
7+
manager: CelesteDG
8+
ms.reviewer: kengaderdus
89
ms.service: active-directory
910
ms.workload: identity
1011
ms.topic: how-to

articles/active-directory-b2c/azure-sentinel.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ titleSuffix: Azure AD B2C
44
description: In this tutorial, you use Microsoft Sentinel to perform security analytics for Azure Active Directory B2C data.
55
services: active-directory-b2c
66
author: gargi-sinha
7-
manager: martinco
7+
manager: CelesteDG
8+
ms.reviewer: kengaderdus
89

910
ms.service: active-directory
1011
ms.workload: identity

articles/active-directory-b2c/configure-a-sample-node-web-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: how-to
11-
ms.date: 02/09/2022
11+
ms.date: 04/03/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
---
@@ -143,7 +143,7 @@ You can now test the sample app. You need to start the Node server and access it
143143
### Test sign in
144144

145145
1. After the page with the **Sign in** button finishes loading, select **Sign in**. You're prompted to sign in.
146-
1. Enter your sign-in credentials, such as email address and password. If you don't have an account, select **Sign up now** to create an account. If you have an account but have forgotten your password, select **Forgot your password?** to recover your password. After you successfully sign in or sign up, you should see the following page that shows sign-in status.
146+
1. Enter your sign-in credentials, such as email address and password. If you don't have an account, select **Sign up now** to create an account. After you successfully sign in or sign up, you should see the following page that shows sign-in status.
147147

148148
:::image type="content" source="./media/configure-a-sample-node-web-app/tutorial-dashboard-page.png" alt-text="Screenshot shows web app sign-in status.":::
149149

articles/active-directory-b2c/configure-authentication-in-sample-node-web-app-with-api.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
12-
ms.date: 02/09/2022
12+
ms.date: 04/03/2022
1313
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
@@ -250,7 +250,7 @@ You're now ready to test the web application's scoped access to the web API. Run
250250

251251
1. To call the protected API endpoint, select the **Sign in to call PROTECTED API** button. You're prompted to sign in.
252252
253-
1. Enter your sign-in credentials, such as email address and password. If you don't have an account, select **Sign up now** to create an account. If you have an account but have forgotten your password, select **Forgot your password?** to recover your password. After you successfully sign in or sign up, you should see the following page with **Call the PROTECTED API** button.
253+
1. Enter your sign-in credentials, such as email address and password. If you don't have an account, select **Sign up now** to create an account. After you successfully sign in or sign up, you should see the following page with **Call the PROTECTED API** button.
254254

255255

256256
:::image type="content" source="./media/tutorial-call-api-using-access-token/signed-in-to-call-api.png" alt-text="Web page for signed to call protected A P I.":::

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ zone_pivot_groups: b2c-policy-type
3131

3232
## Create an application
3333

34-
To enable sign-in for users with a Twitter account in Azure AD B2C, you need to create a Twitter application. If you don't already have a Twitter account, you can sign up at [`https://twitter.com/signup`](https://twitter.com/signup). You also need to [Apply for a developer account](https://developer.twitter.com/en/apply/user.html). For more information, see [Apply for access](https://developer.twitter.com/en/apply-for-access).
34+
To enable sign-in for users with a Twitter account in Azure AD B2C, you need to create a Twitter application. If you don't already have a Twitter account, you can sign up at [`https://twitter.com/signup`](https://twitter.com/signup). You also need to [Apply for a developer account](https://developer.twitter.com/). For more information, see [Apply for access](https://developer.twitter.com/en/apply-for-access).
3535

3636
1. Sign in to the [Twitter Developer Portal](https://developer.twitter.com/portal/projects-and-apps) with your Twitter account credentials.
3737
1. Under **Standalone Apps**, select **+Create App**.

0 commit comments

Comments
 (0)