Skip to content

Commit 52dc44f

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-support-case
2 parents 5fa6955 + f96a218 commit 52dc44f

File tree

166 files changed

+1478
-1129
lines changed

Some content is hidden

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

166 files changed

+1478
-1129
lines changed

articles/active-directory/conditional-access/concept-conditional-access-grant.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ services: active-directory
66
ms.service: active-directory
77
ms.subservice: conditional-access
88
ms.topic: conceptual
9-
ms.date: 01/27/2022
9+
ms.date: 06/27/2022
1010

1111
ms.author: joflore
1212
author: MicrosoftGuyJFlo
@@ -99,7 +99,7 @@ The following client apps have been confirmed to support this setting:
9999
- Microsoft Invoicing
100100
- Microsoft Kaizala
101101
- Microsoft Launcher
102-
- Microsoft Lists (iOS)
102+
- Microsoft Lists
103103
- Microsoft Office
104104
- Microsoft OneDrive
105105
- Microsoft OneNote

articles/active-directory/managed-identities-azure-resources/qs-configure-powershell-windows-vm.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ title: Configure managed identities on an Azure VM using PowerShell - Azure AD
33
description: Step-by-step instructions for configuring managed identities for Azure resources on an Azure VM using PowerShell.
44
services: active-directory
55
author: barclayn
6-
manager: karenhoran
6+
manager: rkarlin
77
ms.service: active-directory
88
ms.subservice: msi
99
ms.topic: quickstart
1010
ms.tgt_pltfrm: na
1111
ms.workload: identity
12-
ms.date: 01/11/2022
12+
ms.date: 06/24/2022
1313
ms.author: barclayn
1414
ms.collection: M365-identity-device-management
1515
ms.custom: devx-track-azurepowershell, mode-api
@@ -35,7 +35,7 @@ In this article, using PowerShell, you learn how to perform the following manage
3535

3636
## System-assigned managed identity
3737

38-
In this section, you will learn how to enable and disable the system-assigned managed identity using Azure PowerShell.
38+
In this section, you'll learn how to enable and disable the system-assigned managed identity using Azure PowerShell.
3939

4040
### Enable system-assigned managed identity during creation of an Azure VM
4141

@@ -129,7 +129,7 @@ To assign a user-assigned identity to a VM, your account needs the [Virtual Mach
129129
130130
To assign a user-assigned identity to a VM, your account needs the [Virtual Machine Contributor](../../role-based-access-control/built-in-roles.md#virtual-machine-contributor) and [Managed Identity Operator](../../role-based-access-control/built-in-roles.md#managed-identity-operator) role assignments. No other Azure AD directory role assignments are required.
131131
132-
1. Create a user-assigned managed identity using the [New-AzUserAssignedIdentity](/powershell/module/az.managedserviceidentity/new-azuserassignedidentity) cmdlet. Note the `Id` in the output because you will need this in the next step.
132+
1. Create a user-assigned managed identity using the [New-AzUserAssignedIdentity](/powershell/module/az.managedserviceidentity/new-azuserassignedidentity) cmdlet. Note the `Id` in the output because you'll need this information in the next step.
133133
134134
> [!IMPORTANT]
135135
> Creating user-assigned managed identities only supports alphanumeric, underscore and hyphen (0-9 or a-z or A-Z, \_ or -) characters. Additionally, name should be limited from 3 to 128 character length for the assignment to VM/VMSS to work properly. For more information, see [FAQs and known issues](known-issues.md)
@@ -157,7 +157,7 @@ If your VM has multiple user-assigned managed identities, you can remove all but
157157
$vm = Get-AzVm -ResourceGroupName myResourceGroup -Name myVm
158158
Update-AzVm -ResourceGroupName myResourceGroup -VirtualMachine $vm -IdentityType UserAssigned -IdentityID <USER ASSIGNED IDENTITY NAME>
159159
```
160-
If your VM does not have a system-assigned managed identity and you want to remove all user-assigned managed identities from it, use the following command:
160+
If your VM doesn't have a system-assigned managed identity and you want to remove all user-assigned managed identities from it, use the following command:
161161

162162
```azurepowershell-interactive
163163
$vm = Get-AzVm -ResourceGroupName myResourceGroup -Name myVm

articles/active-directory/saas-apps/alexishr-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
130130

131131
1. In the **New identity provider** section, perform the following steps:
132132

133-
![Screenshot shows the Account Settings.](./media/alexishr-tutorial/account.png " Settings")
133+
![Screenshot shows the Account Settings.](./media/alexishr-tutorial/account.png "Settings")
134134

135135
1. In the **Identity provider SSO URL** textbox, paste the **Login URL** value which you have copied from the Azure portal.
136136

articles/active-directory/saas-apps/amazon-managed-grafana-tutorial.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
147147

148148
1. In the **Review and create** page, verify all the workspace details and click **Create workspace**.
149149

150-
![Screenshot shows review and create page.](./media/amazon-managed-grafana-tutorial/review-workspace.png " Create Workspace")
150+
![Screenshot shows review and create page.](./media/amazon-managed-grafana-tutorial/review-workspace.png "Create Workspace")
151151

152152
1. After creating workspace, click **Complete setup** to complete the SAML configuration.
153153

articles/active-directory/saas-apps/hiretual-tutorial.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Follow these steps to enable Azure AD SSO in the Azure portal.
8585

8686
1. Click the **Properties** tab on the left menu bar, copy the value of **User access URL**,and save it on your computer.
8787

88-
![Screenshot shows the User access URL.](./media/hiretual-tutorial/access-url.png " SSO Configuration")
88+
![Screenshot shows the User access URL.](./media/hiretual-tutorial/access-url.png "SSO Configuration")
8989

9090
1. On the **Set up single sign-on with SAML** page, In the **SAML Signing Certificate** section, click copy button to copy **App Federation Metadata Url** and save it on your computer.
9191

@@ -123,7 +123,7 @@ In this section, you'll enable B.Simon to use Azure single sign-on by granting a
123123

124124
1. In the **SAML2.0 Authentication** page, perform the following steps:
125125

126-
![Screenshot shows the SSO Configuration.](./media/hiretual-tutorial/configuration.png " SSO Configuration")
126+
![Screenshot shows the SSO Configuration.](./media/hiretual-tutorial/configuration.png "SSO Configuration")
127127

128128
1. In the **SAML2.O SSO URL** textbox, paste the **User access URL** which you have copied from the Azure portal.
129129

0 commit comments

Comments
 (0)