Adding changes from PR against Main

#11850

Author: chrisda

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

@@ -20,7 +20,8 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-Get-FeatureConfiguration [[-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>]
+Get-FeatureConfiguration [-FeatureScenario] <Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario>
+ [[-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>]
  [-Confirm]
  [-WhatIf]
  [<CommonParameters>]
@@ -33,14 +34,14 @@ To use this cmdlet in Security & Compliance PowerShell, you need to be assigned
 
 ### Example 1
 ```powershell
-Get-FeatureConfiguration | Format-Table Name,Mode
+Get-FeatureConfiguration -FeatureScenario KnowYourData | Format-Table Name,Mode
 ```
 
 This example returns a summary list of all Discovery policies in the organization.
 
 ### Example 2
 ```powershell
-Get-FeatureConfiguration -Identity "Engineering Group"
+Get-FeatureConfiguration -FeatureScenario KnowYourData -Identity "Engineering Group"
 ```
 
 This example returns detailed information about the specified Discovery policy.
@@ -67,6 +68,22 @@ Accept pipeline input: True (ByPropertyName, ByValue)
 Accept wildcard characters: False
 ```
 
+### -FeatureScenario
+The FeatureScenario parameter identifies the type of Discovery policy that you want to view.
+
+```yaml
+Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario
+Parameter Sets: (All)
+Aliases:
+Applicable: Security & Compliance
+
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Confirm
 This parameter is reserved for internal Microsoft use.
 

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

@@ -20,7 +20,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
 ## SYNTAX
 
 ```
-New-FeatureConfiguration [-Name] <String> -Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode> -Scenario <Microsoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario> -ScenarioConfig <String>
+New-FeatureConfiguration [-Name] <String> -Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode> -FeatureScenario <Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario> -ScenarioConfig <String>
  [-Comment <String>]
  [-Confirm]
  [-Locations <String>]
@@ -58,104 +58,102 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Comment
-The Comment parameter specifies an optional comment. If you specify a value that contains spaces, enclose the value in quotation marks ("), for example: "This is an admin note".
+### -FeatureScenario
+The FeatureScenario parameter specifies the scenario for the Discovery policy. Currently, the only valid value is KnowYourData.
 
 ```yaml
-Type: String
+Type: Microsoft.Office.CompliancePolicy.PolicyConfiguration.PolicyScenario
 Parameter Sets: (All)
 Aliases:
 Applicable: Security & Compliance
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Confirm
-The Confirm switch specifies whether to show or hide the confirmation prompt. How this switch affects the cmdlet depends on if the cmdlet requires confirmation before proceeding.
+### -Mode
+The Mode parameter specifies the action and notification level of the Discovery policy. Valid values are:
 
-- Destructive cmdlets (for example, Remove-\* cmdlets) have a built-in pause that forces you to acknowledge the command before proceeding. For these cmdlets, you can skip the confirmation prompt by using this exact syntax: `-Confirm:$false`.
-- Most other cmdlets (for example, New-\* and Set-\* cmdlets) don't have a built-in pause. For these cmdlets, specifying the Confirm switch without a value introduces a pause that forces you acknowledge the command before proceeding.
+- Enable: The policy is enabled for actions and notifications. This is the default value.
+- Disable: The policy is disabled.
 
 ```yaml
-Type: SwitchParameter
+Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyMode
 Parameter Sets: (All)
-Aliases: cf
+Aliases:
 Applicable: Security & Compliance
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Locations
-{{ Fill Locations Description }}
+### -ScenarioConfig
+{{ Fill ScenarioConfig Description }}
 
 ```yaml
 Type: String
 Parameter Sets: (All)
 Aliases:
 Applicable: Security & Compliance
 
-Required: False
+Required: True
 Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Mode
-The Mode parameter specifies the action and notification level of the Discovery policy. Valid values are:
-
-- Enable: The policy is enabled for actions and notifications. This is the default value.
-- Disable: The policy is disabled.
-- TestWithNotifications: Simulation mode where no actions are taken, but notifications **are** sent.
-- TestWithoutNotifications: Simulation mode where no actions are taken, and no notifications are sent.
+### -Comment
+The Comment parameter specifies an optional comment. If you specify a value that contains spaces, enclose the value in quotation marks ("), for example: "This is an admin note".
 
 ```yaml
-Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyMode
+Type: String
 Parameter Sets: (All)
 Aliases:
 Applicable: Security & Compliance
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Scenario
-The Scenario parameter specifies the scenario for the Discovery policy. Currently, the only valid value is KnowYourData.
+### -Confirm
+The Confirm switch specifies whether to show or hide the confirmation prompt. How this switch affects the cmdlet depends on if the cmdlet requires confirmation before proceeding.
+
+- Destructive cmdlets (for example, Remove-\* cmdlets) have a built-in pause that forces you to acknowledge the command before proceeding. For these cmdlets, you can skip the confirmation prompt by using this exact syntax: `-Confirm:$false`.
+- Most other cmdlets (for example, New-\* and Set-\* cmdlets) don't have a built-in pause. For these cmdlets, specifying the Confirm switch without a value introduces a pause that forces you acknowledge the command before proceeding.
 
 ```yaml
-Type: icrosoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario
+Type: SwitchParameter
 Parameter Sets: (All)
-Aliases:
+Aliases: cf
 Applicable: Security & Compliance
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -ScenarioConfig
-{{ Fill ScenarioConfig Description }}
+### -Locations
+{{ Fill Locations Description }}
 
 ```yaml
 Type: String
 Parameter Sets: (All)
 Aliases:
 Applicable: Security & Compliance
 
-Required: True
+Required: False
 Position: Named
 Default value: None
 Accept pipeline input: False

exchange/exchange-ps/exchange/Set-FeatureConfiguration.md

@@ -24,73 +24,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
 Set-FeatureConfiguration [-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter> [-Locations <String>] [-Comment <String>]
  [-Confirm]
  [-Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode>]
- [-Scenario <Microsoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario>]
- [-ScenarioConfig <String>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
-### AdaptiveScopeLocation
-```
-Set-FeatureConfiguration [-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter> [-Comment <String>]
- [-Confirm]
- [-Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode>]
- [-Scenario <Microsoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario>]
- [-ScenarioConfig <String>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
-### TeamLocation
-```
-Set-FeatureConfiguration [-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter> [-Comment <String>]
- [-Confirm]
- [-Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode>]
- [-Scenario <Microsoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario>]
- [-ScenarioConfig <String>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
-### OrganizationSegmentsDefault
-```
-Set-FeatureConfiguration [-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>
- [-Confirm]
- [-Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode>]
- [-Scenario <Microsoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario>]
- [-ScenarioConfig <String>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
-### InformationBarrierDefault
-```
-Set-FeatureConfiguration [-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>
- [-Confirm]
- [-Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode>]
- [-Scenario <Microsoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario>]
- [-ScenarioConfig <String>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
-### DisableRestrictiveRetentionParameterSet
-```
-Set-FeatureConfiguration [-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>
- [-Confirm]
- [-Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode>]
- [-Scenario <Microsoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario>]
- [-ScenarioConfig <String>]
- [-WhatIf]
- [<CommonParameters>]
-```
-
-### RetryDistributionParameterSet
-```
-Set-FeatureConfiguration [-Identity] <Microsoft.Office.CompliancePolicy.Tasks.PolicyIdParameter>
- [-Confirm]
- [-Mode <Microsoft.Office.CompliancePolicy.Tasks.PolicyMode>]
- [-Scenario <Microsoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario>]
  [-ScenarioConfig <String>]
  [-WhatIf]
  [<CommonParameters>]
@@ -186,8 +119,6 @@ The Mode parameter specifies the action and notification level of the Discovery
 
 - Enable: The policy is enabled for actions and notifications. This is the default value.
 - Disable: The policy is disabled.
-- TestWithNotifications: Simulation mode where no actions are taken, but notifications **are** sent.
-- TestWithoutNotifications: Simulation mode where no actions are taken, and no notifications are sent.
 
 ```yaml
 Type: Microsoft.Office.CompliancePolicy.Tasks.PolicyMode
@@ -202,22 +133,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Scenario
-The Scenario parameter specifies the scenario for the Discovery policy. Currently, the only valid value is KnowYourData.
-
-```yaml
-Type: Microsoft.Office.CompliancePolicy.Tasks.FeatureConfigurationScenario
-Parameter Sets: (All)
-Aliases:
-Applicable: Security & Compliance
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -ScenarioConfig
 {{ Fill ScenarioConfig Description }}