Skip to content

Commit 463e6ec

Browse files
authored
Merge branch 'MicrosoftDocs:main' into shbatr/funcscenarios
2 parents 1fcc0bf + 0ce37ab commit 463e6ec

File tree

2,138 files changed

+15032
-9116
lines changed

Some content is hidden

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

2,138 files changed

+15032
-9116
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1289,7 +1289,6 @@
12891289
".openpublishing.redirection.azure-databricks.json",
12901290
".openpublishing.redirection.azure-datalake-storage-gen1.json",
12911291
".openpublishing.redirection.azure-hpc.json",
1292-
".openpublishing.redirection.azure-kubernetes-service.json",
12931292
".openpublishing.redirection.azure-monitor.json",
12941293
".openpublishing.redirection.azure-percept.json",
12951294
".openpublishing.redirection.azure-productivity.json",
@@ -1337,7 +1336,6 @@
13371336
"articles/active-directory-b2c/.openpublishing.redirection.active-directory-b2c.json",
13381337
"articles/ai-services.openpublishing.redirection.ai-services.json",
13391338
"articles/ai-studio/.openpublishing.redirection.ai-studio.json",
1340-
"articles/aks/.openpublishing.redirection.aks.json",
13411339
"articles/analysis-services/.openpublishing.redirection.analysis-services.json",
13421340
"articles/application-gateway/.openpublishing.redirection.application-gateway.json",
13431341
"articles/automation/.openpublishing.redirection.automation.json",

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

Lines changed: 0 additions & 14 deletions
This file was deleted.

.openpublishing.redirection.container-registry.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,16 @@
165165
"source_path": "articles/container-registry/monitor-service-reference.md",
166166
"redirect_url": "/azure/container-registry/monitor-container-registry-reference",
167167
"redirect_document_id": true
168+
},
169+
{
170+
"source_path_from_root": "/articles/container-registry/container-registry-auth-aks.md",
171+
"redirect_url": "/azure/aks/cluster-container-registry-integration",
172+
"redirect_document_id": false
173+
},
174+
{
175+
"source_path_from_root": "/articles/container-service/kubernetes/container-service-kubernetes-jenkins.md",
176+
"redirect_url": "/azure/aks/jenkins-continuous-deployment",
177+
"redirect_document_id": false
168178
}
169179
]
170180
}

.openpublishing.redirection.json

Lines changed: 4592 additions & 4594 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/tenant-management-check-tenant-creation-permission.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ As a *Global Administrator* in an Azure AD B2C tenant, you can restrict non-admi
4242

4343
1. Under **Manage**, select **User Settings**.
4444

45-
1. Under **Tenant creation**, select **Yes**.
45+
1. Under **Default user role permissions**, for **Restrict non-admin users from creating tenants**, select **Yes**.
4646

4747
1. At the top of the **User Settings** page, select **Save**.
4848

@@ -58,7 +58,7 @@ Before you create an Azure AD B2C tenant, make sure that you've the permission t
5858

5959
1. Under **Manage**, select **User Settings**.
6060

61-
1. Review your **Tenant Creation** setting. If the settings is set to **No**, then contact your administrator to assign the tenant creator role to you. The setting is greyed out if you're not an administrator in the tenant.
61+
1. Under **Default user role permissions**, review your **Restrict non-admin users from creating tenants** setting. If the setting is set to **No**, then contact your administrator to assign the tenant creator role to you. The setting is greyed out if you're not an administrator in the tenant.
6262

6363

6464
## Next steps

articles/ai-services/content-safety/includes/quickstarts/rest-quickstart-image.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ The following section walks through a sample image moderation request with cURL.
2727

2828
Choose a sample image to analyze, and download it to your device.
2929

30-
We support JPEG, PNG, GIF, BMP, TIFF, or WEBP image formats. The maximum size for image submissions is 4 MB, and image dimensions must be between 50 x 50 pixels and 2,048 x 2,048 pixels. If your format is animated, we'll extract the first frame to do the detection.
30+
We support JPEG, PNG, GIF, BMP, TIFF, or WEBP image formats. The maximum size for image submissions is 4 MB, and image dimensions must be between 50 x 50 pixels and 7,200 x 7,200 pixels. If your format is animated, we'll extract the first frame to do the detection.
3131

