Merge branch 'master' into Dariomws1

Author: kenwith

exchange/exchange-ps/exchange/client-access/set-CASMailboxPlan.md

@@ -11,7 +11,7 @@ monikerRange: "exchonline-ps"
 ## SYNOPSIS
 This cmdlet is available only in the cloud-based service.
 
-Use the Get-CASMailboxPlan cmdlet to view Client Access services (CAS) mailbox plans in cloud-based organizations.
+Use the Set-CASMailboxPlan cmdlet to modify Client Access services (CAS) mailbox plans in cloud-based organizations.
 
 For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
 

exchange/exchange-ps/exchange/encryption-and-certificates/Set-IRMConfiguration.md

@@ -200,13 +200,8 @@ Accept wildcard characters: False
 ```
 
 ### -DecryptAttachmentFromPortal
-This parameter is available only in the cloud-based service.
-
-The DecryptAttachmentFromPortal parameter specifies whether Office attachments are protected for recipients outside of Office 365 when Encrypt-only policy is used for sending mails using new Office 365 Message Encryption capabilities. Use this option when you don't need to retain the original protection for the attachment upon download. Valid values are:
-
-- $true: The recipients will have permissions to download Encrypt-only attachments without protection.
+This parameter will be deprecated soon. It has been replaced by the DecryptAttachmentForEncryptOnly parameter.
 
-- $false: The recipients will continue to have Encrypt-only attachments protected even after download.
 
 ```yaml
 Type: $true | $false