Skip to content

Commit 8970380

Browse files
authored
Merge branch 'main' into netmotion-mobility
2 parents 2d52ad5 + 580acdb commit 8970380

File tree

1,644 files changed

+17569
-9675
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,644 files changed

+17569
-9675
lines changed

.openpublishing.publish.config.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,7 @@
990990
"articles/azure-netapp-files/.openpublishing.redirection.azure-netapp-files.json",
991991
"articles/azure-relay/.openpublishing.redirection.relay.json",
992992
"articles/communication-services/.openpublishing.redirection.communication-services.json",
993+
"articles/confidential-computing/.openpublishing.redirection.json",
993994
"articles/cosmos-db/.openpublishing.redirection.cosmos-db.json",
994995
"articles/cost-management-billing/.openpublishing.redirection.cost-management-billing.json",
995996
"articles/data-catalog/.openpublishing.redirection.data-catalog.json",

.openpublishing.redirection.active-directory.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,7 +2038,7 @@
20382038
{
20392039
"source_path_from_root": "/articles/active-directory/conditional-access/conditional-access-for-exo-and-spo.md",
20402040
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
2041-
"redirect_document_id": true
2041+
"redirect_document_id": false
20422042
},
20432043
{
20442044
"source_path_from_root": "/articles/active-directory/conditional-access/baseline-protection.md",
@@ -4253,7 +4253,12 @@
42534253
},
42544254
{
42554255
"source_path_from_root": "/articles/active-directory/conditional-access/concept-conditional-access-block-legacy-authentication.md",
4256-
"redirect_url": "/azure/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication",
4256+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
4257+
"redirect_document_id": false
4258+
},
4259+
{
4260+
"source_path_from_root": "/articles/active-directory/fundamentals/concept-fundamentals-block-legacy-authentication.md",
4261+
"redirect_url": "/azure/active-directory/conditional-access/block-legacy-authentication",
42574262
"redirect_document_id": true
42584263
},
42594264
{
@@ -10835,6 +10840,11 @@
1083510840
"source_path_from_root": "/articles/active-directory/manage-apps/recover-deleted-apps-faq.md",
1083610841
"redirect_url": "/azure/active-directory/manage-apps/delete-recover-faq",
1083710842
"redirect_document_id": false
10843+
},
10844+
{
10845+
"source_path_from_root": "/articles/azure-percept/voice-control-your-inventory-then-visualize-with-power-bi-dashboard.md",
10846+
"redirect_url": "/azure-docs/articles/azure-percept/index.yml",
10847+
"redirect_document_id": false
1083810848
}
1083910849

1084010850

