Skip to content

Commit 6ad50c5

Browse files
authored
Merge branch 'main' into java-quickstart
2 parents 8cbd603 + eb71c96 commit 6ad50c5

File tree

6,104 files changed

+23664
-22312
lines changed

Some content is hidden

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

6,104 files changed

+23664
-22312
lines changed

.openpublishing.publish.config.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,6 +1215,7 @@
12151215
".openpublishing.redirection.container-service.json",
12161216
".openpublishing.redirection.defender-for-cloud.json",
12171217
".openpublishing.redirection.defender-for-iot.json",
1218+
".openpublishing.redirection.guidance.json",
12181219
".openpublishing.redirection.iot-hub-device-update.json",
12191220
".openpublishing.redirection.key-vault.json",
12201221
".openpublishing.redirection.machine-configuration.json",
@@ -1233,6 +1234,7 @@
12331234
"articles/ai-services/.openpublishing.redirection.cognitive-services.json",
12341235
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
12351236
"articles/azure-fluid-relay/.openpublishing.redirection.fluid-relay.json",
1237+
"articles/azure-functions/.openpublishing.redirection.azure-functions.json",
12361238
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
12371239
"articles/azure-relay/.openpublishing.redirection.relay.json",
12381240
"articles/azure-video-analyzer/.openpublishing.redirection.azure-video-analyzer.json",

.openpublishing.redirection.azure-monitor.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2287,17 +2287,17 @@
22872287
},
22882288
{
22892289
"source_path_from_root": "/articles/azure-monitor/insights/solutions-inventory.md",
2290-
"redirect_url": "/azure/azure-monitor/monitor-reference",
2290+
"redirect_url": "/azure/azure-monitor/overview",
22912291
"redirect_document_id": false
22922292
},
22932293
{
22942294
"source_path_from_root": "/articles/monitoring/monitoring-solutions-inventory.md",
2295-
"redirect_url": "/azure/azure-monitor/monitor-reference",
2295+
"redirect_url": "/azure/azure-monitor/overview",
22962296
"redirect_document_id": false
22972297
},
22982298
{
22992299
"source_path_from_root": "/articles/azure-monitor/platform/data-locations.md",
2300-
"redirect_url": "/azure/azure-monitor/monitor-reference/",
2300+
"redirect_url": "/azure/azure-monitor/overview/",
23012301
"redirect_document_id": false
23022302
},
23032303
{
@@ -5146,7 +5146,7 @@
51465146
},
51475147
{
51485148
"source_path_from_root": "/articles/azure-monitor/platform/partners.md",
5149-
"redirect_url": "/azure/azure-monitor//partners",
5149+
"redirect_url": "/azure/azure-monitor/overview#integrate",
51505150
"redirect_document_id": false
51515151
},
51525152
{
@@ -6598,6 +6598,16 @@
65986598
"source_path_from_root": "/articles/azure-monitor/app/java-standalone-arguments.md",
65996599
"redirect_url": "/azure/azure-monitor/app/java-get-started-supplemental",
66006600
"redirect_document_id": true
6601+
},
6602+
{
6603+
"source_path_from_root": "/articles/azure-monitor/partners.md",
6604+
"redirect_url": "/azure/azure-monitor/overview#integrate",
6605+
"redirect_document_id": false
6606+
},
6607+
{
6608+
"source_path_from_root": "/articles/azure-monitor/monitor-reference.md",
6609+
"redirect_url": "/azure/azure-monitor/overview",
6610+
"redirect_document_id": false
66016611
}
66026612
]
66036613
}

.openpublishing.redirection.guidance.json

Lines changed: 419 additions & 0 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.json

Lines changed: 279 additions & 1202 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.machine-configuration.json

Lines changed: 144 additions & 79 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/claim-resolver-overview.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ The following table lists the claim resolvers with information about the OpenID
108108
| {OIDC:Resource} |The `resource` query string parameter. | N/A |
109109
| {OIDC:Scope} |The `scope` query string parameter. | openid |
110110
| {OIDC:Username}| The [resource owner password credentials flow](add-ropc-policy.md) user's username.| [email protected]|
111+
| {OIDC:IdToken} | The `id token` query string parameter. | N/A |
111112

112113
Check out the [Live demo](https://github.com/azure-ad-b2c/unit-tests/tree/main/claims-resolver#openid-connect-relying-party-application) of the OpenID Connect claim resolvers.
113114

articles/active-directory-b2c/custom-policies-series-validate-user-input.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -379,7 +379,7 @@ Follow the steps in [Upload custom policy file](custom-policies-series-hello-wor
379379

380380
## Step 7 - Validate user input by using validation technical profiles
381381

382-
The validation techniques we've used in step 1, step 2 and step 3 aren't applicable for all scenarios. If your business rules are complex to be defined at claim declaration level, you can configure a [Validation Technical](validation-technical-profile.md), and then call it from a [Self-Asserted Technical Profile](self-asserted-technical-profile.md).
382+
The validation techniques we've used in step 1, step 2 and step 3 aren't applicable for all scenarios. If your business rules are too complex to be defined at claim declaration level, you can configure a [Validation Technical](validation-technical-profile.md), and then call it from a [Self-Asserted Technical Profile](self-asserted-technical-profile.md).
383383

384384
> [!NOTE]
385385
> Only self-asserted technical profiles can use validation technical profiles. Learn more about [validation technical profile](validation-technical-profile.md)
11.7 KB
Loading
17.6 KB
Loading

articles/active-directory/azuread-dev/index.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@ metadata:
1313
ms.author: celested
1414
ms.service: active-directory
1515
ms.subservice: azuread-dev
16-
ms.workload: identity
1716
ROBOTS: NOINDEX
18-
1917
landingContent:
2018
- title: Azure Active Directory for developers
2119
linkLists:

0 commit comments

Comments
 (0)