Skip to content

Commit 5cf1f1e

Browse files
authored
Merge branch 'main' into patch-1
2 parents 6bbe516 + 3ba7c36 commit 5cf1f1e

File tree

3 files changed

+21
-6
lines changed

3 files changed

+21
-6
lines changed

exchange/exchange-ps/exchange/New-Label.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ Accept wildcard characters: False
473473
```
474474

475475
### -ApplyDynamicWatermarkingEnabled
476-
**Note**: This parameter is currently in Public Preview, isn't available in all organizations, and is subject to change.
476+
**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.
477477

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

@@ -717,7 +717,7 @@ Accept wildcard characters: False
717717
```
718718

719719
### -DynamicWatermarkDisplay
720-
**Note**: This parameter is currently in Public Preview, isn't available in all organizations, and is subject to change.
720+
**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.
721721

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

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

Lines changed: 3 additions & 3 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 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.
291+
**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.
292292

293293
```yaml
294294
Type: System.Int32
@@ -455,7 +455,7 @@ Accept wildcard characters: False
455455
```
456456

457457
### -ApplyDynamicWatermarkingEnabled
458-
**Note**: This parameter is currently in Public Preview, isn't available in all organizations, and is subject to change.
458+
**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.
459459

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

@@ -715,7 +715,7 @@ Accept wildcard characters: False
715715
```
716716

717717
### -DynamicWatermarkDisplay
718-
**Note**: This parameter is currently in Public Preview, isn't available in all organizations, and is subject to change.
718+
**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.
719719

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

exchange/exchange-ps/exchange/Set-ServerComponentState.md

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

3939
### Example 1
4040
```powershell
41-
Set-ServerComponentState -Component UMCallRouter -Identity MailboxServer01 -Requester Maintenance -State Active
41+
Set-ServerComponentState -Identity MailboxServer01 -Component UMCallRouter -Requester Maintenance -State Active
4242
```
4343

4444
This example sets the Unified Messaging (UM) component state to Active, as requested by maintenance mode.
4545

46+
### Example 2
47+
```powershell
48+
Set-ServerComponentState -Identity Exch5 -Component ServerWideOffline -State Inactive -Requester Maintenance
49+
50+
Set-ServerComponentState -Identity Exch5 -Component ServerWideOffline -State Active -Requester Maintenance
51+
```
52+
53+
This example prepares the server for maintenance, such as installing a Security Update or Cumulative Update.
54+
55+
The first command changes the state of all server components to Inactive.
56+
57+
The second command changes the state to Active after the maintenance is over (required).
58+
59+
**Note**: By design, the Microsoft Exchange IMAP4 and Microsoft Exchange POP3 services stop if the related `ImapProxy` and `PopProxy` components are in the Inactive state. The services may need to be manually started after the related `ImapProxy` and `PopProxy` components are changed to the Active state.
60+
4661
## PARAMETERS
4762

4863
### -Identity

0 commit comments

Comments
 (0)