Skip to content

Commit 92b6e78

Browse files
authored
Merge branch 'master' into patch-1
2 parents ac57447 + b62fca1 commit 92b6e78

File tree

14 files changed

+198
-72
lines changed

14 files changed

+198
-72
lines changed

.openpublishing.publish.config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,6 @@
265265
"template_folder": "_themes.pdf"
266266
}
267267
},
268-
"need_generate_pdf": false,
269268
"need_generate_intellisense": false,
270269
"enable_incremental_build": false,
271270
"dependent_packages": [

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ description: "Learn how to use remote PowerShell to connect to Exchange Online."
1919
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.
2020

2121
> [!IMPORTANT]
22-
> 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.
22+
> 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.
2323
2424
## What do you need to know before you begin?
2525

@@ -54,7 +54,7 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
5454
You need to configure this setting only once on your computer, not every time you connect.
5555

5656
> [!TIP]
57-
> 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).
57+
> 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).
5858
5959
## Connect to Exchange Online PowerShell
6060

@@ -77,13 +77,13 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
7777
- For Office 365 operated by 21Vianet, use the _ConnectionUri_ value: `https://partner.outlook.cn/PowerShell`
7878

7979
- For Office 365 Germany, use the _ConnectionUri_ value: `https://outlook.office.de/powershell-liveid/`
80-
80+
8181
- For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://outlook.office365.us/powershell-liveid/`
8282

8383
- 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`.
84-
84+
8585
Then, add the following parameter and value to the end of the $Session = ... command: `-SessionOption $ProxyOptions`.
86-
86+
8787
For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
8888

8989
3. Run the following command.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
external help file:
2+
external help file: Microsoft.Exchange.Management-Help.xml
33
applicable: Exchange Online
44
title: Get-Clutter
55
schema: 2.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
external help file:
2+
external help file: Microsoft.Exchange.Management-Help.xml
33
applicable: Exchange Online
44
title: Get-FocusedInbox
55
schema: 2.0.0

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

Lines changed: 90 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -12,26 +12,39 @@ monikerRange: "exchonline-ps"
1212
# Get-MailboxLocation
1313

1414
## SYNOPSIS
15-
This cmdlet is available only in the cloud-based service.
15+
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.
1616

1717
Use the Get-MailboxLocation cmdlet to view mailbox location information in Exchange Online.
1818

1919
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
2020

2121
## SYNTAX
2222

23+
### DatabaseSet
24+
```
25+
Get-MailboxLocation -Database <DatabaseIdParameter>
26+
[-Confirm]
27+
[-MailboxLocationType <MailboxLocationType>]
28+
[-ResultSize <Unlimited>]
29+
[-WhatIf] [<CommonParameters>]
30+
```
31+
2332
### Identity
2433
```
25-
Get-MailboxLocation -Identity <MailboxLocationIdParameter> [-Confirm]
26-
[-MailboxLocationType <Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared>]
27-
[-ResultSize <Unlimited>] [-WhatIf] [<CommonParameters>]
34+
Get-MailboxLocation -Identity <MailboxLocationIdParameter>
35+
[-Confirm]
36+
[-MailboxLocationType <MailboxLocationType>]
37+
[-ResultSize <Unlimited>]
38+
[-WhatIf] [<CommonParameters>]
2839
```
2940

3041
### User
3142
```
32-
Get-MailboxLocation -User <UserIdParameter> [-Confirm]
33-
[-MailboxLocationType <Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared>]
34-
[-ResultSize <Unlimited>] [-WhatIf] [<CommonParameters>]
43+
Get-MailboxLocation -User <UserIdParameter> [-IncludePreviousPrimary]
44+
[-Confirm]
45+
[-MailboxLocationType <MailboxLocationType>]
46+
[-ResultSize <Unlimited>]
47+
[-WhatIf] [<CommonParameters>]
3548
```
3649

3750
## DESCRIPTION
@@ -44,20 +57,60 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
4457
Get-MailboxLocation -User [email protected]
4558
```
4659

