Skip to content

Commit 82bc40e

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into notebooks-dedup
2 parents cc68292 + 1fc85f5 commit 82bc40e

File tree

2,859 files changed

+26967
-33852
lines changed

Some content is hidden

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

2,859 files changed

+26967
-33852
lines changed

.github/policies/disallow-edits.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,8 @@ configuration:
160160
matchAny: true
161161
pattern: articles/reliability/*
162162
- commentContains:
163-
pattern: \#sign-off
164-
isRegex: false
163+
pattern: '\#sign-off'
164+
isRegex: true
165165
- not:
166166
or:
167167
- isActivitySender:

.openpublishing.publish.config.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -242,12 +242,6 @@
242242
"branch": "main",
243243
"branch_mapping": {}
244244
},
245-
{
246-
"path_to_root": "azure-proactive-resiliency-library",
247-
"url": "https://github.com/Azure/Azure-Proactive-Resiliency-Library",
248-
"branch": "main",
249-
"branch_mapping": {}
250-
},
251245
{
252246
"path_to_root": "azure-sdk-for-go-samples",
253247
"url": "https://github.com/Azure-Samples/azure-sdk-for-go-samples",
@@ -590,6 +584,12 @@
590584
"branch": "main",
591585
"branch_mapping": {}
592586
},
587+
{
588+
"path_to_root": "laravel-tasks",
589+
"url": "https://github.com/Azure-Samples/laravel-tasks",
590+
"branch": "main",
591+
"branch_mapping": {}
592+
},
593593
{
594594
"path_to_root": "playwright-testing-service",
595595
"url": "https://github.com/microsoft/playwright-testing-service",

.openpublishing.redirection.json

Lines changed: 116 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,85 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/automation/change-tracking/enable-from-portal.md",
5+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/automation/change-tracking/enable-from-vm.md",
10+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/automation/change-tracking/enable-from-automation-account.md",
15+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/automation/change-tracking/configure-alerts.md",
20+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/automation/change-tracking/enable-from-runbook.md",
25+
"redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/automation/change-tracking/manage-change-tracking.md",
30+
"redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
31+
"redirect_document_id": false
32+
},
33+
{
34+
"source_path": "articles/automation/change-tracking/manage-inventory-vms.md",
35+
"redirect_url": "/azure/automation/change-tracking/manage-change-tracking-monitoring-agent",
36+
"redirect_document_id": false
37+
},
38+
{
39+
"source_path": "articles/automation/change-tracking/manage-scope-configurations.md",
40+
"redirect_url": "/azure/automation/change-tracking/enable-vms-monitoring-agent",
41+
"redirect_document_id": false
42+
},
43+
{
44+
"source_path": "articles/automation/change-tracking/overview.md",
45+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
46+
"redirect_document_id": false
47+
},
48+
{
49+
"source_path": "articles/automation/change-tracking/remove-feature.md",
50+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
51+
"redirect_document_id": false
52+
},
53+
{
54+
"source_path": "articles/automation/change-tracking/remove-vms-from-change-tracking.md",
55+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
56+
"redirect_document_id": false
57+
},
58+
{
59+
"source_path": "articles/automation/how-to/region-mappings.md",
60+
"redirect_url": "/azure/automation/change-tracking/region-mappings-monitoring-agent",
61+
"redirect_document_id": false
62+
},
63+
{
64+
"source_path": "articles/automation/automation-tutorial-installed-software.md",
65+
"redirect_url": "/azure/automation/change-tracking/overview-monitoring-agent",
66+
"redirect_document_id": false
67+
},
68+
{
69+
"source_path": "articles/automation/troubleshoot/change-tracking.md",
70+
"redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
71+
"redirect_document_id": false
72+
},
73+
{
74+
"source_path": "articles/automation/troubleshoot/onboarding.md",
75+
"redirect_url": "/azure/automation/change-tracking/guidance-migration-log-analytics-monitoring-agent",
76+
"redirect_document_id": false
77+
},
78+
{
79+
"source_path": "articles/migrate/tutorial-modernize-asp-net-aks.md",
80+
"redirect_url": "/azure/migrate/migrate-services-overview",
81+
"redirect_document_id": false
82+
},
383
{
484
"source_path": "articles/databox-online/azure-stack-edge-gpu-deploy-sample-module-marketplace.md",
585
"redirect_url": "https://azuremarketplace.microsoft.com/marketplace/apps?page=1",
@@ -30,6 +110,11 @@
30110
"redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
31111
"redirect_document_id": false
32112
},
113+
{
114+
"source_path": "articles/event-grid/event-schema-storage-actions.md",
115+
"redirect_url": "/azure/storage-actions/overview",
116+
"redirect_document_id": false
117+
},
33118
{
34119
"source_path_from_root": "/articles/hdinsight-aks/index.yml",
35120
"redirect_url": "/previous-versions/azure/hdinsight-aks",
@@ -1855,6 +1940,11 @@
18551940
"redirect_url": "/azure/api-management/monitor-api-management",
18561941
"redirect_document_id": false
18571942
},
1943+
{
1944+
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-cross-premises-options.md",
1945+
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-vpn-gateway-settings",
1946+
"redirect_document_id": false
1947+
},
18581948
{
18591949
"source_path_from_root": "/articles/vpn-gateway/vpn-gateway-about-forced-tunneling.md",
18601950
"redirect_url": "/previous-versions/azure/vpn-gateway/vpn-gateway-about-forced-tunneling",
@@ -4075,36 +4165,6 @@
40754165
"redirect_url": "/azure/notification-hubs/notification-hubs-push-notification-http2-token-authentication",
40764166
"redirect_document_id": false
40774167
},
4078-
{
4079-
"source_path_from_root": "/articles/openshift/howto-encrypt-data-disks.md",
4080-
"redirect_url": "/azure/openshift/howto-byok",
4081-
"redirect_document_id": false
4082-
},
4083-
{
4084-
"source_path_from_root": "/articles/openshift/howto-deploy-java-jboss-enterprise-application-platform-with-auto-redeploy.md",
4085-
"redirect_url": "/azure/openshift/index",
4086-
"redirect_document_id": false
4087-
},
4088-
{
4089-
"source_path_from_root": "/articles/openshift/quickstart-portal.md",
4090-
"redirect_url": "/azure/openshift/create-cluster",
4091-
"redirect_document_id": false
4092-
},
4093-
{
4094-
"source_path_from_root": "/articles/openshift/tutorial-connect-cluster.md",
4095-
"redirect_url": "/azure/openshift/connect-cluster",
4096-
"redirect_document_id": false
4097-
},
4098-
{
4099-
"source_path_from_root": "/articles/openshift/tutorial-create-cluster.md",
4100-
"redirect_url": "/azure/openshift/create-cluster",
4101-
"redirect_document_id": false
4102-
},
4103-
{
4104-
"source_path_from_root": "/articles/openshift/tutorial-delete-cluster.md",
4105-
"redirect_url": "/azure/openshift/delete-cluster",
4106-
"redirect_document_id": false
4107-
},
41084168
{
41094169
"source_path_from_root": "/articles/operator-service-manager/overview.md",
41104170
"redirect_url": "azure/operator-service-manager/azure-operator-service-manager-overview",
@@ -5935,6 +5995,11 @@
59355995
"redirect_url": "/azure/reliability/overview-reliability-guidance",
59365996
"redirect_document_id": false
59375997
},
5998+
{
5999+
"source_path_from_root": "/articles/reliability/sovereign-cloud-china.md",
6000+
"redirect_url": "/azure/china/concepts-service-availability",
6001+
"redirect_document_id": false
6002+
},
59386003
{
59396004
"source_path_from_root": "/articles/managed-grafana/concept-role-based-access-control.md",
59406005
"redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
@@ -5949,6 +6014,26 @@
59496014
"source_path": "articles/sentinel/resources.md",
59506015
"redirect_url": "/azure/sentinel/overview",
59516016
"redirect_document_id": false
6017+
},
6018+
{
6019+
"source_path_from_root": "/articles/nat-gateway/tutorial-dual-stack-outbound-nat-load-balancer.md",
6020+
"redirect_url": "/azure/nat-gateway/nat-overview",
6021+
"redirect_document_id": false
6022+
},
6023+
{
6024+
"source_path": "articles/sentinel/kusto-resources.md",
6025+
"redirect_url": "/kusto/query/kql-learning-resources?view=microsoft-sentinel?view=microsoft-sentinel&preserve-view=true&toc=/azure/sentinel/TOC.json&bc=/azure/sentinel/breadcrumb/toc.json",
6026+
"redirect_document_id": false
6027+
},
6028+
{
6029+
"source_path": "articles/reliability/availability-zones-baseline.md",
6030+
"redirect_url": "/azure/reliability/availability-zones-migration-overview",
6031+
"redirect_document_id": false
6032+
},
6033+
{
6034+
"source_path_from_root": "/articles/virtual-network/virtual-network-for-azure-services.md",
6035+
"redirect_url": "/azure/virtual-network/vnet-integration-for-azure-services",
6036+
"redirect_document_id": false
59526037
}
59536038
]
5954-
}
6039+
}

articles/active-directory-b2c/add-ropc-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: azure-active-directory
1010

1111
ms.topic: how-to
12-
ms.date: 09/11/2024
12+
ms.date: 02/24/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515
zone_pivot_groups: b2c-policy-type

articles/active-directory-b2c/b2clogin.md

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
---
22
title: Migrate applications and APIs to b2clogin.com
33
titleSuffix: Azure AD B2C
4-
description: Learn about using b2clogin.com in your redirect URLs for Azure Active Directory B2C.
4+
description: Learn how to update redirect URLs in Azure AD B2C applications to use b2clogin.com or a custom domain for authentication endpoints.
55

66
author: kengaderdus
77
manager: CelesteDG
88

99
ms.service: azure-active-directory
1010

1111
ms.topic: how-to
12-
ms.date: 01/26/2024
12+
ms.date: 02/26/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515

@@ -40,9 +40,9 @@ With Azure AD B2C [custom domain](./custom-domain.md) the corresponding updated
4040
- <code>https://<b>login.contoso.com</b>/\<tenant-name\>.onmicrosoft.com/<b>\<policy-name\></b>/oauth2/v2.0/authorize</code> or <code>https://<b>login.contoso.com</b>/\<tenant-name\>.onmicrosoft.com/oauth2/v2.0/authorize?<b>p=\<policy-name\></b></code> for the `/authorize` endpoint.
4141
- <code>https://<b>login.contoso.com</b>/\<tenant-name\>.onmicrosoft.com/<b>\<policy-name\></b>/oauth2/v2.0/logout</code> or <code>https://<b>login.contoso.com</b>/\<tenant-name\>.onmicrosoft.com/oauth2/v2.0/logout?<b>p=\<policy-name\></b></code> for the `/logout` endpoint.
4242

43-
## Endpoints that are not affected
43+
## Endpoints that aren't affected
4444

45-
Some customers use the shared capabilities of Microsoft Entra enterprise tenants. For example, acquiring an access token to call the [MS Graph API](microsoft-graph-operations.md#code-discussion) of the Azure AD B2C tenant.
45+
Some customers use the shared capabilities of Microsoft Entra enterprise tenants. For example, acquiring an access token to call the [MS Graph API](microsoft-graph-operations.md) of the Azure AD B2C tenant.
4646

4747
This change doesn't affect all endpoints, which don't contain a policy parameter in the URL. They're accessed only with the Microsoft Entra ID's login.microsoftonline.com endpoints, and can't be used with the *b2clogin.com*, or custom domains. The following example shows a valid token endpoint of the Microsoft identity platform:
4848

@@ -64,7 +64,6 @@ There are several modifications you might need to make to migrate your applicati
6464
* Update your Azure AD B2C applications to use *b2clogin.com*, or custom domain in their user flow and token endpoint references. The change may include updating your use of an authentication library like Microsoft Authentication Library (MSAL).
6565
* Update any **Allowed Origins** that you define in the CORS settings for [user interface customization](customize-ui-with-html.md).
6666

67-
6867
## Change identity provider redirect URLs
6968

7069
On each identity provider's website in which you've created an application, change all trusted URLs to redirect to `your-tenant-name.b2clogin.com`, or a custom domain instead of *login.microsoftonline.com*.
@@ -146,7 +145,7 @@ this.clientApplication = new UserAgentApplication(
146145
);
147146
```
148147

149-
## Next steps
148+
## Related content
150149

151150
For information about migrating OWIN-based web applications to b2clogin.com, see [Migrate an OWIN-based web API to b2clogin.com](multiple-token-endpoints.md).
152151

articles/active-directory-b2c/custom-email-mailjet.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: azure-active-directory
1010

1111
ms.topic: how-to
12-
ms.date: 01/11/2024
12+
ms.date: 02/21/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515
zone_pivot_groups: b2c-policy-type
@@ -33,7 +33,7 @@ Use custom email in Azure Active Directory B2C (Azure AD B2C) to send customized
3333

3434
::: zone pivot="b2c-custom-policy"
3535

36-
Custom email verification requires the use of a third-party email provider like [Mailjet](https://www.mailjet.com/), [SendGrid](./custom-email-sendgrid.md), or [SparkPost](https://messagebird.com/email/cloud-sending?sp=true), a custom REST API, or any HTTP-based email provider (including your own). This article describes setting up a solution that uses Mailjet.
36+
Custom email verification requires the use of a third-party email provider like [Mailjet](https://www.mailjet.com/), [SendGrid](./custom-email-sendgrid.md), or [SparkPost](https://messagebird.com/support-center/omnichannel-and-connectivity/sms/sending-email-to-sms?sp=true), a custom REST API, or any HTTP-based email provider (including your own). This article describes setting up a solution that uses Mailjet.
3737

3838
## Create a Mailjet account
3939

@@ -74,7 +74,7 @@ With a Mailjet account created and the Mailjet API key stored in an Azure AD B2C
7474
1. On the Mailjet site, open the [transactional templates](https://app.mailjet.com/templates/transactional) page and select **Create a new template**.
7575
1. Select **By coding it in HTML**, and then select **Code from scratch**.
7676
1. Enter a unique template name like `Verification email`, and then select **Create**.
77-
1. In the HTML editor, paste following HTML template or use your own. The `{{var:otp:""}}` and `{{var:email:""}}` parameters will be replaced dynamically with the one-time password value and the user email address.
77+
1. In the HTML editor, paste following HTML template or use your own. The `{{var:otp:""}}` and `{{var:email:""}}` parameters are replaced dynamically with the one-time password value and the user email address.
7878

7979
```HTML
8080
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@ -210,7 +210,7 @@ These claims types are necessary to generate and verify the email address using
210210

211211
## Add the claims transformation
212212

213-
Next, you need a claims transformation to output a JSON string claim that will be the body of the request sent to Mailjet.
213+
Next, you need a claims transformation to output a JSON string claim that's the body of the request sent to Mailjet.
214214

215215
The JSON object's structure is defined by the IDs in dot notation of the InputParameters and the TransformationClaimTypes of the InputClaims. Numbers in the dot notation imply arrays. The values come from the InputClaims' values and the InputParameters' "Value" properties. For more information about JSON claims transformations, see [JSON claims transformations](json-transformations.md).
216216

@@ -572,9 +572,9 @@ The Localization element allows you to support multiple locales or languages in
572572
```
573573

574574

575-
## Next steps
575+
## Related content
576576

577577
- You can find an example of a [Custom email verification - DisplayControls](https://github.com/azure-ad-b2c/samples/tree/master/policies/custom-email-verifcation-displaycontrol/policy/Mailjet) custom policy on GitHub.
578578
- For information about using a custom REST API or any HTTP-based SMTP email provider, see [Define a RESTful technical profile in an Azure AD B2C custom policy](restful-technical-profile.md).
579579

580-
::: zone-end
580+
::: zone-end

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ manager: CelesteDG
99
ms.service: azure-active-directory
1010

1111
ms.topic: how-to
12-
ms.date: 01/11/2024
12+
ms.date: 02/21/2025
1313
ms.author: kengaderdus
1414
ms.subservice: b2c
1515
zone_pivot_groups: b2c-policy-type
@@ -33,7 +33,7 @@ Use custom email in Azure Active Directory B2C (Azure AD B2C) to send customized
3333

3434
::: zone pivot="b2c-custom-policy"
3535

36-
Custom email verification requires the use of a third-party email provider like [SendGrid](https://sendgrid.com), [Mailjet](https://www.mailjet.com/), or [SparkPost](https://messagebird.com/email/cloud-sending?sp=true), a custom REST API, or any HTTP-based email provider (including your own). This article describes setting up a solution that uses SendGrid.
36+
Custom email verification requires the use of a third-party email provider like [SendGrid](https://sendgrid.com), [Mailjet](https://www.mailjet.com/), or [SparkPost](https://messagebird.com/support-center/omnichannel-and-connectivity/sms/sending-email-to-sms?sp=true), a custom REST API, or any HTTP-based email provider (including your own). This article describes setting up a solution that uses SendGrid.
3737

3838
## Create a SendGrid account
3939

@@ -42,7 +42,7 @@ If you don't already have one, start by setting up a SendGrid account. For setup
4242
Make sure you complete the section in which you [create a SendGrid API key](https://docs.sendgrid.com/for-developers/partners/microsoft-azure-2021#to-find-your-sendgrid-api-key). Record the API key for use in a later step.
4343

4444
> [!IMPORTANT]
45-
> SendGrid offers customers the ability to send emails from shared IP and [dedicated IP addresses](https://docs.sendgrid.com/ui/account-and-settings/dedicated-ip-addresses). When using dedicated IP addresses, you need to build your own reputation properly with an IP address warm-up. For more information, see [Warming Up An Ip Address](https://docs.sendgrid.com/ui/sending-email/warming-up-an-ip-address).
45+
> SendGrid offers customers the ability to send emails from shared IP and [dedicated IP addresses](https://docs.sendgrid.com/ui/account-and-settings/dedicated-ip-addresses). When using dedicated IP addresses, you need to build your own reputation properly with an IP address warm-up. For more information, see [Warming Up An IP Address](https://www.twilio.com/docs/sendgrid/ui/sending-email/warming-up-an-ip-address).
4646
4747
## Create Azure AD B2C policy key
4848

@@ -558,9 +558,9 @@ The Localization element allows you to support multiple locales or languages in
558558
```
559559

560560

561-
## Next steps
561+
## Related content
562562

563563
- Find an example of [Custom email verification - DisplayControls custom policy](https://github.com/azure-ad-b2c/samples/tree/master/policies/custom-email-verifcation-displaycontrol/policy/SendGrid) on GitHub.
564564
- Learn how to use a custom REST API or any HTTP-based SMTP email provider, see [Define a RESTful technical profile in an Azure AD B2C custom policy](restful-technical-profile.md).
565565

566-
::: zone-end
566+
::: zone-end

0 commit comments

Comments
 (0)