Skip to content

Commit d1ef264

Browse files
kenwithkenwith
authored
Merge branch 'master' into patch-2
2 parents 6d265a9 + 5f5d2c0 commit d1ef264

File tree

43 files changed

+1289
-387
lines changed

Some content is hidden

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

43 files changed

+1289
-387
lines changed

‎Get-TeamsApp.md

Lines changed: 0 additions & 117 deletions
This file was deleted.

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The following examples show how to use the Exchange Online PowerShell V2 module
3737
- Connect using a certificate thumbprint:
3838

3939
```powershell
40-
Connect-ExchangeOnline -CertificateThumbPrint "012THISISADEMOTHUMBPRINT" -AppID "alpha-beta-gamma-123456" -TenantID "contosoelectronics.onmicrosoft.com" -RoutingHintUPN "admin_exo@contosoelectronics.com"
40+
Connect-ExchangeOnline -CertificateThumbPrint "012THISISADEMOTHUMBPRINT" -AppID "alpha-beta-gamma-123456" -TenantID "contosoelectronics.onmicrosoft.com"
4141
```
4242
When you use the _CertificateThumbPrint_ parameter, the certificate needs to be installed on the computer where you are running the command. The certificate should be installed in the user certificate store.
4343

@@ -90,6 +90,8 @@ For a detailed visual flow bout creating applications in Azure AD, see <https://
9090
- Security reader
9191
- Security administrator
9292
- Helpdesk administrator
93+
- Exchange Service administrator
94+
- Global Reader
9395
9496
## Appendix
9597

