Skip to content

Commit c212823

Browse files
authored
Merge branch 'master' into patch-4
2 parents 3241758 + 941653c commit c212823

File tree

82 files changed

+166
-139
lines changed

Some content is hidden

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

82 files changed

+166
-139
lines changed
Loading

exchange/exchange-ps/exchange/Get-ComplianceCase.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,10 +88,11 @@ The CaseType parameter specifies the type of compliance case that you want to vi
8888
8989
- AdvancedEdiscovery: Advanced eDiscovery cases are used to manage legal or other types of investigations. In the Microsoft 365 compliance center, Advanced eDiscovery cases are displayed under **eDiscovery** \> **Advanced eDiscovery**.
9090
- ComplianceClassifier: This type of case corresponds to a trainable classifier. In the Microsoft 365 compliance center, trainable classifiers are displayed under **Data classification** \> **Trainable classifiers**.
91-
- ComplianceWorkspace: This value is reserved for internal Microsoft use.- DataInvestigation: Data investigation cases are used to investigate data spillage incidents. In the Microsoft 365 compliance center, Data investigation cases are displayed on the Data investigations page.
91+
- ComplianceWorkspace: This value is reserved for internal Microsoft use.
92+
- DataInvestigation: Data investigation cases are used to investigate data spillage incidents. In the Microsoft 365 compliance center, Data investigation cases are displayed on the **Data investigations** page.
9293
- DSR: Data Subject Request (DSR) cases are used to manage General Data Protection Regulation (GDPR) DSR investigations. In the Microsoft 365 compliance center, DSR cases are displayed under **Data privacy** \> **Data subject requests**.
9394
- eDiscovery: eDiscovery (also called core eDiscovery) cases are used to manage legal or other types of investigations. In the Microsoft 365 compliance center, core eDiscovery cases are displayed under **eDiscovery** \> **eDiscovery**. This is the default value.
94-
- InsiderRisk: Insider risk cases are use to manage insider risk management cases. In the Microsoft 365 compliance center, insider risk cases are displayed under **Insider risk management** \> **Cases**. Typically, insider risk management cases are manually created in the compliance center to further investigate activity based on an risk alert.
95+
- InsiderRisk: Insider risk cases are used to manage insider risk management cases. In the Microsoft 365 compliance center, insider risk cases are displayed under **Insider risk management** \> **Cases**. Typically, insider risk management cases are manually created in the compliance center to further investigate activity based on a risk alert.
9596
- InternalInvestigation: This value is reserved for internal Microsoft use.
9697
- SupervisionPolicy: This type of case corresponds to communication compliance policy. In the Microsoft 365 Compliance center, communication compliance policies are displayed under **Communication compliance** \> **Policies**.
9798

exchange/exchange-ps/exchange/Import-DlpPolicyCollection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ Accept wildcard characters: False
6666
### -FileData
6767
The FileData parameter specifies the DLP policy collection file you want to import.
6868
69-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
69+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
7070

7171
```yaml
7272
Type: Byte[]

exchange/exchange-ps/exchange/Import-DlpPolicyTemplate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ This example imports the DLP policy template file C:\\My Documents\\External DLP
4444
### -FileData
4545
The FileData parameter specifies the DLP policy template file you want to import.
4646

47-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
47+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
4848

4949
```yaml
5050
Type: Byte[]

exchange/exchange-ps/exchange/Import-ExchangeCertificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ This example imports a chain of certificates from the PKCS #7 file C:\\Certifica
9494
### -FileData
9595
The FileData parameter specifies the contents of the certificate file that you want to import. Typically, you use this parameter for PKCS #7 text certificate files that have .p7b or .p7c filename extensions. These text files contain the text: -----BEGIN CERTIFICATE----- and -----END CERTIFICATE----- or -----BEGIN PKCS7----- and -----END PKCS7-----.
9696

97-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
97+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
9898

