Skip to content

Commit bfd41db

Browse files
authored
Merge branch 'master' into EDM-deniseb
2 parents 79aa82b + aff2375 commit bfd41db

File tree

57 files changed

+1987
-784
lines changed

Some content is hidden

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

57 files changed

+1987
-784
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/docs-conceptual/office-365-scc/connect-to-scc-powershell/connect-to-scc-powershell.md

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ description: "Learn how to connect to Security & Compliance Center PowerShell."
1717
Office 365 Security & Compliance Center PowerShell allows you to manage your Office 365 Security & Compliance Center settings from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to the Security & Compliance Center. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Security & Compliance Center cmdlets into your local Windows PowerShell session so that you can use them.
1818

1919
> [!NOTE]
20-
> If you want to use multi-factor authentication (MFA) to connect to Security & Compliance Center PowerShell, or if your organization uses federated authentication, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Office 365 Security & Compliance Center PowerShell using multi-factor authentication](mfa-connect-to-scc-powershell.md). For some features (for example, mailbox archiving), the Security & Compliance Center links to existing functionality in the Exchange admin center (EAC). To use PowerShell with these features, you need to connect to Exchange Online instead of the Security & Compliance Center. For more information, see [Connect to Exchange Online PowerShell](../../exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell.md).
20+
> The procedures in this topic won't work if: <br/>• Your account uses multi-factor authentication (MFA). <br/>• Your organization uses federated authentication. <br/>• A location condition in an Azure Active Directory conditional access policy restricts your access to trusted IPs. <br/> In these scenarions, you need to download and use the Exchange Online Remote PowerShell Module to connect to Security & Compliance Center PowerShell. For instructions, see [Connect to Office 365 Security & Compliance Center PowerShell using multi-factor authentication](mfa-connect-to-scc-powershell.md). <br/><br/> Some features in the Security & Compliance Center (for example, mailbox archiving) link to existing functionality in the Exchange admin center (EAC). To use PowerShell with these features, you need to connect to Exchange Online PowerShell instead of Security & Compliance Center PowerShell. For instructions, see [Connect to Exchange Online PowerShell](../../exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell.md). <br/><br/>
2121
2222
For more information about the Security & Compliance Center, see [Office 365 Security & Compliance Center](https://go.microsoft.com/fwlink/p/?LinkId=627054).
2323

@@ -59,31 +59,31 @@ For more information about the Security & Compliance Center, see [Office 365 Sec
5959
6060
1. On your local computer, open Windows PowerShell and run the following command:
6161
62-
```
63-
$UserCredential = Get-Credential
64-
```
62+
```
63+
$UserCredential = Get-Credential
64+
```
6565
66-
In the **Windows PowerShell Credential Request** dialog box that appears, type your work or school account and password, and then click **OK**.
66+
In the **Windows PowerShell Credential Request** dialog box that appears, type your work or school account and password, and then click **OK**.
6767
6868
2. Run the following command:
6969
70-
```
71-
$Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.compliance.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
72-
```
70+
```
71+
$Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.compliance.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
72+
```
7373
74-
**Notes**:
74+
**Notes**:
7575
76-
- For Office 365 Germany, use the _ConnectionUri_ value: `https://ps.compliance.protection.outlook.de/powershell-liveid/`.
76+
- For Office 365 Germany, use the _ConnectionUri_ value: `https://ps.compliance.protection.outlook.de/powershell-liveid/`.
7777
78-
- For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://ps.compliance.protection.office365.us/powershell-liveid/
78+
- For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://ps.compliance.protection.office365.us/powershell-liveid/
7979
80-
- If you want to connect to Security & Compliance Center PowerShell in the same window as an active Exchange Online PowerShell connection, you need to add the Prefix parameter and value (for example, `-Prefix "CC"`) to the end of this command to prevent cmdlet name collisions (both environments share some cmdlets with the same names).
80+
- If you want to connect to Security & Compliance Center PowerShell in the same window as an active Exchange Online PowerShell connection, you need to add the Prefix parameter and value (for example, `-Prefix "CC"`) to the end of this command to prevent cmdlet name collisions (both environments share some cmdlets with the same names).
8181
8282
3. Run the following command:
8383
84-
```
85-
Import-PSSession $Session -DisableNameChecking
86-
```
84+
```
85+
Import-PSSession $Session -DisableNameChecking
86+
```
8787
8888
> [!NOTE]
8989
> 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.
@@ -108,9 +108,9 @@ If you receive errors, check the following requirements:
108108
109109
- The **New-PSSession** command (Step 2) might fail to connect if your client IP address changes during the connection request. This can happen if your organization uses a source network address translation (SNAT) pool that contains multiple IP addresses. The connection error looks like this:
110110
111-
`The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
111+
`The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
112112
113-
To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Security & Compliance Center PowerShell endpoint.
113+
To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Security & Compliance Center PowerShell endpoint.
114114
115115
## See also
116116

exchange/exchange-ps/exchange/advanced-threat-protection/New-AntiPhishPolicy.md

Lines changed: 132 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,34 @@ For information about the parameter sets in the Syntax section below, see Exchan
2121
## SYNTAX
2222

2323
```
24-
New-AntiPhishPolicy -Name <String> [-AdminDisplayName <String>] [-AuthenticationFailAction <MoveToJmf | Quarantine>] [-Confirm] [-EnableAntispoofEnforcement <$true | $false>] [-EnableAuthenticationSafetyTip <$true | $false>] [-EnableAuthenticationSoftPassSafetyTip <$true | $false>] [-Enabled <$true | $false>] [-EnableMailboxIntelligence <$true | $false>] [-EnableOrganizationDomainsProtection <$true | $false>] [-EnableSimilarDomainsSafetyTips <$true | $false>] [-EnableSimilarUsersSafetyTips <$true | $false>] [-EnableTargetedDomainsProtection <$true | $false>] [-EnableTargetedUserProtection <$true | $false>] [-EnableUnusualCharactersSafetyTips <$true | $false>] [-ExcludedDomains <MultiValuedProperty>] [-ExcludedSenders <MultiValuedProperty>] [-PhishThresholdLevel <Int32>] [-TargetedDomainActionRecipients <MultiValuedProperty>] [-TargetedDomainProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>] [-TargetedDomainsToProtect <MultiValuedProperty>] [-TargetedUserActionRecipients <MultiValuedProperty>] [-TargetedUserProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>] [-TargetedUsersToProtect <MultiValuedProperty>] [-TreatSoftPassAsAuthenticated <$true | $false>] [-WhatIf] [<CommonParameters>]
24+
New-AntiPhishPolicy -Name <String>
25+
[-AdminDisplayName <String>]
26+
[-AuthenticationFailAction <MoveToJmf | Quarantine>]
27+
[-Confirm]
28+
[-EnableAntiSpoofEnforcement <$true | $false>]
29+
[-EnableAuthenticationSafetyTip <$true | $false>]
30+
[-EnableAuthenticationSoftPassSafetyTip <$true | $false>]
31+
[-Enabled <$true | $false>]
32+
[-EnableMailboxIntelligence <$true | $false>]
33+
[-EnableMailboxIntelligenceProtection <$true | $false>]
34+
[-EnableOrganizationDomainsProtection <$true | $false>]
35+
[-EnableSimilarDomainsSafetyTips <$true | $false>]
36+
[-EnableSimilarUsersSafetyTips <$true | $false>]
37+
[-EnableTargetedDomainsProtection <$true | $false>]
38+
[-EnableTargetedUserProtection <$true | $false>]
39+
[-EnableUnauthenticatedSender <$true | $false>]
40+
[-EnableUnusualCharactersSafetyTips <$true | $false>]
41+
[-ExcludedDomains <MultiValuedProperty>]
42+
[-ExcludedSenders <MultiValuedProperty>]
43+
[-PhishThresholdLevel <Int32>]
44+
[-TargetedDomainActionRecipients <MultiValuedProperty>]
45+
[-TargetedDomainProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>]
46+
[-TargetedDomainsToProtect <MultiValuedProperty>]
47+
[-TargetedUserActionRecipients <MultiValuedProperty>]
48+
[-TargetedUserProtectionAction <NoAction | MoveToJmf | Redirect | Quarantine | Delete | BccMessage>]
49+
[-TargetedUsersToProtect <MultiValuedProperty>]
50+
[-TreatSoftPassAsAuthenticated <$true | $false>]
51+
[-WhatIf] [<CommonParameters>]
2552
```
2653

2754
## DESCRIPTION
@@ -231,6 +258,25 @@ Accept pipeline input: False
231258
Accept wildcard characters: False
232259
```
233260
261+
### -EnableMailboxIntelligenceProtection
262+
The EnableMailboxIntelligenceProtection specifies whether to enable or disable intelligence based impersonation protection. Valid values are:
263+
264+
- $true: Enable intelligence based impersonation protection.
265+
266+
- $false: Don't enable intelligence based impersonation protection. This is the default value.
267+
268+
```yaml
269+
Type: $true | $false
270+
Parameter Sets: (All)
271+
Aliases:
272+
Applicable: Exchange Online, Exchange Online Protection
273+
Required: False
274+
Position: Named
275+
Default value: None
276+
Accept pipeline input: False
277+
Accept wildcard characters: False
278+
```
279+
234280
### -EnableOrganizationDomainsProtection
235281
The EnableOrganizationDomainsProtection parameter specifies whether to enable domain impersonation protection for all registered domains in the Office 365 organization. Valid values are:
236282
@@ -326,6 +372,25 @@ Accept pipeline input: False
326372
Accept wildcard characters: False
327373
```
328374
375+
### -EnableUnauthenticatedSender
376+
The EnableUnauthenticatedSender parameter specifies whether to apply a "?" symbol in Outlook's sender card if the sender fails authentication checks. Valid values are:
377+
378+
- $true: Apply the "?" symbol.
379+
380+
- $false: Do not apply the "?" symbol.
381+
382+
```yaml
383+
Type: $true | $false
384+
Parameter Sets: (All)
385+
Aliases:
386+
Applicable: Exchange Online, Exchange Online Protection
387+
Required: False
388+
Position: Named
389+
Default value: True
390+
Accept pipeline input: False
391+
Accept wildcard characters: False
392+
```
393+
329394
### -EnableUnusualCharactersSafetyTips
330395
The EnableUnusualCharactersSafetyTips parameter specifies whether to enable safety tips that are shown to recipients in messages for unusual characters in domain and user impersonation detections. Valid values are:
331396
@@ -375,6 +440,71 @@ Accept pipeline input: False
375440
Accept wildcard characters: False
376441
```
377442
443+
### -ImpersonationProtectionState
444+
The ImpersonationProtectionState parameter specifies the configuration of impersonation protection. Valid values are:
445+
446+
- Automatic
447+
448+
- Manual (This is the default value)
449+
450+
- Off
451+
452+
```yaml
453+
Type: ImpersonationProtectionState
454+
Parameter Sets: (All)
455+
Aliases:
456+
Applicable: Exchange Online, Exchange Online Protection
457+
Required: False
458+
Position: Named
459+
Default value: None
460+
Accept pipeline input: False
461+
Accept wildcard characters: False
462+
```
463+
464+
### -MailboxIntelligenceProtectionAction
465+
The MailboxIntelligenceProtectionAction parameter specifies what to do with messages that fail mailbox intelligence protection. Valid values are:
466+
467+
- NoAction (This is the default value)
468+
469+
- BccMessage: Add the recipients specified by the MailboxIntelligenceProtectionActionRecipients parameter to the Bcc field of the message.
470+
471+
- Delete: Delete the message during filtering. Use caution when selecting this value, because you can't recover the deleted message.
472+
473+
- MoveToJmf: Move the message to the user's Junk Email folder.
474+
475+
- Quarantine: Move the message to the phishing quarantine.
476+
477+
- Redirect: Redirect the message to the recipients specified by the MailboxIntelligenceProtectionActionRecipients parameter.
478+
479+
```yaml
480+
Type: ImpersonationAction
481+
Parameter Sets: (All)
482+
Aliases:
483+
Applicable: Exchange Online, Exchange Online Protection
484+
Required: False
485+
Position: Named
486+
Default value: None
487+
Accept pipeline input: False
488+
Accept wildcard characters: False
489+
```
490+
491+
### -MailboxIntelligenceProtectionActionRecipients
492+
The MailboxIntelligenceProtectionActionRecipients parameter specifies the recipients to add to detected messages when the MailboxIntelligenceProtectionAction parameter is set to the value Redirect or BccMessage.
493+
494+
A valid value for this parameter is an email address. You can specify multiple email addresses separated by commas.
495+
496+
```yaml
497+
Type: MultiValuedProperty
498+
Parameter Sets: (All)
499+
Aliases:
500+
Applicable: Exchange Online, Exchange Online Protection
501+
Required: False
502+
Position: Named
503+
Default value: None
504+
Accept pipeline input: False
505+
Accept wildcard characters: False
506+
```
507+
378508
### -PhishThresholdLevel
379509
The PhishThresholdLevel parameter specifies the tolerance level that's used by machine learning in the handling of phishing messages. Valid values are:
380510
@@ -477,7 +607,7 @@ Accept wildcard characters: False
477607
```
478608
479609
### -TargetedUserProtectionAction
480-
The TargetedUserProtectionAction parameter specifies the action to take on detected user impersonation messages for the users specified by the TargetedUsersToProtect parameter. Valid values are:
610+
The TargetedUserProtectionAction parameter specifies the action to take on detected messages for the users specified by the TargetedUsersToProtect parameter. Valid values are:
481611
482612
- NoAction (This is the default value)
483613

0 commit comments

Comments
 (0)