Merge branch 'master' into patch-21

Author: chrisda

exchange/exchange-ps/exchange/advanced-threat-protection/New-AntiPhishPolicy.md

@@ -663,7 +663,7 @@ The TreatSoftPassAsAuthenticated parameter specifies whether or not to respect t
 
 - $false: Only use this value when you want to enable more restrictive antispoofing filtering, because this value might cause false positives.
 
-Note: This parameter corresponds to the Strict filtering value in the Office 365 admin center.
+Note: This parameter corresponds to the Strict filtering value in the Microsoft 365 admin center.
 
 ```yaml
 Type: $true | $false

exchange/exchange-ps/exchange/advanced-threat-protection/Set-AntiPhishPolicy.md

@@ -660,7 +660,7 @@ The TreatSoftPassAsAuthenticated parameter specifies whether or not to respect t
 
 - $false: Only use this value when you want to enable more restrictive antispoofing filtering, because this value might cause false positives.
 
-Note: This parameter corresponds to the Strict filtering value in the Office 365 admin center.
+Note: This parameter corresponds to the Strict filtering value in the Microsoft 365 admin center.
 
 ```yaml
 Type: $true | $false

exchange/exchange-ps/exchange/mailboxes/New-Mailbox.md

@@ -1628,7 +1628,7 @@ The MailboxPlan parameter specifies the mailbox plan to apply to the mailbox. Yo
 
 - GUID
 
-A mailbox plan specifies the permissions and features that are available to a mailbox. In Office 365, mailbox plans correspond to the subscriptions and licenses that administrators purchase and assign in the Office 365 admin center.
+A mailbox plan specifies the permissions and features that are available to a mailbox. In Office 365, mailbox plans correspond to the subscriptions and licenses that administrators purchase and assign in the Microsoft 365 admin center.
 
 You can see the available mailbox plans by using the Get-MailboxPlan cmdlet.
 

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

@@ -3037,7 +3037,7 @@ Unqualified values are typically treated as bytes, but small values may be round
 
 The IssueWarningQuota value must be less than or equal to the ProhibitSendReceiveQuota value.
 
-In Office 365, the quota value is determined by the subscriptions and licenses that administrators purchase and assign in the Office 365 admin center. You can lower the quota value, and you may be able to raise the quota, but you can't exceed the maximum value that's allowed by the subscription or license. In Office 365, you can't use this parameter on public folder mailboxes.
+In Office 365, the quota value is determined by the subscriptions and licenses that administrators purchase and assign in the Microsoft 365 admin center. You can lower the quota value, and you may be able to raise the quota, but you can't exceed the maximum value that's allowed by the subscription or license. In Office 365, you can't use this parameter on public folder mailboxes.
 
 In on-premises Exchange, the default value of this parameter is unlimited. When the UseDatabaseQuotaDefaults parameter is set to $true, the value of the this parameter is ignored, and the mailbox uses the IssueWarningQuota value on the mailbox database. To use this parameter to enforce a specific quota value for the mailbox, you need to set the UseDatabaseQuotaDefaults parameter to the value $false.
 
@@ -3418,7 +3418,7 @@ Unqualified values are typically treated as bytes, but small values may be round
 
 A valid value is a number up to 1.999999 gigabytes (2147483647 bytes) or the value unlimited.
 
-In Office 365, the value is determined by the subscriptions and licenses that administrators purchase and assign in the Office 365 admin center. You can lower the value, and you may be able to raise the value, but you can't exceed the maximum value that's allowed by the subscription or license.
+In Office 365, the value is determined by the subscriptions and licenses that administrators purchase and assign in the Microsoft 365 admin center. You can lower the value, and you may be able to raise the value, but you can't exceed the maximum value that's allowed by the subscription or license.
 
 In Office 365, you use this parameter to configure the MaxReceiveSize value on existing mailboxes. Use the Set-MailboxPlan cmdlet to change the MaxReceiveSize value for all new mailboxes that you create in the future.
 
@@ -3472,7 +3472,7 @@ Unqualified values are typically treated as bytes, but small values may be round
 
 A valid value is a number up to 1.999999 gigabytes (2147483647 bytes) or the value unlimited.
 
-In Office 365, the value is determined by the subscriptions and licenses that administrators purchase and assign in the Office 365 admin center. You can lower the value, and you may be able to raise the value, but you can't exceed the maximum value that's allowed by the subscription or license.
+In Office 365, the value is determined by the subscriptions and licenses that administrators purchase and assign in the Microsoft 365 admin center. You can lower the value, and you may be able to raise the value, but you can't exceed the maximum value that's allowed by the subscription or license.
 
 In Office 365, you use this parameter to configure the MaxSendSize value on existing mailboxes. Use the Set-MailboxPlan cmdlet to change the MaxSendSize value for all new mailboxes that you create in the future.
 