9999
You can use a local path if the certificate file is located on the Exchange server where you're running the command, and this is the same server where you want to install the certificate. Otherwise, use a UNC path (`\\Server\Share`).
100100

exchange/exchange-ps/exchange/Import-JournalRuleCollection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ Accept wildcard characters: False
7272
### -FileData
7373
The FileData parameter specifies the variable name that contains the content of the XML file.
7474
75-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
75+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
7676

7777
```yaml
7878
Type: Byte[]

exchange/exchange-ps/exchange/Import-RMSTrustedPublishingDomain.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
7676

7777
### Example 1
7878
```powershell
79-
Import-RMSTrustedPublishingDomain -Name "Contoso TPD" -FileData $([byte[]](Get-Content -Encoding byte -Path "C:\My Documents\Contoso.xml" -ReadCount 0)) -Password (ConvertTo-SecureString -String 'Pa$$word1' -AstPlainText -Force)-ExtranetLicensingUrl https://rms.contoso.com/_wmcs/licensing -IntranetLicensingUrl https://RMS01/_wmcs/licensing
79+
Import-RMSTrustedPublishingDomain -Name "Contoso TPD" -FileData ([System.IO.File]::ReadAllBytes('C:\My Documents\Contoso.xml')) -Password (ConvertTo-SecureString -String 'Pa$$word1' -AstPlainText -Force) -ExtranetLicensingUrl https://rms.contoso.com/_wmcs/licensing -IntranetLicensingUrl https://RMS01/_wmcs/licensing
8080
```
8181

8282
This example imports a TPD from an AD RMS server into a cloud-based organization. The TPD uses the following values:
@@ -110,7 +110,7 @@ Accept wildcard characters: False
110110
### -FileData
111111
The FileData parameter specifies the XML file you want to import. The XML file contains the TPD you exported from the on-premises AD RMS server.
112112
113-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
113+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
114114

115115
```yaml
116116
Type: Byte[]

exchange/exchange-ps/exchange/Import-RecipientDataProperty.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Accept wildcard characters: False
8585
### -FileData
8686
The FileData parameter specifies the location and file name of the picture or audio file.
8787
88-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
88+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
8989

9090
```yaml
9191
Type: Byte[]

exchange/exchange-ps/exchange/Import-TransportRuleCollection.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,7 @@ Accept wildcard characters: False
7777
### -FileData
7878
The FileData parameter specifies the variable name that contains the content of the XML file.
7979
80-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `(Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0)`.
81-
82-
**Note**: In PowerShell 6.0 or later, replace `-Encoding Byte` with `-AsByteStream`.
80+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
8381

8482
```yaml
8583
Type: Byte[]

exchange/exchange-ps/exchange/Import-UMPrompt.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ This example imports the welcome greeting file AfterHoursWelcomeGreeting.wav fro
9494
### -PromptFileData
9595
The PromptFileData parameter specifies the byte array of the custom prompt.
9696

97+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
98+
9799
```yaml
98100
Type: Byte[]
99101
Parameter Sets: UploadDialPlanPrompts, UploadAutoAttendantPrompts

exchange/exchange-ps/exchange/New-App.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
108108

109109
### Example 1
110110
```powershell
111-
New-App -FileData ([Byte[]](Get-Content -Encoding Byte -Path "C:\Apps\FinanceTestApp.xml" -ReadCount 0))
111+
New-App -FileData ([System.IO.File]::ReadAllBytes('C:\Apps\FinanceTestApp.xml'))
112112
```
113113

114114
This example installs the Finance Test app manifest file that has been copied to the local hard disk.
@@ -255,7 +255,7 @@ Accept wildcard characters: False
255255
### -FileData
256256
The FileData parameter specifies the location of the app manifest file. You need to specify only one source location for the app manifest file. You can specify the app manifest file by using the MarketplaceServicesUrl, Url, or FileData parameter.
257257

258-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
258+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
259259

260260
```yaml
261261
Type: Byte[]

