Skip to content

Commit bbd6769

Browse files
authored
Merge pull request #196672 from MicrosoftDocs/main
4/29 PM Publish
2 parents 9e08d2c + c245a1a commit bbd6769

File tree

201 files changed

+3079
-1645
lines changed

Some content is hidden

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

201 files changed

+3079
-1645
lines changed

.openpublishing.redirection.json

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24203,6 +24203,21 @@
2420324203
"redirect_url": "/azure/sql-database/sql-database-threat-detection-overview",
2420424204
"redirect_document_id": false
2420524205
},
24206+
{
24207+
"source_path_from_root": "/articles/sql-database/sql-database-managed-instance-create-manage",
24208+
"redirect_url": "/azure/azure-sql/managed-instance/instance-create-quickstart",
24209+
"redirect_document_id": false
24210+
},
24211+
{
24212+
"source_path_from_root": "/articles/sql-database/sql-database-single-database.md",
24213+
"redirect_url": "/azure/azure-sql/database/sql-database-paas-overview",
24214+
"redirect_document_id": false
24215+
},
24216+
{
24217+
"source_path_from_root": "/articles/sql-database/sql-database-managed-instance.md",
24218+
"redirect_url": "/azure/azure-sql/managed-instance/sql-managed-instance-paas-overview",
24219+
"redirect_document_id": false
24220+
},
2420624221
{
2420724222
"source_path_from_root": "/articles/sql-data-warehouse/sql-data-warehouse-backups.md",
2420824223
"redirect_url": "/azure/sql-data-warehouse/backup-and-restore",
@@ -42977,6 +42992,16 @@
4297742992
"source_path_from_root": "/articles/cognitive-services/video-indexer/video-indexer-view-edit.md",
4297842993
"redirect_url": "/azure/azure-video-analyzer/video-analyzer-for-media-docs/video-indexer-view-edit",
4297942994
"redirect_document_id": false
42995+
},
42996+
{
42997+
"source_path_from_root": "/articles/cognitive-services/translator/translator-how-to-signup.md",
42998+
"redirect_url": "/azure/cognitive-services/translator/how-to-create-translator-resource",
42999+
"redirect_document_id": false
43000+
},
43001+
{
43002+
"source_path_from_root": "/articles/cognitive-services/translator/custom-translator/terminology.md",
43003+
"redirect_url": "/azure/cognitive-services/translator/custom-translator/key-terms",
43004+
"redirect_document_id": false
4298043005
}
4298143006
]
4298243007
}

articles/active-directory/develop/msal-v1-app-scopes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The logic used by Azure AD is the following:
6262

6363
- For ADAL (Azure AD v1.0) endpoint with a v1.0 access token (the only possible), aud=resource
6464
- For MSAL (Microsoft identity platform) asking an access token for a resource accepting v2.0 tokens, `aud=resource.AppId`
65-
- For MSAL (v2.0 endpoint) asking an access token for a resource that accepts a v1.0 access token (which is the case above), Azure AD parses the desired audience from the requested scope by taking everything before the last slash and using it as the resource identifier. Therefore, if `https://database.windows.net` expects an audience of `https://database.windows.net`, you'll need to request a scope of `https://database.windows.net//.default`. See also GitHub issue [#747: `Resource url's trailing slash is omitted, which caused sql auth failure`](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/747).
65+
- For MSAL (v2.0 endpoint) asking an access token for a resource that accepts a v1.0 access token (which is the case above), Azure AD parses the desired audience from the requested scope by taking everything before the last slash and using it as the resource identifier. Therefore, if `https://database.windows.net` expects an audience of `https://database.windows.net/`, you'll need to request a scope of `https://database.windows.net//.default`. See also GitHub issue [#747: `Resource url's trailing slash is omitted, which caused sql auth failure`](https://github.com/AzureAD/microsoft-authentication-library-for-dotnet/issues/747).
6666

6767
## Scopes to request access to all the permissions of a v1.0 application
6868

128 KB
Loading

articles/active-directory/standards/memo-22-09-multi-factor-authentication.md

Lines changed: 63 additions & 19 deletions
Large diffs are not rendered by default.

articles/aks/node-auto-repair.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ If AKS finds multiple unhealthy nodes during a health check, each node is repair
4343

4444

