Skip to content

Commit 2032985

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-cm
2 parents e015f6f + 8e4c22b commit 2032985

File tree

379 files changed

+4486
-2650
lines changed

Some content is hidden

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

379 files changed

+4486
-2650
lines changed

.openpublishing.redirection.json

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4064,14 +4064,33 @@
40644064
"redirect_document_id": false
40654065
},
40664066
{
4067-
"source_path_from_root": "/articles/cosmos-dbcreate-websitemd",
4067+
"source_path_from_root": "/articles/cosmos-db/create-website.md",
40684068
"redirect_url": "/azure/cosmos-db/sql/create-website",
40694069
"redirect_document_id": true
40704070
},
40714071
{
40724072
"source_path_from_root": "/articles/virtual-machines-linux-nodejs-deploy.md",
40734073
"redirect_url": "/azure",
40744074
"redirect_document_id": false
4075+
},
4076+
{
4077+
"source_path_from_root": "/articles/event-grid/move-system-topics-across-regions.md",
4078+
"redirect_url": "/azure",
4079+
"redirect_document_id": false
4080+
},
4081+
{
4082+
"source_path_from_root": "/articles/event-grid/move-custom-topics-across-regions.md",
4083+
"redirect_url": "/azure",
4084+
"redirect_document_id": false
4085+
},
4086+
{
4087+
"source_path_from_root": "/articles/event-grid/move-domains-across-regions.md",
4088+
"redirect_url": "/azure",
4089+
"redirect_document_id": false
40754090
}
4091+
4092+
4093+
4094+
40764095
]
40774096
}

