Merge pull request MicrosoftDocs#4245 from MicrosoftDocs/master

Merges Master to Live. See commits for details.

Author: kenwith

exchange/exchange-ps/exchange/client-access/Set-OwaMailboxPolicy.md

@@ -348,15 +348,17 @@ Accept wildcard characters: False
 ```
 
 ### -AllowOfflineOn
-The AllowOfflineOn parameter specifies when Outlook on the web in offline mode is available for supported web browsers. Valid values are:
+This parameter is functional only in on-premises Exchange.
+
+The AllowOfflineOn parameter specifies when Outlook Web App in offline mode is available for supported web browsers. Valid values are:
 
 - PrivateComputersOnly: Offline mode is available in private computer sessions. By default in Exchange 2013 or later and Exchange Online, all Outlook on the web sessions are considered to be on private computers. In Exchange 2013 or later, users can only specify public computer sessions if you've enabled the private/public selection on the sign in page (the LogonPagePublicPrivateSelectionEnabled parameter value is $true on the Set-OwaVirtualDirectory cmdlet).
 
 - NoComputers: Offline mode is disabled.
 
 - AllComputers: Offline mode is available for public and private computer sessions. This is the default value.
 
-When offline mode is available, users can turn offline mode on or off themselves in Outlook on the web. For more information, see [Using Outlook Web App offline](https://go.microsoft.com/fwlink/p/?linkid=267644).
+When offline mode is available, users can turn offline mode on or off themselves in Outlook Web App. For more information, see [Using Outlook Web App offline](https://go.microsoft.com/fwlink/p/?linkid=267644).
 
 ```yaml
 Type: PrivateComputersOnly | NoComputers | AllComputers
@@ -439,17 +441,19 @@ Accept wildcard characters: False
 ```
 
 ### -CalendarEnabled
-The CalendarEnabled parameter specifies whether to enable or disable the calendar in Outlook on the web. Valid values are:
+This parameter is functional only in on-premises Exchange.
+
+The CalendarEnabled parameter specifies whether to enable or disable the calendar in Outlook Web App. Valid values are:
 
-- $true: The Calendar is available in Outlook on the web. This is the default value.
+- $true: The Calendar is available in Outlook Web App. This is the default value.
 
-- $false: The Calendar isn't available in Outlook on the web.
+- $false: The Calendar isn't available in Outlook Web App.
 
 ```yaml
 Type: $true | $false
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
+Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
 Required: False
 Position: Named
 Default value: None
@@ -542,17 +546,19 @@ Accept wildcard characters: False
 ```
 
 ### -ContactsEnabled
-The ContactsEnabled parameter specifies whether to enable or disable Contacts in Outlook on the web. Valid values are:
+This parameter is functional only in on-premises Exchange.
+
+The ContactsEnabled parameter specifies whether to enable or disable Contacts in Outlook Web App. Valid values are:
 
-- $true: Contacts are available in Outlook on the web. This is the default value.
+- $true: Contacts are available in Outlook Web App. This is the default value.
 
-- $false: Contacts aren't available in Outlook on the web.
+- $false: Contacts aren't available in Outlook Web App.
 
 ```yaml
 Type: $true | $false
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
+Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
 Required: False
 Position: Named
 Default value: None
@@ -1778,19 +1784,21 @@ Accept wildcard characters: False
 ```
 
 ### -TasksEnabled
-The TasksEnabled parameter specifies whether Tasks folder is available in Outlook on the web. Valid values are:
+This parameter is functional only in on-premises Exchange.
 
-- $true: The Tasks folder is available in Outlook on the web. This is the default value.
+The TasksEnabled parameter specifies whether Tasks folder is available in Outlook Web App. Valid values are:
 
-- $false: The Tasks folder isn't available in Outlook on the web.
+- $true: The Tasks folder is available in Outlook Web App. This is the default value.
 
-This parameter doesn't apply to the light version of Outlook on the web.
+- $false: The Tasks folder isn't available in Outlook Web App.
+
+This parameter doesn't apply to the light version of Outlook Web App.
 
 ```yaml
 Type: $true | $false
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
+Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
 Required: False
 Position: Named
 Default value: None

exchange/exchange-ps/exchange/devices/Export-ActiveSyncLog.md

@@ -41,7 +41,7 @@ This example exports the Exchange ActiveSync log for the date range 06/08/18 to
 
 ### -------------------------- Example 2 --------------------------
 ```
-Dir D:\Logs\*.log | Export-ActiveSyncLog -Filename:"c:\Windows\System32\LogFiles\W2SVC1\ex072018.log" -StartDate:"06/20/18" -EndDate:"07/20/18" -UseGMT:$true -Force $true -Confirm -OutputPath:"c:\exreports\easreports"
+Get-Childitem D:\Logs\*.log | foreach { Export-ActiveSyncLog -Filename $_.FullName -StartDate:"06/20/18" -EndDate:"07/20/18" -UseGMT:$true -Force $true -Confirm -OutputPath:"c:\exreports\easreports" }
 ```
 
 This example exports the Exchange ActiveSync log for the date range 06/20/18 to 07/20/18 by reading all log files in the D:\\logs directory. All prompts are suppressed while running the report and a confirmation message is displayed. The times on the report are in UTC and the report is saved in c:\\exreports\\easreports.

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

@@ -14,6 +14,8 @@ monikerRange: "exchserver-ps-2010 || exchserver-ps-2013 || exchserver-ps-2016 ||
 ## SYNOPSIS
 This cmdlet is available in on-premises Exchange and in the cloud-based service. Some parameters and settings may be exclusive to one environment or the other.
 
