Skip to content

Commit a5785f3

Browse files
authored
Merge pull request MicrosoftDocs#1746 from MicrosoftDocs/chrisda
Chrisda to Master
2 parents dcc1d5c + 643d905 commit a5785f3

File tree

14 files changed

+225
-225
lines changed

14 files changed

+225
-225
lines changed

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,22 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
2121

2222
- Estimated time to complete: 5 minutes
2323

24+
- You can use the following versions of Windows:
25+
26+
- Windows 10
27+
28+
- Windows 8.1
29+
30+
- Windows Server 2016
31+
32+
- Windows Server 2012 or Windows Server 2012 R2
33+
34+
- Windows 7 Service Pack 1 (SP1)<sup>*</sup>
35+
36+
- Windows Server 2008 R2 SP1<sup>*</sup>
37+
38+
<sup>*</sup> For older versions of Windows, you need to install the Microsoft.NET Framework 4.5 or later and then an updated version of the Windows Management Framework: 3.0, 4.0, or 5.1 (only one). For more information, see [Installing the .NET Framework](https://go.microsoft.com/fwlink/p/?LinkId=257868), [Windows Management Framework 3.0](https://go.microsoft.com/fwlink/p/?LinkId=272757), [Windows Management Framework 4.0](https://go.microsoft.com/fwlink/p/?LinkId=391344), and [Windows Management Framework 5.1](https://aka.ms/wmf5download).
39+
2440
- The Exchange Online Remote PowerShell Module needs to be installed on your computer:
2541

2642
1. In Internet Explorer or Edge, open the Exchange admin center (EAC) for your Exchange Online organization (Google Chrome or Mozilla Firefox won't work). For instructions, see [Exchange Admin Center in Exchange Online](http://technet.microsoft.com/library/ace44f6b-4084-4f9c-89b3-e0317962472b.aspx).

exchange/docs-conceptual/office-365-scc/connect-to-scc-powershell/mfa-connect-to-scc-powershell.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,22 @@ If your account uses multi-factor authentication (MFA) or federated authenticati
2121

2222
- Estimated time to complete: 5 minutes
2323

24+
- You can use the following versions of Windows:
25+
26+
- Windows 10
27+
28+
- Windows 8.1
29+
30+
- Windows Server 2016
31+
32+
- Windows Server 2012 or Windows Server 2012 R2
33+
34+
- Windows 7 Service Pack 1 (SP1)<sup>*</sup>
35+
36+
- Windows Server 2008 R2 SP1<sup>*</sup>
37+
38+
<sup>*</sup> For older versions of Windows, you need to install the Microsoft.NET Framework 4.5 or later and then an updated version of the Windows Management Framework: 3.0, 4.0, or 5.1 (only one). For more information, see [Installing the .NET Framework](https://go.microsoft.com/fwlink/p/?LinkId=257868), [Windows Management Framework 3.0](https://go.microsoft.com/fwlink/p/?LinkId=272757), [Windows Management Framework 4.0](https://go.microsoft.com/fwlink/p/?LinkId=391344), and [Windows Management Framework 5.1](https://aka.ms/wmf5download).
39+
2440
- The Exchange Online Remote PowerShell Module needs to be installed on your computer. If your installed version of the Exchange Online Remote PowerShell Module doesn't have the **Connect-IPPSSession** cmdlet, you need to install the latest version of the module:
2541

2642
1. In Internet Explorer or Edge, open the Exchange admin center (EAC) for your Exchange Online organization (Google Chrome or Mozilla Firefox won't work). For instructions, see [Exchange Admin Center in Exchange Online](http://technet.microsoft.com/library/ace44f6b-4084-4f9c-89b3-e0317962472b.aspx).
@@ -49,7 +65,6 @@ If your account uses multi-factor authentication (MFA) or federated authenticati
4965

5066
`The WinRM client cannot process the request. Basic authentication is currently disabled in the client configuration. Change the client configuration and try the request again.`
5167

52-
5368
> [!TIP]
5469
> Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Server](https://go.microsoft.com/fwlink/p/?linkId=60612), [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351).
5570

exchange/exchange-ps/exchange/advanced-threat-protection/Get-MailDetailATPReport.md

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ For information about the parameter sets in the Syntax section below, see Exchan
1818
## SYNTAX
1919

2020
```
21-
Get-MailDetailATPReport [-Action <MultiValuedProperty>] [-Direction <MultiValuedProperty>]
21+
Get-MailDetailATPReport [-Direction <MultiValuedProperty>]
2222
[-Domain <MultiValuedProperty>] [-EndDate <DateTime>] [-EventType <MultiValuedProperty>]
2323
[-Expression <Expression>] [-MalwareName <MultiValuedProperty>] [-MessageId <MultiValuedProperty>]
2424
[-MessageTraceId <MultiValuedProperty>] [-Page <Int32>] [-PageSize <Int32>] [-ProbeTag <String>]
@@ -44,21 +44,6 @@ This example returns the Advanced Threat Protection actions for July, 2017.
4444

4545
## PARAMETERS
4646

47-
### -Action
48-
This parameter is reserved for internal Microsoft use.
49-
50-
```yaml
51-
Type: MultiValuedProperty
52-
Parameter Sets: (All)
53-
Aliases:
54-
Applicable: Exchange Online, Exchange Online Protection
55-
Required: False
56-
Position: Named
57-
Default value: None
58-
Accept pipeline input: False
59-
Accept wildcard characters: False
60-
```
61-
6247
### -Direction
6348
The Direction parameter filters the results by incoming or outgoing messages. Valid values for this parameter are Inbound and Outbound.
6449

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ For information about the parameter sets in the Syntax section below, see Exchan
1919

2020
```
2121
Get-CASMailboxPlan [[-Identity] <MailboxPlanIdParameter>] [-Credential <PSCredential>]
22-
[-DomainController <Fqdn>] [-Filter <String>] [-IgnoreDefaultScope] [-ReadFromDomainController]
22+
[-DomainController <Fqdn>] [-Filter <String>] [-IgnoreDefaultScope]
2323
[-ResultSize <Unlimited>] [-SortBy <String>] [<CommonParameters>]
2424
```
2525

@@ -135,21 +135,6 @@ Accept pipeline input: False
135135
Accept wildcard characters: False
136136
```
137137
138-
### -ReadFromDomainController
139-
This parameter is reserved for internal Microsoft use.
140-
141-
```yaml
142-
Type: SwitchParameter
143-
Parameter Sets: (All)
144-
Aliases:
145-
Applicable: Exchange Online
146-
Required: False
147-
Position: Named
148-
Default value: None
149-
Accept pipeline input: False
150-
Accept wildcard characters: False
151-
```
152-
153138
### -ResultSize
154139
The ResultSize parameter specifies the maximum number of results to return. If you want to return all requests that match the query, use unlimited for the value of this parameter. The default value is 1000.
155140

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

Lines changed: 6 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -17,28 +17,21 @@ For information about the parameter sets in the Syntax section below, see Exchan
1717

1818
## SYNTAX
1919

20-
### Set3
20+
### DatabaseSet
2121
```
2222
Get-MailboxLocation -Database <DatabaseIdParameter> [-Confirm]
2323
[-MailboxLocationType <Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared>]
2424
[-ResultSize <Unlimited>] [-WhatIf] [<CommonParameters>]
2525
```
2626

27-
### Set1
27+
### Identity
2828
```
2929
Get-MailboxLocation -Identity <MailboxLocationIdParameter> [-Confirm]
3030
[-MailboxLocationType <Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared>]
3131
[-ResultSize <Unlimited>] [-WhatIf] [<CommonParameters>]
3232
```
3333

34-
### Set4
35-
```
36-
Get-MailboxLocation -Organization <OrganizationIdParameter> [-Confirm]
37-
[-MailboxLocationType <Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared>]
38-
[-ResultSize <Unlimited>] [-WhatIf] [<CommonParameters>]
39-
```
40-
41-
### Set2
34+
### User
4235
```
4336
Get-MailboxLocation -User <UserIdParameter> [-Confirm]
4437
[-MailboxLocationType <Primary | MainArchive | AuxArchive | Aggregated | AuxPrimary | ComponentShared>]
@@ -64,7 +57,7 @@ This parameter is reserved for internal Microsoft use.
6457

6558
```yaml
6659
Type: DatabaseIdParameter
67-
Parameter Sets: Set3
60+
Parameter Sets: DatabaseSet
6861
Aliases:
6962
Applicable: Exchange Online
7063
Required: True
@@ -81,22 +74,7 @@ You can't use this parameter with the User parameter.
8174
8275
```yaml
8376
Type: MailboxLocationIdParameter
84-
Parameter Sets: Set1
85-
Aliases:
86-
Applicable: Exchange Online
87-
Required: True
88-
Position: Named
89-
Default value: None
90-
Accept pipeline input: False
91-
Accept wildcard characters: False
92-
```
93-
94-
### -Organization
95-
This parameter is reserved for internal Microsoft use.
96-
97-
```yaml
98-
Type: OrganizationIdParameter
99-
Parameter Sets: Set4
77+
Parameter Sets: Identity
10078
Aliases:
10179
Applicable: Exchange Online
10280
Required: True
@@ -125,7 +103,7 @@ You can't use this parameter with the Identity parameter.
125103
126104
```yaml
127105
Type: UserIdParameter
128-
Parameter Sets: Set2
106+
Parameter Sets: User
129107
Aliases:
130108
Applicable: Exchange Online
131109
Required: True

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

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ For information about the parameter sets in the Syntax section below, see Exchan
1919

2020
```
2121
Get-MailboxPlan [[-Identity] <MailboxPlanIdParameter>] [-AllMailboxPlanReleases] [-Credential <PSCredential>]
22-
[-DomainController <Fqdn>] [-Filter <String>] [-IgnoreDefaultScope]
22+
[-Filter <String>] [-IgnoreDefaultScope]
2323
[-OrganizationalUnit <OrganizationalUnitIdParameter>] [-ResultSize <Unlimited>] [-SortBy <String>]
2424
[<CommonParameters>]
2525
```
@@ -81,21 +81,6 @@ Accept pipeline input: False
8181
Accept wildcard characters: False
8282
```
8383
84-
### -DomainController
85-
This parameter is reserved for internal Microsoft use.
86-
87-
```yaml
88-
Type: Fqdn
89-
Parameter Sets: (All)
90-
Aliases:
91-
Applicable: Exchange Online
92-
Required: False
93-
Position: Named
94-
Default value: None
95-
Accept pipeline input: False
96-
Accept wildcard characters: False
97-
```
98-
9984
### -Filter
10085
The Filter parameter indicates the OPath filter used to filter recipients.
10186

exchange/exchange-ps/exchange/policy-and-compliance-content-search/New-ComplianceSearchAction.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -304,6 +304,8 @@ Accept wildcard characters: False
304304
```
305305
306306
### -Format
307+
In the Security & Compliance Center, this parameter requires the Export role. By default, the Export role is assigned only to the eDiscovery Manager role group.
308+
307309
The Format parameter specifies the format of the search results when you use the Export switch. Valid values are:
308310
309311
- FxStream: Export to PST files. This is the only option that's available when you export search results from the Security & Compliance Center.
@@ -314,8 +316,6 @@ The Format parameter specifies the format of the search results when you use the
314316
315317
- BodyText: Export to .txt files.
316318
317-
This parameter requires the Export role in the Security & Compliance Center. By default, the Export role is assigned only to the eDiscovery Manager role group.
318-
319319
```yaml
320320
Type: ComplianceDataTransferFormat
321321
Parameter Sets: (All)
@@ -380,12 +380,12 @@ Accept wildcard characters: False
380380
```
381381
382382
### -NotifyEmail
383+
In the Security & Compliance Center, this parameter requires the Export role. By default, the Export role is assigned only to the eDiscovery Manager role group.
384+
383385
The NotifyEmail parameter specifies the email address target for the search results when you use the Export switch.
384386
385387
The recipient you specify is in the To: field of the message.
386388
387-
In the Security & Compliance Center, this parameter requires the Export role. By default, the Export role is assigned only to the eDiscovery Manager role group.
388-
389389
```yaml
390390
Type: String
391391
Parameter Sets: Export
@@ -399,12 +399,12 @@ Accept wildcard characters: False
399399
```
400400
401401
### -NotifyEmailCC
402+
In the Security & Compliance Center, this parameter requires the Export role. By default, the Export role is assigned only to the eDiscovery Manager role group.
403+
402404
The NotifyEmailCC parameter specifies the email address target for the search results when you use the Export switch.
403405
404406
The recipient you specify is in the Cc: field of the message.
405407
406-
In the Security & Compliance Center, this parameter requires the Export role. By default, the Export role is assigned only to the eDiscovery Manager role group.
407-
408408
```yaml
409409
Type: String
410410
Parameter Sets: Export
@@ -552,6 +552,8 @@ Accept wildcard characters: False
552552
```
553553
554554
### -Scenario
555+
In the Security & Compliance Center, this parameter requires the Preivew role. By default, the Preview role is assigned only to the eDiscovery Manager role group.
556+
555557
The Scenario parameter specifies the scenario type when you use the Export switch. Valid values are:
556558
557559
- AnalyzeWithZoom: Prepare the search results for processing in Office 365 Advanced eDiscovery.
@@ -566,8 +568,6 @@ The Scenario parameter specifies the scenario type when you use the Export switc
566568
567569
- TriagePreview:
568570
569-
In the Security & Compliance Center, this parameter requires the Preivew role. By default, the Preview role is assigned only to the eDiscovery Manager role group.
570-
571571
```yaml
572572
Type: ComplianceSearchActionScenario
573573
Parameter Sets: (All)

exchange/exchange-ps/exchange/role-based-access-control/Add-ManagementRoleEntry.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,9 +223,11 @@ This parameter is available on in on-premises Exchange.
223223
224224
By default, this parameter is only available in the UnScoped Role Management role, and that role isn't assigned to any role groups. To use this parameter, you need to add the UnScoped Role Management role to a role group (for example, to the Organization Management role group). For more information, see the "Add a role to a role group" section in Manage role groups (https://technet.microsoft.com/library/jj657480.aspx).
225225
226-
The UnScopedTopLevel switch specifies that you're adding a custom script or non-Exchange cmdlet to an unscoped top-level management role. You don't need to specify a value with this switch.
226+
The UnScopedTopLevel switch specifies that you're adding the role entry to an unscoped top-level management role. You don't need to specify a value with this switch.
227227
228-
You can only use this switch when you add a role entry to an unscoped top-level role. When you use this switch, you can't use the ParentRoleEntry parameter.
228+
Unscoped top-level management roles can only contain custom scripts or non-Exchange cmdlets. For more information, see Create an unscoped role(https://technet.microsoft.com/library/dd876886.aspx).
229+
230+
You can't use this switch with the ParentRoleEntry parameter.
229231
230232
```yaml
231233
Type: SwitchParameter

exchange/exchange-ps/exchange/role-based-access-control/New-ManagementRole.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,11 @@ This parameter is available on in on-premises Exchange.
106106
107107
By default, this parameter is only available in the UnScoped Role Management role, and that role isn't assigned to any role groups. To use this parameter, you need to add the UnScoped Role Management role to a role group (for example, to the Organization Management role group). For more information, see the "Add a role to a role group" section in Manage role groups (https://technet.microsoft.com/library/jj657480.aspx).
108108
109-
The UnScopedTopLevel switch specifies that the role should be a custom, empty role. You don't need to specify a value with this switch.
109+
The UnScopedTopLevel switch specifies that the role new role is an unscoped top-level management role (a custom, empty role). You don't need to specify a value with this switch.
110110
111-
If you use this switch, you can't use the Parent parameter.
111+
You can only add custom scripts or non-Exchange cmdlets to an unscoped top-level management role. For more information, see Create an unscoped role(https://technet.microsoft.com/library/dd876886.aspx).
112+
113+
You can't use this switch with the Parent parameter.
112114
113115
```yaml
114116
Type: SwitchParameter

exchange/exchange-ps/exchange/role-based-access-control/New-ManagementRoleAssignment.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,9 @@ This parameter is available on in on-premises Exchange.
404404
405405
By default, this parameter is only available in the UnScoped Role Management role, and that role isn't assigned to any role groups. To use this parameter, you need to add the UnScoped Role Management role to a role group (for example, to the Organization Management role group). For more information, see the "Add a role to a role group" section in Manage role groups (https://technet.microsoft.com/library/jj657480.aspx).
406406
407-
The UnScopedTopLevel switch specifies that the role provided with the Role parameter is an unscoped top level management role. You don't need to specify a value with this switch.
407+
The UnScopedTopLevel switch specifies that the role provided with the Role parameter is an unscoped top-level management role. You don't need to specify a value with this switch.
408+
409+
Unscoped top-level management roles can only contain custom scripts or non-Exchange cmdlets. For more information, see Create an unscoped role(https://technet.microsoft.com/library/dd876886.aspx).
408410
409411
```yaml
410412
Type: SwitchParameter

exchange/exchange-ps/exchange/role-based-access-control/Remove-ManagementRole.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,9 @@ This parameter is available on in on-premises Exchange.
153153
154154
By default, this parameter is only available in the UnScoped Role Management role, and that role isn't assigned to any role groups. To use this parameter, you need to add the UnScoped Role Management role to a role group (for example, to the Organization Management role group). For more information, see the "Add a role to a role group" section in Manage role groups (https://technet.microsoft.com/library/jj657480.aspx).
155155
156-
The UnScopedTopLevel switch specifies that the role you're trying to remove is an unscoped top-level role. You don't need to specify a value with this switch.
156+
The UnScopedTopLevel switch specifies the role that you want to remove is an unscoped top-level role. You don't need to specify a value with this switch.
157+
158+
Unscoped top-level management roles can only contain custom scripts or non-Exchange cmdlets.
157159
158160
You must use this switch if you want to remove an unscoped top-level role.
159161

exchange/exchange-ps/exchange/role-based-access-control/Set-ManagementRoleEntry.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,9 @@ This parameter is available on in on-premises Exchange.
177177
178178
By default, this parameter is only available in the UnScoped Role Management role, and that role isn't assigned to any role groups. To use this parameter, you need to add the UnScoped Role Management role to a role group (for example, to the Organization Management role group). For more information, see the "Add a role to a role group" section in Manage role groups (https://technet.microsoft.com/library/jj657480.aspx).
179179
180-
The UnScopedTopLevel switch specifies the role entry is on an unscoped top level role. You don't need to specify a value with this switch.
180+
The UnScopedTopLevel switch specifies the role entry that you want to modify is on an unscoped top-level role. You don't need to specify a value with this switch.
181+
182+
Unscoped top-level management roles can only contain custom scripts or non-Exchange cmdlets. For more information, see Create an unscoped role(https://technet.microsoft.com/library/dd876886.aspx).
181183
182184
You must use this switch to modify role entries on unscoped top level roles.
183185

0 commit comments

Comments
 (0)