Skip to content

Commit f258b57

Browse files
authored
Merge pull request #225123 from MicrosoftDocs/repo_sync_working_branch
Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)
2 parents bd983e0 + 767d4cf commit f258b57

File tree

9 files changed

+35
-29
lines changed

9 files changed

+35
-29
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/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/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).

articles/service-fabric/service-fabric-linux-windows-differences.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@ There are some features that are supported on Windows, but not yet on Linux. Eve
2020
* DNS service for Service Fabric services (DNS service is supported for containers on Linux)
2121
* CLI command equivalents of certain PowerShell commands (list below, most of which apply only to standalone clusters)
2222
* [Differences in log implementation that may affect scalability](service-fabric-concepts-scalability.md#choosing-a-platform)
23+
* [Difference in Service Fabric Events Channel](service-fabric-diagnostics-overview.md#platform-cluster-monitoring)
24+
2325

2426
## PowerShell cmdlets that do not work against a Linux Service Fabric cluster
2527

articles/storage/blobs/storage-quickstart-blobs-cli.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@ Only Blob storage data operations support the `--auth-mode` parameter. Managemen
3535
To begin, sign-in to to your Azure account with the [az login](/cli/azure/reference-index#az-login).
3636

3737
```azurecli
38-
az login \
39-
--name <resource-group> \
40-
--location <location>
38+
az login
4139
```
4240

4341
## Create a resource group

0 commit comments

Comments
 (0)