Skip to content

Commit dc142a1

Browse files
authored
Merge pull request #281546 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents 18ce037 + 6bfcb99 commit dc142a1

File tree

6 files changed

+9
-12
lines changed

6 files changed

+9
-12
lines changed

articles/ai-services/content-safety/how-to/custom-categories-rapid.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ curl --location --request PATCH 'https://<endpoint>/contentsafety/text/incidents
5353
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
5454
--header 'Content-Type: application/json' \
5555
--data '{
56-
"incidentName": "<text-incident-name>",
57-
"incidentDefinition": "string"
56+
\"incidentName\": \"<text-incident-name>\",
57+
\"incidentDefinition\": \"string\"
5858
}'
5959
```
6060

@@ -248,7 +248,7 @@ curl --location --request PATCH 'https://<endpoint>/contentsafety/image/incident
248248
--header 'Ocp-Apim-Subscription-Key: <your-content-safety-key>' \
249249
--header 'Content-Type: application/json' \
250250
--data '{
251-
"incidentName": "<image-incident-name>"
251+
\"incidentName\": \"<image-incident-name>\"
252252
}'
253253
```
254254

articles/defender-for-cloud/gain-end-user-context-ai.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ If a field’s name is misspelled, the Azure OpenAI API call will still succeed.
3232

3333
The provided schema consists of the `SecurityContext` objects that contains several parameters that describe the application itself, and the end user that interacts with the application. These fields assist your security operations teams to investigate and mitigate security incidents by providing a comprehensive approach to protecting your AI applications.
3434

35-
- End used ID
35+
- End user ID
3636
- End user type
3737
- End user tenant's ID
3838
- Source IP address.

articles/machine-learning/prompt-flow/how-to-deploy-for-real-time-inference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ In this article, you'll learn how to deploy a flow as a managed online endpoint
4646
- Have basic understanding on managed identities. [Learn more about managed identities.](../../active-directory/managed-identities-azure-resources/overview.md)
4747

4848
> [!NOTE]
49-
> Managed online endpoint only supports managed virtual network. If your workspace is in custom vnet, you need to try other deployment options, such as deploy to [Kubernetes online endpoint using CLI/SDK](./how-to-deploy-to-code.md), or [deploy to other platforms suchs Docker](https://microsoft.github.io/promptflow/how-to-guides/deploy-a-flow/index.html).
49+
> Managed online endpoint only supports managed virtual network. If your workspace is in custom vnet, you need to try other deployment options, such as deploy to [Kubernetes online endpoint using CLI/SDK](./how-to-deploy-to-code.md), or [deploy to other platforms such as Docker](https://microsoft.github.io/promptflow/how-to-guides/deploy-a-flow/index.html).
5050
5151
## Build the flow and get it ready for deployment
5252

articles/machine-learning/prompt-flow/how-to-deploy-to-code.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Before beginning make sure that you have tested your flow properly, and feel con
3636
- Azure role-based access controls (Azure RBAC) are used to grant access to operations in Azure Machine Learning. To perform the steps in this article, your user account must be assigned the owner or contributor role for the Azure Machine Learning workspace, or a custom role allowing "Microsoft.MachineLearningServices/workspaces/onlineEndpoints/". If you use studio to create/manage online endpoints/deployments, you'll need an additional permission "Microsoft.Resources/deployments/write" from the resource group owner. For more information, see [Manage access to an Azure Machine Learning workspace](../how-to-assign-roles.md).
3737

3838
> [!NOTE]
39-
> Managed online endpoint only supports managed virtual network. If your workspace is in custom vnet, you can deploy to Kubernetes online endpoint, or [deploy to other platforms suchs Docker](https://microsoft.github.io/promptflow/how-to-guides/deploy-a-flow/index.html).
39+
> Managed online endpoint only supports managed virtual network. If your workspace is in custom vnet, you can deploy to Kubernetes online endpoint, or [deploy to other platforms such as Docker](https://microsoft.github.io/promptflow/how-to-guides/deploy-a-flow/index.html).
4040
4141
### Virtual machine quota allocation for deployment
4242

articles/machine-learning/prompt-flow/how-to-evaluate-semantic-kernel.md

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -179,11 +179,8 @@ This will present you with a detailed table, line-by-line comparison of the resu
179179
> Follow along with our documentations to get started!
180180
> And keep an eye out for more integrations.
181181
182-
If youre interested in learning more about how you can use prompt flow to test and evaluate Semantic Kernel, we recommend following along to the articles we created. At each step, we provide sample code and explanations so you can use prompt flow successfully with Semantic Kernel.
182+
If you're interested in learning more about how you can use Planners in Semantic Kernel, we recommend that you read the following article:
183183

184-
* [Using prompt flow with Semantic Kernel](/semantic-kernel/ai-orchestration/planners/evaluate-and-deploy-planners/)
185-
* [Create a prompt flow with Semantic Kernel](/semantic-kernel/ai-orchestration/planners/evaluate-and-deploy-planners/create-a-prompt-flow-with-semantic-kernel)
186-
* [Running batches with prompt flow](/semantic-kernel/ai-orchestration/planners/evaluate-and-deploy-planners/running-batches-with-prompt-flow)
187-
* [Evaluate your plugins and planners](/semantic-kernel/ai-orchestration/planners/evaluate-and-deploy-planners/)
184+
* [Learn more about planners](/semantic-kernel/ai-orchestration/planners/evaluate-and-deploy-planners/)
188185

189186
When your planner is fully prepared, it can be deployed as an online endpoint in Azure Machine Learning. This allows it to be easily integrated into your application for consumption. Learn more about how to [deploy a flow as a managed online endpoint for real-time inference](./how-to-deploy-for-real-time-inference.md).

articles/storage/common/storage-use-azcopy-migrate-on-premises-data.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ Copy the AzCopy command to a text editor. Update the parameter values of the AzC
117117
These examples assume that your folder is named `myFolder`, your storage account name is `mystorageaccount` and your container name is `mycontainer`.
118118

119119
> [!NOTE]
120-
> The Linux example appends a SAS token. You'll need to provide one in your command. The current version of AzCopy V10 doesn't support Microsoft Entra authorization in cron jobs.
120+
> The Linux example appends a SAS token. You'll need to provide one in your command. To utilize Microsoft Entra authentication in cron jobs, ensure you configure the AZCOPY_AUTO_LOGIN_TYPE environment variable appropriately.
121121
122122
# [Linux](#tab/linux)
123123

0 commit comments

Comments
 (0)