Skip to content

Commit 4d75698

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into managing-payment-methods
2 parents d1138ca + 8ad7300 commit 4d75698

File tree

1,928 files changed

+13958
-8500
lines changed

Some content is hidden

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

1,928 files changed

+13958
-8500
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/openai/concepts/use-your-data.md

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -349,18 +349,20 @@ You can deploy to a standalone Teams app directly from Azure OpenAI Studio. Foll
349349

350350
1. Provision your app: (detailed instructions in [Provision cloud resources](/microsoftteams/platform/toolkit/provision))
351351

352-
1. Assign the **Cognitive Service OpenAI User** role to your deployed App Service resource
353-
1. Go to the Azure portal and select the newly created Azure App Service resource
354-
1. Go to **settings** -> **identity** -> **enable system assigned identity**
355-
1. Select **Azure role assignments** and then **add role assignments**. Specify the following parameters:
356-
* Scope: resource group
357-
* Subscription: the subscription of your Azure OpenAI resource
358-
* Resource group of your Azure OpenAI resource
359-
* Role: **Cognitive Service OpenAI user**
352+
1. Assign the **Cognitive Service OpenAI User** role to your deployed **User Assigned Managed Identity** resource of your custom copilot.
353+
1. Go to the Azure portal and select the newly created **User Assigned Managed Identity** resource for your custom copilot.
354+
1. Go to **Azure Role Assignments**.
355+
1. Select **add role assignment**. Specify the following parameters:
356+
* Scope: resource group
357+
* Subscription: the subscription of your Azure OpenAI resource
358+
* Resource group of your Azure OpenAI resource
359+
* Role: **Cognitive Service OpenAI user**
360360

361361
1. Deploy your app to Azure by following the instructions in [Deploy to the cloud](/microsoftteams/platform/toolkit/deploy).
362362

363363
1. Publish your app to Teams by following the instructions in [Publish Teams app](/microsoftteams/platform/toolkit/publish).
364+
> [!IMPORTANT]
365+
> Your Teams app is intended for use within the same tenant of your Azure account used during setup, as it is securely configured by default for single-tenant usage. Using this app with a Teams account not associated with the Azure tenant used during setup will result in an error.
364366
365367
The README file in your Teams app has additional details and tips. Also, see [Tutorial - Build Custom Copilot using Teams](/microsoftteams/platform/teams-ai-library-tutorial) for guided steps.
366368

articles/ai-services/speech-service/includes/release-notes/release-notes-tts.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@ ms.author: eur
77
ms.custom: references_regions
88
---
99

10+
### July 2024 release
11+
12+
#### Text to speech avatar (GA)
13+
14+
Text to speech avatar is now generally available. For more information, see [text to speech avatar](../../text-to-speech-avatar/what-is-text-to-speech-avatar.md).
15+
1016
### June 2024 release
1117

1218
#### Prebuilt neural voice

articles/ai-studio/concepts/concept-synthetic-data.md

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,14 @@ ms.custom: references_regions
1515

1616
# Synthetic data generation in Azure AI Studio
1717

18-
In this article
19-
- [Synthetic data generation](#synthetic-data-generation)
20-
- [Next Steps](#next-steps)
18+
In Azure AI Studio, you can use synthetic data generation to efficiently produce predictions for your datasets. In this article, you're introduced to the concept of synthetic data generation and how it can be used in machine learning.
2119

22-
In Azure AI Studio, you can leverage synthetic data generation to efficiently produce predictions for your datasets.
2320

2421
## Synthetic data generation
2522

2623
Synthetic data generation involves creating artificial data that mimics the statistical properties of real-world data. This data is generated using algorithms and machine learning techniques, and it can be used in various ways, such as computer simulations or by modeling real-world events.
2724

28-
In machine learning, synthetic data is particularly valuable for several reasons:
25+
In machine learning, synthetic data is valuable for several reasons:
2926

3027
**Data Augmentation:** It helps in expanding the size of training datasets, which is crucial for training robust machine learning models. This is especially useful when real-world data is scarce or expensive to obtain.
3128

@@ -37,4 +34,4 @@ You can use the sample notebook available at this [link](https://aka.ms/meta-lla
3734
- [What is Azure AI Studio?](../what-is-ai-studio.md)
3835
- [Learn more about deploying Meta Llama models](../how-to/deploy-models-llama.md)
3936

40-
- [Azure AI FAQ article](../faq.yml)
37+
- [Azure AI FAQ article](../faq.yml)

0 commit comments

Comments
 (0)