Skip to content

Publish main to live, 02/18/25, 3:30 PM PT #12530

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Feb 18, 2025
Merged

Publish main to live, 02/18/25, 3:30 PM PT #12530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
040918e
Update Set-Label.md with clarification on applycontentmarkingfooterma…
cabirch Feb 18, 2025
534e4c0
Update Set-Label.md with GA for DW on admin-defined labels
cabirch Feb 18, 2025
96d5418
Update New-Label.md with GA for DW on admin-defined labels
cabirch Feb 18, 2025
0aff541
Merge pull request #12528 from cabirch/patch-9
chrisda Feb 18, 2025
b81ea07
Merge branch 'main' into patch-10
chrisda Feb 18, 2025
3ba7c36
Merge pull request #12529 from cabirch/patch-10
chrisda Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions exchange/exchange-ps/exchange/New-Label.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,7 +473,7 @@ Accept wildcard characters: False
```

### -ApplyDynamicWatermarkingEnabled
**Note**: This parameter is currently in Public Preview, isn't available in all organizations, and is subject to change.
**Note**: This parameter is Generally Available only for labels with admin-defined permissions. Support for label with user-defined permissions is currently in Public Preview, isn't available in all organizations, and is subject to change.

The ApplyDynamicWatermarkingEnabled parameter enables dynamic watermarking for a specific label that applies encryption. Valid values are:

Expand Down Expand Up @@ -717,7 +717,7 @@ Accept wildcard characters: False
```

### -DynamicWatermarkDisplay
**Note**: This parameter is currently in Public Preview, isn't available in all organizations, and is subject to change.
**Note**: This parameter is Generally Available only for labels with admin-defined permissions. Support for label with user-defined permissions is currently in Public Preview, isn't available in all organizations, and is subject to change.

The DynamicWatermarkDisplay parameter specifies the watermark text to display for a given label. This parameter supports text and the following special tokens:

Expand Down
6 changes: 3 additions & 3 deletions exchange/exchange-ps/exchange/Set-Label.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ The ApplyContentMarkingFooterMargin parameter specifies the size (in points) of

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

**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.
**Note**: In Microsoft Word and PowerPoint, the specified value is used as a bottom (vertical) 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.

```yaml
Type: System.Int32
Expand Down Expand Up @@ -455,7 +455,7 @@ Accept wildcard characters: False
```

### -ApplyDynamicWatermarkingEnabled
**Note**: This parameter is currently in Public Preview, isn't available in all organizations, and is subject to change.
**Note**: This parameter is Generally Available only for labels with admin-defined permissions. Support for label with user-defined permissions is currently in Public Preview, isn't available in all organizations, and is subject to change.

The ApplyDynamicWatermarkingEnabled parameter enables dynamic watermarking for a specific label that applies encryption. Valid values are:

Expand Down Expand Up @@ -715,7 +715,7 @@ Accept wildcard characters: False
```

### -DynamicWatermarkDisplay
**Note**: This parameter is currently in Public Preview, isn't available in all organizations, and is subject to change.
**Note**: This parameter is Generally Available only for labels with admin-defined permissions. Support for label with user-defined permissions is currently in Public Preview, isn't available in all organizations, and is subject to change.

The DynamicWatermarkDisplay parameter specifies the watermark text to display for a given label. This parameter supports text and the following special tokens:

Expand Down