Skip to content

Commit ea6992b

Browse files
chrisdachrisda
authored
Merge branch 'master' into patch-35
2 parents c8fc375 + dd42ccf commit ea6992b

18 files changed

+1903
-1825
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ description: "Learn how to connect to Exchange Online PowerShell by using multi-
1616
If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you can't use the instructions at [Connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md) to use remote PowerShell to connect to Exchange Online. MFA requires you to install the Exchange Online Remote PowerShell Module, and use the **Connect-EXOPSSession** cmdlet to connect.
1717

1818
> [!NOTE]
19-
> • You can't use the Exchange Online Remote PowerShell Module to connect to Exchange Online PowerShell and Security & Compliance Center PowerShell in the same session (window). You need to use separate sessions of the Exchange Online Remote PowerShell Module. <br/>• Delegated Access Permission (DAP) partners can't use the procedures in this topic to connect to their customer tenant organizations in Exchange Online PowerShell. MFA and the Exchange Online Remote PowerShell Module don't work with delegated authentication. <br/>• The Exchange Online Remote PowerShell Module is not supported in PowerShell Core (macOS, Linux, or Windows Nano Server). As a workaround, you can install the module on a computer that's running a supported version of Windows (physical or virtual), and use remote desktop software to connect.
19+
> • Delegated Access Permission (DAP) partners can't use the procedures in this topic to connect to their customer tenant organizations in Exchange Online PowerShell. MFA and the Exchange Online Remote PowerShell Module don't work with delegated authentication. <br/>• The Exchange Online Remote PowerShell Module is not supported in PowerShell Core (macOS, Linux, or Windows Nano Server). As a workaround, you can install the module on a computer that's running a supported version of Windows (physical or virtual), and use remote desktop software to connect.
2020
2121
## What do you need to know before you begin?
2222

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ description: "Learn how to connect to Security & Compliance Center PowerShell by
1616
If your account uses multi-factor authentication (MFA) or federated authentication, you can't use the instructions at [Connect to Office 365 Security & Compliance Center PowerShell](connect-to-scc-powershell.md) to use remote PowerShell to connect to the Office 365 Security & Compliance Center. Instead, you need to install the Exchange Online Remote PowerShell Module, and use the **Connect-IPPSSession** cmdlet to connect to Security & Compliance Center PowerShell.
1717

1818
> [!NOTE]
19-
> • You can't use the Exchange Online Remote PowerShell Module to connect to Exchange Online PowerShell and Security & Compliance Center PowerShell in the same session (window). You need to use separate sessions of the Exchange Online Remote PowerShell Module. <br/>• Delegated Access Permission (DAP) partners can't use the procedures in this topic to connect to their customer tenant organizations in Security & Compliance Center PowerShell. MFA and the Exchange Online Remote PowerShell Module don't work with delegated authentication. <br/>• The Exchange Online Remote PowerShell Module is not supported in PowerShell Core (macOS, Linux, or Windows Nano Server). As a workaround, you can install the module on a computer that's running a supported version of Windows (physical or virtual), and use remote desktop software to connect.
19+
> • Delegated Access Permission (DAP) partners can't use the procedures in this topic to connect to their customer tenant organizations in Security & Compliance Center PowerShell. MFA and the Exchange Online Remote PowerShell Module don't work with delegated authentication. <br/>• The Exchange Online Remote PowerShell Module is not supported in PowerShell Core (macOS, Linux, or Windows Nano Server). As a workaround, you can install the module on a computer that's running a supported version of Windows (physical or virtual), and use remote desktop software to connect.
2020
2121
## What do you need to know before you begin?
2222

@@ -111,6 +111,19 @@ If your account uses multi-factor authentication (MFA) or federated authenticati
111111
4. **(MFA only)**: In the verification window that opens, enter the verification code, and then click **Sign in**.
112112
113113
![Enter your verification code in the Exchange Online Remote PowerShell window](../../media/d3a405ce-5364-4732-a7bb-2cc9c678da2d.png)
114+
115+
5. **(Optional)**: If you want to connect to an Exchange Online PowerShell module session in the same window, you need to run
116+
117+
```
118+
$EXOSession=New-ExoPSSSession -UserPrincipalName <UPN> [-ConnectionUri <ConnectionUri> -AzureADAuthorizationEndPointUri <AzureADUri>]
119+
```
120+
121+
and then import the Exchange Online session into the current one using an specific prefix
122+
123+
```
124+
Import-PSSession $EXOSession -Prefix EXO
125+
```
126+
114127
115128
## How do you know this worked?
116129

‎exchange/exchange-ps/exchange/policy-and-compliance-retention/New-RetentionCompliancePolicy.md

Lines changed: 45 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,17 @@ Accept wildcard characters: False
447447
```
448448
449449
### -TeamsChannelLocation
450-
{{Fill TeamsChannelLocation Description}}
450+
The TeamsChannelLocation parameter is used to target specific Teams to include in the policy.
451+
452+
You can use any value that uniquely identifies the Team. For example:
453+
454+
- Name
455+
456+
- Email address
457+
458+
- GUID
459+
460+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
451461
452462
```yaml
453463
Type:
@@ -462,7 +472,16 @@ Accept wildcard characters: False
462472
```
463473
464474
### -TeamsChannelLocationException
465-
{{Fill TeamsChannelLocationException Description}}
475+
This parameter specifies the Teams to exclude when you use the value All for the TeamsChannelLocation parameter. You can use any value that uniquely identifies the team. For example:
476+
477+
- Name
478+
479+
- Email address
480+
481+
- GUID
482+
483+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
484+
466485
467486
```yaml
468487
Type:
@@ -477,7 +496,19 @@ Accept wildcard characters: False
477496
```
478497
479498
### -TeamsChatLocation
480-
{{Fill TeamsChatLocation Description}}
499+
The TeamsChatLocation parameter is used to target specific Teams users to include in the policy.
500+
501+
You can use any value that uniquely identifies the user. For example:
502+
503+
- Name
504+
505+
- Distinguished name (DN)
506+
507+
- Email address
508+
509+
- GUID
510+
511+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
481512
482513
```yaml
483514
Type:
@@ -492,7 +523,17 @@ Accept wildcard characters: False
492523
```
493524
494525
### -TeamsChatLocationException
495-
{{Fill TeamsChatLocationException Description}}
526+
This parameter specifies the Teams users to exclude when you use the value All for the TeamsChatLocation parameter. You can use any value that uniquely identifies the user. For example:
527+
528+
- Name
529+
530+
- Distinguished name (DN)
531+
532+
- Email address
533+
534+
- GUID
535+
536+
To enter multiple values, use the following syntax: \<value1\>,\<value2\>,...\<valueX\>. If the values contain spaces or otherwise require quotation marks, use the following syntax: "\<value1\>","\<value2\>",..."\<valueX\>".
496537
497538
```yaml
498539
Type:

0 commit comments

Comments
 (0)