Skip to content

Commit f829d28

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into 281930
2 parents 34a772a + 3185c0e commit f829d28

File tree

8,859 files changed

+23988
-18218
lines changed

Some content is hidden

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

8,859 files changed

+23988
-18218
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: 4607 additions & 4594 deletions
Large diffs are not rendered by default.

.openpublishing.redirection.sentinel.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
{
22
"redirections": [
3+
{
4+
"source_path": "articles/sentinel/cef-name-mapping.md",
5+
"redirect_url": "/azure/sentinel/cef-syslog-ama-overview",
6+
"redirect_document_id": false
7+
},
38
{
49
"source_path": "articles/sentinel/detect-threats-built-in.md#use-analytics-rule-templates",
510
"redirect_url": "/azure/sentinel/create-analytics-rule-from-template",

CODEOWNERS

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
# Codeowners file
22
# Each line is a file pattern followed by one or more owners.
33

4-
# Specify owners for the aks folder
4+
# Folder paths in this list have been migrated to new repositories and content can no longer be created for these services in this repo.
55
/articles/aks @tynevi @thomps23
6+
/articles/defender-for-cloud @tynevi @thomps23
7+
/articles/attestation @tynevi @thomps23
8+
/articles/confidential-ledger @tynevi @thomps23
9+
/articles/dedicated-hsm @tynevi @thomps23
10+
/articles/key-vault @tynevi @thomps23
11+
/articles/payment-hsm @tynevi @thomps23

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/advisor/includes/azure-advisor.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
ms.service: advisor
2+
ms.service: azure-advisor
33
ms.topic: include
44
ms.date: 07/07/2022
55
author: ikhapova

articles/advisor/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ metadata:
77
title: Azure Advisor documentation
88
description: Azure Advisor is a personalized cloud consultant that helps you follow best practices to optimize your Azure deployments. It analyzes your resource configuration and usage telemetry. It then recommends solutions to help improve the performance, security, and high availability of your resources while looking for opportunities to reduce your overall Azure spend.
99
ms.topic: landing-page
10-
ms.service: advisor
10+
ms.service: azure-advisor
1111
author: rboucher
1212
ms.author: robb
1313
ms.date: 10/16/2019

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

0 commit comments

Comments
 (0)