exchange/exchange-ps/exchange/New-ClassificationRuleCollection.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This example imports the classification rule collection file C:\\My Documents\\E
4747
### -FileData
4848
The FileData parameter specifies the classification rule collection file you want to import.
4949

50-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
50+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
5151

5252
```yaml
5353
Type: Byte[]

exchange/exchange-ps/exchange/New-DlpEdmSchema.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ This example creates a new DLP EDM schema. The first command reads the schema in
4747
### -FileData
4848
The FileData parameter specifies the DLP EDM schema that you want to import.
4949

50-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
50+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
5151

5252
```yaml
5353
Type: Byte[]

exchange/exchange-ps/exchange/New-DlpFingerprint.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ To use this cmdlet in Security & Compliance Center PowerShell, you need to be as
3636

3737
### Example 1
3838
```powershell
39-
$Patent_Template = Get-Content "C:\My Documents\Contoso Patent Template.docx" -Encoding byte
39+
$Patent_Template = [System.IO.File]::ReadAllBytes('C:\My Documents\Contoso Patent Template.docx)'
4040
$Patent_Fingerprint = New-DlpFingerprint -FileData $Patent_Template -Description "Contoso Patent Template"
4141
```
4242

@@ -82,7 +82,7 @@ Accept wildcard characters: False
8282
### -FileData
8383
The FileData parameter specifies the file to use as a document fingerprint.
8484

85-
You need to read the file to a byte-encoded object using the Get-Content cmdlet. For details, see the Examples section in this topic.
85+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
8686

8787
```yaml
8888
Type: Byte[]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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]::Unicode.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

exchange/exchange-ps/exchange/New-DlpPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ Accept wildcard characters: False
195195
### -TemplateData
196196
The TemplateData parameter specifies an external DLP policy template file from which you can create a new DLP policy. You can't use the TemplateData and Template parameters in the same command.
197197

198-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
198+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
199199

200200
```yaml
201201
Type: Byte[]

exchange/exchange-ps/exchange/New-DlpSensitiveInformationTypeRulePackage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ This example imports the sensitive information type rule package C:\\My Document
4848
### -FileData
4949
The FileData parameter specifies the sensitive information type rule package that you want to import.
5050

51-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
51+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
5252

5353
```yaml
5454
Type: Byte[]

exchange/exchange-ps/exchange/New-EdgeSubscription.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,9 +159,9 @@ Accept wildcard characters: False
159159
### -FileData
160160
The FileData parameter specifies the byte-encoded data object that contains the Edge Subscription file information.
161161

162-
A valid value for this parameter requires you to read the file to a byte-encoded object using the Get-Content cmdlet. For example, `([Byte[]](Get-Content -Encoding Byte -Path "C:\My Documents\<filename>" -ReadCount 0))`.
162+
A valid value for this parameter requires you to read the file to a byte-encoded object using the following syntax: `([System.IO.File]::ReadAllBytes('<Path>\<FileName>'))`. You can use this command as the parameter value, or you can write the output to a variable (`$data = [System.IO.File]::ReadAllBytes('<Path>\<FileName>')`) and use the variable as the parameter value (`$data`).
163163

164-
You can only use this parameter when you're running this command on a Mailbox server.
164+
You can only use this parameter when you're running the command on a Mailbox server.
165165

166166
```yaml
167167
Type: Byte[]

exchange/exchange-ps/exchange/New-Fingerprint.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ You need to be assigned permissions before you can run this cmdlet. Although thi
3838

3939
### Example 1
4040
```powershell
41-
$Patent_Template = Get-Content "C:\My Documents\Contoso Patent Template.docx" -Encoding byte
41+
$Patent_Template = [System.IO.File]::ReadAllBytes('C:\My Documents\Contoso Patent Template.docx')
4242
$Patent_Fingerprint = New-Fingerprint -FileData $Patent_Template -Description "Contoso Patent Template"
4343
```
4444

0 commit comments

Comments
 (0)