Skip to content

Commit cb0617d

Browse files
authored
Merge pull request #5018 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-ai-docs (branch main)
2 parents fa3a3fe + e14d4d0 commit cb0617d

File tree

5 files changed

+7
-15
lines changed

5 files changed

+7
-15
lines changed

articles/ai-services/cognitive-services-data-loss-prevention.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ There are two parts to enable data loss prevention. First, the resource property
2424
>[!NOTE]
2525
>
2626
> * The `allowedFqdnList` property value supports a maximum of 1000 URLs.
27-
> * The property supports both IP addresses (IPv4 only) and fully qualified domain names (i.e., `www.microsoft.com`) as values.
27+
> * The property supports fully qualified domain names (i.e., `www.microsoft.com`) as values.
2828
> * It can take up to 15 minutes for the updated list to take effect.
2929
3030
# [Azure CLI](#tab/azure-cli)

articles/ai-services/openai/use-your-data-quickstart.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ In this quickstart, you can use your own data with Azure OpenAI models. Using Az
2222
## Prerequisites
2323

2424
The following resources:
25-
- [Azure OpenAI](https://portal.azure.com/#create/Microsoft.CognitiveServicesOpenAI)
26-
- [Azure Blob Storage](https://portal.azure.com/#create/Microsoft.StorageAccount-ARM)
27-
- [Azure AI Search](https://portal.azure.com/#create/Microsoft.Search)
28-
- An [Azure OpenAI resource](https://portal.azure.com/#create/Microsoft.CognitiveServicesOpenAI) deployed in a [supported region and with a supported model](./concepts/use-your-data.md#regional-availability-and-model-support).
29-
- Be sure that you're assigned at least the [Cognitive Services Contributor](./how-to/role-based-access-control.md#cognitive-services-contributor) role for the Azure OpenAI resource.
25+
-
3026
- Download the example data from [GitHub](https://github.com/Azure-Samples/cognitive-services-sample-data-files/blob/master/openai/contoso_benefits_document_example.pdf) if you don't have your own data.
3127

3228

@@ -41,11 +37,7 @@ The following resources:
4137
## Prerequisites
4238

4339
The following resources:
44-
- [Azure OpenAI](https://portal.azure.com/#create/Microsoft.CognitiveServicesOpenAI)
45-
- [Azure Blob Storage](https://portal.azure.com/#create/Microsoft.StorageAccount-ARM)
46-
- [Azure AI Search](https://portal.azure.com/#create/Microsoft.Search)
47-
- An [Azure OpenAI resource](https://portal.azure.com/#create/Microsoft.CognitiveServicesOpenAI) deployed in a [supported region and with a supported model](./concepts/use-your-data.md#regional-availability-and-model-support).
48-
- Be sure that you're assigned at least the [Cognitive Services Contributor](./how-to/role-based-access-control.md#cognitive-services-contributor) role for the Azure OpenAI resource.
40+
- An Azure subscription - <a href="https://azure.microsoft.com/free/cognitive-services" target="_blank">Create one for free</a>.
4941
- Download the example data from [GitHub](https://github.com/Azure-Samples/cognitive-services-sample-data-files/blob/master/openai/contoso_benefits_document_example.pdf) if you don't have your own data.
5042
- The [.NET 8 SDK](https://dotnet.microsoft.com/download/dotnet/8.0)
5143

articles/machine-learning/reference-managed-online-endpoints-vm-sku-list.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ The following table shows the virtual machine (VM) stock keeping units (SKUs) th
104104
| standardNDv5H100Family | STANDARD_ND96ISR_H100_v5 | Yes | NvidiaGpu | 8 | 96 | Yes |
105105

106106
> [!CAUTION]
107-
> Small VM SKUs such as `Standard_DS1_v2` and `Standard_F2s_v2` may be too small for bigger models and may lead to container termination due to insufficient memory, not enough space on the disk, or probe failure as it takes too long to initiate the container. If you face [OutOfQuota errors](how-to-troubleshoot-online-endpoints.md?tabs=cli#error-outofquota) or [ReourceNotReady errors](how-to-troubleshoot-online-endpoints.md?tabs=cli#error-resourcenotready), try bigger VM SKUs. If you want to reduce the cost of deploying multiple models with managed online endpoint, see [Deployment for several local models](concept-online-deployment-model-specification.md#deployment-for-several-local-models).
107+
> Small VM SKUs such as `Standard_DS1_v2` and `Standard_F2s_v2` may be too small for bigger models and may lead to container termination due to insufficient memory, not enough space on the disk, or probe failure as it takes too long to initiate the container. If you face [OutOfQuota errors](how-to-troubleshoot-online-endpoints.md?tabs=cli#error-outofquota) or [ResourceNotReady errors](how-to-troubleshoot-online-endpoints.md?tabs=cli#error-resourcenotready), try bigger VM SKUs. If you want to reduce the cost of deploying multiple models with managed online endpoint, see [Deployment for several local models](concept-online-deployment-model-specification.md#deployment-for-several-local-models).
108108
109109
> [!NOTE]
110110
> We recommend having more than 3 instances for deployments in production scenarios. In addition, Azure Machine Learning reserves 20% of your compute resources for performing upgrades on some VM SKUs as described in [Virtual machine quota allocation for deployment](how-to-manage-quotas.md#virtual-machine-quota-allocation-for-deployment). VM SKUs that are exempted from this extra quota reservation are specified in the "Skip 20% Reservation" column.

articles/machine-learning/reference-yaml-connection-python-feed.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ ms.reviewer: ambadal
3434
| `credentials` | object | Credential-based authentication to access the storage account. A [personal access token](https://docs.github.com/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens) or username and password can be used. Do not specify `credentials` when using a public Python feed. | | |
3535
| `credentials.type` | string | The type of authentication to use. | `pat`, `username_password` | |
3636
| `credentials.pat` | string | The personal access token to authenticate with. | | |
37-
| `credentials_username` | string | The username to authenticate with. | | |
38-
| `credentials_password` | string | The password to authenticate with. | | |
37+
| `credentials.username` | string | The username to authenticate with. | | |
38+
| `credentials.password` | string | The password to authenticate with. | | |
3939

4040
## Remarks
4141

articles/search/search-security-rbac.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -531,7 +531,7 @@ These steps create a custom role that augments search query rights to include li
531531

532532
### [**Azure PowerShell**](#tab/custom-role-ps)
533533

534-
The PowerShell example shows the JSON syntax for creating a custom role that's a clone of **Search Index Data Reader**, but withe ability to list all indexes by name.
534+
The PowerShell example shows the JSON syntax for creating a custom role that's a clone of **Search Index Data Reader**, but with ability to list all indexes by name.
535535

536536
1. Review the [list of atomic permissions](/azure/role-based-access-control/resource-provider-operations#microsoftsearch) to determine which ones you need. For this example, you'll need the following:
537537

0 commit comments

Comments
 (0)