Skip to content

Commit a5c94b6

Browse files
authored
Merge pull request MicrosoftDocs#965 from MicrosoftDocs/master
Master to ExMigration
2 parents f0e0250 + f21316a commit a5c94b6

File tree

52 files changed

+1016
-237
lines changed

Some content is hidden

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

52 files changed

+1016
-237
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.audience: Admin
88
ms.topic: article
99
ms.service: exchange-online
1010
localization_priority: Priority
11-
ms.collection : Strat_EX_Admin
11+
ms.collection: Strat_EX_Admin
1212
ms.custom:
1313
ms.assetid: c8bea338-6c1a-4bdf-8de0-7895d427ee5b
1414
description: "Learn how to use remote PowerShell to connect to Exchange Online."

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,14 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
9393
4. In the verification window that opens, enter the verification code, and then click **Sign in**.
9494

9595
![Enter your verification code in the Exchange Online Remote PowerShell window](../../media/d3a405ce-5364-4732-a7bb-2cc9c678da2d.png)
96-
96+
97+
> [!NOTE]
98+
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Exchange Online Remote PowerShell Module 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 all currently open PowerShell sessions in the current window, run the following command:
99+
100+
```
101+
Get-PSSession | Remove-PSSession
102+
```
103+
97104
## How do you know this worked?
98105

99106
After Step 4, the Exchange Online cmdlets are imported into your Exchange Online Remote PowerShell Module session and tracked by a progress bar. If you don't receive any errors, you connected successfully. A quick test is to run an Exchange Online cmdlet, for example, **Get-Mailbox**, and see the results.
@@ -105,5 +112,3 @@ If you receive errors, check the following requirements:
105112
- The account you use to connect to Exchange Online must be enabled for remote PowerShell. For more information, see [Enable or disable access to Exchange Online PowerShell](../disable-access-to-exchange-online-powershell.md).
106113

107114
- TCP port 80 traffic needs to be open between your local computer and Office 365. It's probably open, but it's something to consider if your organization has a restrictive Internet access policy.
108-
109-

exchange/docs-conceptual/exchange-server/connect-to-exchange-servers-using-remote-powershell.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ ms.audience: ITPro
88
ms.topic: article
99
ms.prod: exchange-server-itpro
1010
localization_priority: Priority
11-
ms.collection:
12-
- Strat_EX_Admin
11+
ms.collection: Strat_EX_Admin
1312
ms.custom:
1413
ms.assetid: 0b5987c3-8836-456d-99f7-abc2ffb57300
1514
description: "Use Windows PowerShell on a local computer to connect to an Exchange Server."

exchange/exchange-ps/exchange/antispam-antimalware/Export-QuarantineMessage.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ monikerRange: "exchonline-ps || eop-ps"
1111
## SYNOPSIS
1212
This cmdlet is available only in the cloud-based service.
1313

14-
Use the Export-QuarantineMessage cmdlet to export quarantined messages from your cloud-based organization to .eml message files. You can then open the .eml files in Outlook.
14+
Use the Export-QuarantineMessage cmdlet to export quarantined messages and files from your cloud-based organization. Messages are exported to .eml message files so you can open them in Outlook.
15+
16+
For files that are protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams, the files are exported in Base64 format.
1517

1618
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
1719

@@ -43,6 +45,13 @@ Notes:
4345

4446
- You need to use the Out-File cmdlet to write the .eml message file with the required encoding. If you use the default PowerShell redirection operator ">" to write the output file, the default encoding is Unicode, which might not match the actual message encoding.
4547

48+
### -------------------------- Example 2 --------------------------
49+
```
50+
$e = Export-QuarantineMessage -Identity 9c6bb3e8-db9e-4823-9759-08d594179bd3\7fec89fe-41b0-ae67-4887-5bede017d111; $bytes = [Convert]::FromBase64String($e.eml); [IO.File]::WriteAllBytes("C:\My Documents\Export1.txt", $bytes)
51+
```
52+
53+
This example exports the quarantined file with the specified Identity value. The first command exports the file to a Base 64 string. The next two commands convert the string to byte format and write it to the output file.
54+
4655
## PARAMETERS
4756

