Merge branch 'FeatureConfig-chrisda' into patch-7

Author: chrisda

exchange/exchange-ps/exchange/Get-FeatureConfiguration.md

@@ -20,9 +20,11 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Get-FeatureConfiguration [-FeatureScenario] <Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario>
- [[-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>]
+Get-FeatureConfiguration [[-Identity] <PolicyIdParameter>] [-FeatureScenario] <PolicyScenario>
+ [-All]
  [-Confirm]
+ [-GeneralDiscovery]
+ [-IrmDiscovery]
  [-WhatIf]
  [<CommonParameters>]
 ```
@@ -56,7 +58,7 @@ The Identity policy specifies the Discovery policy that you want to view. You ca
 - GUID
 
 ```yaml
-Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter
+Type: PolicyIdParameter
 Parameter Sets: (All)
 Aliases:
 Applicable: Security & Compliance
@@ -72,7 +74,7 @@ Accept wildcard characters: False
 The FeatureScenario parameter specifies the scenario for the Discovery policy. Currently, the only valid value is KnowYourData.
 
 ```yaml
-Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario
+Type: PolicyScenario
 Parameter Sets: (All)
 Aliases:
 Applicable: Security & Compliance
@@ -84,6 +86,22 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -All
+{{ Fill All Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Confirm
 This parameter is reserved for internal Microsoft use.
 
@@ -100,6 +118,38 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -GeneralDiscovery
+{{ Fill GeneralDiscovery Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -IrmDiscovery
+{{ Fill IrmDiscovery Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhatIf
 This parameter is reserved for internal Microsoft use.
 

exchange/exchange-ps/exchange/New-FeatureConfiguration.md

@@ -9,20 +9,24 @@ schema: 2.0.0
 # New-FeatureConfiguration
 
 ## SYNOPSIS
-**Note**: Currently, this cmdlet is available only in Private Preview.
+**Note**: This cmdlet is available in Public Preview.
 
 This cmdlet is available only in Security & Compliance PowerShell. For more information, see [Security & Compliance PowerShell](https://learn.microsoft.com/powershell/exchange/scc-powershell).
 
-Use the New-FeatureConfiguration cmdlet to create Discovery policies.
+Use the New-FeatureConfiguration cmdlet to create Microsoft Purview feature configurations within your organization, including:
+- Collection policies
+- Endpoint DLP trust container
 
 For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
 
 ## SYNTAX
 
 ```
-New-FeatureConfiguration [-Name] <String> -Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode> -FeatureScenario <Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario> -ScenarioConfig <String>
+New-FeatureConfiguration [-Name] <String> -Mode <PolicyMode> -FeatureScenario <PolicyScenario> -ScenarioConfig <String>
  [-Comment <String>]
  [-Confirm]
+ [-GeneralDiscovery]
+ [-IrmDiscovery]
  [-Locations <String>]
  [-WhatIf]
  [<CommonParameters>]
@@ -35,15 +39,39 @@ To use this cmdlet in Security & Compliance PowerShell, you need to be assigned
 
 ### Example 1
 ```powershell
-New-FeatureConfiguration -Name "Discovery policy for Contoso executives" -FeatureScenario KnowYourData -Mode Enable -ScenarioConfig '{"Activities": ["UploadText", "UploadFile"], "EnforcementPlanes": ["Browser"], "SensitiveTypeIds": ["a44669fe-0d48-453d-a9b1-2cc83f2cba77","50842eb7-edc8-4019-85dd-5a5c1f2bb085"]}' –Locations '[{"Workload": "Applications","Location": "51622","Inclusions": [{"Type": "Group","Identity": "[email protected]"}]},{"Workload": "Applications","Location": "51399","Inclusions": [{"Type": "Group","Identity": "[email protected]"}]},{"Workload": "Applications","Location": "51279","Inclusions": [{"Type": "Group","Identity": "[email protected]"}]}]'
+New-FeatureConfiguration -Name "Collection policy for supported Copilots" -FeatureScenario KnowYourData -Mode Enable -ScenarioConfig '{"Activities":["UploadText","DownloadText"],"EnforcementPlanes":["CopilotExperiences","Browser"],"SensitiveTypeIds":["All"],"IsIngestionEnabled":true}' –Locations '[{"Workload":"Applications","Location":"52655","LocationSource":"SaaS","LocationType":"Individual","Inclusions":[{"Type":"Tenant","Identity":"All","DisplayName":"All","Name":"All"}]},{"Workload":"Applications","Location":"49baeafd-1a6b-4c58-be55-75ae6d1dff6a","LocationSource":"PurviewConfig","LocationType":"Group","Inclusions":[{"Type":"Tenant","Identity":"All","DisplayName":"All","Name":"All"}]}]'
 ```
 
-This example displays a discovery policy that includes the group "Executives" and targets a specific set of sensitive information types.
+This example creates an enabled collection policy named "Collection policy for supported Copilots" that:
+- Includes UploadText & DownloadText activity for all supported classifiers
+- Captures all AI prompts
+- Includes Microsoft Copilot & Copilot Experiences locations, both scoped to all users & groups
+
+### Example 2
+```powershell
+New-FeatureConfiguration -Name "Scoped browser collection policy for Microsoft Copilot" -FeatureScenario KnowYourData -Mode Enable -ScenarioConfig '{"Activities":["UploadText"],"EnforcementPlanes":["Browser"],"SensitiveTypeIds":["All"],"ExcludedSensitiveTypeIds":["50b8b56b-4ef8-44c2-a924-03374f5831ce","8548332d-6d71-41f8-97db-cc3b5fa544e6"],"IsIngestionEnabled":false}' –Locations '[{"Workload":"Applications","Location":"52655","LocationDisplayName":null,"LocationSource":"SaaS","LocationType":"Individual","Inclusions":[{"Type":"Tenant","Identity":"All","DisplayName":"All","Name":"All"}],"Exclusions":[{"Type":"Group","Identity":"db458ddb-4f56-4d88-a4f7-e29545560839","DisplayName":"Contoso Executives","Name":"[email protected]"}]}]'
+```
+
+This example creates an enabled collection policy named "Scoped browser collection policy for Microsoft Copilot" that:
+- Includes UploadText activity for all supported classifiers except "All Full Names" and "All Physical Addresses"
+- Includes Microsoft Copilot location, for all users & groups except the "Contoso Executives Group"
+
+### Example 3
+```powershell
+New-FeatureConfiguration -Name "Scoped collection policies for browser and devices" -FeatureScenario KnowYourData -Mode Disable -ScenarioConfig '{"Activities":["UploadText","filecreated","filedeleted","filemodified"],"EnforcementPlanes":["Devices","Browser"],"SensitiveTypeIds":["a44669fe-0d48-453d-a9b1-2cc83f2cba77","cb353f78-2b72-4c3c-8827-92ebe4f69fdf"],"FileExtensions":["pdf"],"IsIngestionEnabled":false}' –Locations '[{"Workload":"EndpointDevices","Location":"","Inclusions":[{"Type":"Group","Identity":"db458ddb-4f56-4d88-a4f7-e29545560839","DisplayName":"All Company","Name":"[email protected]"}],"Exclusions":[{"Type":"IndividualResource","Identity":"a828f25a-cede-4d0e-97e6-b0b0c913732a","DisplayName":"Alex Wilber","Name":"[email protected]"}]},{"Workload":"Applications","Location":"52655","LocationSource":"SaaS","LocationType":"Individual","Inclusions":[{"Type":"IndividualResource","Identity":"84f9af2e-b224-4cb8-b9cd-bc531bb07a48","DisplayName":"Adele Vance","Name":"[email protected]"}]}]'
+```
+
+This example creates a disabled collection policy named "Scoped collection policies for browser and devices" that:
+- Includes UploadText (for browser) and filecreated, filedeleted, and filemodified activities (for devices)
+- Includes "U.S. Social Security Number (SSN)" and "ABA Routing Number" classifiers only
+- Detects files on devices with "pdf" file extension only
+- Includes devices location, scoped to the "All company" group, excluding the user "Alex Wilber"
+- Includes Microsoft Copilot location, scoped only to the user "Adele Vance"
 
 ## PARAMETERS
 
 ### -Name
-The Name parameter specifies the unique name for the Discovery policy. The maximum length is 64 characters. If the value contains spaces, enclose the value in quotation marks (").
+The Name parameter specifies the unique name for the feature configuration. The maximum length is 64 characters. If the value contains spaces, enclose the value in quotation marks (").
 
 ```yaml
 Type: String
@@ -59,10 +87,12 @@ Accept wildcard characters: False
 ```
 
 ### -FeatureScenario
-The FeatureScenario parameter specifies the scenario for the Discovery policy. Currently, the only valid value is KnowYourData.
+The FeatureScenario parameter specifies the scenario for the feature configuration. Currently, the only valid values are:
+- `KnowYourData` for collection policies
+- `TrustContainer` for Endpoint DLP trust container
 
 ```yaml
-Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario
+Type: PolicyScenario
 Parameter Sets: (All)
 Aliases:
 Applicable: Security & Compliance
@@ -75,13 +105,13 @@ Accept wildcard characters: False
 ```
 
 ### -Mode
-The Mode parameter specifies the action and notification level of the Discovery policy. Valid values are:
+The Mode parameter specifies feature configuration mode. Valid values are:
 
-- Enable: The policy is enabled for actions and notifications. This is the default value.
-- Disable: The policy is disabled.
+- Enable: The feature configuration is enabled.
+- Disable: The feature configuration is disabled.
 
 ```yaml
-Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyMode
+Type: PolicyMode
 Parameter Sets: (All)
 Aliases:
 Applicable: Security & Compliance
@@ -94,7 +124,7 @@ Accept wildcard characters: False
 ```
 
 ### -ScenarioConfig
-The ScenarioConfig parameter specifies additional information about the policy configuration.
+The ScenarioConfig parameter specifies additional information about the feature configuration.
 
 ```yaml
 Type: String
@@ -144,8 +174,40 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -GeneralDiscovery
+{{ Fill GeneralDiscovery Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -IrmDiscovery
+{{ Fill IrmDiscovery Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Locations
-The locations parameter specifies where the policy applies.
+The locations parameter specifies where the feature configuration applies.
 
 ```yaml
 Type: String

exchange/exchange-ps/exchange/Remove-FeatureConfiguration.md

@@ -22,8 +22,10 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Remove-FeatureConfiguration -Identity <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>
+Remove-FeatureConfiguration [-Identity] <PolicyIdParameter>
  [-Confirm]
+ [-GeneralDiscovery]
+ [-IrmDiscovery]
  [-WhatIf]
  [<CommonParameters>]
 ```
@@ -50,7 +52,7 @@ The Identity policy specifies the feature configuration that you want to remove.
 - GUID
 
 ```yaml
-Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter
+Type: PolicyIdParameter
 Parameter Sets: (All)
 Aliases:
 Applicable: Security & Compliance
@@ -81,6 +83,38 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -GeneralDiscovery
+{{ Fill GeneralDiscovery Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -IrmDiscovery
+{{ Fill IrmDiscovery Description }}
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -WhatIf
 The WhatIf switch simulates the actions of the command. You can use this switch to view the changes that would occur without actually applying those changes. You don't need to specify a value with this switch.
 

exchange/exchange-ps/exchange/Resume-MoveRequest.md

@@ -51,7 +51,7 @@ This example resumes any failed move requests.
 
 ### Example 3
 ```powershell
-Get-MoveRequest -MoveStatus Suspended | Get-MoveRequestStatistics |Where {$_.Message -like "*resume after 10 P.M."} | Resume-MoveRequest
+Get-MoveRequest -MoveStatus Suspended | Get-MoveRequestStatistics | Where {$_.Message -like "*resume after 10 P.M."} | Resume-MoveRequest
 ```
 
 This example resumes any move requests that have the suspend comment "Resume after 10 P.M."

exchange/exchange-ps/exchange/Resume-PublicFolderMoveRequest.md

@@ -49,7 +49,7 @@ This example resumes failed public folder move requests.
 
 ### Example 3
 ```powershell
-Get-PublicFolderMoveRequest -MoveStatus Suspended | Get-PublicFolderMoveRequestStatistics |Where {$_.Message -like "*resume after 10 P.M."} | Resume-PublicFolderMoveRequest
+Get-PublicFolderMoveRequest -MoveStatus Suspended | Get-PublicFolderMoveRequestStatistics | Where {$_.Message -like "*resume after 10 P.M."} | Resume-PublicFolderMoveRequest
 ```
 
 This example resumes a move request that has the suspend comment "Resume after 10 P.M."

exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md

@@ -385,7 +385,7 @@ A valid value is a JSON string. Refer to the Examples section for syntax and usa
 
 For information about the inactive mailbox scenario, see [Learn about inactive mailboxes](https://learn.microsoft.com/purview/inactive-mailboxes-in-office-365).
 
-**CAUTION**: This parameter uses the SMTP address of the deleted mailbox or mail user, which might also be specified for other mailboxes or mail users. If you use this parameter without first taking additional steps, other mailboxes and mail users with the same SMTP address in the retention policy will also be excluded. To check for additional mailboxes or mail users with the same SMTP address, use the following command and replace *user@example.com* with the SMTP address to check: `Get-Recipient -IncludeSoftDeletedRecipients [email protected] |Select-Object DisplayName, EmailAddresses, Description, Alias, RecipientTypeDetails, WhenSoftDeleted`
+**CAUTION**: This parameter uses the SMTP address of the deleted mailbox or mail user, which might also be specified for other mailboxes or mail users. If you use this parameter without first taking additional steps, other mailboxes and mail users with the same SMTP address in the retention policy will also be excluded. To check for additional mailboxes or mail users with the same SMTP address, use the following command and replace `user@contoso.com` with the SMTP address to check: `Get-Recipient -IncludeSoftDeletedRecipients [email protected] | Select-Object DisplayName, EmailAddresses, Description, Alias, RecipientTypeDetails, WhenSoftDeleted`
 
 To prevent active mailboxes or mail users with the same SMTP address from being excluded, put the mailbox on [Litigation Hold](https://learn.microsoft.com/purview/ediscovery-create-a-litigation-hold) before you run the command with the DeletedResources parameter.