Skip to content

Commit 16b4e3f

Browse files
TimShererWithAquentTimShererWithAquent
committed
Resolve merge conflict.
2 parents f513116 + 2b44ca6 commit 16b4e3f

File tree

714 files changed

+20579
-6272
lines changed

Some content is hidden

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

714 files changed

+20579
-6272
lines changed

‎.openpublishing.redirection.container-registry.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@
109109
},
110110
{
111111
"source_path": "articles/container-registry/container-registry-diagnostics-audit-logs.md",
112-
"redirect_url": "/azure/container-registry/monitor-service"
112+
"redirect_url": "/azure/container-registry/monitor-container-registry"
113113
},
114114
{
115115
"source_path_from_root": "/articles/container-registry/container-registry-managed-get-started-azure-cli.md",
@@ -155,6 +155,16 @@
155155
"source_path_from_root": "/articles/container-registry/github-action-scan.md",
156156
"redirect_url": "/azure/developer/github/",
157157
"redirect_document_id": false
158+
},
159+
{
160+
"source_path": "articles/container-registry/monitor-service.md",
161+
"redirect_url": "/azure/container-registry/monitor-container-registry",
162+
"redirect_document_id": true
163+
},
164+
{
165+
"source_path": "articles/container-registry/monitor-service-reference.md",
166+
"redirect_url": "/azure/container-registry/monitor-container-registry-reference",
167+
"redirect_document_id": true
158168
}
159169
]
160170
}

‎.openpublishing.redirection.json

Lines changed: 103 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,55 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/application-gateway/resource-manager-template-samples.md",
5+
"redirect_url": "/previous-versions/azure/application-gateway/resource-manager-template-samples",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/application-gateway/cli-samples.md",
10+
"redirect_url": "/previous-versions/azure/application-gateway/cli-samples",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/application-gateway/scripts/create-vmss-cli.md",
15+
"redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-cli",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/application-gateway/scripts/create-vmss-powershell.md",
20+
"redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-powershell",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/application-gateway/scripts/waf-custom-rules-powershell.md",
25+
"redirect_url": "/previous-versions/azure/application-gateway/scripts/waf-custom-rules-powershell",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/dns/scripts/dns-cli-create-dns-zone-record.md",
30+
"redirect_url": "/previous-versions/azure/dns/scripts/dns-cli-create-dns-zone-record",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/dns/scripts/find-unhealthy-dns-records.md",
35+
"redirect_url": "/previous-versions/azure/dns/scripts/find-unhealthy-dns-records",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/dns/cli-samples.md",
40+
"redirect_url": "/previous-versions/azure/dns/cli-samples",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/traffic-manager/scripts/traffic-manager-powershell-websites-high-availability.md",
45+
"redirect_url": "/previous-versions/azure/traffic-manager/scripts/traffic-manager-powershell-websites-high-availability",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/traffic-manager/cli-samples.md",
50+
"redirect_url": "/previous-versions/azure/traffic-manager/cli-samples",
51+
"redirect_document_id": false
52+
},
353
{
454
"source_path": "articles/expressroute/about-public-peering.md",
555
"redirect_url": "/previous-versions/azure/expressroute/about-public-peering",
@@ -28,6 +78,7 @@
2878
{
2979
"source_path": "articles/expressroute/expressroute-howto-set-global-reach-cli.md",
3080
"redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-set-global-reach-cli",
81+
"redirect_document_id": false
3182
},
3283
{
3384
"source_path": "articles/digital-twins/how-to-integrate-maps.md",
@@ -4352,6 +4403,11 @@
43524403
"redirect_url": "/azure/azure-functions",
43534404
"redirect_document_id": false
43544405
},
4406+
{
4407+
"source_path_from_root": "/articles/azure-functions/durable/durable-functions-create-first-csharp.md",
4408+
"redirect_url": "/azure/azure-functions/durable/durable-functions-isolated-create-first-csharp.md",
4409+
"redirect_document_id": false
4410+
},
43554411
{
43564412
"source_path_from_root": "/articles/twilio-dotnet-how-to-use-for-voice-sms.md",
43574413
"redirect_url": "https://www.twilio.com/docs/usage/tutorials/serverless-webhooks-azure-functions-and-csharp",
@@ -4818,6 +4874,11 @@
48184874
"redirect_document_id": false
48194875
},
48204876
{
4877+
"source_path_from_root": "/articles/azure-resource-manager/management/control-plane-metrics.md",
4878+
"redirect_url": "/azure/azure-resource-manager/management/monitor-resource-manager",
4879+
"redirect_document_id": false
4880+
},
4881+
{
48214882
"source_path_from_root": "/articles/expressroute/expressroute-monitoring-metrics-alerts.md",
48224883
"redirect_url": "/azure/expressroute/monitor-expressroute-reference",
48234884
"redirect_document_id": false
@@ -4828,6 +4889,13 @@
48284889
"redirect_document_id": false
48294890
},
48304891
{
4892+
4893+
"source_path_from_root": "/articles/backup/azure-backup-move-vaults-across-regions.md",
4894+
"redirect_url": "/azure/operational-excellence/relocation-backup",
4895+
"redirect_document_id": false
4896+
},
4897+
{
4898+
48314899
"source_path_from_root": "/articles/cosmos-db/how-to-move-regions.md",
48324900
"redirect_url": "/azure/operational-excellence/relocation-cosmos-db",
48334901
"redirect_document_id": false
@@ -4857,6 +4925,11 @@
48574925
"redirect_url": "/azure/vpn-gateway/monitor-vpn-gateway",
48584926
"redirect_document_id": false
48594927
},
4928+
{
4929+
"source_path_from_root": "/articles/app-service/manage-move-across-regions.md",
4930+
"redirect_url": "/azure/operational-excellence/relocation-app-service",
4931+
"redirect_document_id": false
4932+
},
48604933
{
48614934
"source_path_from_root": "/articles/event-grid/high-availability-disaster-recovery.md",
48624935
"redirect_url": "/azure/reliability/reliability-event-grid",
@@ -4871,11 +4944,37 @@
48714944
"source_path_from_root": "/articles/event-grid/availability-zones-disaster-recovery.md",
48724945
"redirect_url": "/azure/reliability/reliability-event-grid",
48734946
"redirect_document_id": false
4947+
},
4948+
{
4949+
"source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-powershell.md",
4950+
"redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
4951+
"redirect_document_id": false
4952+
},
4953+
{
4954+
"source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-cli.md",
4955+
"redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
4956+
"redirect_document_id": false
4957+
},
4958+
{
4959+
"source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-cli.md",
4960+
"redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
4961+
"redirect_document_id": true
4962+
},
4963+
{
4964+
"source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-powershell.md",
4965+
"redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
4966+
"redirect_document_id": false
4967+
},
4968+
{
4969+
"source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-powershell.md",
4970+
"redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
4971+
"redirect_document_id": false
4972+
},
4973+
{
4974+
"source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-cli.md",
4975+
"redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
4976+
"redirect_document_id": false
48744977
}
4875-
4876-
4877-
48784978

4879-
48804979
]
48814980
}

