Skip to content

Commit 68fe26f

Browse files
amagginettiamagginetti
authored
Merge branch 'MicrosoftDocs:main' into patch-12
2 parents 03adcc3 + a1b31d2 commit 68fe26f

File tree

3,037 files changed

+38843
-22874
lines changed

Some content is hidden

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

3,037 files changed

+38843
-22874
lines changed

‎.openpublishing.publish.config.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,12 @@
872872
"branch": "master",
873873
"branch_mapping": {}
874874
},
875+
{
876+
"path_to_root": "blob-devguide-go",
877+
"url": "https://github.com/Azure-Samples/blob-storage-devguide-go",
878+
"branch": "main",
879+
"branch_mapping": {}
880+
},
875881
{
876882
"path_to_root": "azure-sdk-for-net",
877883
"url": "https://github.com/Azure/azure-sdk-for-net/",

‎.openpublishing.redirection.azure-kubernetes-service.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -351,12 +351,6 @@
351351
"redirect_url": "/cli/azure/aks#az_aks_create",
352352
"redirect_document_id": false
353353
},
354-
{
355-
"source_path_from_root": "/articles/aks/delete-cluster.md",
356-
"redirect_url": "/cli/azure/aks#az_aks_delete",
357-
"redirect_document_id": false
358-
},
359-
360354
{
361355
"source_path": "articles/aks/view-master-logs.md",
362356
"redirect_url": "/azure/aks/view-control-plane-logs",

‎.openpublishing.redirection.azure-monitor.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
"redirect_url": "/azure/azure-monitor/snapshot-debugger/snapshot-debugger#release-notes-for-microsoftapplicationinsightssnapshotcollector",
66
"redirect_document_id": false
77
},
8+
{
9+
"source_path_from_root": "/articles/azure-monitor/agents/om-agents.md",
10+
"redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
11+
"redirect_document_id": false
12+
},
813
{
914
"source_path_from_root": "/articles/azure-monitor/best-practices.md",
1015
"redirect_url": "/azure/azure-monitor/getting-started",

‎.openpublishing.redirection.json

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/germany/index.yml",
5+
"redirect_url": "/previous-versions/azure/germany/index",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path_from_root": "/articles/internet-analyzer/internet-analyzer-cli.md",
510
"redirect_url": "/previous-versions/azure/internet-analyzer/internet-analyzer-cli",
@@ -3999,6 +4004,11 @@
39994004
"source_path_from_root":"/articles/service-connector/quickstart-cli-aks-connection.md",
40004005
"redirect_url":"/azure/service-connector/quickstart-portal-aks-connection",
40014006
"redirect_document_id":false
4002-
}
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+
}
40034013
]
40044014
}

‎.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: 428 additions & 13 deletions
Large diffs are not rendered by default.

‎.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

0 commit comments

Comments
 (0)