Skip to content

Commit 2536f66

Browse files
authored
Merge branch 'master' into patch-3
2 parents f6a1d0f + e738b46 commit 2536f66

13 files changed

+250
-22
lines changed
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
---
2+
external help file: Microsoft.Exchange.ServerStatus-Help.xml
3+
online version: https://docs.microsoft.com/powershell/module/exchange/get-externalinoutlook
4+
applicable: Exchange Online
5+
title: Get-ExternalInOutlook
6+
schema: 2.0.0
7+
author: chrisda
8+
ms.author: chrisda
9+
ms.reviewer:
10+
---
11+
12+
# Get-ExternalInOutlook
13+
14+
## SYNOPSIS
15+
This cmdlet is available only in the cloud-based service.
16+
17+
Use the Get-ExternalInOutlook cmdlet to view the configuration of external sender identification that's available in supported versions of Outlook.
18+
19+
**Note**: We recommend that you use the Exchange Online PowerShell V2 module to connect to Exchange Online PowerShell. For instructions, see [Connect to Exchange Online PowerShell](https://docs.microsoft.com/powershell/exchange/connect-to-exchange-online-powershell).
20+
21+
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
22+
23+
## SYNTAX
24+
25+
```
26+
Get-ExternalInOutlook [[-Identity] <OrganizationIdParameter>] [<CommonParameters>]
27+
```
28+
29+
## DESCRIPTION
30+
The important properties that are returned in the output of this cmdlet are:
31+
32+
- Enabled: True means the feature is enabled; False means the feature is disabled.
33+
- AllowList: The list of exceptions. Messages received from the specified senders or senders in the specified domains don't receive the External icon in the area of subject line.
34+
35+
You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see [Find the permissions required to run any Exchange cmdlet](https://docs.microsoft.com/powershell/exchange/find-exchange-cmdlet-permissions).
36+
37+
## EXAMPLES
38+
39+
### Example 1
40+
```powershell
41+
Get-ExternalInOutlook
42+
```
43+
44+
This example returns the settings of the external sender identification feature for the organization.
45+
46+
## PARAMETERS
47+
48+
### -Identity
49+
The Identity parameter specifies the GUID of the external sender identification object that you want to view. Although this parameter is available, you don't need to use it.
50+
51+
```yaml
52+
Type: OrganizationIdParameter
53+
Parameter Sets: (All)
54+
Aliases:
55+
Applicable: Exchange Online
56+
57+
Required: False
58+
Position: 0
59+
Default value: None
60+
Accept pipeline input: False
61+
Accept wildcard characters: False
62+
```
63+
64+
### CommonParameters
65+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
66+
67+
## INPUTS
68+
69+
###
70+
71+
## OUTPUTS
72+
73+
###
74+
75+
## NOTES
76+
77+
## RELATED LINKS

exchange/exchange-ps/exchange/Get-MailboxFolderStatistics.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,14 @@ Get-MailboxFolderStatistics -Identity "Tony" -FolderScope RecoverableItems -Incl
8484

8585
This example uses the IncludeAnalysis switch to view the statistics of Tony's Recoverable Items folder.
8686

87+
### Example 5
88+
```powershell
89+
$All = Get-Mailbox -ResultSize Unlimited
90+
$All | foreach {Get-MailboxFolderStatistics -Identity $_.Identity -FolderScope Inbox | Format-Table Identity,ItemsInFolderAndSubfolders,FolderAndSubfolderSize -AutoSize}
91+
```
92+
93+
This example uses the FolderScope parameter to view inbox folders statistics for all mailboxes.
94+
8795
## PARAMETERS
8896

8997
### -Identity

exchange/exchange-ps/exchange/New-DlpKeywordDictionary.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You need to be assigned permissions in the Security & Compliance Center before y
3939
### Example 1
4040
```powershell
4141
$Keywords = @("Aarskog's syndrome","Abandonment","Abasia","Abderhalden-Kaufmann-Lignac","Abdominalgia","Abduction contracture","Abetalipo proteinemia","Abiotrophy","Ablatio","ablation","Ablepharia","Abocclusion","Abolition","Aborter","Abortion","Abortus","Aboulomania","Abrami's disease","Abramo")
42-
$EncodedKeywords = $Keywords | ForEach-Object{[System.Text.Encoding]::UTF8.GetBytes($_+"`r`n")}
42+
$EncodedKeywords = $Keywords | ForEach-Object {[System.Text.Encoding]::Unicode.GetBytes($_+"`r`n")}
4343
New-DlpKeywordDictionary -Name "Diseases" -Description "Names of diseases and injuries from ICD-10-CM lexicon" -FileData $EncodedKeywords
4444
```
4545

@@ -48,7 +48,7 @@ This example creates a DLP keyword dictionary named Diseases by using the specif
4848
### Example 2
4949
```powershell
5050
$Keywords = Get-Content "C:\My Documents\InappropriateTerms.txt"
51-
$EncodedKeywords = $Keywords | ForEach-Object{[System.Text.Encoding]::UTF8.GetBytes($_+"`r`n")}
51+
$EncodedKeywords = $Keywords | ForEach-Object{[System.Text.Encoding]::Unicode.GetBytes($_+"`r`n")}
5252
New-DlpKeywordDictionary -Name "Inappropriate Language" -Description "Unprofessional and inappropriate terminology" -FileData $EncodedKeywords
5353
```
5454

@@ -108,7 +108,7 @@ Accept wildcard characters: False
108108
```
109109

110110
### -FileData
111-
The FileData parameter specifies the terms that are used in the DLP keyword dictionary. This parameter requires a comma-separated list of values that's binary encoded in UTF8. For more information, see the examples in this topic.
111+
The FileData parameter specifies the terms that are used in the DLP keyword dictionary. This parameter requires a comma-separated list of values that's binary encoded in UTF-16. For more information, see the examples in this topic.
112112

113113
```yaml
114114
Type: Byte[]

exchange/exchange-ps/exchange/New-MigrationBatch.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ Onboarding and offboarding in Exchange Online
263263
- Cutover Exchange migration: This is another type of onboarding migration and is used to migrate all mailboxes in an on-premises Exchange organization to Exchange Online. You can migrate a maximum of 1,000 Exchange Server 2003, Exchange Server 2007, or Exchange Server 2010 mailboxes using a cutover migration. Mailboxes will be automatically provisioned in Exchange Online when you perform a cutover Exchange migration. For more information, see Example 5.
264264
- Staged Exchange migration: You can also migrate a subset of mailboxes from an on-premises Exchange organization to Exchange Online. This is another type of onboarding migration. Migrating mailboxes from Exchange 2010 or later versions of Exchange isn't supported using a staged migration. Prior to running a staged migration, you have to use directory synchronization or some other method to provision mail users in your Exchange Online organization. For more information, see Example 6.
265265
- IMAP migration: This onboarding migration type migrates mailbox data from an IMAP server (including Exchange) to Exchange Online. For an IMAP migration, you must first provision mailboxes in Exchange Online before you can migrate mailbox data. For more information, see Example 7.
266-
- G Suite migration: This onboarding migration type migrates mailbox data from a G Suite organization to Exchange Online. For a G Suite migration, you must first provision mail users (or mailboxes) in Exchange Online before you can migrate mailbox data. For more information, see Example 10.
266+
- Google Workspace (formerly G Suite) migration: This onboarding migration type migrates mailbox data from a Google Workspace organization to Exchange Online. For a Google Workspace migration, you must first provision mail users (or mailboxes) in Exchange Online before you can migrate mailbox data. For more information, see Example 10.
267267

268268
You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see [Find the permissions required to run any Exchange cmdlet](https://docs.microsoft.com/powershell/exchange/find-exchange-cmdlet-permissions).
269269

@@ -363,7 +363,7 @@ ludeFolders "Payment"
363363
Start-MigrationBatch -Identity $OnboardingBatch.Identity
364364
```
365365

366-
A G Suite migration batch is created that uses the CSV migration file gmail.csv and includes the contents of the Payment label and only migrate the mails which were received after the time '2019/4/30 00:00' (local system time). This migration batch is pending until it's started with the Start-MigrationBatch cmdlet.
366+
A Google Workspace migration batch is created that uses the CSV migration file gmail.csv and includes the contents of the Payment label and only migrate the mails which were received after the time '2019/4/30 00:00' (local system time). This migration batch is pending until it's started with the Start-MigrationBatch cmdlet.
367367

368368
## PARAMETERS
369369

@@ -679,9 +679,9 @@ Accept wildcard characters: False
679679
```
680680

681681
### -ContentFilter
682-
This parameter is available only in the cloud-based service.
682+
This parameter is available only in the cloud-based service for IMAP migration and Google Workspace migration.
683683

684-
The ContentFilter parameter uses OPath filter syntax to filter the messages by Received date. Only content that match the ContentFilter parameter will be moved to Exchange online. For example:
684+
The ContentFilter parameter uses OPath filter syntax to filter the messages by Received time. Only content that match the ContentFilter parameter will be moved to Exchange online. For example:
685685

686686
- `"Received -gt '8/23/2020'"`
687687
- `"Received -le '2019/01/01'"`
@@ -703,7 +703,7 @@ Accept wildcard characters: False
703703
```
704704

705705
### -ContentFilterLanguage
706-
This parameter is available only in the cloud-based service.
706+
This parameter is available only in the cloud-based service for IMAP migration and Google Workspace migration.
707707

708708
The ContentFilterLanguage parameter specifies the language being used in the ContentFilter parameter for string searches.
709709

@@ -799,9 +799,9 @@ Accept wildcard characters: False
799799
### -ExcludeFolders
800800
This parameter is available only in the cloud-based service.
801801

802-
For an IMAP migration or G Suite migration, the ExcludeFolders parameter specifies mailbox folders that you don't want to migrate from the source email system to the cloud-based mailboxes. Specify the value as a string array and separate multiple folder names with commas.
802+
For an IMAP migration or Google Workspace migration, the ExcludeFolders parameter specifies mailbox folders that you don't want to migrate from the source email system to the cloud-based mailboxes. Specify the value as a string array and separate multiple folder names with commas.
803803

804-
For IMAP migration, use folder names relative to the IMAP root on the source mail server. For G Suite migration, use label names on the source mail server.
804+
For IMAP migration, use folder names relative to the IMAP root on the source mail server. For Google Workspace migration, use label names on the source mail server.
805805

806806
Folder names aren't case-sensitive, and there are no character restrictions. Use the following syntax:
807807

@@ -847,9 +847,9 @@ Accept wildcard characters: False
847847
### -IncludeFolders
848848
This parameter is available only in the cloud-based service.
849849

850-
For an IMAP migration or G Suite migration, the IncludeFolders parameter specifies mailbox folders that you want to migrate from the on-premises email system to the cloud-based mailboxes. Use folder names relative to the IMAP root on the source mail server or use label names for G Suite migration. Specify the value as a string array and separate multiple folder names with commas.
850+
For an IMAP migration or Google Workspace migration, the IncludeFolders parameter specifies mailbox folders that you want to migrate from the on-premises email system to the cloud-based mailboxes. Specify the value as a string array and separate multiple folder names with commas.
851851

852-
For IMAP migration, use folder names relative to the IMAP root on the source mail server. For G Suite migration, use label names on the source mail server.
852+
For IMAP migration, use folder names relative to the IMAP root on the source mail server. For Google Workspace migration, use label names on the source mail server.
853853

854854
Folder names aren't case-sensitive, and there are no character restrictions. Use the following syntax:
855855

exchange/exchange-ps/exchange/Set-DlpKeywordDictionary.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You need to be assigned permissions in the Security & Compliance Center before y
3838
### Example 1
3939
```powershell
4040
$Keywords = "Aarskog's syndrome, Abandonment, Abasia, Abderhalden-Kaufmann-Lignac, Abdominalgia, Abduction contracture, Abetalipo proteinemia, Abiotrophy, Ablatio, ablation, Ablepharia, Abocclusion, Abolition, Aborter, Abortion, Abortus, Aboulomania, Abrami's disease, Abramo"
41-
$EncodedKeywords = [system.Text.Encoding]::UTF8.GetBytes($keywords)
41+
$EncodedKeywords = [system.Text.Encoding]::Unicode.GetBytes($keywords)
4242
Set-DlpKeywordDictionary -Identity "Diseases" -FileData $EncodedKeywords
4343
```
4444

@@ -50,7 +50,7 @@ $Dictionary = Get-DlpKeywordDictionary -Name "Diseases"
5050
$Terms = $Dictionary.KeywordDictionary.split(',').trim()
5151
$Terms += "Achylia","Acidemia","Acidocytopenia","Acidocytosis","Acidopenia","Acidosis","Aciduria","Acladiosis","Aclasis"
5252
$Keywords = $Terms -Join ", "
53-
$EncodedKeywords = [system.Text.Encoding]::UTF8.GetBytes($Keywords)
53+
$EncodedKeywords = [system.Text.Encoding]::Unicode.GetBytes($Keywords)
5454
Set-DlpKeywordDictionary -Identity "Diseases" -FileData $EncodedKeywords
5555
```
5656

@@ -63,7 +63,7 @@ $Terms = $Dictionary.KeywordDictionary.split(',').trim()
6363
$TermsToRemove = @('abandonment', 'ablatio')
6464
$UpdatedTerms = $Terms | Where-Object {$_ -NotIn $TermsToRemove}
6565
$Keywords = $UpdatedTerms -Join ", "
66-
$EncodedKeywords = [system.Text.Encoding]::UTF8.GetBytes($Keywords)
66+
$EncodedKeywords = [system.Text.Encoding]::Unicode.GetBytes($Keywords)
6767
Set-DlpKeywordDictionary -Identity "Diseases" -FileData $EncodedKeywords
6868
```
6969

@@ -76,7 +76,7 @@ $Terms = $Dictionary.KeywordDictionary.split(',').trim()
7676
Set-Content $Terms -Path "C:\My Documents\InappropriateTerms.txt"
7777
$UpdatedTerms = Get-Content -Path "C:\My Documents\InappropriateTerms.txt"
7878
$Keywords = $UpdatedTerms -Join ", "
79-
$EncodedKeywords = [system.Text.Encoding]::UTF8.GetBytes($Keywords)
79+
$EncodedKeywords = [system.Text.Encoding]::Unicode.GetBytes($Keywords)
8080
Set-DlpKeywordDictionary -Identity "Inappropriate Language" -FileData $EncodedKeywords
8181
```
8282

@@ -138,7 +138,8 @@ Accept wildcard characters: False
138138
```
139139

140140
### -FileData
141-
The FileData parameter specifies the terms that are used in the DLP keyword dictionary. This parameter requires a comma-separated list of values that's binary encoded in UTF8. For more information, see the examples in this topic. The maximum file size limit is 100 KB.
141+
The FileData parameter specifies the terms that are used in the DLP keyword dictionary. This parameter requires a comma-separated list of values that's binary encoded in UTF-16. For more information, see the examples in this topic. The maximum file size is up to 1 MB of terms after compression. The organization limit for all dictionaries is also 1 MB after compression.
142+
142143

143144
```yaml
144145
Type: Byte[]
Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
---
2+
external help file: Microsoft.Exchange.ServerStatus-Help.xml
3+
online version: https://docs.microsoft.com/powershell/module/exchange/set-externalinoutlook
4+
applicable: Exchange Online
5+
title: Set-ExternalInOutlook
6+
schema: 2.0.0
7+
author: chrisda
8+
ms.author: chrisda
9+
ms.reviewer:
10+
---
11+
12+
# Set-ExternalInOutlook
13+
14+
## SYNOPSIS
15+
This cmdlet is available only in the cloud-based service.
16+
17+
Use the Set-ExternalInOutlook cmdlet to modify the configuration of external sender identification that's available in supported versions of Outlook.
18+
19+
**Note**: We recommend that you use the Exchange Online PowerShell V2 module to connect to Exchange Online PowerShell. For instructions, see [Connect to Exchange Online PowerShell](https://docs.microsoft.com/powershell/exchange/connect-to-exchange-online-powershell).
20+
21+
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://docs.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
22+
23+
## SYNTAX
24+
25+
```
26+
Set-ExternalInOutlook [[-Identity] <OrganizationIdParameter>]
27+
[-AllowList <MultiValuedProperty>]
28+
[-Enabled <System.Boolean>]
29+
[<CommonParameters>]
30+
```
31+
32+
## DESCRIPTION
33+
If your organization already uses mail flow rules (also known as transport rules) to add text to the subject line of messages from external senders, you should disable those rules before you enable this feature to avoid duplication.
34+
35+
You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see [Find the permissions required to run any Exchange cmdlet](https://docs.microsoft.com/powershell/exchange/find-exchange-cmdlet-permissions).
36+
37+
## EXAMPLES
38+
39+
### Example 1
40+
```powershell
41+
Set-ExternalInOutlook -Enabled $true
42+
```
43+
44+
This example enables external sender identification in supported versions of Outlook.
45+
46+
### Example 2
47+
```powershell
48+
Set-ExternalInOutlook -AllowList [email protected],[email protected]
49+
```
50+
51+
This example prevents the specified email addresses from receiving the External icon in the area of the subject line in supported versions of Outlook.
52+
53+
### Example 3
54+
```powershell
55+
Set-ExternalInOutlook -AllowList @{Add="[email protected]"; Remove="[email protected]"}
56+
```
57+
58+
This example adds and removes the specified email addresses from the exception list without affecting other existing entries.
59+
60+
## PARAMETERS
61+
62+
### -Identity
63+
The Identity parameter specifies the GUID of the external sender identification object that you want to modify. Although this parameter is available, you don't need to use it.
64+
65+
```yaml
66+
Type: OrganizationIdParameter
67+
Parameter Sets: (All)
68+
Aliases:
69+
Applicable: Exchange Online
70+
71+
Required: False
72+
Position: 0
73+
Default value: None
74+
Accept pipeline input: False
75+
Accept wildcard characters: False
76+
```
77+
78+
### -AllowList
79+
The AllowList parameter specifies exceptions to external sender identification in supported versions of Outlook. Messages received from the specified senders or senders in the specified domains don't receive native External sender identification. Valid values are domains (contoso.com) or email addresses ([email protected]).
80+
81+
To enter multiple values and overwrite any existing entries, use the following syntax: `Value1,Value2,...ValueN`. If the values contain spaces or otherwise require quotation marks, use the following syntax: `"Value1","Value2",..."ValueN"`.
82+
83+
To add or remove one or more values without affecting any existing entries, use the following syntax: `@{Add="Value1","Value2"...; Remove="Value3","Value4"...}`.
84+
85+
This parameter is meaningful only when the value of the Enabled parameter is $true.
86+
87+
The maximum number of entries is 30, and the total size of all entries can't exceed one kilobyte.
88+
89+
```yaml
90+
Type: MultiValuedProperty
91+
Parameter Sets: (All)
92+
Aliases:
93+
Applicable: Exchange Online
94+
95+
Required: False
96+
Position: Named
97+
Default value: None
98+
Accept pipeline input: False
99+
Accept wildcard characters: False
100+
```
101+
102+
### -Enabled
103+
The Enabled parameter enables or disables external sender identification in supported versions of Outlook. Valid values are:
104+
105+
- $true: External sender identification in Outlook is enabled. An External icon is added in the area of the subject line of messages from external senders. To exempt specific senders or sender domains from this identification, use the AllowList parameter.
106+
- $false: External sender identification in Outlook is disabled.
107+
108+
```yaml
109+
Type: System.Boolean
110+
Parameter Sets: (All)
111+
Aliases:
112+
Applicable: Exchange Online
113+
114+
Required: False
115+
Position: Named
116+
Default value: None
117+
Accept pipeline input: False
118+
Accept wildcard characters: False
119+
```
120+
121+
### CommonParameters
122+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
123+
124+
## INPUTS
125+
126+
###
127+
128+
## OUTPUTS
129+
130+
###
131+
132+
## NOTES
133+
134+
## RELATED LINKS

0 commit comments

Comments
 (0)