Skip to content

Commit be92628

Browse files
paulth1paulth1
committed
fixing merge conflict
2 parents 0ad5f2e + c40d442 commit be92628

File tree

1,013 files changed

+13738
-7184
lines changed

Some content is hidden

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

1,013 files changed

+13738
-7184
lines changed

‎.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,16 @@
398398
"redirect_url": "/articles/load-balancer/concepts",
399399
"redirect_document_id": false
400400
},
401+
{
402+
"source_path_from_root": "/articles/azure-sql/database/doc-changes-updates-release-notes.md",
403+
"redirect_url": "/azure/azure-sql/database/doc-changes-updates-release-notes-whats-new",
404+
"redirect_document_id": true
405+
},
406+
{
407+
"source_path_from_root": "/articles/azure-sql/virtual-machines/windows/doc-changes-updates-release-notes.md",
408+
"redirect_url": "/azure/azure-sql/virtual-machines/windows/doc-changes-updates-release-notes-whats-new",
409+
"redirect_document_id": true
410+
},
401411
{
402412
"source_path_from_root": "/articles/app-service-web/web-sites-dotnet-deploy-aspnet-mvc-app-membership-oauth-sql-database.md",
403413
"redirect_url": "/aspnet/core/security/authorization/secure-data",
@@ -5898,6 +5908,11 @@
58985908
"redirect_url": "/azure/azure-cache-for-redis/scripts/show-cache",
58995909
"redirect_document_id": false
59005910
},
5911+
{
5912+
"source_path_from_root": "/articles/storage/blobs/Storage-blob-performance-tiers.md",
5913+
"redirect_url": "/azure/storage/common/storage-account-overview",
5914+
"redirect_document_id": false
5915+
},
59015916
{
59025917
"source_path_from_root": "/articles/storage/blobs/data-lake-storage-handle-data-using-databricks.md",
59035918
"redirect_url": "/azure/azure-databricks/databricks-extract-load-sql-data-warehouse",
@@ -46487,6 +46502,16 @@
4648746502
"source_path_from_root": "/articles/app-service/environment/app-service-web-how-to-create-a-web-app-in-an-ase.md",
4648846503
"redirect_url": "/azure/app-service/environment/using",
4648946504
"redirect_document_id": false
46505+
},
46506+
{
46507+
"source_path_from_root": "/articles/virtual-desktop/diagnostics-role-service.md",
46508+
"redirect_url": "/azure/virtual-desktop/troubleshoot-set-up-overview",
46509+
"redirect_document_id": false
46510+
},
46511+
{
46512+
"source_path_from_root": "/articles/azure-monitor/app/how-do-i.md",
46513+
"redirect_url": "/azure/azure-monitor/faq",
46514+
"redirect_document_id": false
4649046515
}
4649146516
]
4649246517
}

‎articles/active-directory-b2c/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@
376376
items:
377377
- name: Datawiza
378378
href: partner-datawiza.md
379+
- name: F5
380+
href: partner-f5.md
379381
- name: Ping Identity
380382
href: partner-ping-identity.md
381383
- name: Strata

‎articles/active-directory-b2c/aad-sspr-technical-profile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Azure AD SSPR technical profiles in custom policies
33
titleSuffix: Azure AD B2C
44
description: Custom policy reference for Azure AD SSPR technical profiles in Azure AD B2C.
55
services: active-directory-b2c
6-
author: msmimart
7-
manager: celestedg
6+
author: kengaderdus
7+
manager: CelesteDG
88

99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
1212
ms.date: 06/23/2020
13-
ms.author: mimart
13+
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
1616

‎articles/active-directory-b2c/access-tokens.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
---
2-
title: Request an access token - Azure Active Directory B2C | Microsoft Docs
2+
title: Request an access token - Azure Active Directory B2C
33
description: Learn how to request an access token from Azure Active Directory B2C.
44
services: active-directory-b2c
5-
author: msmimart
6-
manager: celestedg
5+
author: kengaderdus
6+
manager: CelesteDG
77

88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
1111
ms.date: 05/26/2021
1212
ms.custom: project-no-code
13-
ms.author: mimart
13+
ms.author: kengaderdus
1414
ms.subservice: B2C
1515