4545
## Node Autodrain
46-
[Scheduled Events][scheduled-events] can occur on the underlying virtual machines (VMs) in any of your node pools. For [spot node pools][spot-node-pools], scheduled events may cause a *preempt* node event for the node. Certain node events, such as *preempt*, cause AKS node autodrain to attempt a cordon and drain of the affected node, which allows for a graceful reschedule of any affected workloads on that node.
46+
[Scheduled Events][scheduled-events] can occur on the underlying virtual machines (VMs) in any of your node pools. For [spot node pools][spot-node-pools], scheduled events may cause a *preempt* node event for the node. Certain node events, such as *preempt*, cause AKS node autodrain to attempt a cordon and drain of the affected node, which allows for a graceful reschedule of any affected workloads on that node. When this happens, you might notice the node to receive a taint with *"remediator.aks.microsoft.com/unschedulable"*, because of *"kubernetes.azure.com/scalesetpriority: spot"*.
4747

4848

4949
The following table shows the node events, and the actions they cause for AKS node autodrain.

articles/applied-ai-services/form-recognizer/api-v2-0/includes/csharp-v3-0-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ These code snippets show you how to do the following tasks with the Form Recogni
116116

117117
## Authenticate the client
118118

119-
Below **Main**, create a new method named `AuthenticateClient`. You'll use this method in other tasks to authenticate your requests to the Form Recognizer service. This method uses the `AzureKeyCredential` object, so that if needed, you can update the API key without creating new client objects.
119+
Below **Main**, create a new method named `AuthenticateClient`. You'll use this method in other tasks to authenticate your requests to the Form Recognizer service. This method uses the `AzureKeyCredential` object, so that if needed, you can update the key without creating new client objects.
120120

121121
> [!IMPORTANT]
122122
> Get your key and endpoint from the Azure portal. If the Form Recognizer resource you created in the **Prerequisites** section deployed successfully, click the **Go to Resource** button under **Next Steps**. You can find your key and endpoint in the resource's **key and endpoint** page, under **resource management**.

articles/applied-ai-services/form-recognizer/api-v2-0/includes/java-v3-0-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ These code snippets show you how to do the following tasks with the Form Recogni
145145

146146
## Authenticate the client
147147

148-
At the top of your **main** method, add the following code. Here, you'll authenticate two client objects using the subscription variables you defined above. You'll use an **AzureKeyCredential** object, so that if needed, you can update the API key without creating new client objects.
148+
At the top of your **main** method, add the following code. Here, you'll authenticate two client objects using the subscription variables you defined above. You'll use an **AzureKeyCredential** object, so that if needed, you can update the key without creating new client objects.
149149

150150
[!code-java[](~/cognitive-services-quickstart-code/java/FormRecognizer/FormRecognizer.java?name=snippet_auth)]
151151

articles/applied-ai-services/form-recognizer/api-v2-0/includes/javascript-v3-0-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ These code snippets show you how to do the following tasks with the Form Recogni
105105

106106
## Authenticate the client
107107

108-
Authenticate a client object using the subscription variables you defined. You'll use an `AzureKeyCredential` object, so that if needed, you can update the API key without creating new client objects. You'll also create a training client object.
108+
Authenticate a client object using the subscription variables you defined. You'll use an `AzureKeyCredential` object, so that if needed, you can update the key without creating new client objects. You'll also create a training client object.
109109

110110
[!code-javascript[](~/cognitive-services-quickstart-code/javascript/FormRecognizer/FormRecognizerQuickstart.js?name=snippet_auth)]
111111

articles/applied-ai-services/form-recognizer/api-v2-0/includes/python-v3-0-0.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ These code snippets show you how to do the following tasks with the Form Recogni
9191

9292
## Authenticate the client
9393

94-
Here, you'll authenticate two client objects using the subscription variables you defined above. You'll use an **AzureKeyCredential** object, so that if needed, you can update the API key without creating new client objects.
94+
Here, you'll authenticate two client objects using the subscription variables you defined above. You'll use an **AzureKeyCredential** object, so that if needed, you can update the key without creating new client objects.
9595

9696
[!code-python[](~/cognitive-services-quickstart-code/python/FormRecognizer/FormRecognizerQuickstart.py?name=snippet_auth)]
9797

0 commit comments

Comments
 (0)