Skip to content

Commit 1708a1f

Browse files
authored
Merge branch 'master' into patch-17
2 parents b0344a2 + fcd9069 commit 1708a1f

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,8 @@ The LogLevel parameter specifies the logging level for the search. It can have o
340340
341341
The default log level is Basic.
342342
343+
When you included this parameter, an email message is created and sent to the mailbox specified by the TargetMailbox parameter. The log file (which is a CSV-formatted file named Search Results.csv) is attached to this email message, and will be located in the folder specified by the TargetFolder parameter. The log file contains a row for each message that's included in the search results when you run the Search-Mailbox cmdlet.
344+
343345
```yaml
344346
Type: LoggingLevel
345347
Parameter Sets: Mailbox

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ Accept wildcard characters: False
188188
```
189189
190190
### -AdditionalResponse
191-
The AdditionalResponse parameter specifies the additional information to be included in responses to meeting requests when the value of the AdditionalResponse parameter is $true. If the value contains spaces, enclose the value in quotation marks (").
191+
The AdditionalResponse parameter specifies the additional information to be included in responses to meeting requests when the value of the AddAdditionalResponse parameter is $true. If the value contains spaces, enclose the value in quotation marks (").
192192
193193
```yaml
194194
Type: String

exchange/exchange-ps/exchange/policy-and-compliance-dlp/New-DlpKeywordDictionary.md

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,18 @@ You need to be assigned permissions in the Office 365 Security & Compliance Cent
3434

3535
### Example 1
3636
```powershell
37-
$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"; $EncodedKeywords = $Keywords | ForEach-Object{[system.Text.Encoding]::UTF8.GetBytes($_+"rn")}; New-DlpKeywordDictionary -Name "Diseases" -Description "Names of diseases and injuries from ICD-10-CM lexicon" -FileData $EncodedKeywords
37+
$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");
38+
$EncodedKeywords = $Keywords | ForEach-Object{[System.Text.Encoding]::UTF8.GetBytes($_+"`r`n")};
39+
New-DlpKeywordDictionary -Name "Diseases" -Description "Names of diseases and injuries from ICD-10-CM lexicon" -FileData $EncodedKeywords
3840
```
3941

4042
This example creates a DLP keyword dictionary named Diseases by using the specified values.
4143

4244
### Example 2
4345
```powershell
44-
$Terms = Get-Content "C:\My Documents\InappropriateTerms.txt"; $Keywords = $Terms -Join ", "; $EncodedKeywords = [system.Text.Encoding]::UTF8.GetBytes($Keywords); New-DlpKeywordDictionary -Name "Inappropriate Language" -Description "Unprofessional and inappropriate terminology" -FileData $EncodedKeywords
46+
$Keywords = Get-Content "C:\My Documents\InappropriateTerms.txt";
47+
$EncodedKeywords = $Keywords | ForEach-Object{[System.Text.Encoding]::UTF8.GetBytes($_+"`r`n")};
48+
New-DlpKeywordDictionary -Name "Inappropriate Language" -Description "Unprofessional and inappropriate terminology" -FileData $EncodedKeywords
4549
```
4650

4751
This example creates a DLP keyword dictionary named Inappropriate Language from the file C:\\My Documents\\InappropriateTerms.txt. The file contains one term on each line.

0 commit comments

Comments
 (0)