Skip to content

Commit 9fc80f9

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into snapshotClarity
2 parents 60683c7 + 2ccd65e commit 9fc80f9

File tree

21 files changed

+150
-115
lines changed

21 files changed

+150
-115
lines changed

articles/active-directory/cloud-sync/what-is-cloud-sync.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ The following table provides a comparison between Azure AD Connect and Azure AD
6464
| Allow removing attributes from flowing from AD to Azure AD |||
6565
| Allow advanced customization for attribute flows || |
6666
| Support for password writeback |||
67-
| Support for device writeback||Customers should use [Cloud kerberose trust](https://learn.microsoft.com/windows/security/identity-protection/hello-for-business/hello-hybrid-cloud-kerberos-trust?tabs=intune) for this moving forward|
67+
| Support for device writeback||Customers should use [Cloud Kerberos trust](/windows/security/identity-protection/hello-for-business/hello-hybrid-cloud-kerberos-trust?tabs=intune) for this moving forward|
6868
| Support for group writeback|| |
6969
| Support for merging user attributes from multiple domains|| |
7070
| Azure AD Domain Services support|| |

articles/active-directory/develop/reference-claims-mapping-policy-type.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ ms.workload: identity
1111
ms.topic: reference
1212
ms.date: 01/06/2023
1313
ms.author: davidmu
14-
ms.reviewer: ludwignick, jeedes, luleon
14+
ms.reviewer: ludwignick, jeedes
1515
---
1616

1717
# Claims mapping policy type

articles/active-directory/manage-apps/configure-admin-consent-workflow.md

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,23 @@ To enable the admin consent workflow and choose reviewers:
3838
1. Sign-in to the [Azure portal](https://portal.azure.com) with one of the roles listed in the prerequisites.
3939
1. Search for and select **Azure Active Directory**.
4040
1. Select **Enterprise applications**.
41-
1. Under **Manage**, select **User settings**.
41+
1. Under **Security**, select **Consent and permissions**.
42+
1. Under **Manage**, select **Admin consent settings**.
4243
Under **Admin consent requests**, select **Yes** for **Users can request admin consent to apps they are unable to consent to** .
43-
:::image type="content" source="media/configure-admin-consent-workflow/enable-admin-consent-workflow.png" alt-text="Configure admin consent workflow settings":::
44+
45+
![Screenshot of configure admin consent workflow settings.](./media/configure-admin-consent-workflow/enable-admin-consent-workflow.png)
46+
4447
1. Configure the following settings:
4548

4649
- **Select users, groups, or roles that will be designated as reviewers for admin consent requests** - Reviewers can view, block, or deny admin consent requests, but only global administrators can approve admin consent requests. People designated as reviewers can view incoming requests in the **My Pending** tab after they have been set as reviewers. Any new reviewers won't be able to act on existing or expired admin consent requests.
4750
- **Selected users will receive email notifications for requests** - Enable or disable email notifications to the reviewers when a request is made.
48-
- **Selected users will receive request expiration reminders** - Enable or disable reminder email notifications to the reviewers when a request is about to expire.
51+
- **Selected users will receive request expiration reminders** - Enable or disable reminder email notifications to the reviewers when a request is about to expire.
4952
- **Consent request expires after (days)** - Specify how long requests stay valid.
53+
5054
1. Select **Save**. It can take up to an hour for the workflow to become enabled.
5155

52-
> [!NOTE]
53-
> You can add or remove reviewers for this workflow by modifying the **Select admin consent requests reviewers** list. A current limitation of this feature is that a reviewer can retain the ability to review requests that were made while they were designated as a reviewer.
56+
> [!NOTE]
57+
> You can add or remove reviewers for this workflow by modifying the **Select admin consent requests reviewers** list. A current limitation of this feature is that a reviewer can retain the ability to review requests that were made while they were designated as a reviewer.
5458
5559
## Configure the admin consent workflow using Microsoft Graph
5660

articles/applied-ai-services/form-recognizer/service-limits.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,9 @@ This article contains both a quick reference and detailed description of Azure F
8080
| Adjustable | No | No |
8181
| **Training dataset size * Neural** | 1 GB <sup>3</sup> | 1 GB (default value) |
8282
| Adjustable | No | No |
83-
| **Training dataset size * Template** | 50 MB <sup>4</sup> | 50 MB (default value) |
83+
| **Training file size * Template** | 50 MB <sup>4</sup> | 50 MB (default value) |
84+
| Adjustable | No | No |
85+
| **Total Training dataset size * Template** | 150 MB <sup>4</sup> | 150 MB (default value) |
8486
| Adjustable | No | No |
8587
| **Max number of pages (Training) * Template** | 500 | 500 (default value) |
8688
| Adjustable | No | No |

articles/azure-maps/about-azure-maps.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ For more details, read the [Geolocation service documentation](/rest/api/maps/ge
6464

6565
### Render service
6666

67-
[Render service V2](/rest/api/maps/render-v2) introduces a new version of the [Get Map Tile V2 API](/rest/api/maps/render-v2/get-map-tile) that supports using Azure Maps tiles not only in the Azure Maps SDKs but other map controls as well. It includes raster and vector tile formats, 256x256 or 512x512 (where applicable) tile sizes and numerous map types such as road, weather, contour, or map tiles created using Azure Maps Creator. For a complete list see [TilesetID](/rest/api/maps/render-v2/get-map-tile#tilesetid) in the REST API documentation. It's recommended that you use Render service V2 instead of Render service V1. You are required to display the appropriate copyright attribution on the map anytime you use the Azure Maps Render service V2, either as basemaps or layers, in any third-party map control. For more information see [How to use the Get Map Attribution API](how-to-show-attribution.md).
67+
[Render service V2](/rest/api/maps/render-v2) introduces a new version of the [Get Map Tile V2 API](/rest/api/maps/render-v2/get-map-tile) that supports using Azure Maps tiles not only in the Azure Maps SDKs but other map controls as well. It includes raster and vector tile formats, 256x256 or 512x512 (where applicable) tile sizes and numerous map types such as road, weather, contour, or map tiles created using Azure Maps Creator. For a complete list, see [TilesetID](/rest/api/maps/render-v2/get-map-tile#tilesetid) in the REST API documentation. It's recommended that you use Render service V2 instead of Render service V1. You're required to display the appropriate copyright attribution on the map anytime you use the Azure Maps Render service V2, either as basemaps or layers, in any third-party map control. For more information, see [How to use the Get Map Attribution API](how-to-show-attribution.md).
6868

6969
:::image type="content" source="./media/about-azure-maps/intro_map.png" border="false" alt-text="Example of a map from the Render service V2":::
7070

@@ -154,7 +154,7 @@ For more information, see the [Traffic service documentation](/rest/api/maps/tra
154154

155155
### Weather services
156156

157-
Weather services offer APIs that developers can use to retrieve weather information for a particular location. The information contains details such as observation date and time, brief description of the weather conditions, weather icon, precipitation indicator flags, temperature, and wind speed information. Additional details such as RealFeel™ Temperature and UV index are also returned.
157+
Weather services offer APIs that developers can use to retrieve weather information for a particular location. The information contains details such as observation date and time, brief description of the weather conditions, weather icon, precipitation indicator flags, temperature, and wind speed information. Other details such as RealFeel™ Temperature and UV index are also returned.
158158

159159
Developers can use the [Get Weather along route API](/rest/api/maps/weather/getweatheralongroute) to retrieve weather information along a particular route. Also, the service supports the generation of weather notifications for waypoints that are affected by weather hazards, such as flooding or heavy rain.
160160

articles/azure-monitor/snapshot-debugger/snapshot-debugger-app-service.md

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,16 @@ ms.author: hannahhunter
66
author: hhunter-ms
77
ms.reviewer: charles.weininger
88
reviewer: cweining
9-
ms.date: 08/18/2022
9+
ms.date: 01/24/2023
1010
ms.custom: devdivchpfy22
1111
---
1212

1313
# Enable Snapshot Debugger for .NET apps in Azure App Service
1414

1515
Snapshot Debugger currently supports ASP.NET and ASP.NET Core apps that are running on Azure App Service on Windows service plans.
1616

17-
We recommend that you run your application on the Basic service tier, or higher, when using Snapshot Debugger.
18-
19-
For most applications, the Free and Shared service tiers don't have enough memory or disk space to save snapshots.
17+
> [!NOTE]
18+
> We recommend that you run your application on the Basic service tier, or higher, when using Snapshot Debugger. For most applications, the Free and Shared service tiers don't have enough memory or disk space to save snapshots. The Consumption tier is not currently available for Snapshot Debugger.
2019
2120
## <a id="installation"></a> Enable Snapshot Debugger
2221

articles/azure-vmware/deploy-arc-for-azure-vmware-solution.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ In this article, you'll learn how to deploy Arc for Azure VMware Solution. Once
1515
Before you begin checking off the prerequisites, verify the following actions have been done:
1616

1717
- You deployed an Azure VMware Solution private cluster.
18-
- You have a connection to the Azure VMware Solution private cloud through your on-prem environment or your native Azure Virtual Network.
18+
- You have a connection to the Azure VMware Solution private cloud through your on-premises environment or your native Azure Virtual Network.
1919
- There should be an isolated NSX-T Data Center segment for deploying the Arc for Azure VMware Solution Open Virtualization Appliance (OVA). If an isolated NSX-T Data Center segment doesn't exist, one will be created.
2020

2121
## Prerequisites
@@ -35,7 +35,7 @@ The following items are needed to ensure you're set up to begin the onboarding p
3535
> [!NOTE]
3636
> Only the default port of 443 is supported. If you use a different port, Appliance VM creation will fail.
3737
38-
At this point, you should have already deployed an Azure VMware Solution private cloud. You need to have a connection from your on-prem environment or your native Azure Virtual Network to the Azure VMware Solution private cloud.
38+
At this point, you should have already deployed an Azure VMware Solution private cloud. You need to have a connection from your on-premises environment or your native Azure Virtual Network to the Azure VMware Solution private cloud.
3939

4040
For Network planning and setup, use the [Network planning checklist - Azure VMware Solution | Microsoft Docs](./tutorial-network-checklist.md)
4141

@@ -93,7 +93,7 @@ Use the following steps to guide you through the process to onboard in Arc for A
9393
- `GatewayIPAddress` is the gateway for the segment for Arc appliance VM.
9494
- `applianceControlPlaneIpAddress` is the IP address for the Kubernetes API server that should be part of the segment IP CIDR provided. It shouldn't be part of the k8s node pool IP range.
9595
- `k8sNodeIPPoolStart`, `k8sNodeIPPoolEnd` are the starting and ending IP of the pool of IPs to assign to the appliance VM. Both need to be within the `networkCIDRForApplianceVM`.
96-
- `k8sNodeIPPoolStart`, `k8sNodeIPPoolEnd`, `gatewayIPAddress` ,`applianceControlPlaneIpAddress` are optional. You may choose to skip all the optional fields or provide values for all. If you choose not to provide the optional fields then you must use /28 address space for `networkCIDRForApplianceVM`
96+
- `k8sNodeIPPoolStart`, `k8sNodeIPPoolEnd`, `gatewayIPAddress` ,`applianceControlPlaneIpAddress` are optional. You may choose to skip all the optional fields or provide values for all. If you choose not to provide the optional fields, then you must use /28 address space for `networkCIDRForApplianceVM`
9797

9898
**Json example**
9999
```json
@@ -306,9 +306,9 @@ When the extension installation steps are completed, they trigger deployment and
306306

307307
## Change Arc appliance credential
308308

309-
When **cloudadmin** credentials are updated, use the following steps to update the credentials in the appliance store.
309+
When **cloud admin** credentials are updated, use the following steps to update the credentials in the appliance store.
310310

311-
1. Log into the jumpbox VM from where onboarding was performed. Change the directory to **onboarding directory**.
311+
1. Log in to the jumpbox VM from where onboarding was performed. Change the directory to **onboarding directory**.
312312
1. Run the following command for Windows-based jumpbox VM.
313313

314314
`./.temp/.env/Scripts/activate`
@@ -344,7 +344,7 @@ Use the following steps to perform a manual upgrade for Arc appliance virtual ma
344344
1. Power off the VM.
345345
1. Delete the VM.
346346
1. Delete the download template corresponding to the VM.
347-
1. Delete the resource bridge ARM resource.
347+
1. Delete the resource bridge Azure Resource Manager resource.
348348
1. Get the previous script `Config_avs` file and add the following configuration item:
349349
1. `"register":false`
350350
1. Download the latest version of the Azure VMware Solution onboarding script.
@@ -361,7 +361,7 @@ Use the following steps to uninstall extensions from the portal.
361361
>[!NOTE]
362362
>**Steps 2-5** must be performed for all the VMs that have VM extensions installed.
363363

364-
1. Log into your Azure VMware Solution private cloud.
364+
1. Log in to your Azure VMware Solution private cloud.
365365
1. Select **Virtual machines** in **Private cloud**, found in the left navigation under “Arc-enabled VMware resources”.
366366
1. Search and select the virtual machine where you have **Guest management** enabled.
367367
1. Select **Extensions**.
@@ -401,9 +401,9 @@ For the final step, you'll need to delete the resource bridge VM and the VM temp
401401

402402
## Preview FAQ
403403

404-
**Is Arc supported in all the Azure VMware Solution regions?**
404+
**Region support for Azure VMware Solution**
405405

406-
Arc is supported in EastUS, WestEU, UK South, Australia East, Canada Central and Southeast Asia regions however we are working to extend the regional support.
406+
Arc for Azure VMware Solution is supported in all regions where Arc for VMware vSphere on-premises is supported. For more details, see [Azure Arc-enabled VMware vSphere](https://learn.microsoft.com/azure/azure-arc/vmware-vsphere/overview).
407407

408408
**How does support work?**
409409

@@ -419,7 +419,7 @@ Yes
419419

420420
**Is DHCP support available?**
421421

422-
DHCP support is not available to customers at this time, we only support static IP.
422+
DHCP support isn't available to customers at this time, we only support static IP.
423423

424424
>[!NOTE]
425425
> This is Azure VMware Solution 2.0 only. It's not available for Azure VMware Solution by Cloudsimple.

articles/batch/batch-customer-managed-key.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ resourceGroupName='myResourceGroup'
4242
accountName='mybatchaccount'
4343
4444
az batch account create \
45-
-n $accountName \
46-
-g $resourceGroupName \
45+
--name $accountName \
46+
--resource-group $resourceGroupName \
4747
--locations regionName='West US 2' \
4848
--identity 'SystemAssigned'
4949
```
@@ -52,8 +52,8 @@ After the account is created, you can verify that system-assigned managed identi
5252

5353
```azurecli
5454
az batch account show \
55-
-n $accountName \
56-
-g $resourceGroupName \
55+
--name $accountName \
56+
--resource-group $resourceGroupName \
5757
--query identity
5858
```
5959

@@ -109,14 +109,14 @@ In the [Azure portal](https://portal.azure.com/), go to the Batch account page.
109109

110110
### Azure CLI
111111

112-
After the Batch account is created with system-assigned managed identity and the access to Key Vault is granted, update the Batch account with the `{Key Identifier}` URL under `keyVaultProperties` parameter. Also set **encryption_key_source** as `Microsoft.KeyVault`.
112+
After the Batch account is created with system-assigned managed identity and the access to Key Vault is granted, update the Batch account with the `{Key Identifier}` URL under `keyVaultProperties` parameter. Also set `--encryption-key-source` as `Microsoft.KeyVault`.
113113

114114
```azurecli
115115
az batch account set \
116-
-n $accountName \
117-
-g $resourceGroupName \
118-
--encryption_key_source Microsoft.KeyVault \
119-
--encryption_key_identifier {YourKeyIdentifier}
116+
--name $accountName \
117+
--resource-group $resourceGroupName \
118+
--encryption-key-source Microsoft.KeyVault \
119+
--encryption-key-identifier {YourKeyIdentifier}
120120
```
121121

122122
## Create a Batch account with user-assigned managed identity and customer-managed keys
@@ -159,9 +159,9 @@ You can also use Azure CLI to update the version.
159159

160160
```azurecli
161161
az batch account set \
162-
-n $accountName \
163-
-g $resourceGroupName \
164-
--encryption_key_identifier {YourKeyIdentifierWithNewVersion}
162+
--name $accountName \
163+
--resource-group $resourceGroupName \
164+
--encryption-key-identifier {YourKeyIdentifierWithNewVersion}
165165
```
166166

167167
## Use a different key for Batch encryption
@@ -176,9 +176,9 @@ You can also use Azure CLI to use a different key.
176176

177177
```azurecli
178178
az batch account set \
179-
-n $accountName \
180-
-g $resourceGroupName \
181-
--encryption_key_identifier {YourNewKeyIdentifier}
179+
--name $accountName \
180+
--resource-group $resourceGroupName \
181+
--encryption-key-identifier {YourNewKeyIdentifier}
182182
```
183183

184184
## Frequently asked questions

articles/batch/jobs-and-tasks.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ A job specifies the [pool](nodes-and-pools.md#pools) in which the work is to be
1919

2020
You can assign an optional job priority to jobs that you create. The Batch service uses the priority value of the job to determine the order of scheduling (for all tasks within the job) wtihin each pool.
2121

22-
To update the priority of a job, call the [Update the properties of a job](/rest/api/batchservice/job/update) operation (Batch REST), or modify the [CloudJob.Priority](/dotnet/api/microsoft.azure.batch.cloudjob.priority) (Batch .NET). Priority values range from -1000 (lowest priority) to 1000 (highest priority).
22+
To update the priority of a job, call the [Update the properties of a job](/rest/api/batchservice/job/update) operation (Batch REST), or modify the [CloudJob.Priority](/dotnet/api/microsoft.azure.batch.cloudjob.priority) (Batch .NET). Priority values range from -1000 (lowest priority) to +1000 (highest priority).
2323

2424
Within the same pool, higher-priority jobs have scheduling precedence over lower-priority jobs. Tasks in lower-priority jobs that are already running won't be preempted by tasks in a higher-priority job. Jobs with the same priority level have an equal chance of being scheduled, and ordering of task execution is not defined.
2525

articles/cognitive-services/openai/reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,5 +175,5 @@ curl https://YOUR_RESOURCE_NAME.openai.azure.com/openai/deployments/YOUR_DEPLOYM
175175

176176
## Next steps
177177

178-
Learn about [managing deployments, models, and finetuning with the REST API](/rest/api/cognitiveservices/azureopenai/deployments/create).
178+
Learn about [managing deployments, models, and finetuning with the REST API](/rest/api/cognitiveservices/azureopenaistable/deployments/create).
179179
Learn more about the [underlying models that power Azure OpenAI](./concepts/models.md).

0 commit comments

Comments
 (0)