Skip to content

Commit 3cc3cf1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into subnet-prefixes
2 parents f64984c + 9609eaa commit 3cc3cf1

File tree

1,029 files changed

+18620
-9324
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,029 files changed

+18620
-9324
lines changed

.openpublishing.redirection.json

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,35 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/network-watcher/network-watcher-security-group-view-powershell.md",
5+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-security-group-view-powershell",
6+
"redirect_document_id": false
7+
},
8+
{
9+
"source_path": "articles/network-watcher/network-watcher-security-group-view-cli.md",
10+
"redirect_url": "/previous-versions/azure/network-watcher/network-watcher-security-group-view-cli",
11+
"redirect_document_id": false
12+
},
13+
{
14+
"source_path": "articles/storage/blobs/blob-v11-samples-dotnet.md",
15+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v11-samples-dotnet",
16+
"redirect_document_id": false
17+
},
18+
{
19+
"source_path": "articles/storage/blobs/blob-v11-samples-javascript.md",
20+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v11-samples-javascript",
21+
"redirect_document_id": false
22+
},
23+
{
24+
"source_path": "articles/storage/blobs/blob-v2-samples-python.md",
25+
"redirect_url": "/previous-versions/azure/storage/blobs/blob-v2-samples-python",
26+
"redirect_document_id": false
27+
},
28+
{
29+
"source_path": "articles/storage/common/geo-redundant-design-legacy.md",
30+
"redirect_url": "/previous-versions/azure/storage/common/geo-redundant-design-legacy",
31+
"redirect_document_id": false
32+
},
333
{
434
"source_path": "articles/germany/index.yml",
535
"redirect_url": "/previous-versions/azure/germany/index",
@@ -4004,6 +4034,11 @@
40044034
"source_path_from_root":"/articles/aks/generation-2-vm-windows.md",
40054035
"redirect_url":"/azure/aks/generation-2-vm",
40064036
"redirect_document_id":false
4037+
},
4038+
{
4039+
"source_path_from_root":"/articles/cosmos-db/high-availability.md",
4040+
"redirect_url":"/azure/reliability/reliability-cosmos-db-nosql.md",
4041+
"redirect_document_id":false
40074042
}
40084043
]
40094044
}

articles/active-directory-b2c/TOC.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -535,8 +535,10 @@
535535
href: partner-nevis.md
536536
- name: Nok Nok
537537
href: partner-nok-nok.md
538-
- name: Transmit Security
538+
- name: Transmit Security for passwordless
539539
href: partner-bindid.md
540+
- name: Transmit Security for risk detection
541+
href: partner-transmit-security.md
540542
- name: Trusona
541543
href: partner-trusona.md
542544
- name: Twilio