1616
---

‎articles/active-directory-b2c/active-directory-technical-profile.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Define an Azure AD technical profile in a custom policy
33
titleSuffix: Azure AD B2C
44
description: Define an Azure Active Directory technical profile in a custom policy in Azure Active Directory B2C.
55
services: active-directory-b2c
6-
author: msmimart
7-
manager: celestedg
6+
author: kengaderdus
7+
manager: CelesteDG
88

99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: reference
1212
ms.date: 12/11/2020
13-
ms.author: mimart
13+
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
---
1616

‎articles/active-directory-b2c/add-api-connector-token-enrichment.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
title: Token enrichment - Azure Active Directory B2C
33
description: Enrich tokens with claims from external sources using APIs.
44
services: active-directory-b2c
5-
author: msmimart
6-
manager: celestedg
5+
author: kengaderdus
6+
manager: CelesteDG
77

88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: how-to
1111
ms.date: 08/29/2021
12-
ms.author: mimart
12+
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
zone_pivot_groups: b2c-policy-type
1515
---
@@ -252,7 +252,7 @@ After you deploy your REST API, set the metadata of the `REST-GetProfile` techni
252252

253253
See the [RESTful technical profile metadata](restful-technical-profile.md#metadata) for more configurations.
254254

255-
The comments above `AuthenticationType` and `AllowInsecureAuthInProduction` specify changes you should make when you move to a production environment. To learn how to secure your RESTful APIs for production, see [Secure RESTful API](secure-rest-api.md).
255+
The comments above `AuthenticationType` and `AllowInsecureAuthInProduction` specify changes you should make when you move to a production environment. To learn how to secure your RESTful APIs for production, see [Secure your RESTful API](secure-rest-api.md).
256256

257257
## Add an orchestration step
258258

‎articles/active-directory-b2c/add-api-connector.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ ms.subservice: B2C
77
ms.topic: how-to
88
ms.date: 08/24/2021
99

10-
ms.author: mimart
11-
author: msmimart
12-
manager: celestedg
10+
ms.author: kengaderdus
11+
author: kengaderdus
12+
manager: CelesteDG
1313
ms.custom: "it-pro"
1414
zone_pivot_groups: b2c-policy-type
1515
---

‎articles/active-directory-b2c/add-identity-provider.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Add an identity provider - Azure Active Directory B2C | Microsoft Docs
2+
title: Add an identity provider - Azure Active Directory B2C
33
description: Learn how to add an identity provider to your Active Directory B2C tenant.
44
services: active-directory-b2c
5-
author: msmimart
6-
manager: celestedg
5+
author: kengaderdus
6+
manager: CelesteDG
77

8-
ms.author: mimart
8+
ms.author: kengaderdus
99
ms.date: 04/29/2021
1010
ms.custom: mvc
1111
ms.topic: how-to

‎articles/active-directory-b2c/add-native-application.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
---
2-
title: Add a native client application - Azure Active Directory B2C | Microsoft Docs
2+
title: Add a native client application - Azure Active Directory B2C
33
description: Learn how to add a native client application to your Active Directory B2C tenant.
44
services: active-directory-b2c
5-
author: msmimart
6-
manager: celestedg
5+
author: kengaderdus
6+
manager: CelesteDG
77

8-
ms.author: mimart
8+
ms.author: kengaderdus
99
ms.date: 02/04/2019
1010
ms.custom: mvc
1111
ms.topic: how-to

‎articles/active-directory-b2c/add-password-change-policy.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ title: Set up password change by using custom policies
33
titleSuffix: Azure AD B2C
44
description: Learn how to set up a custom policy so users can change their password in Azure Active Directory B2C.
55
services: active-directory-b2c
6-
author: msmimart
7-
manager: celestedg
6+
author: kengaderdus
7+
manager: CelesteDG
88

99
ms.service: active-directory
1010
ms.workload: identity
1111
ms.topic: how-to
1212
ms.date: 08/24/2021
13-
ms.author: mimart
13+
ms.author: kengaderdus
1414
ms.subservice: B2C
1515
zone_pivot_groups: b2c-policy-type
1616
---

0 commit comments

Comments
 (0)