Skip to content

Commit ab0bda6

Browse files
kgrembankgremban
committed
fix merge conflict
2 parents ab71a48 + f633d79 commit ab0bda6

File tree

936 files changed

+15401
-6406
lines changed

Some content is hidden

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

936 files changed

+15401
-6406
lines changed

‎.openpublishing.redirection.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4004,6 +4004,11 @@
40044004
"source_path_from_root":"/articles/service-connector/quickstart-cli-aks-connection.md",
40054005
"redirect_url":"/azure/service-connector/quickstart-portal-aks-connection",
40064006
"redirect_document_id":false
4007-
}
4007+
},
4008+
{
4009+
"source_path_from_root":"/articles/aks/generation-2-vm-windows.md",
4010+
"redirect_url":"/azure/aks/generation-2-vm",
4011+
"redirect_document_id":false
4012+
}
40084013
]
40094014
}

‎.openpublishing.redirection.operator-5g-core.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
"redirect_document_id": false
1717
},
1818
{
19-
"source_path_from_root": "/articles/operator-5g-core/how-to-complete-prerequisites-deploy-azure-kubernetes-service.md",
20-
"redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service",
19+
"source_path_from_root": "/articles/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service.md",
20+
"redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-nexus-azure-kubernetes-service",
2121
"redirect_document_id": false
2222
},
2323
{
@@ -49,6 +49,11 @@
4949
"source_path_from_root": "/articles/operator-5g-core/quickstart-perform-checks-post-deployment.md",
5050
"redirect_url": "/azure/operator-5g-core/quickstart-configure-extension-for-status-monitoring",
5151
"redirect_document_id": false
52+
},
53+
{
54+
"source_path_from_root": "/articles/operator-5g-core/how-to-complete-prerequisites-deploy-azure-kubernetes-service.md",
55+
"redirect_url": "/azure/operator-5g-core/quickstart-complete-prerequisites-deploy-azure-kubernetes-service",
56+
"redirect_document_id": false
5257
}
5358
]
5459
}

‎.openpublishing.redirection.sentinel.json

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1180,11 +1180,6 @@
11801180
"redirect_url": "/azure/sentinel/data-connectors-reference",
11811181
"redirect_document_id": false
11821182
},
1183-
{
1184-
"source_path_from_root": "/articles/sentinel/data-connectors/sonicwall-firewall.md",
1185-
"redirect_url": "/azure/sentinel/data-connectors-reference",
1186-
"redirect_document_id": false
1187-
},
11881183
{
11891184
"source_path_from_root": "/articles/sentinel/data-connectors/varmour-application-controller.md",
11901185
"redirect_url": "/azure/sentinel/data-connectors-reference",

‎.openpublishing.redirection.virtual-desktop.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -409,6 +409,16 @@
409409
"source_path_from_root": "/articles/virtual-desktop/autoscale-scaling-plan.md",
410410
"redirect_url": "/azure/virtual-desktop/autoscale-create-assign-scaling-plan",
411411
"redirect_document_id": true
412+
},
413+
{
414+
"source_path_from_root": "/articles/virtual-desktop/getting-started-feature.md",
415+
"redirect_url": "/azure/virtual-desktop/quickstart",
416+
"redirect_document_id": true
417+
},
418+
{
419+
"source_path_from_root": "/articles/virtual-desktop/troubleshoot-getting-started.md",
420+
"redirect_url": "/azure/virtual-desktop/troubleshoot-quickstart",
421+
"redirect_document_id": true
412422
}
413423
]
414424
}

‎articles/active-directory-b2c/add-captcha.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ author: kengaderdus
55
manager: mwongerapk
66
ms.service: active-directory
77
ms.topic: how-to
8-
ms.date: 03/01/2024
8+
ms.date: 05/03/2024
99
ms.custom: project-no-code
1010
ms.author: kengaderdus
1111
ms.subservice: B2C
@@ -234,9 +234,9 @@ For the various page layouts, use the following page layout versions:
234234

235235
|Page layout |Page layout version range |
236236
|---------|---------|
237-
| Selfasserted | >=2.1.29 |
238-
| Unifiedssp | >=2.1.17 |
239-
| Multifactor | >=1.2.15 |
237+
| Selfasserted | >=2.1.30 |
238+
| Unifiedssp | >=2.1.18 |
239+
| Multifactor | >=1.2.16 |
240240

241241
**Example:**
242242

