Merge pull request MicrosoftDocs#7137 from MicrosoftDocs/chrisda

Chrisda to Master

Author: chrisda

exchange/docs-conceptual/app-only-auth-powershell-v2.md

@@ -50,7 +50,10 @@ The following examples show how to use the Exchange Online PowerShell V2 module
   When you use the _Certificate_ parameter, the certificate does not need to be installed on the computer where you are running the command. This parameter is applicable for scenarios where the certificate object is stored remotely and fetched at runtime during script execution.
 
 > [!TIP]
-> In the **Connect-ExchangeOnline** commands, be sure to use an `.onmicrosoft.com` domain in the  _Organization_ parameter value. Otherwise, you might encounter cryptic permission issues when you run commands in the app context.
+>
+> - In the **Connect-ExchangeOnline** commands, be sure to use an `.onmicrosoft.com` domain in the  _Organization_ parameter value. Otherwise, you might encounter cryptic permission issues when you run commands in the app context.
+>
+> - App-only authentication does not support delegation. Unattended scripting in delegation scenarios is supported with the Secure App Model. For more information, go [here](https://docs.microsoft.com/powershell/partnercenter/multi-factor-auth#exchange).
 
 ## How does it work?
 

exchange/exchange-ps/exchange/Add-UnifiedGroupLinks.md

@@ -34,9 +34,7 @@ Microsoft 365 Groups are group objects that are available across Microsoft 365 s
 
 You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see [Find the permissions required to run any Exchange cmdlet](https://docs.microsoft.com/powershell/exchange/find-exchange-cmdlet-permissions).
 
->
- [!NOTE]
-> Only members can be owners of a group, so you must first add a user as member before adding it as an owner.
+**Note**: Only members can be owners of a group, so you must first add a user as member before adding it as an owner.
 
 ## EXAMPLES
 

exchange/exchange-ps/exchange/Get-ExchangeCertificate.md

@@ -53,9 +53,9 @@ By default, this cmdlet returns the following certificate properties in the summ
 - Services: The Exchange services that the certificate is assigned to by using the Enable-ExchangeCertificate cmdlet. Values are None, Federation, IIS, IMAP, POP, SMTP, UM, and UMCallRouter. You'll see the value None in certificates that aren't used with Exchange (for example, the `WMSvc-<ServerName>` certificate that's used for the IIS Web Management Service).
 - Subject: Contains the X.500 value in the certificate's Subject Name field. The important part is the CN= value.
 
-If you append | Format-List to the command, the cmdlet returns these additional certificate properties:
+If you append ` | Format-List` to the command, the cmdlet returns these additional certificate properties:
 
-- AccessRules: The host names or FQDNs in the certificate's Subject Alternative Name field.
+- AccessRules: Typically, this value is multiple instances of the value System.Security.AccessControl.CryptoKeyAccessRule separated by commas.
 - CertificateDomains: The host names or FQDNs in the certificate's Subject Alternative Name field.
 - HasPrivateKey: Whether or not the certificate contains a private key.
 - IsSelfSigned: Whether or not the certificate is self-signed (not issued by a certification authority).
@@ -125,29 +125,54 @@ This example shows which certificate Exchange will select for the domain name ma
 
 ## PARAMETERS
 
-### -DomainController
-The DomainController parameter specifies the domain controller that's used by this cmdlet to read data from or write data to Active Directory. You identify the domain controller by its fully qualified domain name (FQDN). For example, dc01.contoso.com.
+### -Thumbprint
+The Thumbprint parameter specifies the thumbprint value of the certificate that you want to view.
 
-The DomainController parameter isn't supported on Edge Transport servers. An Edge Transport server uses the local instance of Active Directory Lightweight Directory Services (AD LDS) to read and write data.
+The Thumbprint parameter, not the Identity parameter, is the positional parameter for this cmdlet. Therefore, when you specify a thumbprint value by itself, the command uses that value for the Thumbprint parameter.
 
 ```yaml
-Type: Fqdn
-Parameter Sets: (All)
+Type: String
+Parameter Sets: Thumbprint
 Aliases:
 Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
 
 Required: False
-Position: Named
+Position: 1
+Default value: None
+Accept pipeline input: True
+Accept wildcard characters: False
+```
+
+### -Identity
+The Identity parameter specifies the certificate that you want to view. Valid values are:
+
+- `ServerNameOrFQDN\Thumbprint`
+- `Thumbprint`
+
+You can't use this parameter with the Server parameter.
+
+The Thumbprint parameter, not the Identity parameter, is the positional parameter for this cmdlet. Therefore, when you specify a thumbprint value by itself, the command uses that value for the Thumbprint parameter.
+
+```yaml
+Type: ExchangeCertificateIdParameter
+Parameter Sets: Identity
+Aliases:
+Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
+
+Required: False
+Position: 1
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -DomainName
-The DomainName parameter filters the results by the fully qualified domain name (FQDN) or server name values in the Subject Name or the Subject Alternative Name fields. You can specify multiple values separated by commas.
+### -DomainController
+The DomainController parameter specifies the domain controller that's used by this cmdlet to read data from or write data to Active Directory. You identify the domain controller by its fully qualified domain name (FQDN). For example, dc01.contoso.com.
+
+The DomainController parameter isn't supported on Edge Transport servers. An Edge Transport server uses the local instance of Active Directory Lightweight Directory Services (AD LDS) to read and write data.
 
 ```yaml
-Type: MultiValuedProperty
+Type: Fqdn
 Parameter Sets: (All)
 Aliases:
 Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
@@ -159,24 +184,17 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Identity
-The Identity parameter specifies the certificate that you want to view. Valid values are:
-
-- `ServerNameOrFQDN\Thumbprint`
-- `Thumbprint`
-
-You can't use this parameter with the Server parameter.
-
-The Thumbprint parameter, not the Identity parameter, is the positional parameter for this cmdlet. Therefore, when you specify a thumbprint value by itself, the command uses that value for the Thumbprint parameter.
+### -DomainName
+The DomainName parameter filters the results by the fully qualified domain name (FQDN) or server name values in the Subject Name or the Subject Alternative Name fields. You can specify multiple values separated by commas.
 
 ```yaml
-Type: ExchangeCertificateIdParameter
-Parameter Sets: Identity
+Type: MultiValuedProperty
+Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
+Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
 
 Required: False
-Position: 1
+Position: Named
 Default value: None
 Accept pipeline input: False
 Accept wildcard characters: False
@@ -223,24 +241,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Thumbprint
-The Thumbprint parameter specifies the thumbprint value of the certificate that you want to view.
-
-The Thumbprint parameter, not the Identity parameter, is the positional parameter for this cmdlet. Therefore, when you specify a thumbprint value by itself, the command uses that value for the Thumbprint parameter.
-
-```yaml
-Type: String
-Parameter Sets: Thumbprint
-Aliases:
-Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
-
-Required: False
-Position: 1
-Default value: None
-Accept pipeline input: True
-Accept wildcard characters: False
-```
-
 ### CommonParameters
 This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
 

exchange/exchange-ps/exchange/Get-RecoverableItems.md

@@ -246,30 +246,16 @@ The SourceFolder parameter specifies where to search for deleted items in the ma
 
 - DeletedItems: The Deleted Items folder.
 - RecoverableItems: The Recoverable Items\Deletions folder. This folder contains items that have been deleted from the Deleted Items folder (soft-deleted items).
-- PurgedItems: (Cloud only) The Recoverable Items\Purges folder. This folder contains items that have been purged from the Recoverable Items folder (hard-deleted items).
+- PurgedItems: The Recoverable Items\Purges folder. This folder contains items that have been purged from the Recoverable Items folder (hard-deleted items).
 
 If you don't use this parameter, the command will search all of these folders.
 
 ```yaml
 Type: RecoverableItemsFolderType
-Parameter Sets: OnPremises
-Aliases:
-Accepted values: DeletedItems | RecoverableItems
-Applicable: Exchange Server 2016, Exchange Server 2019
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
-```yaml
-Type: RecoverableItemsFolderType
-Parameter Sets: Cloud
+Parameter Sets: (All)
 Aliases:
 Accepted values: DeletedItems | RecoverableItems | PurgedItems
-Applicable: Exchange Online
+Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
 
 Required: False
 Position: Named

exchange/exchange-ps/exchange/New-Label.md

@@ -140,7 +140,7 @@ Accept wildcard characters: False
 ```
 
 ### -AdvancedSettings
-The AdvancedSettings parameter enables client-specific features and capabilities on the sensitivity label. The settings that you configure with this parameter only affect apps that are designed for the setting. For more information, see [How to configure advanced settings for the client by using Security & Compliance Center PowerShell](https://docs.microsoft.com/azure/information-protection/rms-client/clientv2-admin-guide-customizations#how-to-configure-advanced-settings-for-the-client-by-using-office-365-security--compliance-center-powershell).
+The AdvancedSettings parameter enables client-specific features and capabilities for a sensitivity label. The settings that you configure with this parameter are supported only by the Azure Information Protection unified labeling client and not by Office apps that support built-in labeling. For more information how to configure these advanced settings, see [Custom configurations for the Azure Information Protection unified labeling client](https://docs.microsoft.com/azure/information-protection/rms-client/clientv2-admin-guide-customizations).
 
 ```yaml
 Type: PswsHashtable

exchange/exchange-ps/exchange/New-LabelPolicy.md

@@ -85,7 +85,7 @@ Accept wildcard characters: False
 ```
 
 ### -AdvancedSettings
-The AdvancedSettings parameter enables client-specific features and capabilities on the sensitivity label policy. The settings that you configure with this parameter only affect apps that are designed for the setting. For more information, see [How to configure advanced settings for the client by using Security & Compliance Center PowerShell](https://docs.microsoft.com/azure/information-protection/rms-client/clientv2-admin-guide-customizations#how-to-configure-advanced-settings-for-the-client-by-using-office-365-security--compliance-center-powershell).
+The AdvancedSettings parameter enables client-specific features and capabilities for the sensitivity label policy. The settings that you configure with this parameter are supported only by the Azure Information Protection unified labeling client and not by Office apps that support built-in labeling. For more information how to configure these advanced settings, see [Custom configurations for the Azure Information Protection unified labeling client](https://docs.microsoft.com/azure/information-protection/rms-client/clientv2-admin-guide-customizations).
 
 ```yaml
 Type: PswsHashtable

exchange/exchange-ps/exchange/Restore-RecoverableItems.md

@@ -308,16 +308,16 @@ The SourceFolder parameter specifies where to search for deleted items in the ma
 
 - DeletedItems: The Deleted Items folder.
 - RecoverableItems: The Recoverable Items\Deletions folder. This folder contains items that have been deleted from the Deleted Items folder (soft-deleted items).
-- PurgedItems: (Cloud only) The Recoverable Items\Purges folder. This folder contains items that have been purged from the Recoverable Items folder (hard-deleted items).
+- PurgedItems: The Recoverable Items\Purges folder. This folder contains items that have been purged from the Recoverable Items folder (hard-deleted items).
 
 If you don't use this parameter, the command will search all of these folders.
 
 ```yaml
 Type: RecoverableItemsFolderType
-Parameter Sets: OnPremises
+Parameter Sets: (All)
 Aliases:
-Accepted values: DeletedItems | RecoverableItems
-Applicable: Exchange Server 2016, Exchange Server 2019
+Accepted values: DeletedItems | RecoverableItems | PurgedItems
+Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
 
 Required: False
 Position: Named

exchange/exchange-ps/exchange/Set-Mailbox.md

@@ -5249,10 +5249,11 @@ Accept wildcard characters: False
 ### -Type
 The Type parameter specifies the mailbox type for the mailbox. Valid values are:
 
+- Equipment
 - Regular
 - Room
-- Equipment
 - Shared
+- Workspace (cloud-only)
 
 ```yaml
 Type: ConvertibleMailboxSubType

exchange/exchange-ps/exchange/Set-User.md

@@ -724,9 +724,7 @@ The PermanentlyClearPreviousMailboxInfo switch specifies whether to clear the Ex
 
 Clearing these attributes might be required in mailbox move and re-licensing scenarios between on-premises Exchange and Microsoft 365. For more information, see [Permanently Clear Previous Mailbox Info](https://techcommunity.microsoft.com/t5/exchange-team-blog/permanently-clear-previous-mailbox-info/ba-p/607619).
 
->
- [!CAUTION]
-> This switch permanently deletes the existing cloud mailbox and its associated archive, prevents you from reconnecting to the mailbox, and prevents you from recovering content from the mailbox.
+**Caution**: This switch permanently deletes the existing cloud mailbox and its associated archive, prevents you from reconnecting to the mailbox, and prevents you from recovering content from the mailbox.
 
 ```yaml
 Type: SwitchParameter

exchange/exchange-ps/exchange/exchange.md

@@ -44,7 +44,7 @@ Exchange PowerShell is built on Windows PowerShell technology and provides a pow
 
 ### [Set-AdSiteLink](Set-AdSiteLink.md)
 
-## advanced-threat-protection Cmdlets
+## defender-for-office-365 Cmdlets
 ### [Disable-AntiPhishRule](Disable-AntiPhishRule.md)
 
 ### [Disable-SafeAttachmentRule](Disable-SafeAttachmentRule.md)

exchange/mapping/serviceMapping.json

@@ -14,50 +14,50 @@
   "Set-ADServerSettings": "active-directory",
   "Set-ADSite": "active-directory",
   "Set-AdSiteLink": "active-directory",
-  "Disable-AntiPhishRule": "advanced-threat-protection",
-  "Disable-SafeAttachmentRule": "advanced-threat-protection",
-  "Disable-SafeLinksRule": "advanced-threat-protection",
-  "Enable-AntiPhishRule": "advanced-threat-protection",
-  "Enable-SafeAttachmentRule": "advanced-threat-protection",
-  "Enable-SafeLinksRule": "advanced-threat-protection",
-  "Get-AdvancedThreatProtectionDocumentDetail": "advanced-threat-protection",
-  "Get-AdvancedThreatProtectionDocumentReport": "advanced-threat-protection",
-  "Get-AdvancedThreatProtectionTrafficReport": "advanced-threat-protection",
-  "Get-AntiPhishPolicy": "advanced-threat-protection",
-  "Get-AntiPhishRule": "advanced-threat-protection",
-  "Get-AtpPolicyForO365": "advanced-threat-protection",
-  "Get-ATPTotalTrafficReport": "advanced-threat-protection",
-  "Get-MailDetailATPReport": "advanced-threat-protection",
-  "Get-MailTrafficATPReport": "advanced-threat-protection",
-  "Get-PhishFilterPolicy": "advanced-threat-protection",
-  "Get-SafeAttachmentPolicy": "advanced-threat-protection",
-  "Get-SafeAttachmentRule": "advanced-threat-protection",
-  "Get-SafeLinksAggregateReport": "advanced-threat-protection",
-  "Get-SafeLinksDetailRepor": "advanced-threat-protection",
-  "Get-SafeLinksPolicy": "advanced-threat-protection",
-  "Get-SafeLinksRule": "advanced-threat-protection",
-  "Get-SpoofMailReport": "advanced-threat-protection",
-  "Get-UrlTrace": "advanced-threat-protection",
-  "New-AntiPhishPolicy": "advanced-threat-protection",
-  "New-AntiPhishRule": "advanced-threat-protection",
-  "New-SafeAttachmentPolicy": "advanced-threat-protection",
-  "New-SafeAttachmentRule": "advanced-threat-protection",
-  "New-SafeLinksPolicy": "advanced-threat-protection",
-  "New-SafeLinksRule": "advanced-threat-protection",
-  "Remove-AntiPhishPolicy": "advanced-threat-protection",
-  "Remove-AntiPhishRule": "advanced-threat-protection",
-  "Remove-SafeAttachmentPolicy": "advanced-threat-protection",
-  "Remove-SafeAttachmentRule": "advanced-threat-protection",
-  "Remove-SafeLinksPolicy": "advanced-threat-protection",
-  "Remove-SafeLinksRule": "advanced-threat-protection",
-  "Set-AntiPhishPolicy": "advanced-threat-protection",
-  "Set-AntiPhishRule": "advanced-threat-protection",
-  "Set-AtpPolicyForO365": "advanced-threat-protection",
-  "Set-PhishFilterPolicy": "advanced-threat-protection",
-  "Set-SafeAttachmentPolicy": "advanced-threat-protection",
-  "Set-SafeAttachmentRule": "advanced-threat-protection",
-  "Set-SafeLinksPolicy": "advanced-threat-protection",
-  "Set-SafeLinksRule": "advanced-threat-protection",
+  "Disable-AntiPhishRule": "defender-for-office-365",
+  "Disable-SafeAttachmentRule": "defender-for-office-365",
+  "Disable-SafeLinksRule": "defender-for-office-365",
+  "Enable-AntiPhishRule": "defender-for-office-365",
+  "Enable-SafeAttachmentRule": "defender-for-office-365",
+  "Enable-SafeLinksRule": "defender-for-office-365",
+  "Get-AdvancedThreatProtectionDocumentDetail": "defender-for-office-365",
+  "Get-AdvancedThreatProtectionDocumentReport": "defender-for-office-365",
+  "Get-AdvancedThreatProtectionTrafficReport": "defender-for-office-365",
+  "Get-AntiPhishPolicy": "defender-for-office-365",
+  "Get-AntiPhishRule": "defender-for-office-365",
+  "Get-AtpPolicyForO365": "defender-for-office-365",
+  "Get-ATPTotalTrafficReport": "defender-for-office-365",
+  "Get-MailDetailATPReport": "defender-for-office-365",
+  "Get-MailTrafficATPReport": "defender-for-office-365",
+  "Get-PhishFilterPolicy": "defender-for-office-365",
+  "Get-SafeAttachmentPolicy": "defender-for-office-365",
+  "Get-SafeAttachmentRule": "defender-for-office-365",
+  "Get-SafeLinksAggregateReport": "defender-for-office-365",
+  "Get-SafeLinksDetailRepor": "defender-for-office-365",
+  "Get-SafeLinksPolicy": "defender-for-office-365",
+  "Get-SafeLinksRule": "defender-for-office-365",
+  "Get-SpoofMailReport": "defender-for-office-365",
+  "Get-UrlTrace": "defender-for-office-365",
+  "New-AntiPhishPolicy": "defender-for-office-365",
+  "New-AntiPhishRule": "defender-for-office-365",
+  "New-SafeAttachmentPolicy": "defender-for-office-365",
+  "New-SafeAttachmentRule": "defender-for-office-365",
+  "New-SafeLinksPolicy": "defender-for-office-365",
+  "New-SafeLinksRule": "defender-for-office-365",
+  "Remove-AntiPhishPolicy": "defender-for-office-365",
+  "Remove-AntiPhishRule": "defender-for-office-365",
+  "Remove-SafeAttachmentPolicy": "defender-for-office-365",
+  "Remove-SafeAttachmentRule": "defender-for-office-365",
+  "Remove-SafeLinksPolicy": "defender-for-office-365",
+  "Remove-SafeLinksRule": "defender-for-office-365",
+  "Set-AntiPhishPolicy": "defender-for-office-365",
+  "Set-AntiPhishRule": "defender-for-office-365",
+  "Set-AtpPolicyForO365": "defender-for-office-365",
+  "Set-PhishFilterPolicy": "defender-for-office-365",
+  "Set-SafeAttachmentPolicy": "defender-for-office-365",
+  "Set-SafeAttachmentRule": "defender-for-office-365",
+  "Set-SafeLinksPolicy": "defender-for-office-365",
+  "Set-SafeLinksRule": "defender-for-office-365",
   "Add-AttachmentFilterEntry": "antispam-antimalware",
   "Add-ContentFilterPhrase": "antispam-antimalware",
   "Add-IPAllowListEntry": "antispam-antimalware",