‎articles/active-directory-b2c/best-practices.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ The following best practices and recommendations cover some of the primary aspec
2929
| Choose user flows for most scenarios | The Identity Experience Framework of Azure AD B2C is the core strength of the service. Policies fully describe identity experiences such as sign-up, sign-in, or profile editing. To help you set up the most common identity tasks, the Azure AD B2C portal includes predefined, configurable policies called user flows. With user flows, you can create great user experiences in minutes, with just a few clicks. [Learn when to use user flows vs. custom policies](user-flow-overview.md#comparing-user-flows-and-custom-policies).|
3030
| App registrations | Every application (web, native) and API that is being secured must be registered in Azure AD B2C. If an app has both a web and native version of iOS and Android, you can register them as one application in Azure AD B2C with the same client ID. Learn how to [register OIDC, SAML, web, and native apps](./tutorial-register-applications.md?tabs=applications). Learn more about [application types that can be used in Azure AD B2C](./application-types.md). |
3131
| Move to monthly active users billing | Azure AD B2C has moved from monthly active authentications to monthly active users (MAU) billing. Most customers will find this model cost-effective. [Learn more about monthly active users billing](https://azure.microsoft.com/updates/mau-billing/). |
32+
| Follow Security best practices | There are continuous and evolving threats and attacks, and like all owned resources, your Azure AD B2C deployment should follow best practices for security, including guidance on implementing WAFs (defense against threats such as DDOS and Bots) and other defense in depth best guidance [B2C Security Architecture](/azure/active-directory-b2c/security-architecture). |
3233

3334
## Planning and design
3435

‎articles/active-directory-b2c/custom-email-sendgrid.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -542,9 +542,9 @@ The Localization element allows you to support multiple locales or languages in
542542
<LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_send_new_code">Send new code</LocalizedString>
543543
<LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_change_claims">Change e-mail</LocalizedString>
544544
<!-- Claims-->
545-
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
546-
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
547-
<LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
545+
<LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
546+
<LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
547+
<LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
548548
<LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Email</LocalizedString>
549549
<!-- Email validation error messages-->
550550
<LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</LocalizedString>

‎articles/advisor/advisor-assessments.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
title: Use Well Architected Framework assessments in Azure Advisor
33
description: Azure Advisor offers Well Architected Framework assessments (curated and focused Advisor optimization reports) through the Assessments entry in the left menu of the Azure Advisor Portal.
4-
author: mabrahms
5-
ms.author: v-mabrahms
64
ms.service: azure
75
ms.topic: article
86
ms.date: 02/18/2024

‎articles/advisor/advisor-get-started.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
---
22
title: Azure Advisor portal basics
33
description: Learn how to get started with Azure Advisor through the Azure portal, get and manage recommendations, and configure Advisor settings.
4-
author: mabrahms
5-
ms.author: v-mabrahms
64
ms.service: azure
75
ms.topic: article
86
ms.date: 03/07/2024

‎articles/advisor/advisor-how-to-performance-resize-high-usage-vm-recommendations.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
11
---
2-
author: madewithsmiles
3-
ms.author: ngdiarra
42
title: Improve the performance of highly used VMs using Azure Advisor
53
description: Use Azure Advisor to improve the performance of your Azure virtual machines with consistent high utilization.
64
ms.topic: article

‎articles/advisor/advisor-reference-cost-recommendations.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
title: Cost recommendations
33
description: Full list of available cost recommendations in Advisor.
44
ms.topic: article
5-
author: mabrahms
6-
ms.author: v-mabrahms
75
ms.date: 10/15/2023
86
---
97

‎articles/advisor/advisor-reference-operational-excellence-recommendations.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
title: Operational excellence recommendations
33
description: Operational excellence recommendations
44
ms.topic: article
5-
author: mabrahms
6-
ms.author: v-mabrahms
75
ms.date: 10/05/2023
86
---
97

‎articles/advisor/advisor-reference-performance-recommendations.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
title: Performance recommendations
33
description: Full list of available performance recommendations in Advisor.
44
ms.topic: article
5-
author: mabrahms
6-
ms.author: v-mabrahms
75
ms.date: 6/24/2024
86
---
97

0 commit comments

Comments
 (0)