Skip to content

Commit 7e2a156

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/memdocs-pr into prod-score-rn
2 parents d2500ca + fc7b07a commit 7e2a156

13 files changed

Lines changed: 97 additions & 7 deletions

File tree

memdocs/configmgr/core/clients/manage/collections/collection-evaluation.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ ms.date: 06/05/2020
66
ms.prod: configuration-manager
77
ms.technology: configmgr-client
88
ms.topic: conceptual
9-
author: aczechowski
10-
ms.author: aaroncz
11-
manager: dougeby
9+
author: gowdhamankarthikeyan
10+
ms.author: gokarthi
11+
manager: apoorvseth
1212
ms.localizationpriority: medium
1313
---
1414

@@ -30,12 +30,13 @@ At a high level, each individual collection evaluation and update follows these
3030

3131
1. Execute the collection query.
3232
1. Add any systems that are direct members.
33+
1. Add members specified in the *Include* collections.
3334
1. Perform a logical `AND` between the returned results and the limiting collection.
34-
1. Evaluate the *exclude* collections.
35+
1. Remove members specified in the *exclude* collections.
3536

3637
If the exclude collections also have query rules, or have include or exclude collections, evaluate them also. If these collections themselves are limiting collections, evaluate any collections below them. After fully evaluating the tree, return the results to the calling collection.
3738

38-
1. Compare the result set from evaluating the direct members and include collections with the results of evaluating the exclude collections.
39+
1. Compare the result set from evaluating the direct members and include collections with the results of the exclude collections.
3940
1. Write the changes to the database and perform updates.
4041
1. Trigger any dependent collections to update as well. Dependent collections are collections that the current collection limits, or that refer to the current collection using include or exclude rules.
4142

-90.6 KB
Loading

memdocs/intune/remote-actions/devices-wipe.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The **Retain enrollment state and user account** option is only available for Wi
5050

5151
MDM policies will be reapplied the next time the device connects to Intune.
5252

53-
A wipe is useful for resetting a device before you give the device to a new user, or when the device has been lost or stolen. Be careful about selecting **Wipe**. Data on the device cannot be recovered. This level of device wipe follows a standard file delete process, rather than a low-level delete.
53+
A wipe is useful for resetting a device before you give the device to a new user, or when the device has been lost or stolen. Be careful about selecting **Wipe**. Data on the device cannot be recovered. The method that "Wipe" uses to remove data is simple file deletion, and the drive is BitLocker decrypted as part of this process.
5454

5555
### Wiping a device
5656

windows-365/enterprise/TOC.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@ items:
119119
href: manage-rdp-device-redirections.md
120120
- name: Enable screen capture protection
121121
href: /azure/virtual-desktop/screen-capture-protection?context=/windows-365/context/pr-context
122+
- name: Restrict Office 365 access to Cloud PCs
123+
href: restrict-office-365-cloud-pcs.md
122124
- name: Apps
123125
items:
124126
- name: App overview
60.8 KB
Loading
92.4 KB
Loading
97.2 KB
Loading
38.3 KB
Loading
86.7 KB
Loading
106 KB
Loading

0 commit comments

Comments
 (0)