.openpublishing.redirection.json

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6813,6 +6813,11 @@
68136813
"redirect_url": "/azure/azure-functions/functions-bindings-error-pages",
68146814
"redirect_document_id": false
68156815
},
6816+
{
6817+
"source_path_from_root": "/articles/azure-functions/functions-debug-event-grid-trigger-local.md",
6818+
"redirect_url": "/azure/azure-functions/functions-event-grid-blob-trigger",
6819+
"redirect_document_id": false
6820+
},
68166821
{
68176822
"source_path_from_root": "/articles/azure-government/documentation-government-k8.md",
68186823
"redirect_url": "/azure/azure-government",
@@ -18319,14 +18324,19 @@
1831918324
"redirect_document_id": false
1832018325
},
1832118326
{
18322-
"source_path_from_root": "/articles/connectors/connectors-create-api-bingsearch.md",
18327+
"source_path_from_root": "/articles/connectors/connectors-create-api-bingsearch.md",
1832318328
"redirect_url": "/connectors/bingsearch",
18324-
"redirect_document_id": false
18329+
"redirect_document_id": false
1832518330
},
1832618331
{
18327-
"source_path_from_root": "/articles/connectors/connectors-create-api-twilio.md",
18328-
"redirect_url": "/connectors/twilio",
18329-
"redirect_document_id": false
18332+
"source_path_from_root": "/articles/connectors/connectors-create-api-twilio.md",
18333+
"redirect_url": "/connectors/twilio",
18334+
"redirect_document_id": false
18335+
},
18336+
{
18337+
"source_path_from_root": "/articles/connectors/connectors-create-api-sendgrid.md",
18338+
"redirect_url": "/connectors/sendgrid",
18339+
"redirect_document_id": false
1833018340
},
1833118341
{
1833218342
"source_path_from_root": "/articles/connectors/connectors-schema-migration.md",

articles/active-directory-b2c/configure-authentication-in-azure-static-app.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ manager: CelesteDG
77
ms.service: active-directory
88
ms.workload: identity
99
ms.topic: reference
10-
ms.date: 06/28/2022
10+
ms.date: 08/22/2022
1111
ms.author: kengaderdus
1212
ms.subservice: B2C
1313
ms.custom: "b2c-support"
@@ -30,7 +30,7 @@ OpenID Connect (OIDC) is an authentication protocol that's built on OAuth 2.0. U
3030
When the access token expires or the app session is invalidated, Azure Static Web App initiates a new authentication request and redirects users to Azure AD B2C. If the Azure AD B2C [SSO session](session-behavior.md) is active, Azure AD B2C issues an access token without prompting users to sign in again. If the Azure AD B2C session expires or becomes invalid, users are prompted to sign in again.
3131

3232
## Prerequisites
33-
33+
- A premium Azure subscription.
3434
- If you haven't created an app yet, follow the guidance how to create an [Azure Static Web App](../static-web-apps/overview.md).
3535
- Familiarize yourself with the Azure Static Web App [staticwebapp.config.json](../static-web-apps/configuration.md) configuration file.
3636
- Familiarize yourself with the Azure Static Web App [App Settings](../static-web-apps/application-settings.md).

articles/active-directory-b2c/json-transformations.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ The following example generates a JSON string based on the claim value of "email
152152
<InputClaims>
153153
<InputClaim ClaimTypeReferenceId="email" TransformationClaimType="personalizations.0.to.0.email" />
154154
<InputClaim ClaimTypeReferenceId="otp" TransformationClaimType="personalizations.0.dynamic_template_data.otp" />
155-
<InputClaim ClaimTypeReferenceId="email" TransformationClaimType="personalizations.0.dynamic_template_data.verify-email" />
155+
<InputClaim ClaimTypeReferenceId="copiedEmail" TransformationClaimType="personalizations.0.dynamic_template_data.verify-email" />
156156
</InputClaims>
157157
<InputParameters>
158158
<InputParameter Id="template_id" DataType="string" Value="d-4c56ffb40fa648b1aa6822283df94f60"/>
@@ -169,6 +169,7 @@ The following claims transformation outputs a JSON string claim that will be the
169169

170170
- Input claims:
171171
- **email**, transformation claim type **personalizations.0.to.0.email**: "[email protected]"
172+
- **copiedEmail**, transformation claim type **personalizations.0.dynamic_template_data.verify-email**: "[email protected]"
172173
- **otp**, transformation claim type **personalizations.0.dynamic_template_data.otp** "346349"
173174
- Input parameter:
174175
- **template_id**: "d-4c56ffb40fa648b1aa6822283df94f60"

articles/active-directory-b2c/openid-connect.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99
ms.workload: identity
1010
ms.topic: conceptual
11-
ms.date: 04/12/2022
11+
ms.date: 08/12/2022
1212
ms.author: kengaderdus
1313
ms.subservice: B2C
1414
ms.custom: fasttrack-edit
@@ -43,7 +43,7 @@ client_id=90c0fe63-bcf2-44d5-8fb7-b8bbc0b29dc6
4343
&response_type=code+id_token
4444
&redirect_uri=https%3A%2F%2Fjwt.ms%2F
4545
&response_mode=fragment
46-
&scope=&scope=openid%20offline_access%20{application-id-uri}/{scope-name}
46+
&scope=openid%20offline_access%20{application-id-uri}/{scope-name}
4747
&state=arbitrary_data_you_can_receive_in_the_response
4848
&nonce=12345
4949
```

articles/active-directory-b2c/user-flow-custom-attributes.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,12 @@ You can create these attributes by using the portal UI before or after you use t
143143

144144
|Name |Used in |
145145
|---------|---------|
146-
|`extension_loyaltyId` | Custom policy|
146+
|`extension_loyaltyId` | Custom policy|
147147
|`extension_<b2c-extensions-app-guid>_loyaltyId` | [Microsoft Graph API](microsoft-graph-operations.md#application-extension-directory-extension-properties)|
148148

149+
> [!NOTE]
150+
> When using a custom attribute in custom policies, you must prefix the claim type ID with `extension_` to allow the correct data mapping to take place within the Azure AD B2C directory.
151+
149152
The following example demonstrates the use of custom attributes in an Azure AD B2C custom policy claim definition.
150153

151154
```xml

articles/active-directory-domain-services/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@
8383
href: manage-dns.md
8484
- name: Check health status
8585
href: check-health.md
86+
- name: Fleet metrics
87+
href: fleet-metrics.md
8688
- name: Configure email notifications
8789
href: notifications.md
8890
- name: Delete a managed domain

articles/active-directory-domain-services/administration-concepts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Management concepts for Azure AD Domain Services | Microsoft Docs
33
description: Learn about how to administer an Azure Active Directory Domain Services managed domain and the behavior of user accounts and passwords
44
services: active-directory-ds
55
author: justinha
6-
manager: karenhoran
6+
manager: amycolannino
77

88
ms.service: active-directory
99
ms.subservice: domain-services

articles/active-directory-domain-services/alert-ldaps.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ title: Resolve secure LDAP alerts in Azure AD Domain Services | Microsoft Docs
33
description: Learn how to troubleshoot and resolve common alerts with secure LDAP for Azure Active Directory Domain Services.
44
services: active-directory-ds
55
author: justinha
6-
manager: karenhoran
6+
manager: amycolannino
77

88
ms.assetid: 81208c0b-8d41-4f65-be15-42119b1b5957
99
ms.service: active-directory

0 commit comments

Comments
 (0)