Skip to content

Commit 6b33b1c

Browse files
authored
Merge pull request #296 from MicrosoftDocs/master
reverse merge
2 parents f66b1eb + 7194ff5 commit 6b33b1c

File tree

948 files changed

+10440
-3273
lines changed

Some content is hidden

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

948 files changed

+10440
-3273
lines changed

.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -782,6 +782,12 @@
782782
"url": "https://github.com/dotnet/samples",
783783
"branch": "main",
784784
"branch_mapping": {}
785+
},
786+
{
787+
"path_to_root": "azure-docs-bicep-samples",
788+
"url": "https://github.com/Azure/azure-docs-bicep-samples/",
789+
"branch": "main",
790+
"branch_mapping": {}
785791
}
786792
],
787793
"branch_target_mapping": {

.openpublishing.redirection.healthcare-apis.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -451,6 +451,11 @@
451451
"source_path_from_root": "/articles/healthcare-apis/fhir/fhir-arm-template-quickstart.md",
452452
"redirect_url": "/azure/healthcare-apis/fhir/fhir-service-resource-manager-template",
453453
"redirect_document_id": true
454+
},
455+
{
456+
"source_path_from_root": "/articles/healthcare-apis/azure-api-for-fhir/access-fhir-postman-tutorial.md",
457+
"redirect_url": "/azure/healthcare-apis/fhir/using-postman",
458+
"redirect_document_id": true
454459
}
455460
]
456461
}

.openpublishing.redirection.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/storage/blobs/storage-c-plus-plus-how-to-use-blobs.md",
5+
"redirect_url": "/azure/storage/blobs/quickstart-blobs-c-plus-plus",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "active-directory/authentication/concept-mfa-plan.md",
510
"redirect_url": "active-directory/authentication/howto-mfa-getstarted",
@@ -9571,8 +9576,13 @@
95719576
},
95729577
{
95739578
"source_path_from_root": "/articles/azure-supportability/resource-manager-core-quotas-request.md",
9574-
"redirect_url": "/azure/azure-portal/supportability/resource-manager-core-quotas-request",
9575-
"redirect_document_id": true
9579+
"redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
9580+
"redirect_document_id": false
9581+
},
9582+
{
9583+
"source_path_from_root": "/articles/azure-portal/supportability/resource-manager-core-quotas-request.md",
9584+
"redirect_url": "/azure/azure-portal/supportability/regional-quota-requests",
9585+
"redirect_document_id": false
95769586
},
95779587
{
95789588
"source_path_from_root": "/articles/azure-supportability/sku-series-unavailable.md",

articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,8 @@
414414
items:
415415
- name: Akamai
416416
href: partner-akamai.md
417+
- name: Azure WAF
418+
href: partner-azure-web-application-firewall.md
417419
- name: Cloudflare
418420
href: partner-cloudflare.md
419421
- name: Configure web API domains

articles/active-directory-b2c/add-sign-up-and-sign-in-policy.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: 06/07/2021
12+
ms.date: 08/17/2021
1313
ms.author: mimart
1414
ms.subservice: B2C
1515
ms.custom: "b2c-support"
@@ -46,7 +46,7 @@ The sign-up and sign-in user flow handles both sign-up and sign-in experiences w
4646
1. In the Azure portal, search for and select **Azure AD B2C**.
4747
1. Under **Policies**, select **User flows**, and then select **New user flow**.
4848

49-
![User flows page in portal with New user flow button highlighted](./media/add-sign-up-and-sign-in-policy/signup-signin-user-flow.png)
49+
![User flows page in portal with New user flow button highlighted](./media/add-sign-up-and-sign-in-policy/sign-up-sign-in-user-flow.png)
5050

5151
1. On the **Create a user flow** page, select the **Sign up and sign in** user flow.
5252

articles/active-directory-b2c/enable-authentication-android-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.topic: reference
1010
ms.date: 07/06/2021
1111
ms.author: mimart
1212
ms.subservice: B2C
13-
ms.custom: "b2c-support"
13+
ms.custom: "b2c-support, has-adal-ref"
1414
---
1515

1616
# Enable authentication in your own Android application using Azure Active Directory B2C
36.9 KB
Loading
Binary file not shown.
36.8 KB
Loading
Binary file not shown.

0 commit comments

Comments
 (0)