Skip to content

Commit 21f15f2

Browse files
authored
Merge branch 'master' into patch-2
2 parents 8f3939a + fa18ba0 commit 21f15f2

File tree

120 files changed

+896
-833
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

120 files changed

+896
-833
lines changed

exchange/docfx.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,10 @@
8181
"ms.date": "09/25/2017",
8282
"ms.topic": "reference",
8383
"ms.service": "exchange-powershell",
84+
"products": [
85+
"https://authoring-docs-microsoft.poolparty.biz/devrel/0b654e73-5728-4af3-8c2e-17bfbf4c9f23",
86+
"https://authoring-docs-microsoft.poolparty.biz/devrel/8bce367e-2e90-4b56-9ed5-5e4e9f3a2dc3"
87+
],
8488
"ms.devlang": "powershell",
8589
"feedback_system": "GitHub",
8690
"feedback_github_repo": "MicrosoftDocs/office-docs-powershell",

exchange/docs-conceptual/app-only-auth-powershell-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ Create a self-signed x.509 certificate using one of the following methods:
207207

208208
## Step 4: Attach the certificate to the Azure AD application
209209

210-
After you register the certificate with your application, you can use the public key (`.pfx` file) or the thumbprint for authentication.
210+
After you register the certificate with your application, you can use the private key (`.pfx` file) or the thumbprint for authentication.
211211

212212
1. On the **Apps registration** page from the end of [Step 2](#step-2-assign-api-permissions-to-the-application), select your application.
213213

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ If your account uses multi-factor authentication, use the steps in this section.
7979
Connect-IPPSSession -UserPrincipalName -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/
8080
```
8181

82-
For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-exchangeonline).
82+
For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-ippssession).
8383

8484
> [!NOTE]
8585
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command.
@@ -146,7 +146,7 @@ If your account doesn't use multi-factor authentication, use the steps in this s
146146
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.us/common
147147
```
148148

149-
For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-exchangeonline).
149+
For detailed syntax and parameter information, see [Connect-IPPSSession](/powershell/module/exchange/connect-ippssession).
150150

151151
> [!NOTE]
152152
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command:

exchange/exchange-ps/exchange/Add-AvailabilityAddressSpace.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Exchange.CalendarsAndGroups-Help.xml
33
online version: https://docs.microsoft.com/powershell/module/exchange/add-availabilityaddressspace
4-
applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
4+
applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
55
title: Add-AvailabilityAddressSpace
66
schema: 2.0.0
77
author: chrisda
@@ -77,7 +77,7 @@ The AccessMethod parameter specifies how the free/busy data is accessed. Valid v
7777
Type: AvailabilityAccessMethod
7878
Parameter Sets: (All)
7979
Aliases:
80-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
80+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
8181

8282
Required: True
8383
Position: Named
@@ -93,7 +93,7 @@ The ForestName parameter specifies the SMTP ___domain name of the target forest for
9393
Type: String
9494
Parameter Sets: (All)
9595
Aliases:
96-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
96+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
9797

9898
Required: True
9999
Position: Named
@@ -112,7 +112,7 @@ The Confirm switch specifies whether to show or hide the confirmation prompt. Ho
112112
Type: SwitchParameter
113113
Parameter Sets: (All)
114114
Aliases: cf
115-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
115+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
116116
117117
Required: False
118118
Position: Named
@@ -130,7 +130,7 @@ A value for this parameter requires the Get-Credential cmdlet. To pause this com
130130
Type: PSCredential
131131
Parameter Sets: (All)
132132
Aliases:
133-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
133+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
134134
135135
Required: False
136136
Position: Named
@@ -184,7 +184,7 @@ The TargetAutodiscoverEpr parameter specifies the Autodiscover URL of Exchange W
184184
Type: Uri
185185
Parameter Sets: (All)
186186
Aliases:
187-
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
187+
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
188188
189189
Required: False
190190
Position: Named
@@ -221,7 +221,7 @@ The WhatIf switch simulates the actions of the command. You can use this switch
221221
Type: SwitchParameter
222222
Parameter Sets: (All)
223223
Aliases: wi
224-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
224+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
225225
226226
Required: False
227227
Position: Named

exchange/exchange-ps/exchange/Disable-AntiPhishRule.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Exchange.TransportMailflow-Help.xml
33
online version: https://docs.microsoft.com/powershell/module/exchange/disable-antiphishrule
4-
applicable: Exchange Online
4+
applicable: Exchange Online, Exchange Online Protection
55
title: Disable-AntiPhishRule
66
schema: 2.0.0
77
author: chrisda
@@ -54,7 +54,7 @@ The Identity parameter specifies the antiphish rule that you want to disable. Yo
5454
Type: RuleIdParameter
5555
Parameter Sets: (All)
5656
Aliases:
57-
Applicable: Exchange Online
57+
Applicable: Exchange Online, Exchange Online Protection
5858

5959
Required: True
6060
Position: 0
@@ -73,7 +73,7 @@ The Confirm switch specifies whether to show or hide the confirmation prompt. Ho
7373
Type: SwitchParameter
7474
Parameter Sets: (All)
7575
Aliases: cf
76-
Applicable: Exchange Online
76+
Applicable: Exchange Online, Exchange Online Protection
7777
7878
Required: False
7979
Position: Named
@@ -89,7 +89,7 @@ The WhatIf switch simulates the actions of the command. You can use this switch
8989
Type: SwitchParameter
9090
Parameter Sets: (All)
9191
Aliases: wi
92-
Applicable: Exchange Online
92+
Applicable: Exchange Online, Exchange Online Protection
9393
9494
Required: False
9595
Position: Named