4857
### -Identity

exchange/exchange-ps/exchange/antispam-antimalware/Get-QuarantineMessage.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ monikerRange: "exchonline-ps || eop-ps"
1111
## SYNOPSIS
1212
This cmdlet is available only in the cloud-based service.
1313

14-
Use the Get-QuarantineMessage cmdlet to view quarantined messages in your cloud-based organization.
14+
Use the Get-QuarantineMessage cmdlet to view quarantined messages and files in your cloud-based organization.
15+
16+
**Not**: Quarantined files are files protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams.
1517

1618
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
1719

@@ -62,6 +64,15 @@ This example returns the quarantined message with the Message-ID value \<5c695d7
6264
Get-QuarantineMessage -Identity c14401cf-aa9a-465b-cfd5-08d0f0ca37c5\4c2ca98e-94ea-db3a-7eb8-3b63657d4db7 | Format-List
6365
```
6466

67+
This example returns detailed information for the quarantined message with the specified Identity value.
68+
69+
### -------------------------- Example 5 --------------------------
70+
```
71+
Get-QuarantineMessage -QuarantineTypes SPOMalware | Format-List
72+
```
73+
74+
This example returns detailed information for the files protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams.
75+
6576
## PARAMETERS
6677

6778
### -Identity
@@ -216,12 +227,16 @@ The QuarantineTypes parameter filters the results by what caused the message to
216227
217228
- Spam
218229
230+
- SPOMalware
231+
219232
- TransportRule
220233
221234
You can specify multiple values separated by commas.
222235
223236
You don't need to use this parameter with the Type parameter.
224237
238+
For files protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams, the detection information can be found in CustomData field in the output.
239+
225240
```yaml
226241
Type: QuarantineMessageTypeEnum[]
227242
Parameter Sets: Set1

exchange/exchange-ps/exchange/antispam-antimalware/Preview-QuarantineMessage.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ This cmdlet is available only in the cloud-based service.
1313

1414
Use the Preview-QuarantineMessage cmdlet to preview the contents of quarantined messages in your cloud-based organization.
1515

16+
**Note**: This cmdlet isn't available for files that are protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business, and Microsoft Teams.
17+
1618
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
1719

1820
## SYNTAX

exchange/exchange-ps/exchange/antispam-antimalware/Release-QuarantineMessage.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
2+
13
---
24
external help file: Microsoft.Exchange.ServerStatus-Help.xml
35
applicable: Exchange Online, Exchange Online Protection
@@ -13,6 +15,8 @@ This cmdlet is available only in the cloud-based service.
1315

1416
Use the Release-QuarantineMessage cmdlet to release messages from quarantine in your cloud-based organization. You can release messages to all original recipients, or to specific recipients.
1517

18+
For files that are protected by Office 365 Advanced Threat Protection in SharePoint Online, OneDrive for Business and Microsoft Teams, you can unblock the files in the respective team sites and document libraries by using the Release-QuarantineMessage cmdlet so users can access, share, and download the files.
19+
1620
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
1721

1822
## SYNTAX
@@ -133,6 +137,8 @@ Accept wildcard characters: False
133137
### -ReleaseToAll
134138
The ReleaseToAll switch releases the quarantined message to all original recipients. You don't have to specify a value with this switch.
135139
140+
This parameter is required for the quarantine type SPOMalware.
141+
136142
If you previously used the User parameter or the ReleaseToAll switch to release the quarantined message to some or all of the original recipients, those recipients are skipped when you use the ReleaseToAll parameter again. You don't have to specify a value with the ReleaseToAll switch.
137143
138144
You can't use the ReleaseToAll switch and the User parameter in the same command.

exchange/exchange-ps/exchange/mailboxes/Search-Mailbox.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,6 @@ You can use the Search-Mailbox cmdlet to search messages in a specified mailbox
4646

4747
- Delete messages from the source mailbox. You have to be assigned the Mailbox Import Export management role to delete messages.
4848