@@ -3815,7 +3815,7 @@ Accept wildcard characters: False
 ### -Password
 The Password parameter resets the password of the user account that's associated with the mailbox to the value you specify. To use this parameter on a mailbox other than your own, you need to be a member of one of the following role groups:
 
-- Office 365: You can't use this parameter to change another user's password. To change another user's password, use the Set-MsolUserPassword cmdlet in Office 365 (Azure AD) PowerShell. For connection instructions, see Connect to Office 365 PowerShell (https://go.microsoft.com/fwlink/p/?LinkId=614839). To change a another user's password in the Office 365 admin center, see Reset a user's password (https://go.microsoft.com/fwlink/p/?LinkId=614837).
+- Office 365: You can't use this parameter to change another user's password. To change another user's password, use the Set-MsolUserPassword cmdlet in Office 365 (Azure AD) PowerShell. For connection instructions, see Connect to Office 365 PowerShell (https://go.microsoft.com/fwlink/p/?LinkId=614839). To change a another user's password in the Microsoft 365 admin center, see Reset a user's password (https://go.microsoft.com/fwlink/p/?LinkId=614837).
 
 - On-premises Exchange: The Organization Management or Help Desk role groups via the User Options role. The Reset Password role also allows you to use this parameter, but it isn't assigned to any role groups by default.
 
@@ -3871,7 +3871,7 @@ Unqualified values are typically treated as bytes, but small values may be round
 
 The ProhibitSendQuota value must be less than or equal to the ProhibitSendReceiveQuota value.
 
-In Office 365, the quota value is determined by the subscriptions and licenses that administrators purchase and assign in the Office 365 admin center. You can lower the quota value, and you may be able to raise the quota, but you can't exceed the maximum value that's allowed by the subscription or license. In Office 365, you can't use this parameter on public folder mailboxes.
+In Office 365, the quota value is determined by the subscriptions and licenses that administrators purchase and assign in the Microsoft 365 admin center. You can lower the quota value, and you may be able to raise the quota, but you can't exceed the maximum value that's allowed by the subscription or license. In Office 365, you can't use this parameter on public folder mailboxes.
 
 In on-premises Exchange, the default value of this parameter is unlimited. When the UseDatabaseQuotaDefaults parameter is set to the value $true, the value of the this parameter is ignored, and the mailbox uses the ProhibitSendQuota value on the mailbox database. To use this parameter to enforce a specific quota value for the mailbox, you need to set the UseDatabaseQuotaDefaults parameter to the value $false.
 
@@ -3906,7 +3906,7 @@ Unqualified values are typically treated as bytes, but small values may be round
 
 The value must be greater than or equal to the ProhibitSendQuota or IssueWarningQuota values.
 
-In Office 365, the quota value is determined by the subscriptions and licenses that administrators purchase and assign in the Office 365 admin center. You can lower the quota value, but you can't exceed the maximum value that's allowed by the subscription or license. In Office 365, you can't use this parameter on public folder mailboxes.
+In Office 365, the quota value is determined by the subscriptions and licenses that administrators purchase and assign in the Microsoft 365 admin center. You can lower the quota value, but you can't exceed the maximum value that's allowed by the subscription or license. In Office 365, you can't use this parameter on public folder mailboxes.
 
 In on-premises Exchange, the default value of this parameter is unlimited. When the UseDatabaseQuotaDefaults parameter is set to the value $true, the value of the this parameter is ignored, and the mailbox uses the ProhibitSendReceiveQuota value on the mailbox database. To use this parameter to enforce a specific quota value for the mailbox, you need to set the UseDatabaseQuotaDefaults parameter to the value $false.
 

exchange/exchange-ps/exchange/organization/Set-OrganizationConfig.md

@@ -851,7 +851,7 @@ This parameter is available only in the cloud-based service.
 
 The CustomerLockboxEnabled specifies whether Customer Lockbox requests are enabled or disabled for the organization. Valid values are:
 
-- $true: Customer Lockbox requests are enabled. Requests by Microsoft support engineers to access your data appear in the Office 365 admin center for you to approve or reject.
+- $true: Customer Lockbox requests are enabled. Requests by Microsoft support engineers to access your data appear in the Microsoft 365 admin center for you to approve or reject.
 
 - $false: Customer Lockbox are disabled.
 

sharepoint/sharepoint-ps/sharepoint-online/Set-SPOSite.md

@@ -755,7 +755,7 @@ Accept wildcard characters: False
 
 Please read [Control access from unmanaged devices](https://docs.microsoft.com/sharepoint/control-access-from-unmanaged-devices ) documentation here to understand Conditional Access Policy usage in SharePoint Online.
 
-PARAMVALUE: AllowFullAccess | LimitedAccess | BlockAccess
+PARAMVALUE: AllowFullAccess | AllowLimitedAccess | BlockAccess
 
 ```yaml
 Type: SPOConditionalAccessPolicyType