Skip to content

Commit d38a7e3

Browse files
authored
Merge branch 'main' into patch-8
2 parents 6037c4d + b71fac9 commit d38a7e3

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

exchange/exchange-ps/exchange/Invoke-ComplianceSecurityFilterAction.md

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
2121
## SYNTAX
2222

2323
```
24-
Invoke-ComplianceSecurityFilterAction [-Action] <String> [-PropertyName] <String> [[-PropertyValue] <String>] [-SiteUrl] <String>
24+
Invoke-ComplianceSecurityFilterAction [-Action] <String> [[-EmailAddress] <String>] [-PropertyName] <String> [[-PropertyValue] <String>] [-SiteUrl] <String>
2525
[-Confirm]
2626
[-WhatIf]
2727
[<CommonParameters>]
@@ -47,7 +47,7 @@ BoundaryProperty : CustomAttribute1
4747
BoundaryPropertyValue :
4848
```
4949

50-
This example returns the status of a OneDrive site to indicate it's associated to a UserMailbox and the CustomAttribute1 property isn't currently set.
50+
This example returns the status of a OneDrive site to indicate it's associated to a user mailbox and the CustomAttribute1 property isn't currently set.
5151

5252
### Example 2
5353
```powershell
@@ -126,6 +126,22 @@ Accept pipeline input: False
126126
Accept wildcard characters: False
127127
```
128128
129+
### -EmailAddress
130+
The EmailAddress parameter specifies the email address of the affected user mailbox.
131+
132+
```yaml
133+
Type: String
134+
Parameter Sets: (All)
135+
Aliases:
136+
Applicable: Security & Compliance
137+
138+
Required: False
139+
Position: 2
140+
Default value: None
141+
Accept pipeline input: False
142+
Accept wildcard characters: False
143+
```
144+
129145
### -PropertyName
130146
The PropertyName parameter specifies the name of the property of the compliance boundary for the OneDrive site that you want to view or modify. Valid values are:
131147
@@ -140,7 +156,7 @@ Aliases:
140156
Applicable: Security & Compliance
141157

142158
Required: True
143-
Position: 2
159+
Position: 3
144160
Default value: None
145161
Accept pipeline input: False
146162
Accept wildcard characters: False
@@ -156,7 +172,7 @@ Aliases:
156172
Applicable: Security & Compliance
157173

158174
Required: False
159-
Position: 3
175+
Position: 4
160176
Default value: None
161177
Accept pipeline input: False
162178
Accept wildcard characters: False
@@ -172,7 +188,7 @@ Aliases:
172188
Applicable: Security & Compliance
173189
174190
Required: True
175-
Position: 4
191+
Position: 5
176192
Default value: None
177193
Accept pipeline input: False
178194
Accept wildcard characters: False

exchange/exchange-ps/exchange/Set-Label.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ The ApplyContentMarkingFooterMargin parameter specifies the size (in points) of
288288

289289
This parameter is meaningful only when the ApplyContentMarkingFooterEnabled parameter value is either $true or $false.
290290

291-
**Note**: In Microsoft Word, the specified value is used as a bottom margin and left margin or right margin for left-aligned or right-aligned content marks. A minimum value of 15 points is required. Word also adds a constant offset of 5 points to the left margin for left-aligned content marks, or to the right margin for right-aligned content marks.
291+
**Note**: In Microsoft Word and PowerPoint, the specified value is used as a bottom margin and left margin or right margin for left-aligned or right-aligned content marks. A minimum value of 15 points is required. Word also adds a constant offset of 5 points to the left margin for left-aligned content marks, or to the right margin for right-aligned content marks.
292292

293293
```yaml
294294
Type: System.Int32
@@ -421,7 +421,7 @@ The ApplyContentMarkingHeaderMargin parameter specifies the size (in points) of
421421

422422
This parameter is meaningful only when the ApplyContentMarkingHeaderEnabled parameter value is either $true or $false.
423423

424-
**Note**: In Microsoft Word, the specified value is used as a top margin and left margin or right margin for left-aligned or right-aligned content marks. A minimum value of 15 points is required. Word also adds a constant offset of 5 points to the left margin for left-aligned content marks, or to the right margin for right-aligned content marks.
424+
**Note**: In Microsoft Word and PowerPoint, the specified value is used as a top margin and left margin or right margin for left-aligned or right-aligned content marks. A minimum value of 15 points is required. Word also adds a constant offset of 5 points to the left margin for left-aligned content marks, or to the right margin for right-aligned content marks.
425425

426426
```yaml
427427
Type: System.Int32

0 commit comments

Comments
 (0)