exchange/exchange-ps/exchange/Enable-AntiPhishRule.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Exchange.TransportMailflow-Help.xml
33
online version: https://docs.microsoft.com/powershell/module/exchange/enable-antiphishrule
4-
applicable: Exchange Online
4+
applicable: Exchange Online, Exchange Online Protection
55
title: Enable-AntiPhishRule
66
schema: 2.0.0
77
author: chrisda
@@ -54,7 +54,7 @@ The Identity parameter specifies the antiphish rule that you want to enable. You
5454
Type: RuleIdParameter
5555
Parameter Sets: (All)
5656
Aliases:
57-
Applicable: Exchange Online
57+
Applicable: Exchange Online, Exchange Online Protection
5858

5959
Required: True
6060
Position: 0
@@ -73,7 +73,7 @@ The Confirm switch specifies whether to show or hide the confirmation prompt. Ho
7373
Type: SwitchParameter
7474
Parameter Sets: (All)
7575
Aliases: cf
76-
Applicable: Exchange Online
76+
Applicable: Exchange Online, Exchange Online Protection
7777
7878
Required: False
7979
Position: Named
@@ -89,7 +89,7 @@ The WhatIf switch simulates the actions of the command. You can use this switch
8989
Type: SwitchParameter
9090
Parameter Sets: (All)
9191
Aliases: wi
92-
Applicable: Exchange Online
92+
Applicable: Exchange Online, Exchange Online Protection
9393
9494
Required: False
9595
Position: Named

exchange/exchange-ps/exchange/Export-TransportRuleCollection.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ The Identity parameter specifies the transport rule that you want to export. You
7272
Type: RuleIdParameter
7373
Parameter Sets: (All)
7474
Aliases:
75-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
75+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
7676

7777
Required: False
7878
Position: 1
@@ -151,7 +151,7 @@ The Format parameter specifics the format of the exported transport rule collect
151151
Type: RuleCollectionFormat
152152
Parameter Sets: (All)
153153
Aliases:
154-
Applicable: Exchange Online
154+
Applicable: Exchange Online, Exchange Online Protection
155155
156156
Required: False
157157
Position: Named

exchange/exchange-ps/exchange/Get-AdministrativeUnit.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Exchange.RolesAndAccess-Help.xml
33
online version: https://docs.microsoft.com/powershell/module/exchange/get-administrativeunit
4-
applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
4+
applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
55
title: Get-AdministrativeUnit
66
schema: 2.0.0
77
author: chrisda
@@ -66,7 +66,7 @@ The Identity parameter specifies the administrative unit that you want to view.
6666
Type: AdministrativeUnitIdParameter
6767
Parameter Sets: (All)
6868
Aliases:
69-
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
69+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
7070

7171
Required: False
7272
Position: 1
@@ -85,7 +85,7 @@ The Confirm switch specifies whether to show or hide the confirmation prompt. Ho
8585
Type: SwitchParameter
8686
Parameter Sets: (All)
8787
Aliases: cf
88-
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
88+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
8989
9090
Required: False
9191
Position: Named
@@ -97,7 +97,7 @@ Accept wildcard characters: False
9797
### -DomainController
9898
This parameter is available only in on-premises Exchange.
9999

100-
The DomainController parameter specifies the ___domain controller that's used by this cmdlet to read data from or write data to Active Directory. You identify the ___domain controller by its fully qualified ___domain name (FQDN). For example, dc01.contoso.com.
100+
This parameter is reserved for internal Microsoft use.
101101

102102
```yaml
103103
Type: Fqdn
@@ -119,7 +119,7 @@ The WhatIf switch simulates the actions of the command. You can use this switch
119119
Type: SwitchParameter
120120
Parameter Sets: (All)
121121
Aliases: wi
122-
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
122+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online, Exchange Online Protection
123123
124124
Required: False
125125
Position: Named

exchange/exchange-ps/exchange/Get-AntiPhishRule.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Exchange.TransportMailflow-Help.xml
33
online version: https://docs.microsoft.com/powershell/module/exchange/get-antiphishrule
4-
applicable: Exchange Online
4+
applicable: Exchange Online, Exchange Online Protection
55
title: Get-AntiPhishRule
66
schema: 2.0.0
77
author: chrisda
@@ -60,7 +60,7 @@ The Identity parameter specifies the antiphish rule that you want to view. You c
6060
Type: RuleIdParameter
6161
Parameter Sets: (All)
6262
Aliases:
63-
Applicable: Exchange Online
63+
Applicable: Exchange Online, Exchange Online Protection
6464

6565
Required: False
6666
Position: 0
@@ -76,7 +76,7 @@ The State parameter filters the results by the state of the rule. Valid values a
7676
Type: RuleState
7777
Parameter Sets: (All)
7878
Aliases:
79-
Applicable: Exchange Online
79+
Applicable: Exchange Online, Exchange Online Protection
8080

8181
Required: False
8282
Position: Named

exchange/exchange-ps/exchange/Get-ApplicationAccessPolicy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
external help file: Microsoft.Exchange.ServerStatus-Help.xml
33
online version: https://docs.microsoft.com/powershell/module/exchange/get-applicationaccesspolicy
4-
applicable: Exchange Online
4+
applicable: Exchange Online, Exchange Online Protection
55
title: Get-ApplicationAccessPolicy
66
schema: 2.0.0
77
author: chrisda
@@ -57,7 +57,7 @@ The Identity parameter specifies the application access policy that you want to
5757
Type: ApplicationAccessPolicyIdParameter
5858
Parameter Sets: (All)
5959
Aliases:
60-
Applicable: Exchange Online
60+
Applicable: Exchange Online, Exchange Online Protection
6161

6262
Required: True
6363
Position: 1

0 commit comments

Comments
 (0)