Skip to content

Commit 7fb8e98

Browse files
authored
Merge pull request #213084 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 85de237 + 781906b commit 7fb8e98

11 files changed

+19
-11
lines changed

articles/active-directory/authentication/concept-sspr-policy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ The two-gate policy requires two pieces of authentication data, such as an email
8787
* Power BI service administrator
8888
* Privileged Authentication administrator
8989
* Privileged role administrator
90-
* SharePoint administrator
9190
* Security administrator
9291
* Service support administrator
92+
* SharePoint administrator
9393
* Skype for Business administrator
9494
* User administrator
9595

articles/active-directory/authentication/howto-password-smart-lockout.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Smart lockout tracks the last three bad password hashes to avoid incrementing th
2828
> [!NOTE]
2929
> Hash tracking functionality isn't available for customers with pass-through authentication enabled as authentication happens on-premises not in the cloud.
3030
31-
Federated deployments that use AD FS 2016 and AF FS 2019 can enable similar benefits using [AD FS Extranet Lockout and Extranet Smart Lockout](/windows-server/identity/ad-fs/operations/configure-ad-fs-extranet-smart-lockout-protection).
31+
Federated deployments that use AD FS 2016 and AD FS 2019 can enable similar benefits using [AD FS Extranet Lockout and Extranet Smart Lockout](/windows-server/identity/ad-fs/operations/configure-ad-fs-extranet-smart-lockout-protection).
3232

3333
Smart lockout is always on, for all Azure AD customers, with these default settings that offer the right mix of security and usability. Customization of the smart lockout settings, with values specific to your organization, requires Azure AD Premium P1 or higher licenses for your users.
3434

articles/active-directory/authentication/tutorial-enable-sspr-writeback.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,12 @@ To set up the appropriate permissions for password writeback to occur, complete
8383