articles/active-directory-b2c/custom-policies-series-sign-up-or-sign-in-federation.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ Notice the claims transformations we defined in [step 3.2](#step-32---define-cla
225225

226226
Just like in sign-in with a local account, you need to configure the [Microsoft Entra Technical Profiles](active-directory-technical-profile.md), which you use to connect to Microsoft Entra ID storage, to store or read a user social account.
227227

228-
1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile by using the following code:
228+
1. In the `ContosoCustomPolicy.XML` file, locate the `AAD-UserRead` technical profile and then add a new technical profile below it by using the following code:
229229

230230
```xml
231231
<TechnicalProfile Id="AAD-UserWriteUsingAlternativeSecurityId">
@@ -517,6 +517,7 @@ Use the following steps to add a combined local and social account:
517517
```xml
518518
<OutputClaim ClaimTypeReferenceId="authenticationSource" DefaultValue="localIdpAuthentication" AlwaysUseDefaultValue="true" />
519519
```
520+
Make sure you also add the `authenticationSource` claim in the output claims collection of the `UserSignInCollector` self-asserted technical profile.
520521

521522
1. In the `UserJourneys` section, add a new user journey, `LocalAndSocialSignInAndSignUp` by using the following code:
522523

173 KB
Loading

articles/active-directory-b2c/partner-transmit-security.md

Lines changed: 448 additions & 0 deletions
Large diffs are not rendered by default.

articles/active-directory-b2c/service-limits.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ manager: CelesteDG
88
ms.service: active-directory
99

1010
ms.topic: reference
11-
ms.date: 01/11/2024
11+
ms.date: 05/11/2024
1212
ms.subservice: B2C
1313
zone_pivot_groups: b2c-policy-type
1414

@@ -169,7 +169,7 @@ The following table lists the administrative configuration limits in the Azure A
169169
|String Limit per Attribute |250 Chars |
170170
|Number of B2C tenants per subscription |20 |
171171
|Total number of objects (user accounts and applications) per tenant (default limit)|1.25 million |
172-
|Total number of objects (user accounts and applications) per tenant (using a verified custom domain)|5.25 million |
172+
|Total number of objects (user accounts and applications) per tenant (using a verified custom domain). If you want to increase this limit, please contact [Microsoft Support](find-help-open-support-ticket.md).|5.25 million |
173173
|Levels of [inheritance](custom-policy-overview.md#inheritance-model) in custom policies |10 |
174174
|Number of policies per Azure AD B2C tenant (user flows + custom policies) |200 |
175175
|Maximum policy file size |1024 KB |

articles/ai-services/.openpublishing.redirection.applied-ai-services.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,26 @@
219219
"source_path_from_root": "/articles/ai-services/openai/how-to/prepare-dataset.md",
220220
"redirect_url": "/azure/ai-services/openai/concepts/fine-tuning-considerations",
221221
"redirect_document_id": true
222-
}
222+
},
223+
{
224+
"source_path_from_root": "/articles/ai-services/content-moderator/try-image-api.md",
225+
"redirect_url": "/azure/ai-services/content-moderator/client-libraries",
226+
"redirect_document_id": false
227+
},
228+
{
229+
"source_path_from_root": "/articles/ai-services/content-moderator/try-text-api.md",
230+
"redirect_url": "/azure/ai-services/content-moderator/client-libraries",
231+
"redirect_document_id": false
232+
},
233+
{
234+
"source_path_from_root": "/articles/ai-services/content-moderator/try-image-list-api.md",
235+
"redirect_url": "/azure/ai-services/content-moderator/image-lists-quickstart-dotnet",
236+
"redirect_document_id": false
237+
},
238+
{
239+
"source_path_from_root": "/articles/ai-services/content-moderator/try-terms-list-api.md",
240+
"redirect_url": "/azure/ai-services/content-moderator/term-lists-quickstart-dotnet",
241+
"redirect_document_id": false
242+
},
223243
]
224244
}

articles/ai-services/computer-vision/computer-vision-how-to-install-containers.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,6 @@ In this article, you learned concepts and workflow for downloading, installing,
344344

345345
* Review [Configure containers](computer-vision-resource-container-config.md) for configuration settings
346346
* Review the [OCR overview](overview-ocr.md) to learn more about recognizing printed and handwritten text
347-
* Refer to the [Read API](https://westus.dev.cognitive.microsoft.com/docs/services/computer-vision-v3-2/operations/5d986960601faab4bf452005) for details about the methods supported by the container.
347+
* Refer to the [Read API](/rest/api/computervision/operation-groups?view=rest-computervision-v3.2-preview) for details about the methods supported by the container.
348348
* Refer to [Frequently asked questions (FAQ)](FAQ.yml) to resolve issues related to Azure AI Vision functionality.
349349
* Use more [Azure AI containers](../cognitive-services-container-support.md)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ It's important to note the limitations of background removal:
5252

5353
## Use the API
5454

55-
The background removal feature is available through the [Segment](https://centraluseuap.dev.cognitive.microsoft.com/docs/services/unified-vision-apis-public-preview-2023-02-01-preview/operations/63e6b6d9217d201194bbecbd) API (`imageanalysis:segment`). See the [Background removal how-to guide](./how-to/background-removal.md) for more information.
55+
The background removal feature is available through the [Segment](/rest/api/computervision/image-analysis/segment?view=rest-computervision-2023-02-01-preview&tabs=HTTP) API (`imageanalysis:segment`). See the [Background removal how-to guide](./how-to/background-removal.md) for more information.
5656

5757
## Next steps
5858

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,4 +183,4 @@ It returns a JSON response that accounts for each position in the planogram docu
183183
Get started with Product Recognition by trying out the stitching and rectification APIs. Then do basic analysis with the Product Understanding API.
184184
* [Prepare images for Product Recognition](./how-to/shelf-modify-images.md)
185185
* [Analyze a shelf image](./how-to/shelf-analyze.md)
186-
* [API reference](https://eastus.dev.cognitive.microsoft.com/docs/services/unified-vision-apis-public-preview-2023-04-01-preview/operations/644aba14fb42681ae06f1b0b)
186+
* [API reference](/rest/api/computervision/operation-groups?view=rest-computervision-2023-04-01-preview)

0 commit comments

Comments
 (0)