3232
You can input your image by one of two methods: **local filestream** or **blob storage URL**.
3333
- **Local filestream** (recommended): Encode your image to base64. You can use a website like [codebeautify](https://codebeautify.org/image-to-base64-converter) to do the encoding. Then save the encoded string to a temporary location.
@@ -79,7 +79,7 @@ The parameters in the request body are defined in this table:
7979
8080
| Name | Required? | Description | Type |
8181
| :---------- | ----------- | :------------ | ------- |
82-
| **content** | Required | The content or blob URL of the image. I can be either base64-encoded bytes or a blob URL. If both are given, the request is refused. The maximum allowed size of the image is 2048 pixels x 2048 pixels, and the maximum file size is 4 MB. The minimum size of the image is 50 pixels x 50 pixels. | String |
82+
| **content** | Required | The content or blob URL of the image. I can be either base64-encoded bytes or a blob URL. If both are given, the request is refused. The maximum allowed size of the image is 7,200 x 7,200 pixels, and the maximum file size is 4 MB. The minimum size of the image is 50 pixels x 50 pixels. | String |
8383
| **categories** | Optional | This is assumed to be an array of category names. See the [Harm categories guide](../../concepts/harm-categories.md) for a list of available category names. If no categories are specified, all four categories are used. We use multiple categories to get scores in a single request. | String |
8484
| **outputType** | Optional | Image moderation API only supports `"FourSeverityLevels"`. Output severities in four levels. The value can be `0,2,4,6` | String|
8585

articles/ai-services/document-intelligence/concept-custom.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ To create a custom extraction model, label a dataset of documents with the value
5454
> Starting with version 4.0 (2024-02-29-preview) API, custom neural models now support **overlapping fields** and **table, row and cell level confidence**.
5555
>
5656
57-
The custom neural (custom document) model uses deep learning models and base model trained on a large collection of documents. This model is then fine-tuned or adapted to your data when you train the model with a labeled dataset. Custom neural models support structured, semi-structured, and unstructured documents to extract fields. When you're choosing between the two model types, start with a neural model to determine if it meets your functional needs. See [neural models](concept-custom-neural.md) to learn more about custom document models.
57+
The custom neural (custom document) model uses deep learning models and base model trained on a large collection of documents. This model is then fine-tuned or adapted to your data when you train the model with a labeled dataset. Custom neural models support extracting key data fields from structured, semi-structured, and unstructured documents. When you're choosing between the two model types, start with a neural model to determine if it meets your functional needs. See [neural models](concept-custom-neural.md) to learn more about custom document models.
5858

5959
### Custom template model
6060

articles/ai-services/language-service/concepts/custom-features/multi-region-deployment.md

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Deploy custom language projects to multiple regions in Azure AI Language
33
titleSuffix: Azure AI services
4-
description: Learn about deploying your language projects to multiple regions.
4+
description: Learn about how to deploy your custom language projects to multiple regions.
55
#services: cognitive-services
66
author: jboback
77
manager: nitinme
@@ -16,54 +16,57 @@ ms.custom: language-service-clu
1616

1717
> [!NOTE]
1818
> This article applies to the following custom features in Azure AI Language:
19+
>
1920
> * [Conversational language understanding](../../conversational-language-understanding/overview.md)
2021
> * [Custom text classification](../../custom-text-classification/overview.md)
21-
> * [Custom NER](../../custom-named-entity-recognition/overview.md)
22+
> * [Custom named entity recognition (NER)](../../custom-named-entity-recognition/overview.md)
2223
> * [Orchestration workflow](../../orchestration-workflow/overview.md)
2324
24-
Custom Language service features enable you to deploy your project to more than one region, making it much easier to access your project globally while managing only one instance of your project in one place.
25+
Custom language service features enable you to deploy your project to more than one region. This capability makes it much easier to access your project globally while you manage only one instance of your project in one place.
2526

26-
Before you deploy a project, you can assign **deployment resources** in other regions. Each deployment resource is a different Language resource from the one you use to author your project. You deploy to those resources and then target your prediction requests to that resource in their respective regions and your queries are served directly from that region.
27+
Before you deploy a project, you can assign *deployment resources* in other regions. Each deployment resource is a different Language resource from the one that you use to author your project. You deploy to those resources and then target your prediction requests to that resource in their respective regions and your queries are served directly from that region.
2728

28-
When creating a deployment, you can select which of your assigned deployment resources and their corresponding regions you would like to deploy to. The model you deploy is then replicated to each region and accessible with its own endpoint dependent on the deployment resource's custom subdomain.
29+
When you create a deployment, you can select which of your assigned deployment resources and their corresponding regions you want to deploy to. The model you deploy is then replicated to each region and accessible with its own endpoint dependent on the deployment resource's custom subdomain.
2930

3031
## Example
3132

32-
Suppose you want to make sure your project, which is used as part of a customer support chatbot, is accessible by customers across the US and India. You would author a project with the name **ContosoSupport** using a _West US 2_ Language resource named **MyWestUS2**. Before deployment, you would assign two deployment resources to your project - **MyEastUS** and **MyCentralIndia** in _East US_ and _Central India_, respectively.
33+
Suppose you want to make sure your project, which is used as part of a customer support chatbot, is accessible by customers across the United States and India. You author a project with the name `ContosoSupport` by using a West US 2 Language resource named `MyWestUS2`. Before deployment, you assign two deployment resources to your project: `MyEastUS` and `MyCentralIndia` in East US and Central India, respectively.
34+
35+
When you deploy your project, you select all three regions for deployment: the original West US 2 region and the assigned ones through East US and Central India.
3336

34-
When deploying your project, You would select all three regions for deployment: the original _West US 2_ region and the assigned ones through _East US_ and _Central India_.
37+
You now have three different endpoint URLs to access your project in all three regions:
3538

36-
You would now have three different endpoint URLs to access your project in all three regions:
37-
* West US 2: `https://mywestus2.cognitiveservices.azure.com/language/:analyze-conversations`
38-
* East US: `https://myeastus.cognitiveservices.azure.com/language/:analyze-conversations`
39-
* Central India: `https://mycentralindia.cognitiveservices.azure.com/language/:analyze-conversations`
39+
* **West US 2**: `https://mywestus2.cognitiveservices.azure.com/language/:analyze-conversations`
40+
* **East US**: `https://myeastus.cognitiveservices.azure.com/language/:analyze-conversations`
41+
* **Central India**: `https://mycentralindia.cognitiveservices.azure.com/language/:analyze-conversations`
4042

41-
The same request body to each of those different URLs serves the exact same response directly from that region.
43+
The same request body to each of those different URLs serves the exact same response directly from that region.
4244

4345
## Validations and requirements
4446

45-
Assigning deployment resources requires Microsoft Entra authentication. Microsoft Entra ID is used to confirm you have access to the resources you are interested in assigning to your project for multi-region deployment. In the Language Studio, you can automatically [enable Microsoft Entra authentication](https://aka.ms/rbac-language) by assigning yourself the _Cognitive Services Language Owner_ role to your original resource. To programmatically use Microsoft Entra authentication, learn more from the [Azure AI services documentation](../../../authentication.md?source=docs&tabs=powershell&tryIt=true#authenticate-with-azure-active-directory).
47+
Assigning deployment resources requires Microsoft Entra authentication. Microsoft Entra ID is used to confirm that you have access to the resources that you want to assign to your project for multiregion deployment. In Language Studio, you can automatically [enable Microsoft Entra authentication](https://aka.ms/rbac-language) by assigning yourself the Azure Cognitive Services Language Owner role to your original resource. To programmatically use Microsoft Entra authentication, learn more from the [Azure AI services documentation](../../../authentication.md?source=docs&tabs=powershell&tryIt=true#authenticate-with-azure-active-directory).
4648

47-
Your project name and resource are used as its main identifiers. Therefore, a Language resource can only have a specific project name in each resource. Any other projects with the same name will not be deployable to that resource.
49+
Your project name and resource are used as its main identifiers. A Language resource can only have a specific project name in each resource. Any other projects with the same name can't be deployed to that resource.
4850

49-
For example, if a project **ContosoSupport** was created by resource **MyWestUS2** in _West US 2_ and deployed to resource **MyEastUS** in _East US_, the resource **MyEastUS** cannot create a different project called **ContosoSupport** and deploy a project to that region. Similarly, your collaborators cannot then create a project **ContosoSupport** with resource **MyCentralIndia** in _Central India_ and deploy it to either **MyWestUS2** or **MyEastUS**.
51+
For example, if a project `ContosoSupport` was created by the resource `MyWestUS2` in West US 2 and deployed to the resource `MyEastUS` in East US, the resource `MyEastUS` can't create a different project called `ContosoSupport` and deploy a project to that region. Similarly, your collaborators can't then create a project `ContosoSupport` with the resource `MyCentralIndia` in Central India and deploy it to either `MyWestUS2` or `MyEastUS`.
5052

51-
You can only swap deployments that are available in the exact same regions, otherwise swapping will fail.
53+
You can only swap deployments that are available in the exact same regions. Otherwise, swapping fails.
5254

53-
If you remove an assigned resource from your project, all of the project deployments to that resource will then be deleted.
55+
If you remove an assigned resource from your project, all of the project deployments to that resource are deleted.
5456

5557
> [!NOTE]
5658
> Orchestration workflow only:
5759
>
58-
> You **cannot** assign deployment resources to orchestration workflow projects with custom question answering or LUIS connections. You subsequently cannot add custom question answering or LUIS connections to projects that have assigned resources.
60+
> You *can't* assign deployment resources to orchestration workflow projects with custom question answering or LUIS connections. Subsequently, you can't add custom question answering or LUIS connections to projects that have assigned resources.
5961
>
60-
> For multi-region deployment to work as expected, the connected CLU projects **must also be deployed** to the same regional resources you've deployed the orchestration workflow project to. Otherwise the orchestration workflow project will attempt to route a request to a deployment in its region that doesn't exist.
62+
> For multiregion deployment to work as expected, the connected CLU projects *must also be deployed* to the same regional resources to which you deployed the orchestration workflow project. Otherwise, the orchestration workflow project attempts to route a request to a deployment in its region that doesn't exist.
6163
6264
Some regions are only available for deployment and not for authoring projects.
6365

64-
## Next steps
66+
## Related content
6567

6668
Learn how to deploy models for:
69+
6770
* [Conversational language understanding](../../conversational-language-understanding/how-to/deploy-model.md)
6871
* [Custom text classification](../../custom-text-classification/how-to/deploy-model.md)
6972
* [Custom NER](../../custom-named-entity-recognition/how-to/deploy-model.md)

0 commit comments

Comments
 (0)