8484
[ ![Set the appropriate permissions in Active Users and Computers for the account that is used by Azure AD Connect](media/tutorial-enable-sspr-writeback/set-ad-ds-permissions-cropped.png) ](media/tutorial-enable-sspr-writeback/set-ad-ds-permissions.png#lightbox)
8585

86+
1. When ready, select **Apply / OK** to apply the changes.
87+
1. From the **Permissions** tab, select **Add**.
88+
1. For **Principal**, select the account that permissions should be applied to (the account used by Azure AD Connect).
89+
1. In the **Applies to** drop-down list, select **This object and all descendant objects**
90+
1. Under *Permissions*, select the box for the following option:
91+
* **Unexpire Password**
8692
1. When ready, select **Apply / OK** to apply the changes and exit any open dialog boxes.
8793

8894
When you update permissions, it might take up to an hour or more for these permissions to replicate to all the objects in your directory.

articles/active-directory/authentication/tutorial-enable-sspr.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ To finish this tutorial, you need the following resources and privileges:
4040
* A working Azure AD tenant with at least an Azure AD free or trial license enabled. In the Free tier, SSPR only works for cloud users in Azure AD. Password change is supported in the Free tier, but password reset is not.
4141
* For later tutorials in this series, you'll need an Azure AD Premium P1 or trial license for on-premises password writeback.
4242
* If needed, [create an Azure account for free](https://azure.microsoft.com/free/?WT.mc_id=A261C142F).
43-
* An account with *Global Administrator* privileges.
43+
* An account with *Global Administrator* or *Authentication Policy Administrator* privileges.
4444
* A non-administrator user with a password you know, like *testuser*. You'll test the end-user SSPR experience using this account in this tutorial.
4545
* If you need to create a user, see [Quickstart: Add new users to Azure Active Directory](../fundamentals/add-users-azure-active-directory.md).
4646
* A group that the non-administrator user is a member of, likes *SSPR-Test-Group*. You'll enable SSPR for this group in this tutorial.
@@ -55,7 +55,7 @@ Azure AD lets you enable SSPR for *None*, *Selected*, or *All* users. This granu
5555
5656
In this tutorial, set up SSPR for a set of users in a test group. Use the *SSPR-Test-Group* and provide your own Azure AD group as needed:
5757

58-
1. Sign in to the [Azure portal](https://portal.azure.com) using an account with *global administrator* permissions.
58+
1. Sign in to the [Azure portal](https://portal.azure.com) using an account with *global administrator* or *authentication policy administrator* permissions.
5959
1. Search for and select **Azure Active Directory**, then select **Password reset** from the menu on the left side.
6060
1. From the **Properties** page, under the option *Self service password reset enabled*, choose **Selected**.
6161
1. If your group isn't visible, choose **No groups selected**, browse for and select your Azure AD group, like *SSPR-Test-Group*, and then choose *Select*.

articles/iot-edge/how-to-retrieve-iot-edge-logs.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ The [Logger class in IoT Edge](https://github.com/Azure/iotedge/blob/master/edge
4949
Use the **GetModuleLogs** direct method to retrieve the logs of an IoT Edge module.
5050

5151
>[!TIP]
52+
>Use the `since` and `until` filter options to limit the range of logs retrieved. Calling this direct method without bounds retrieves all the logs which may be large, time consuming, or costly.
53+
>
5254
>The IoT Edge troubleshooting page in the Azure portal provides a simplified experience for viewing module logs. For more information, see [Monitor and troubleshoot IoT Edge devices from the Azure portal](troubleshoot-in-portal.md).
5355
5456
This method accepts a JSON payload with the following schema:
@@ -155,6 +157,8 @@ Use the **UploadModuleLogs** direct method to send the requested logs to a speci
155157
::: moniker range=">=iotedge-2020-11"
156158

157159
> [!NOTE]
160+
> Use the `since` and `until` filter options to limit the range of logs retrieved. Calling this direct method without bounds retrieves all the logs which may be large, time consuming, or costly.
161+
>
158162
> If you wish to upload logs from a device behind a gateway device, you will need to have the [API proxy and blob storage modules](how-to-configure-api-proxy-module.md) configured on the top layer device. These modules route the logs from your lower layer device through your gateway device to your storage in the cloud.
159163
160164
::: moniker-end

articles/machine-learning/how-to-auto-train-image-models.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ image_object_detection_job = automl.image_object_detection(
547547
training_data=my_training_data_input,
548548
validation_data=my_validation_data_input,
549549
target_column_name="label",
550-
primary_metric="mean_average_precision",
550+
primary_metric=ObjectDetectionPrimaryMetrics.MEAN_AVERAGE_PRECISION,
551551
tags={"my_custom_tag": "My custom value"},
552552
)
553553

articles/spring-apps/how-to-deploy-in-azure-virtual-network.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ Select the virtual network **azure-spring-apps-vnet** you previously created.
149149

150150
![Screenshot that shows the Access control screen.](./media/spring-cloud-v-net-injection/access-control.png)
151151

152-
1. Assign the *Owner* role to the **Azure Spring Apps Resource Provider**. For detailed steps, see [Assign Azure roles using the Azure portal](../role-based-access-control/role-assignments-portal.md#step-2-open-the-add-role-assignment-page).
152+
1. Assign the *Owner* role to the **Azure Spring Cloud Resource Provider**. For detailed steps, see [Assign Azure roles using the Azure portal](../role-based-access-control/role-assignments-portal.md#step-2-open-the-add-role-assignment-page).
153153

154154
![Screenshot that shows owner assignment to resource provider.](./media/spring-cloud-v-net-injection/assign-owner-resource-provider.png)
155155

articles/storage/blobs/storage-blob-scalable-app-upload-files.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ ms.devlang: csharp
1212

1313
# Upload large amounts of random data in parallel to Azure storage
1414

15-
This tutorial is part two of a series. This tutorial shows you deploy an application that uploads large amount of random data to an Azure storage account.
15+
This tutorial is part two of a series. This tutorial shows you how to deploy an application that uploads large amount of random data to an Azure storage account.
1616

1717
In part two of the series, you learn how to:
1818

articles/virtual-machine-scale-sets/virtual-machine-scale-sets-health-extension.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ ms.custom: mimckitt, devx-track-azurepowershell
1313
---
1414
# Using Application Health extension with virtual machine scale sets
1515

16-
Monitoring your application health is an important signal for managing and upgrading your deployment. Azure virtual machine scale sets provide support for [rolling upgrades](virtual-machine-scale-sets-upgrade-scale-set.md#how-to-bring-vms-up-to-date-with-the-latest-scale-set-model) including [automatic OS-image upgrades](virtual-machine-scale-sets-automatic-upgrade.md), which rely on health monitoring of the individual instances to upgrade your deployment. You can also use health extension to monitor the application health of each instance in your scale set and perform instance repairs using [automatic instance repairs](virtual-machine-scale-sets-automatic-instance-repairs.md).
16+
Monitoring your application health is an important signal for managing and upgrading your deployment. Azure Virtual Machine Scale Sets provide support for [Rolling Upgrades](virtual-machine-scale-sets-upgrade-scale-set.md#how-to-bring-vms-up-to-date-with-the-latest-scale-set-model) including [Automatic OS-Image Upgrades](virtual-machine-scale-sets-automatic-upgrade.md) and [Automatic VM Guest Patching](https://learn.microsoft.com/azure/virtual-machines/automatic-vm-guest-patching), which rely on health monitoring of the individual instances to upgrade your deployment. You can also use Application Health Extension to monitor the application health of each instance in your scale set and perform instance repairs using [Automatic Instance Repairs](virtual-machine-scale-sets-automatic-instance-repairs.md).
1717

1818
This article describes how you can use the Application Health extension to monitor the health of your applications deployed on virtual machine scale sets.
1919

articles/virtual-machines/windows/image-builder-virtual-desktop.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ New-AzResourceGroup -Name $imageResourceGroup -Location $location
129129
'Az.ImageBuilder', 'Az.ManagedServiceIdentity' | ForEach-Object {Install-Module -Name $_ -AllowPrerelease}
130130

131131
# Create the identity
132-
New-AzUserAssignedIdentity -ResourceGroupName $imageResourceGroup -Name $identityName
132+
New-AzUserAssignedIdentity -ResourceGroupName $imageResourceGroup -Name $identityName -Location $location
133133

134134
$identityNameResourceId=$(Get-AzUserAssignedIdentity -ResourceGroupName $imageResourceGroup -Name $identityName).Id
135135
$identityNamePrincipalId=$(Get-AzUserAssignedIdentity -ResourceGroupName $imageResourceGroup -Name $identityName).PrincipalId

0 commit comments

Comments
 (0)