Skip to content

Commit 6d33fed

Browse files
authored
Merge pull request #7941 from MicrosoftDocs/main
merge main to live, Wednesday 10:30
2 parents 2694575 + 7863e17 commit 6d33fed

5 files changed

Lines changed: 12 additions & 9 deletions

File tree

memdocs/intune/fundamentals/role-based-access-control.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,12 @@ To see a role assignment, choose **Intune** > **Tenant administration** > **Role
9595

9696
- **Basics**: The assignments name and description.
9797
- **Members**: All users in the listed Azure security groups have permission to manage the users/devices that are listed in Scope (Groups).
98-
- **Scope (Groups)**: All users/devices in these Azure security groups can be managed by the users in Members.
98+
- **Scope (Groups)**: Scope Groups are Azure AD security groups of users or devices or both for which administrators in that role assignment are limited to performing operations on. For example deployment of a policy or application to a user or remotely locking a device. All users and devices in these Azure AD security groups can be managed by the users in Members.
9999
- **[Scope (Tags)](scope-tags.md)**: Users in Members can see the resources that have the same scope tags.
100100

101+
> [!NOTE]
102+
> Scope Tags are freeform text values that an administrator defines and then adds to a Role Assignment. The scope tag added on a role controls visibility of the role itself, while the scope tag added in role assignment limits the visibility of Intune objects (such as policies and apps) or devices to only administrators in that role assignment because the role assignment contains one or more matching scope tags.
103+
101104
### Multiple role assignments
102105
If a user has multiple role assignments, permissions, and scope tags, those role assignments extend to different objects as follows:
103106

memdocs/intune/protect/certificate-connector-prerequisites.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ Requirements for the computer where you install the connector software:
5656

5757
Requirements for PKCS certificate templates:
5858

59-
- Certificate templates you’ll use for PKCS requests must be configured with permissions that allow the certificate connector service account to auto enroll the certificate.
59+
- Certificate templates you’ll use for PKCS requests must be configured with permissions that allow the certificate connector service account to enroll the certificate.
6060
- The certificate templates must be added to the Certification Authority (CA).
6161

6262
> [!NOTE]

memdocs/intune/protect/windows-update-compatibility-reports.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ keywords:
77
author: brenduns
88
ms.author: brenduns
99
manager: dougeby
10-
ms.date: 06/07/2022
10+
ms.date: 07/05/2022
1111
ms.topic: how-to
1212
ms.service: microsoft-intune
1313
ms.subservice: protect
@@ -91,8 +91,8 @@ To use this report:
9191
1. Sign in to the [Microsoft Endpoint Manager admin center](https://go.microsoft.com/fwlink/?linkid=2109431).
9292
2. In the admin center, go to **Reports** > **Windows updates** > select the **Reports** tab > select **Windows Feature Update Device Readiness Report (Preview)**.
9393
3. Configure settings:
94-
- Click on **Select target OS** and choose the version of Windows you plan to deploy.
95-
- Click on **Select scope tag** and choose which devices should be in scope for this report.
94+
- Click on **Select Target OS** and choose the version of Windows you plan to deploy.
95+
- Click on **Select Scope (Tags)** and choose which devices should be in scope for this report.
9696
- Optionally select **Ownership** and **Readiness status** to refine the report.
9797
- Click **Generate report**. This process can take several minutes. You'll be notified when report generation is complete.
9898

@@ -141,7 +141,7 @@ To use this report:
141141
2. In the admin center, go to **Reports** > **Windows updates** > select the **Reports** tab > select **Windows Feature Update Compatibility Risks Report (Preview)**.
142142
3. Configure settings:
143143

144-
- Click on **Select target OS** and choose the version of Windows you plan to deploy.
144+
- Click on **Select Target OS** and choose the version of Windows you plan to deploy.
145145
- Optionally select **Asset type** and **Risk status** to refine the report.
146146
- Click **Generate report**. This process can take several minutes. You'll be notified when report generation is complete.
147147

@@ -257,4 +257,4 @@ When report data is exported to a .csv file, the exported data doesn't use the f
257257
## Next step
258258

259259
- Configure [Update rings for Windows 10 and later](../protect/windows-10-update-rings.md)
260-
- Configure [Feature updates for Windows 10 and later](../protect/windows-10-feature-updates.md)
260+
- Configure [Feature updates for Windows 10 and later](../protect/windows-10-feature-updates.md)

windows-365/enterprise/cloud-pc-size-recommendations.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This table shows examples of the different sizes available for a Cloud PC:
4444
| 2vCPU/4GB/256GB<br>2vCPU/4GB/128GB<br>2vCPU/4GB/64GB | Mergers and acquisition, short-term and seasonal, customer services | Windows 10/11 Enterprise with Microsoft 365 and Teams | Microsoft 365 Apps, Microsoft Teams (Audio only), OneDrive, Adobe Reader, Edge, line-of-business apps, Defender support. |
4545
| 2vCPU/8GB/256GB<br>2vCPU/8GB/128GB | Bring-your-own-PC, work from home, market researchers, government, consultants. | Windows 10/11 Enterprise with Microsoft 365 and Teams | Microsoft 365 Apps, Microsoft Teams, Outlook, Excel, Access, PowerPoint, OneDrive, Adobe Reader, Edge, line-of-business apps, Defender support. |
4646
| 4vCPU/16GB/512GB<br>4vCPU/16GB/256GB<br>4vCPU/16GB/128GB | Finance, government, consultants, healthcare services, bring-your-own-PC, work from home. | Windows 10/11 Enterprise with Microsoft 365 and Teams | Microsoft 365 Apps, Microsoft Teams, Outlook, Excel, Access, PowerPoint, Power BI, Dynamics 365, OneDrive, Adobe Reader, Edge, line-of-business app, Defender support. |
47-
| 8vCPU/32GB/512GB<br>8vCPU/32GB/256GB<br>8vCPU/32GB/128GB | Software developers, engineers, content creators, design and engineering workstations. | Windows 10/11 Enterprise with Microsoft 365 and Teams | Microsoft 365 Apps, Microsoft Teams, Outlook, Access, OneDrive, Adobe Reader, Edge, Power BI, Visual Studio Code, line-of-business apps, Developer apps: WSL, Hyper-V, and Defender support. |
47+
| 8vCPU/32GB/512GB<br>8vCPU/32GB/256GB<br>8vCPU/32GB/128GB | Software developers, engineers, content creators, design and engineering workstations. | Windows 10/11 Enterprise with Microsoft 365 and Teams | Microsoft 365 Apps, Microsoft Teams, Outlook, Access, OneDrive, Adobe Reader, Edge, Power BI, Visual Studio Code, virtualization-based workloads: Hyper-V, Windows Subsystem for Linux (WSL), line-of-business apps, and Defender support. |
4848

4949
\* The 1vCPU option is being retired. Instead, we recommend the 2vCPU as the minimum configuration for new purchases.
5050

windows-365/enterprise/whats-new.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ Learn what new features are available in Windows 365 Enterprise.
5454
<!-- vvvvvvvvvvvvvvvvvvvvvv -->
5555
### Apps
5656

57-
#### Support for nested virtualization now general available<!--39989666 -->
57+
#### Support for nested virtualization now generally available<!--39989666 -->
5858
Support for nested virtualization has moved out of preview and into general availability. For more information, see [Set up nested virtualization on your Cloud PC](nested-virtualization.md).
5959

6060
<!--***********************************************-->

0 commit comments

Comments
 (0)