@@ -331,4 +331,4 @@ Use the steps in [Test the custom policy](tutorial-create-user-flows.md?pivots=b
331331
## Next steps
332332

333333
- Learn how to [Define a CAPTCHA technical profile](captcha-technical-profile.md).
334-
- Learn how to [Configure CAPTCHA display control](display-control-captcha.md).
334+
- Learn how to [Configure CAPTCHA display control](display-control-captcha.md).

‎articles/active-directory-b2c/configure-authentication-sample-web-app.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ To create the web app registration, use the following steps:
7878
1. Under **Name**, enter a name for the application (for example, *webapp1*).
7979
1. Under **Supported account types**, select **Accounts in any identity provider or organizational directory (for authenticating users with user flows)**.
8080
1. Under **Redirect URI**, select **Web** and then, in the URL box, enter `https://localhost:44316/signin-oidc`.
81-
1. Under **Authentication**, go to **Implicit grant and hybrid flows**, select the **ID tokens (used for implicit and hybrid flows)** checkbox.
81+
1. Under **Manage**, select the **Authentication**, go to **Implicit grant and hybrid flows**, select the **ID tokens (used for implicit and hybrid flows)** checkbox.
8282
1. Under **Permissions**, select the **Grant admin consent to openid and offline access permissions** checkbox.
8383
1. Select **Register**.
8484
1. Select **Overview**.

‎articles/active-directory-b2c/custom-domain.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ To create a CNAME record for your custom domain:
185185
1. Find the page for managing DNS records by consulting the provider's documentation or searching for areas of the web site labeled **Domain Name**, **DNS**, or **Name Server Management**.
186186

187187
1. Create a new TXT DNS record and complete the fields as shown below:
188-
1. Name: `_dnsauth.contoso.com`, but you need to enter just `_dnsauth`.
188+
1. Name: `_dnsauth.login.contoso.com`, but you need to enter just `_dnsauth`.
189189
1. Type: `TXT`
190190
1. Value: Something like `75abc123t48y2qrtsz2bvk......`.
191191

‎articles/active-directory-b2c/custom-policies-series-store-user.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: active-directory
1010

1111
ms.topic: how-to
1212
ms.custom: b2c-docs-improvements
13-
ms.date: 01/11/2024
13+
ms.date: 05/11/2024
1414
ms.author: kengaderdus
1515
ms.reviewer: yoelh
1616
ms.subservice: B2C
@@ -206,7 +206,7 @@ We use the `ClaimGenerator` technical profile to execute three claims transforma
206206
</Precondition>
207207
</Preconditions>
208208
</ValidationTechnicalProfile>
209-
<ValidationTechnicalProfile ReferenceId="DisplayNameClaimGenerator"/>
209+
<ValidationTechnicalProfile ReferenceId="UserInputDisplayNameGenerator"/>
210210
<ValidationTechnicalProfile ReferenceId="AAD-UserWrite"/>
211211
</ValidationTechnicalProfiles>
212212
<!--</TechnicalProfile>-->
@@ -407,15 +407,14 @@ To configure a display control, use the following steps:
407407

408408
1. Use the procedure in [step 6](#step-6---upload-policy) and [step 7](#step-7---test-policy) to upload your policy file, and test it. This time, you must verify your email address before a user account is created.
409409

410-
<a name='update-user-account-by-using-azure-ad-technical-profile'></a>
411410

412411
## Update user account by using Microsoft Entra ID technical profile
413412

414-
You can configure a Microsoft Entra ID technical profile to update a user account instead of attempting to create a new one. To do so, set the Microsoft Entra ID technical profile to throw an error if the specified user account doesn't already exist in the `Metadata` collection by using the following code. The *Operation* needs to be set to *Write*:
413+
You can configure a Microsoft Entra ID technical profile to update a user account instead of attempting to create a new one. To do so, set the Microsoft Entra ID technical profile to throw an error if the specified user account doesn't already exist in the metadata collection by using the following code. Also, remove the `Key="UserMessageIfClaimsPrincipalAlreadyExists` metadata entry. The *Operation* needs to be set to *Write*:
415414

416415
```xml
417416
<Item Key="Operation">Write</Item>
418-
<Item Key="RaiseErrorIfClaimsPrincipalDoesNotExist">true</Item>
417+
<Item Key="RaiseErrorIfClaimsPrincipalDoesNotExist">false</Item>
419418
```
420419

421420
## Use custom attributes

‎articles/active-directory-b2c/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ conceptualContent:
228228
- text: Deploy with GitHub actions
229229
url: deploy-custom-policies-github-action.md
230230
itemType: how-to-guide
231-
- text: Manage resources using Microsoft Powershell
231+
- text: Manage resources using Microsoft PowerShell
232232
url: manage-custom-policies-powershell.md
233233
itemType: how-to-guide
234234

0 commit comments

Comments
 (0)