+**Note**: By default, Search-Mailbox is available only in the Mailbox Search or Mailbox Import Export roles, and these roles aren't assigned to *any* role groups. To use this cmdlet, you need to add one or both of the roles to a role group (for example, the Organization Management role group). Only the Mailbox Import Export role gives you access to the DeleteContent parameter. For more information about adding roles to role groups, see [Add a role to a role group](https://docs.microsoft.com/Exchange/permissions/role-groups#add-a-role-to-a-role-group).
+
 Use the Search-Mailbox cmdlet to search a mailbox and copy the results to a specified target mailbox, delete messages from the source mailbox, or both.
 
 **Note**: In cloud-based environments, the Search-Mailbox cmdlet is being deprecated in favor of [New-ComplianceSearch](https://docs.microsoft.com/powershell/module/exchange/policy-and-compliance-content-search/new-compliancesearch) and related eDiscovery cmdlets.
@@ -22,10 +24,11 @@ For information about the parameter sets in the Syntax section below, see Exchan
 
 ## SYNTAX
 
-### EstimateResult
+### Identity
 ```
-Search-Mailbox [-Identity] <MailboxOrMailUserIdParameter> [-EstimateResultOnly]
+Search-Mailbox [-Identity] <MailboxOrMailUserIdParameter>
  [-Confirm]
+ [-DeleteContent]
  [-DomainController <Fqdn>]
  [-DoNotIncludeArchive]
  [-Force]
@@ -36,32 +39,31 @@ Search-Mailbox [-Identity] <MailboxOrMailUserIdParameter> [-EstimateResultOnly]
  [-WhatIf] [<CommonParameters>]
 ```
 
-### Mailbox
+### EstimateResult
 ```
-Search-Mailbox [-Identity] <MailboxOrMailUserIdParameter> -TargetFolder <String> -TargetMailbox <MailboxIdParameter>
+Search-Mailbox [-Identity] <MailboxOrMailUserIdParameter> [-EstimateResultOnly]
  [-Confirm]
- [-DeleteContent]
  [-DomainController <Fqdn>]
  [-DoNotIncludeArchive]
  [-Force]
  [-IncludeUnsearchableItems]
- [-LogLevel <Suppress | Basic | Full>]
- [-LogOnly]
  [-SearchDumpster]
  [-SearchDumpsterOnly]
  [-SearchQuery <String>]
  [-WhatIf] [<CommonParameters>]
 ```
 
-### Identity
+### Mailbox
 ```
-Search-Mailbox [-Identity] <MailboxOrMailUserIdParameter>
+Search-Mailbox [-Identity] <MailboxOrMailUserIdParameter> -TargetFolder <String> -TargetMailbox <MailboxIdParameter>
  [-Confirm]
  [-DeleteContent]
  [-DomainController <Fqdn>]
  [-DoNotIncludeArchive]
  [-Force]
  [-IncludeUnsearchableItems]
+ [-LogLevel <LoggingLevel>]
+ [-LogOnly]
  [-SearchDumpster]
  [-SearchDumpsterOnly]
  [-SearchQuery <String>]
@@ -79,10 +81,6 @@ You can use the Search-Mailbox cmdlet to search messages in a specified mailbox
 
 - Clean up the Recoverable Items folder for a mailbox when it has reached the Recoverable Items hard quota.
 
-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://technet.microsoft.com/library/mt432940.aspx).
-
-**Note**: By default, Search-Mailbox is available only in the Mailbox Search or Mailbox Import Export roles, and these roles aren't assigned to *any* role groups. To use this cmdlet, you need to add one or both of the roles to a role group (for example, the Organization Management role group). Only the Mailbox Import Export role gives you access to the DeleteContent parameter. For more information about adding roles to role groups, see the "Add a role to a role group" section in [Manage role groups](https://technet.microsoft.com/library/jj657480.aspx).
-
 ## EXAMPLES
 
 ### -------------------------- Example 1 --------------------------
@@ -237,9 +235,11 @@ Accept wildcard characters: False
 ```
 
 ### -DeleteContent
-The DeleteContent switch specifies that the messages returned by the search be permanently deleted from the source mailbox. When used with the TargetMailbox parameter, messages are copied to the target mailbox and removed from the source mailbox. If you set the logging level for the search to Basic or Full, you must specify a target mailbox and a target folder to place the log in. To delete messages from the source mailbox without copying them to the target mailbox, don't specify the TargetMailbox, TargetFolder, and LogLevel parameters.
+**Note**: You need to be assigned the Mailbox Import Export management role to use this switch. By default, this role isn't assigned to any role group (including Organization Management). Typically, you assign a role to a built-in or custom role group.
+
+The DeleteContent switch specifies that the messages returned by the search be permanently deleted from the source mailbox. You don't need to specify a value with this switch.
 
-You need to be assigned the Mailbox Import Export management role to use this switch. By default, this role isn't assigned to any role group. Typically, you assign a role to a built-in or custom role group. Or you can assign a role to a user, or a universal security group.
+When you use this switch with the TargetMailbox parameter, messages are copied to the target mailbox and removed from the source mailbox. If you set the logging level for the search to Basic or Full, you must specify a target mailbox and a target folder to place the log in. To delete messages from the source mailbox without copying them to the target mailbox, don't specify the TargetMailbox, TargetFolder, and LogLevel parameters.
 
 Before you use the DeleteContent switch to delete content, we recommend that you test search parameters by using the LogOnly parameter, as shown in Example 2.
 
@@ -331,7 +331,7 @@ The LogLevel parameter specifies the logging level for the search. It can have o
 The default log level is Basic.
 
 ```yaml
-Type: Suppress | Basic | Full
+Type: LoggingLevel
 Parameter Sets: Mailbox
 Aliases:
 Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online