49-
- Copy messages from the source mailbox and delete them from the target mailbox.
50-
5149
- Perform single item recovery to recover items from a user's Recoverable Items folder.
5250

5351
- Clean up the Recoverable Items folder for a mailbox when it has reached the Recoverable Items hard quota.

exchange/exchange-ps/exchange/mailboxes/Set-Mailbox.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1663,7 +1663,7 @@ Accept wildcard characters: False
16631663
### -ExcludeFromOrgHolds
16641664
This parameter is available only in Exchange Online.
16651665

1666-
The ExcludeFromHolds parameter excludes the mailbox from one or more organization-wide Office 365 retention policies. This parameter can only be used for inactive mailboxes. A valid value for this parameter is the GUID of the organization-wide Office 365 retention policy that the inactive mailbox is excluded from. To find the GUID values of organization-wide Office 365 retention policies, run the command Get-OrganizationConfig | Format-List InplaceHolds. Note that retention policies assigned to mailboxes are prefaced by 'mbx'.
1666+
The ExcludeFromOrgHolds parameter excludes the mailbox from one or more organization-wide Office 365 retention policies. This parameter can only be used for inactive mailboxes. A valid value for this parameter is the GUID of the organization-wide Office 365 retention policy that the inactive mailbox is excluded from. To find the GUID values of organization-wide Office 365 retention policies, run the command Get-OrganizationConfig | Format-List InplaceHolds. Note that retention policies assigned to mailboxes are prefaced by 'mbx'.
16671667

16681668
You can specify multiple values for this parameter by using the syntax “GUID1”,”GUID2”,…”GUIDX”.
16691669

exchange/exchange-ps/exchange/policy-and-compliance-ediscovery/Get-ComplianceCase.md

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,14 @@ monikerRange: "o365scc-ps"
1111
## SYNOPSIS
1212
This cmdlet is available only in the Office 365 Security & Compliance Center. For more information, see Office 365 Security & Compliance Center PowerShell (https://technet.microsoft.com/library/mt587091.aspx).
1313

14-
Use the Get-ComplianceCase cmdlet to view eDiscovery cases in the Security & Compliance Center. You use eDiscovery cases to control who can create, access, and manage compliance searches in your organization.
14+
Use the Get-ComplianceCase cmdlet to view eDiscovery cases and DSR (data subject request) cases in the Security & Compliance Center. You use eDiscovery cases to control who can create, access, and manage compliance searches in your organization.
1515

1616
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
1717

1818
## SYNTAX
1919

2020
```
21-
Get-ComplianceCase [[-Identity] <ComplianceCaseIdParameter>] [-DomainController <Fqdn>] [-RoleGroup <String>]
21+
Get-ComplianceCase [-Identity] <ComplianceCaseIdParameter>] [-CaseType <eDiscovery | DSR>] [-DomainController <Fqdn>] [-RoleGroup <String>]
2222
[<CommonParameters>]
2323
```
2424

@@ -43,6 +43,25 @@ This example returns detailed information for the eDiscovery case named Contoso
4343

4444
## PARAMETERS
4545

46+
### -CaseType
47+
The CaseType parameter specifies the type of eDiscovery case that you want to view. Valid values are:
48+
49+
- eDiscovery: eDiscovery cases are used to manage legal or other types of investigations. In the Security & Compliance Center, eDiscovery cases are displayed under Search & investigation \> eDiscovery. This is the default value.
50+
51+
- DSR: Data Subject Request (DSR) cases are used to manage General Data Protection Regulation (GDPR) DSR investigations. In the Security & Compliance Center, DSR cases are displayed under Data privacy \> DSR cases.
52+
53+
```yaml
54+
Type: eDiscovery | DSR
55+
Parameter Sets: (All)
56+
Aliases:
57+
Applicable: Office 365 Security & Compliance Center
58+
Required: False
59+
Position: Named
60+
Default value: eDiscovery
61+
Accept pipeline input: False
62+
Accept wildcard characters: False
63+
```
64+
4665
### -DomainController
4766
This parameter is reserved for internal Microsoft use.
4867

0 commit comments

Comments
 (0)