articles/active-directory-b2c/localization-string-ids.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ The following IDs are used for an [Microsoft Entra ID multifactor authentication
532532
| `UserMessageIfMaxAllowedCodeRetryReached` | Wrong code entered too many times, please try again later.|
533533
| `UserMessageIfServerError` | Cannot use MFA service, please try again later.|
534534
| `UserMessageIfThrottled` | Your request has been throttled, please try again later.|
535-
| `UserMessageIfWrongCodeEntered` |Wrong code entered, please try again.|
535+
| `UserMessageIfIncorrectOTPCodeEntered` |Wrong code entered, please try again.|
536536

537537
<a name='azure-ad-mfa-example'></a>
538538

@@ -684,4 +684,4 @@ This example shows localized messages for CAPTCHA display control.
684684
See the following articles for localization examples:
685685

686686
- [Language customization with custom policy in Azure AD B2C](language-customization.md)
687-
- [Language customization with user flows in Azure AD B2C](language-customization.md)
687+
- [Language customization with user flows in Azure AD B2C](language-customization.md)

articles/active-directory-b2c/partner-strata.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ ms.subservice: B2C
1717

1818
# Tutorial to configure Azure Active Directory B2C with Strata
1919

20-
> [!CAUTION]
21-
> This article references CentOS, a Linux distribution that is nearing End Of Life (EOL) status. Please consider your use and planning accordingly. For more information, see the [CentOS End Of Life guidance](~/articles/virtual-machines/workloads/centos/centos-end-of-life.md).
22-
2320
In this tutorial, learn how to integrate Azure Active Directory B2C (Azure AD B2C) with Strata [Maverics Identity Orchestrator](https://www.strata.io/), which helps protect on-premises applications. It connects to identity systems, migrates users and credentials, synchronizes policies and configurations, and abstracts authentication and session management. Use Strata to transition from legacy, to Azure AD B2C, without rewriting applications.
2421

2522
The solution has the following benefits:
@@ -98,7 +95,7 @@ Use the instructions in the following sections to configure an Orchestrator inst
9895

9996
You can run your Orchestrator instance on any server, whether on-premises or in a public cloud infrastructure by provider such as Azure, AWS, or GCP.
10097

101-
- **Operating System**: REHL 7.7 or higher, CentOS 7+
98+
- **Operating System**: RHEL 7.7 or higher
10299
- **Disk**: 10 GB (small)
103100
- **Memory**: 16 GB
104101
- **Ports**: 22 (SSH/SCP), 443, 80

articles/advisor/includes/azure-advisor.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ Search-AzGraph -Query "AdvisorResources | where type == 'microsoft.advisor/recom
4343

4444

4545

46-
- Azure portal: <a href="https://portal.azure.com/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/AdvisorResources%0a%7c%20where%20type%20%3d%3d%20%27microsoft.advisor%2frecommendations%27%0a%7c%20where%20properties.category%20%3d%3d%20%27Cost%27%0a%7c%20extend%0a%09resources%20%3d%20tostring(properties.resourceMetadata.resourceId)%2c%0a%09savings%20%3d%20todouble(properties.extendedProperties.savingsAmount)%2c%0a%09solution%20%3d%20tostring(properties.shortDescription.solution)%2c%0a%09currency%20%3d%20tostring(properties.extendedProperties.savingsCurrency)%0a%7c%20summarize%0a%09dcount(resources)%2c%0a%09bin(sum(savings)%2c%200.01)%0a%09by%20solution%2c%20currency%0a%7c%20project%20solution%2c%20dcount_resources%2c%20sum_savings%2c%20currency%0a%7c%20order%20by%20sum_savings%20desc" target="_blank">portal.azure.com</a>
47-
- Azure Government portal: <a href="https://portal.azure.us/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/AdvisorResources%0a%7c%20where%20type%20%3d%3d%20%27microsoft.advisor%2frecommendations%27%0a%7c%20where%20properties.category%20%3d%3d%20%27Cost%27%0a%7c%20extend%0a%09resources%20%3d%20tostring(properties.resourceMetadata.resourceId)%2c%0a%09savings%20%3d%20todouble(properties.extendedProperties.savingsAmount)%2c%0a%09solution%20%3d%20tostring(properties.shortDescription.solution)%2c%0a%09currency%20%3d%20tostring(properties.extendedProperties.savingsCurrency)%0a%7c%20summarize%0a%09dcount(resources)%2c%0a%09bin(sum(savings)%2c%200.01)%0a%09by%20solution%2c%20currency%0a%7c%20project%20solution%2c%20dcount_resources%2c%20sum_savings%2c%20currency%0a%7c%20order%20by%20sum_savings%20desc" target="_blank">portal.azure.us</a>
48-
- Microsoft Azure operated by 21Vianet portal: <a href="https://portal.azure.cn/?feature.customportal=false#blade/HubsExtension/ArgQueryBlade/query/AdvisorResources%0a%7c%20where%20type%20%3d%3d%20%27microsoft.advisor%2frecommendations%27%0a%7c%20where%20properties.category%20%3d%3d%20%27Cost%27%0a%7c%20extend%0a%09resources%20%3d%20tostring(properties.resourceMetadata.resourceId)%2c%0a%09savings%20%3d%20todouble(properties.extendedProperties.savingsAmount)%2c%0a%09solution%20%3d%20tostring(properties.shortDescription.solution)%2c%0a%09currency%20%3d%20tostring(properties.extendedProperties.savingsCurrency)%0a%7c%20summarize%0a%09dcount(resources)%2c%0a%09bin(sum(savings)%2c%200.01)%0a%09by%20solution%2c%20currency%0a%7c%20project%20solution%2c%20dcount_resources%2c%20sum_savings%2c%20currency%0a%7c%20order%20by%20sum_savings%20desc" target="_blank">portal.azure.cn</a>
46+
- Azure portal: <a href="https://portal.azure.com/#blade/HubsExtension/ArgQueryBlade/query/AdvisorResources%0a%7c%20where%20type%20%3d%3d%20%27microsoft.advisor%2frecommendations%27%0a%7c%20where%20properties.category%20%3d%3d%20%27Cost%27%0a%7c%20extend%0a%09resources%20%3d%20tostring(properties.resourceMetadata.resourceId)%2c%0a%09savings%20%3d%20todouble(properties.extendedProperties.savingsAmount)%2c%0a%09solution%20%3d%20tostring(properties.shortDescription.solution)%2c%0a%09currency%20%3d%20tostring(properties.extendedProperties.savingsCurrency)%0a%7c%20summarize%0a%09dcount(resources)%2c%0a%09bin(sum(savings)%2c%200.01)%0a%09by%20solution%2c%20currency%0a%7c%20project%20solution%2c%20dcount_resources%2c%20sum_savings%2c%20currency%0a%7c%20order%20by%20sum_savings%20desc" target="_blank">portal.azure.com</a>
47+
- Azure Government portal: <a href="https://portal.azure.us/#blade/HubsExtension/ArgQueryBlade/query/AdvisorResources%0a%7c%20where%20type%20%3d%3d%20%27microsoft.advisor%2frecommendations%27%0a%7c%20where%20properties.category%20%3d%3d%20%27Cost%27%0a%7c%20extend%0a%09resources%20%3d%20tostring(properties.resourceMetadata.resourceId)%2c%0a%09savings%20%3d%20todouble(properties.extendedProperties.savingsAmount)%2c%0a%09solution%20%3d%20tostring(properties.shortDescription.solution)%2c%0a%09currency%20%3d%20tostring(properties.extendedProperties.savingsCurrency)%0a%7c%20summarize%0a%09dcount(resources)%2c%0a%09bin(sum(savings)%2c%200.01)%0a%09by%20solution%2c%20currency%0a%7c%20project%20solution%2c%20dcount_resources%2c%20sum_savings%2c%20currency%0a%7c%20order%20by%20sum_savings%20desc" target="_blank">portal.azure.us</a>
48+
- Microsoft Azure operated by 21Vianet portal: <a href="https://portal.azure.cn/#blade/HubsExtension/ArgQueryBlade/query/AdvisorResources%0a%7c%20where%20type%20%3d%3d%20%27microsoft.advisor%2frecommendations%27%0a%7c%20where%20properties.category%20%3d%3d%20%27Cost%27%0a%7c%20extend%0a%09resources%20%3d%20tostring(properties.resourceMetadata.resourceId)%2c%0a%09savings%20%3d%20todouble(properties.extendedProperties.savingsAmount)%2c%0a%09solution%20%3d%20tostring(properties.shortDescription.solution)%2c%0a%09currency%20%3d%20tostring(properties.extendedProperties.savingsCurrency)%0a%7c%20summarize%0a%09dcount(resources)%2c%0a%09bin(sum(savings)%2c%200.01)%0a%09by%20solution%2c%20currency%0a%7c%20project%20solution%2c%20dcount_resources%2c%20sum_savings%2c%20currency%0a%7c%20order%20by%20sum_savings%20desc" target="_blank">portal.azure.cn</a>
4949

5050
---

articles/ai-services/autoscale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ This feature is disabled by default for every new resource. Follow these instruc
2626

2727
Go to your resource's page in the Azure portal, and select the **Overview** tab on the left pane. Under the **Essentials** section, find the **Autoscale** line and select the link to view the **Autoscale Settings** pane and enable the feature.
2828

29-
:::image type="content" source="~/reusable-content/ce-skilling/azure/media/cognitive-services-autoscale/portal-autoscale.png" alt-text="Screenshot of the Azure portal with the autoscale pane on right." lightbox="~/reusable-content/ce-skilling/azure/media/cognitive-services-autoscale/portal-autoscale.png":::
29+
:::image type="content" source="~/reusable-content/ce-skilling/azure/media/ai-services/portal-autoscale.png" alt-text="Screenshot of the Azure portal with the autoscale pane on right." lightbox="~/reusable-content/ce-skilling/azure/media/ai-services/portal-autoscale.png":::
3030

3131
#### [Azure CLI](#tab/cli)
3232

articles/ai-services/computer-vision/concept-background-removal.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ms.service: azure-ai-vision
1010
ms.topic: conceptual
1111
ms.date: 01/19/2024
1212
ms.author: pafarley
13-
ms.custom: references_regions
1413
---
1514

1615
# Background removal (version 4.0 preview)
@@ -27,7 +26,7 @@ This feature provides two possible outputs based on the customer's needs:
2726
- An alpha matte that shows the opacity of the detected foreground object. This matte can be used to separate the foreground object from the background for further processing.
2827

2928
> [!IMPORTANT]
30-
> Background removal is only available in the following Azure regions: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US.
29+
> Background removal is only available in certain Azure regions. See [Region availability](./overview-image-analysis.md#region-availability).
3130
3231
## Background removal examples
3332

articles/ai-services/computer-vision/concept-describe-images-40.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ms.service: azure-ai-vision
1010
ms.topic: conceptual
1111
ms.date: 01/19/2024
1212
ms.author: pafarley
13-
ms.custom: references_regions
1413
---
1514

1615
# Image captions (version 4.0)
@@ -21,7 +20,7 @@ Caption generates a one-sentence description for all image contents. Dense Capti
2120
At this time, image captioning is available in English only.
2221

2322
> [!IMPORTANT]
24-
> Image captioning in Image Analysis 4.0 is only available in the following Azure data center regions: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US, East Asia. You must use a Vision resource located in one of these regions to get results from Caption and Dense Captions features.
23+
> Image captioning in Image Analysis 4.0 is only available in certain Azure data center regions: see [Region availability](./overview-image-analysis.md#region-availability). You must use a Vision resource located in one of these regions to get results from Caption and Dense Captions features.
2524
>
2625
> If you have to use a Vision resource outside these regions to generate image captions, please use [Image Analysis 3.2](concept-describing-images.md) which is available in all Azure AI Vision regions.
2726

articles/ai-services/computer-vision/concept-shelf-analysis.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ ms.service: azure-ai-vision
1010
ms.topic: conceptual
1111
ms.date: 02/14/2024
1212
ms.author: pafarley
13-
ms.custom: references_regions, build-2023, build-2023-dataai
13+
ms.custom: build-2023, build-2023-dataai
1414
---
1515

1616
# Product Recognition (version 4.0 preview)
@@ -172,7 +172,7 @@ It returns a JSON response that accounts for each position in the planogram docu
172172

173173
## Limitations
174174

175-
* Product Recognition is only available in the **East US** and **West US 2** Azure regions.
175+
* Product Recognition is only available in certain [Azure regions](./overview-image-analysis.md#region-availability).
176176
* Shelf images can be up to 20 MB in size. The recommended size is 4 MB.
177177
* We recommend you do [stitching and rectification](./how-to/shelf-modify-images.md) on the shelf images before uploading them for analysis.
178178
* Using a [custom model](./how-to/shelf-model-customization.md) is optional in Product Recognition, but it's required for the [planogram matching](./how-to/shelf-planogram.md) function.

articles/ai-services/computer-vision/faq.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ sections:
2929
- question: |
3030
The service is throwing an error because my image file is too large. How can I work around this?
3131
answer: |
32-
The file size limit for most Azure AI Vision features is 4 MB for the 3.2 version of the API and 20MB for the 4.0 version, and the client library SDKs can handle files up to 6 MB. For more information, see the [Image Analysis input limits](overview-image-analysis.md#image-requirements).
32+
The file size limit for most Azure AI Vision features is 4 MB for the 3.2 version of the API and 20MB for the 4.0 version, and the client library SDKs can handle files up to 6 MB. For more information, see the [Image Analysis input limits](overview-image-analysis.md#input-requirements).
3333
3434
- question: |
3535
Can I send multiple images in a single API call to the Azure AI Vision service?

articles/ai-services/computer-vision/how-to/background-removal.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ ms.author: pafarley
99
ms.service: azure-ai-vision
1010
ms.topic: how-to
1111
ms.date: 01/19/2024
12-
ms.custom: references_regions
1312
---
1413

1514
# Remove the background in images
@@ -29,7 +28,7 @@ This guide assumes you have successfully followed the steps mentioned in the [qu
2928
The [quickstart](../quickstarts-sdk/image-analysis-client-library-40.md) shows you how to extract visual features from an image. However, the concepts are similar to background removal. Therefore you benefit from starting with the quickstart and making modifications.
3029

3130
> [!IMPORTANT]
32-
> Background removal is only available in the following Azure regions: East US, France Central, Korea Central, North Europe, Southeast Asia, West Europe, West US.
31+
> Background removal is only available in certain Azure regions. See [Region availability](./../overview-image-analysis.md#region-availability)
3332
3433
## Authenticate against the service
3534

0 commit comments

Comments
 (0)