‎exchange/exchange-ps/exchange/antispam-antimalware/Set-MailboxJunkEmailConfiguration.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,11 +200,9 @@ The Enabled parameter enables or disables the junk email rule on the mailbox (a
200200
201201
You can view the status of the junk email rule by running either of the following commands to find the Enabled property value:
202202
203-
- Get-MailboxJunkEmailConfiguration \<MailboxIdentity\>
203+
- Get-MailboxJunkEmailConfiguration -Identity \<MailboxIdentity\>
204204
205-
- Get-InboxRule "Junk E-mail Rule" -Mailbox \<MailboxIdentity\> -IncludeHidden
206-
207-
You use the JunkEmailEnabled parameter on the Set-OwaMailboxPolicy or Set-OwaVirtualDirectory cmdlets to control the availability of the junk email settings in Outlook on the web.
205+
- On-premises Exchange only: Get-InboxRule "Junk E-mail Rule" -Mailbox \<MailboxIdentity\> -IncludeHidden
208206
209207
The state of the junk email rule on the mailbox doesn't affect the client-side junk email settings that are available in the Outlook Junk Email Filter. Even when the junk email rule is disabled in the mailbox, Outlook can still move messages to the Junk Email folder. For example, if Outlook determines the message is spam, or the sender is defined in the Blocked Senders list, Outlook can move the message to the Junk Email folder. For more information, see [Use Junk Email Filters to control which messages you see](https://go.microsoft.com/fwlink/p/?LinkID=797542).
210208

‎exchange/exchange-ps/exchange/federation-and-hybrid/Set-FederationTrust.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,24 +63,31 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
6363

6464
### Example 1
6565
```powershell
66-
Set-FederationTrust -Identity "Microsoft Federation Gateway" -Thumbprint AC00F35CBA8359953F4126E0984B5CCAFA2F4F17
66+
Set-FederationTrust -Identity "Azure AD Authentication" -Thumbprint AC00F35CBA8359953F4126E0984B5CCAFA2F4F17
6767
```
6868

6969
This example configures the federation trust Microsoft Federation Gateway to use the certificate with the thumbprint AC00F35CBA8359953F4126E0984B5CCAFA2F4F17 as the next certificate.
7070

7171
### Example 2
7272
```powershell
73-
Set-FederationTrust -Identity "Microsoft Federation Gateway" -PublishFederationCertificate
73+
Set-FederationTrust -Identity "Azure AD Authentication" -PublishFederationCertificate
7474
```
7575

7676
This example configures the federation trust Microsoft Federation Gateway to use the next certificate as the current certificate.
7777

78+
### Example 3
79+
```powershell
80+
Set-FederationTrust -Identity "Azure AD Authentication" -MetadataUrl https://login.microsoftonline.us/FederationMetadata/2006-12/FederationMetadata.xml
81+
```
82+
83+
This example updates the configuration if the tenant is hosted in Office 365 U.S. Government GCC High or DoD environment.
84+
7885
Before you configure a federation trust to use the next certificate as the current certificate, you need to use the Test-FederationTrust cmdlet to verify that the certificate is available on all Exchange servers.
7986

8087
## PARAMETERS
8188

8289
### -Identity
83-
The Identity parameter specifies the name of the federation trust being modified.
90+
The Identity parameter specifies the name of the federation trust being modified. <br/><br/>**Note**: For Exchange Online tenants, use the value "Azure AD Authentication".
8491

8592
```yaml
8693
Type: FederationTrustIdParameter
@@ -168,7 +175,7 @@ Accept wildcard characters: False
168175
```
169176
170177
### -MetadataUrl
171-
The MetadataUrl parameter specifies the URL where WS-FederationMetadata is published by the Microsoft Federation Gateway.
178+
The MetadataUrl parameter specifies the URL where WS-FederationMetadata is published by the Microsoft Federation Gateway. <br/><br/> **Note**: For GCC High or DoD tenants, use the value https://login.microsoftonline.us/FederationMetadata/2006-12/FederationMetadata.xml.
172179
173180
```yaml
174181
Type: Uri

‎exchange/exchange-ps/exchange/mailboxes/Get-InboxRule.md

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ For information about the parameter sets in the Syntax section below, see [Excha
2323

2424
```
2525
Get-InboxRule [[-Identity] <InboxRuleIdParameter>]
26+
[-BypassScopeCheck]
2627
[-DescriptionTimeFormat <String>]
2728
[-DescriptionTimeZone <ExTimeZoneValue>]
2829
[-DomainController <Fqdn>]
29-
[-Mailbox <MailboxIdParameter>]
3030
[-IncludeHidden]
31-
[-BypassScopeCheck]
31+
[-Mailbox <MailboxIdParameter>]
3232
[-SweepRules]
3333
[<CommonParameters>]
3434
```
@@ -56,6 +56,22 @@ This example retrieves the Inbox rule ReceivedLastYear from the mailbox joe@cont
5656

5757
## PARAMETERS
5858

59+
### -BypassScopeCheck
60+
The BypassScopeCheck switch specifies whether to bypass the scope check for the user that's running the command. You don't need to specify a value with this switch.
61+
62+
```yaml
63+
Type: SwitchParameter
64+
Parameter Sets: (All)
65+
Aliases:
66+
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
67+
68+
Required: False
69+
Position: Named
70+
Default value: None
71+
Accept pipeline input: False
72+
Accept wildcard characters: False
73+
```
74+
5975
### -DescriptionTimeFormat
6076
The DescriptionTimeFormat parameter specifies the format for time values in the rule description. For example:
6177
@@ -138,6 +154,24 @@ Accept pipeline input: True
138154
Accept wildcard characters: False
139155
```
140156

157+
### -IncludeHidden
158+
This parameter works only in on-premises Exchange.
159+
160+
The IncludeHidden switch specifies whether to include hidden Inbox rules in the results. You don't need to specify a value with this switch.
161+
162+
```yaml
163+
Type: SwitchParameter
164+
Parameter Sets: (All)
165+
Aliases:
166+
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
167+
168+
Required: False
169+
Position: Named
170+
Default value: None
171+
Accept pipeline input: False
172+
Accept wildcard characters: False
173+
```
174+
141175
### -Mailbox
142176
The Mailbox parameter specifies the mailbox that contains the Inbox rule. You can use any value that uniquely identifies the mailbox. For example:
143177

@@ -174,41 +208,9 @@ Accept pipeline input: False
174208
Accept wildcard characters: False
175209
```
176210

177-
### -IncludeHidden
211+
### -SweepRules
178212
This parameter is available only in on-premises Exchange.
179213

180-
The IncludeHidden switch specifies whether to include hidden Inbox rules in the results. You don't need to specify a value with this switch.
181-
182-
```yaml
183-
Type: SwitchParameter
184-
Parameter Sets: (All)
185-
Aliases:
186-
Applicable: Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
187-
188-
Required: False
189-
Position: Named
190-
Default value: None
191-
Accept pipeline input: False
192-
Accept wildcard characters: False
193-
```
194-
195-
### -BypassScopeCheck
196-
The BypassScopeCheck switch specifies whether to bypass the scope check for the user that's running the command. You don't need to specify a value with this switch.
197-
198-
```yaml
199-
Type: SwitchParameter
200-
Parameter Sets: (All)
201-
Aliases:
202-
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
203-
204-
Required: False
205-
Position: Named
206-
Default value: None
207-
Accept pipeline input: False
208-
Accept wildcard characters: False
209-
```
210-
211-
### -SweepRules
212214
The SweepRules switch specifies whether to return only Sweep rules in the results. You don't need to specify a value with this switch.
213215

214216
Sweep rules run at regular intervals to help keep your Inbox clean.
@@ -217,7 +219,7 @@ Sweep rules run at regular intervals to help keep your Inbox clean.
217219
Type: SwitchParameter
218220
Parameter Sets: (All)
219221
Aliases:
220-
Applicable: Exchange Server 2016, Exchange Server 2019, Exchange Online
222+
Applicable: Exchange Server 2016, Exchange Server 2019
221223
222224
Required: False
223225
Position: Named

‎exchange/exchange-ps/exchange/organization/New-ApplicationAccessPolicy.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ For example:
152152
153153
- GUID
154154
155-
This parameter only accepts recipients that are security principals (users or groups that can have permissions assigned to them). The following types of recipients are not security principals, so you can't use them with this parameter::
155+
This parameter only accepts recipients that are security principals (users or groups that can have permissions assigned to them). The following types of recipients are not security principals, so you can't use them with this parameter:
156156
157157
- Discovery mailboxes
158158
@@ -164,6 +164,8 @@ This parameter only accepts recipients that are security principals (users or gr
164164
165165
To verify that a recipient is a security principal, use the syntax `Get-Recipient -Identity <RecipientIdentity> | Select-Object IsValidSecurityPrincipal`.
166166

167+
If you need to scope the policy to shared mailboxes, you can add them to a mail enabled security group.
168+
167169
```yaml
168170
Type: RecipientIdParameter
169171
Parameter Sets: (All)

0 commit comments

Comments
 (0)