Merge pull request MicrosoftDocs#3518 from MicrosoftDocs/chrisda

Chrisda to Master

Author: chrisda

exchange/docs-conceptual/exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell.md

@@ -19,7 +19,7 @@ description: "Learn how to use remote PowerShell to connect to Exchange Online."
 Exchange Online PowerShell allows you to manage your Exchange Online settings from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to Exchange Online. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Exchange Online cmdlets into your local Windows PowerShell session so that you can use them.
 
 > [!IMPORTANT]
-> If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Exchange Online PowerShell using multi-factor authentication](mfa-connect-to-exchange-online-powershell.md). If you're an Exchange Online Protection (EOP) standalone customer, and you're using the service to protect on-premises mailboxes, use the connection instructions in the topic [Connect to Exchange Online Protection PowerShell](../../exchange-eop/connect-to-exchange-online-protection-powershell.md). If your EOP subscription is Exchange Enterprise CAL with Services (includes data loss prevention (DLP) and reporting using web services), the connection instructions in this topic will work for you. 
+> If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Exchange Online PowerShell using multi-factor authentication](mfa-connect-to-exchange-online-powershell.md). <br/><br/> If you're an Exchange Online Protection (EOP) standalone customer, and you're using the service to protect on-premises mailboxes, use the connection instructions in the topic [Connect to Exchange Online Protection PowerShell](../../exchange-eop/connect-to-exchange-online-protection-powershell.md). If your EOP subscription is Exchange Enterprise CAL with Services (includes data loss prevention (DLP) and reporting using web services), the connection instructions in this topic will work for you.
 
 ## What do you need to know before you begin?
 
@@ -54,7 +54,7 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
   You need to configure this setting only once on your computer, not every time you connect.
 
 > [!TIP]
-> Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351). 
+> Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351).
 
 ## Connect to Exchange Online PowerShell
 
@@ -77,13 +77,13 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
    - For Office 365 operated by 21Vianet, use the _ConnectionUri_ value: `https://partner.outlook.cn/PowerShell`
 
    - For Office 365 Germany, use the _ConnectionUri_ value: `https://outlook.office.de/powershell-liveid/`
-    
+
    - For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://outlook.office365.us/powershell-liveid/`
 
    - If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where the _ProxyAccessType_ value is `IEConfig`, `WinHttpConfig`, or `AutoDetect`.
-      
+
      Then, add the following parameter and value to the end of the $Session = ... command: `-SessionOption $ProxyOptions`.
-      
+
      For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
 
 3. Run the following command.

exchange/exchange-ps/exchange/mailboxes/Get-Clutter.md

@@ -1,5 +1,5 @@
 ---
-external help file: 
+external help file: Microsoft.Exchange.Management-Help.xml
 applicable: Exchange Online
 title: Get-Clutter
 schema: 2.0.0

exchange/exchange-ps/exchange/mailboxes/Get-FocusedInbox.md

@@ -1,5 +1,5 @@
 ---
-external help file: 
+external help file: Microsoft.Exchange.Management-Help.xml
 applicable: Exchange Online
 title: Get-FocusedInbox
 schema: 2.0.0

exchange/exchange-ps/exchange/mailboxes/Get-MailboxLocation.md

@@ -12,26 +12,39 @@ monikerRange: "exchonline-ps"
 # Get-MailboxLocation
 
 ## SYNOPSIS
-This cmdlet is available only in the cloud-based service.
+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.
 
 Use the Get-MailboxLocation cmdlet to view mailbox location information in Exchange Online.
 
 For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
 
 ## SYNTAX
 
+### DatabaseSet
+```
+Get-MailboxLocation -Database <DatabaseIdParameter>
+ [-Confirm]
+ [-MailboxLocationType <MailboxLocationType>]
+ [-ResultSize <Unlimited>]
+ [-WhatIf] [<CommonParameters>]
+```
+
 ### Identity
 ```
-Get-MailboxLocation -Identity <MailboxLocationIdParameter> [-Confirm]
- [-MailboxLocationType <Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared>]
- [-ResultSize <Unlimited>] [-WhatIf] [<CommonParameters>]
+Get-MailboxLocation -Identity <MailboxLocationIdParameter>
+ [-Confirm]
+ [-MailboxLocationType <MailboxLocationType>]
+ [-ResultSize <Unlimited>]
+ [-WhatIf] [<CommonParameters>]
 ```
 
 ### User
 ```
-Get-MailboxLocation -User <UserIdParameter> [-Confirm]
- [-MailboxLocationType <Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared>]
- [-ResultSize <Unlimited>] [-WhatIf] [<CommonParameters>]
+Get-MailboxLocation -User <UserIdParameter> [-IncludePreviousPrimary]
+ [-Confirm]
+ [-MailboxLocationType <MailboxLocationType>]
+ [-ResultSize <Unlimited>]
+ [-WhatIf] [<CommonParameters>]
 ```
 
 ## DESCRIPTION