47-
This example returns the mailbox location for the user [email protected].
60+
In Exchange Online, this example returns the mailbox location information for the user [email protected].
61+
62+
### -------------------------- Example 2 --------------------------
63+
```
64+
Get-MailboxLocation -Identity e15664af-82ed-4635-b02a-df7c2e03d950
65+
```
66+
67+
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).
4868

4969
## PARAMETERS
5070

71+
### -Database
72+
This parameter is available only in on-premises Exchange.
73+
74+
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:
75+
76+
- Name
77+
78+
- Distinguished name (DN)
79+
80+
- GUID
81+
82+
You can't use this parameter with the Identity parameter.
83+
84+
```yaml
85+
Type: DatabaseIdParameter
86+
Parameter Sets: DatabaseSet
87+
Aliases:
88+
Applicable: Exchange Server 2016, Exchange Server 2019
89+
Required: True
90+
Position: Named
91+
Default value: None
92+
Accept pipeline input: False
93+
Accept wildcard characters: False
94+
```
95+
5196
### -Identity
52-
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.
97+
The Identity parameter specifies the mailbox location object that you want to view. The value uses the either of the following formats:
98+
99+
- \<TenantGUID\>\\\<MailboxGUID\>
100+
101+
- \<MailboxGUID\>
102+
103+
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.
104+
105+
In Exchange Online, you can find the \<TenantGUID\> and \<MailboxGUID\> values after you run Get-MailboxLocation with the User parameter.
53106
54107
You can't use this parameter with the User parameter.
55108
56109
```yaml
57110
Type: MailboxLocationIdParameter
58111
Parameter Sets: Identity
59112
Aliases:
60-
Applicable: Exchange Online
113+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
61114
Required: True
62115
Position: Named
63116
Default value: None
@@ -66,6 +119,8 @@ Accept wildcard characters: False
66119
```
67120
68121
### -User
122+
This parameter is available only in the cloud-based service.
123+
69124
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:
70125
71126
- Name
@@ -101,6 +156,25 @@ The Confirm switch specifies whether to show or hide the confirmation prompt. Ho
101156
Type: SwitchParameter
102157
Parameter Sets: (All)
103158
Aliases: cf
159+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
160+
Required: False
161+
Position: Named
162+
Default value: None
163+
Accept pipeline input: False
164+
Accept wildcard characters: False
165+
```
166+
167+
### -IncludePreviousPrimary
168+
This parameter is available only in the cloud-based service.
169+
170+
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.
171+
172+
You can only use this switch with the User parameter.
173+
174+
```yaml
175+
Type: SwitchParameter
176+
Parameter Sets: User
177+
Aliases:
104178
Applicable: Exchange Online
105179
Required: False
106180
Position: Named
@@ -122,15 +196,15 @@ The MailboxLocationType filters the results by the type of mailbox. Valid values
122196
123197
- MainArchive
124198
125-
- Primary
199+
- PreviousPrimary (Exchange Online only)
126200
127-
- RemotePrimary
201+
- Primary
128202
129203
```yaml
130-
Type: Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared
204+
Type: MailboxLocationType
131205
Parameter Sets: (All)
132206
Aliases:
133-
Applicable: Exchange Online
207+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
134208
Required: False
135209
Position: Named
136210
Default value: None
@@ -145,7 +219,7 @@ The ResultSize parameter specifies the maximum number of results to return. If y
145219
Type: Unlimited
146220
Parameter Sets: (All)
147221
Aliases:
148-
Applicable: Exchange Online
222+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
149223
Required: False
150224
Position: Named
151225
Default value: None
@@ -160,7 +234,7 @@ The WhatIf switch simulates the actions of the command. You can use this switch
160234
Type: SwitchParameter
161235
Parameter Sets: (All)
162236
Aliases: wi
163-
Applicable: Exchange Online
237+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
164238
Required: False
165239
Position: Named
166240
Default value: None

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
external help file:
2+
external help file: Microsoft.Exchange.Management-Help.xml
33
applicable: Exchange Online
44
title: Set-Clutter
55
schema: 2.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
external help file:
2+
external help file: Microsoft.Exchange.Management-Help.xml
33
applicable: Exchange Online
44
title: Set-FocusedInbox
55
schema: 2.0.0

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
external help file:
2+
external help file: Microsoft.Exchange.Management-Help.xml
33
applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
44
title: Get-ExchangeDiagnosticInfo
55
schema: 2.0.0

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2138,11 +2138,7 @@ Accept wildcard characters: False
21382138
```
21392139
21402140
### -RefreshSessionEnabled
2141-
The RefreshSessionEnabled parameter specifies whether to enable or disable the use of refresh tokens when using OpenID Connect for authentication. Valid values are:
2142-
2143-
- $true: Refresh tokens are enabled.
2144-
2145-
- $false: Refresh tokens are disabled.
2141+
This parameter is reserved for internal Microsoft use.
21462142
21472143
```yaml
21482144
Type: $true | $false

sharepoint/sharepoint-ps/sharepoint-server/Install-SPSolution.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,13 +56,6 @@ This example deploys the installed SharePoint solution contoso_solution.wsp in t
5656

5757
### ------------------EXAMPLE 2------------------
5858
```
59-
Install-SPSolution -Identity contoso_solution.wsp -GACDeployment -AddtoLatestVersion $true
60-
```
61-
62-
This example deploys the installed SharePoint solution contoso_solution.wsp in the farm within the latest version directories and specifies that global assembly cache (GAC) can be deployed for the new SharePoint solution.
63-
64-
### ------------------EXAMPLE 3------------------
65-
```
6659
Install-SPSolution -Identity contoso_solution.wsp -GACDeployment -CompatibilityLevel {14,15}
6760
```
6861

skype/skype-ps/skype/Move-CsRgsConfiguration.md

Lines changed: 15 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,48 +11,42 @@ ms.reviewer:
1111
# Move-CsRgsConfiguration
1212

1313
## SYNOPSIS
14-
15-
Enables you to migrate Response Group configuration settings from Microsoft Office Communications Server 2007 R2 or Microsoft Lync Server 2010 to Skype for Business Server.
14+
Enables you to migrate Response Group configuration settings from legacy version pool to newer version pool. For example, from Microsoft Office Communications Server 2007 R2 or Microsoft Lync Server 2010/2013 to Skype for Business Server 2015.
1615
This cmdlet was introduced in Lync Server 2010.
1716

18-
19-
2017
## SYNTAX
21-
2218
```
2319
Move-CsRgsConfiguration [-Source] <String> [-Destination] <String> [-Force] [-ResolveNameConflicts]
2420
[<CommonParameters>]
2521
```
2622

2723
## DESCRIPTION
28-
2924
The Response Group application provides a way for you to automatically route phone calls to entities such as a help desk or customer support line.
3025
When someone calls a designated phone number, that call can be automatically routed to the appropriate set of Response Group agents.
3126
Alternatively, the call might be routed to an interactive voice response (IVR) queue.
3227
In that queue, the caller would be asked a series of questions (for example, "Are you calling about an existing order?") and then, based on the answers to those questions, be given the asked-for information or be routed to a Response Group agent.
3328

34-
If you are currently running the Response Group application on Office Communications Server 2007 R2 or on Lync Server 2010, the Move-CsRgsConfiguration cmdlet provides a way for you to migrate this service to Skype for Business Server.
29+
If you are currently running the Response Group application on legacy server, the Move-CsRgsConfiguration cmdlet provides a way for you to migrate this service to newer vesion server.
3530
To migrate the service, you need to call the Move-CsRgsConfiguration cmdlet and specify: 1) the fully qualified domain name (FQDN) for the existing version of the Response Group application (the Source); and, 2) the FQDN for the new Skype for Business Server version of the service (the Destination).
36-
Move-CsRgsConfiguration will then move all the configuration settings, audio files, and contact objects from the existing version (either Office Communications Server 2007 R2 or Lync Server 2010) to Skype for Business Server.
37-
After the service has been migrated, all calls to a Response Group phone number will be handled by Skype for Business Server.
31+
Move-CsRgsConfiguration will then move all the configuration settings, audio files, and contact objects from the existing version (for example, Office Communications Server 2007 R2 or Lync Server 2010) to newer version.
32+
After the service has been migrated, all calls to a Response Group phone number will be handled by the newer server.
3833
Calls will no longer be handled by the previous version of the service.
3934

40-
Before you can run Move-CsRgsConfiguration, you must first install the Windows Management Instrumentation (WMI) Backward Compatibility interfaces package; this application is installed by running OCSWMIBC.msi.
41-
The file OCSWMIBC.msi can be found on the installation DVD in the Setup folder.
35+
>[!Note]
36+
> If you are running this service on Office Communications Server 2007 R2 or Lync Server 2010, before you can run Move-CsRgsConfiguration, you must first install the Windows Management Instrumentation (WMI) Backward Compatibility interfaces package; this application is installed by running OCSWMIBC.msi. The file OCSWMIBC.msi can be found on the installation DVD in the Setup folder.
4237
43-
If Office Communications Server 2007 is running Microsoft SQL Server 2005 then, before you attempt to migrate the Response Group application, you must install the Microsoft SQL Server 2005 Native Client on the computer where you will be running the Move-CsRgsConfiguration cmdlet.
38+
>[!Note]
39+
> If Office Communications Server 2007 is running Microsoft SQL Server 2005 then, before you attempt to migrate the Response Group application, you must install the Microsoft SQL Server 2005 Native Client on the computer where you will be running the Move-CsRgsConfiguration cmdlet.
4440
If the Native Client is not installed you will receive the error message "Cannot access WMI settings" when you call Move-CsRgsConfiguration.
4541

46-
The Move-CsRgsConfiguration cmdlet is only for migrating from Office Communications Server 2007 R2 or Lync Server 2010 to Skype for Business Server; you cannot use this cmdlet to migrate from one instance of Skype for Business Server to a new instance of Skype for Business Server.
42+
>[!Note]
43+
> The Move-CsRgsConfiguration cmdlet is only for migrating from legacy version to newer version; you cannot use this cmdlet to migrate between the same version (for example, one instance of Skype for Business Server 2015 to a new instance of Skype for Business Server 2015).
4744
That type of migration can only be done by using the new Import-CsRgsConfiguration and Export-CsRgsConfiguration cmdlets.
4845

49-
50-
5146
## EXAMPLES
5247

5348
### -------------------------- EXAMPLE 1 --------------------------
5449
```
55-
5650
Move-CsRgsConfiguration -Source atl-ocsrgs-001.litwareinc.com -Destination redmond-lyncrgs-001.litwareinc.com
5751
```
5852

@@ -62,10 +56,7 @@ The command shown in Example 1 migrates the Response Group application from atl-
6256
## PARAMETERS
6357

6458
### -Destination
65-
66-
FQDN of the computer where the Skype for Business Server Response Group application is to be hosted (the "copy to" location).
67-
68-
59+
FQDN of the computer where the newer server Response Group application is to be hosted (the "copy to" location).
6960

7061
```yaml
7162
Type: String
@@ -81,10 +72,7 @@ Accept wildcard characters: False
8172
```
8273
8374
### -Source
84-
85-
FQDN of the pool where the Office Communications Server 2007 R2 or Lync Server 2010Response Group application is currently hosted (the "copy from" location).
86-
87-
75+
FQDN of the pool where the legacy Response Group application is currently hosted (the "copy from" location).
8876
8977
```yaml
9078
Type: String
@@ -116,7 +104,7 @@ Accept wildcard characters: False
116104
```
117105
118106
### -ResolveNameConflicts
119-
PARAMVALUE: SwitchParameter
107+
When present, duplicate names will be resolved by appending a unique identifying number. For example, if there are two workflows named Help Desk Workflow one of the two will be renamed Help Desk Workflow (2).
120108
121109
```yaml
122110
Type: SwitchParameter
@@ -153,3 +141,5 @@ Move-CsRgsConfiguration moves instances of the Microsoft.Rtc.Management.Writable
153141

154142
[Move-CsRgsConfiguration](Move-CsRgsConfiguration.md)
155143

144+
145+

0 commit comments

Comments
 (0)