Skip to content

Commit 3e5f5ee

Browse files
authored
Merge branch 'MicrosoftDocs:main' into l3-network-overlaps-warning
2 parents 21e62cb + beec38d commit 3e5f5ee

File tree

4,163 files changed

+46032
-35936
lines changed

Some content is hidden

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

4,163 files changed

+46032
-35936
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1250,6 +1250,7 @@
12501250
"articles/event-grid/.openpublishing.redirection.event-grid.json",
12511251
"articles/event-hubs/.openpublishing.redirection.event-hubs.json",
12521252
"articles/governance/policy/.openpublishing.redirection.policy.json",
1253+
"articles/governance/policy/.openpublishing.redirection.resource-graph.json",
12531254
"articles/hdinsight/.openpublishing.redirection.hdinsight.json",
12541255
"articles/hdinsight-aks/.openpublishing.redirection.hdinsight-aks.json",
12551256
"articles/healthcare-apis/.openpublishing.redirection.healthcare-apis.json",
@@ -1263,6 +1264,7 @@
12631264
"articles/iot-hub/.openpublishing.redirection.iot-hub.json",
12641265
"articles/iot-operations/.openpublishing.redirection.iot-operations.json",
12651266
"articles/load-testing/.openpublishing.redirection.azure-load-testing.json",
1267+
"articles/lab-services/.openpublishing.redirection.lab-services.json",
12661268
"articles/logic-apps/.openpublishing.redirection.logic-apps.json",
12671269
"articles/machine-learning/.openpublishing.redirection.machine-learning.json",
12681270
"articles/machine-learning/v1/.openpublishing.redirection.machine-learning-v1.json",

.openpublishing.redirection.app-service.json

Lines changed: 2642 additions & 147 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.azure-monitor.json

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6573,7 +6573,11 @@
65736573
"source_path_from_root": "/articles/azure-monitor/logs/data-collection-rule-sample-custom-logs.md",
65746574
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
65756575
"redirect_document_id": false
6576-
}
6577-
6576+
},
6577+
{
6578+
"source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-sample-agent.md",
6579+
"redirect_url": "/azure/azure-monitor/essentials/data-collection-rule-samples",
6580+
"redirect_document_id": false
6581+
}
65786582
]
65796583
}

.openpublishing.redirection.json

Lines changed: 2395 additions & 5730 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.sentinel.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,6 @@
215215
"redirect_url": "/azure/sentinel/data-connectors/rubrik-security-cloud-data-connector-using-azure-functions",
216216
"redirect_document_id": true
217217
},
218-
{
219-
"source_path": "articles/sentinel/data-connectors/cisco-asa-ftd-via-ama.md",
220-
"redirect_url": "/azure/sentinel/data-connectors-reference",
221-
"redirect_document_id": false
222-
},
223218
{
224219
"source_path": "articles/sentinel/data-connectors/okta-single-sign-on-using-azure-function.md",
225220
"redirect_url": "/azure/sentinel/data-connectors/okta-single-sign-on-using-azure-functions",
@@ -484,6 +479,11 @@
484479
"source_path": "articles/sentinel/data-connectors/cyberpion-security-logs.md",
485480
"redirect_url": "/azure/sentinel/data-connectors-reference",
486481
"redirect_document_id": false
487-
}
482+
},
483+
{
484+
"source_path": "articles/sentinel/data-connectors/azure-active-directory-identity-protection.md",
485+
"redirect_url": "/azure/sentinel/data-connectors/microsoft-entra-id-protection",
486+
"redirect_document_id": true
487+
}
488488
]
489489
}

.openpublishing.redirection.virtual-desktop.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -369,6 +369,11 @@
369369
"source_path_from_root": "/articles/virtual-desktop/publish-applications.md",
370370
"redirect_url": "/azure/virtual-desktop/publish-applications-stream-remoteapp",
371371
"redirect_document_id": false
372+
},
373+
{
374+
"source_path_from_root": "/articles/virtual-desktop/autoscale-new-existing-host-pool.md",
375+
"redirect_url": "/azure/virtual-desktop/autoscale-scaling-plan",
376+
"redirect_document_id": true
372377
}
373378
]
374379
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,13 @@ manager: CelesteDG
88

99
ms.service: active-directory
1010

11-
ms.custom:
1211
ms.topic: reference
13-
ms.date: 11/08/2022
12+
ms.date: 01/11/2024
1413
ms.author: kengaderdus
1514
ms.subservice: B2C
15+
16+
17+
#Customer intent: As a developer using Azure AD B2C, I want to define a Microsoft Entra ID self-service password reset technical profile.
1618
---
1719

1820
# Define a Microsoft Entra ID SSPR technical profile in an Azure AD B2C custom policy

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@ manager: CelesteDG
88
ms.service: active-directory
99

1010
ms.topic: conceptual
11-
ms.date: 03/09/2023
12-
ms.custom:
11+
ms.date: 01/11/2024
1312
ms.author: kengaderdus
1413
ms.subservice: B2C
14+
15+
16+
#Customer intent: As a developer integrating Azure Active Directory B2C with a web application and web API, I want to understand how to request an access token, so that I can authenticate and authorize users to access my APIs securely.
17+
1518
---
1619
# Request an access token in Azure Active Directory B2C
1720

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,15 @@ manager: CelesteDG
88

99
ms.service: active-directory
1010

11-
ms.custom:
1211
ms.topic: reference
13-
ms.date: 11/06/2023
12+
ms.date: 01/11/2024
1413
ms.author: kengaderdus
1514
ms.reviewer: yoelhor
1615
ms.subservice: B2C
16+
17+
18+
#Customer intent: As a developer using Azure Active Directory B2C, I want to define a technical profile for Microsoft Entra user management, so that I can interact with a claims provider that supports the standardized protocol and perform operations like reading, writing, and deleting user accounts.
19+
1720
---
1821

1922
# Define a Microsoft Entra technical profile in an Azure Active Directory B2C custom policy

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
---
22
title: Token enrichment - Azure Active Directory B2C
33
description: Enrich tokens with claims from external identity data sources using APIs or outbound webhooks.
4-
54
author: garrodonnell
65
manager: CelesteDG
7-
86
ms.service: active-directory
9-
10-
ms.custom:
117
ms.topic: how-to
12-
138
ms.date: 01/17/2023
149
ms.author: godonnell
1510
ms.subservice: B2C

0 commit comments

Comments
 (0)