@@ -44,20 +57,60 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
 Get-MailboxLocation -User [email protected]
 ```
 
-This example returns the mailbox location for the user [email protected].
+In Exchange Online, this example returns the mailbox location information for the user [email protected].
+
+### -------------------------- Example 2 --------------------------
+```
+Get-MailboxLocation -Identity e15664af-82ed-4635-b02a-df7c2e03d950
+```
+
+In Exchange Server or Exchange Online, this example returns the mailbox location information for the specified mailbox GUID (the ExchangeGuid property value from the results of Get-Mailbox -Identity \<MailboxIdentity\> | Format-List ExchangeGuid).
 
 ## PARAMETERS
 
+### -Database
+This parameter is available only in on-premises Exchange.
+
+The Database parameter returns the mailbox location information for all mailboxes on the specified mailbox database. You can use any value that uniquely identifies the database. For example:
+
+- Name
+
+- Distinguished name (DN)
+
+- GUID
+
+You can't use this parameter with the Identity parameter.
+
+```yaml
+Type: DatabaseIdParameter
+Parameter Sets: DatabaseSet
+Aliases:
+Applicable: Exchange Server 2016, Exchange Server 2019
+Required: True
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -Identity
-The Identity parameter specifies the mailbox location object that you want to view. The value uses the syntax \<GUID1\>\\\<GUID2\>. Typically, you can only find this value after you run Get-MailboxLocation with the User parameter.
+The Identity parameter specifies the mailbox location object that you want to view. The value uses the either of the following formats:
+
+- \<TenantGUID\>\\\<MailboxGUID\>
+
+- \<MailboxGUID\>
+
+In Exchange Server or Exchange Online, you can run the following command to find and compare the \<MailboxGUID\> values for the user: Get-Mailbox -Identity \<MailboxIdentity\> \| Format-List *GUID,MailboxLocations.
+
+In Exchange Online, you can find the \<TenantGUID\> and \<MailboxGUID\> values after you run Get-MailboxLocation with the User parameter.
 
 You can't use this parameter with the User parameter.
 
 ```yaml
 Type: MailboxLocationIdParameter
 Parameter Sets: Identity
 Aliases:
-Applicable: Exchange Online
+Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
 Required: True
 Position: Named
 Default value: None
@@ -66,6 +119,8 @@ Accept wildcard characters: False
 ```
 
 ### -User
+This parameter is available only in the cloud-based service.
+
 The User parameter specifies the user whose mailbox location you want to view. You can use any value that uniquely identifies the user. For example:
 
 - Name
@@ -101,6 +156,25 @@ The Confirm switch specifies whether to show or hide the confirmation prompt. Ho
 Type: SwitchParameter
 Parameter Sets: (All)
 Aliases: cf
+Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
+Required: False
+Position: Named
+Default value: None
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
+### -IncludePreviousPrimary
+This parameter is available only in the cloud-based service.
+
+The IncludePreviousPrimary switch specifies whether to include the previous primary mailbox in the results. You don't need to specify a value with this switch.
+
+You can only use this switch with the User parameter.
+
+```yaml
+Type: SwitchParameter
+Parameter Sets: User
+Aliases:
 Applicable: Exchange Online
 Required: False
 Position: Named
@@ -122,15 +196,15 @@ The MailboxLocationType filters the results by the type of mailbox. Valid values
 
 - MainArchive
 
-- Primary
+- PreviousPrimary (Exchange Online only)
 
-- RemotePrimary
+- Primary
 
 ```yaml
-Type: Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared
+Type: MailboxLocationType
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Online
+Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
 Required: False
 Position: Named
 Default value: None
@@ -145,7 +219,7 @@ The ResultSize parameter specifies the maximum number of results to return. If y
 Type: Unlimited
 Parameter Sets: (All)
 Aliases:
-Applicable: Exchange Online
+Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
 Required: False
 Position: Named
 Default value: None
@@ -160,7 +234,7 @@ The WhatIf switch simulates the actions of the command. You can use this switch
 Type: SwitchParameter
 Parameter Sets: (All)
 Aliases: wi
-Applicable: Exchange Online
+Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
 Required: False
 Position: Named
 Default value: None

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

@@ -1,5 +1,5 @@
 ---
-external help file: 
+external help file: Microsoft.Exchange.Management-Help.xml
 applicable: Exchange Online
 title: Set-Clutter
 schema: 2.0.0

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

@@ -1,5 +1,5 @@
 ---
-external help file: 
+external help file: Microsoft.Exchange.Management-Help.xml
 applicable: Exchange Online
 title: Set-FocusedInbox
 schema: 2.0.0

exchange/exchange-ps/exchange/organization/Get-ExchangeDiagnosticInfo.md

@@ -1,5 +1,5 @@
 ---
-external help file: 
+external help file: Microsoft.Exchange.Management-Help.xml
 applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
 title: Get-ExchangeDiagnosticInfo
 schema: 2.0.0

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

@@ -2138,11 +2138,7 @@ Accept wildcard characters: False
 ```
 
 ### -RefreshSessionEnabled
-The RefreshSessionEnabled parameter specifies whether to enable or disable the use of refresh tokens when using OpenID Connect for authentication. Valid values are:
-
-- $true: Refresh tokens are enabled.
-
-- $false: Refresh tokens are disabled.
+This parameter is reserved for internal Microsoft use.
 
 ```yaml
 Type: $true | $false