Skip to content

Commit

Permalink
Merge pull request #12087 from MicrosoftDocs/main
Browse files Browse the repository at this point in the history
Publish main to live, Thursday 3:30PM PDT, 08/22
  • Loading branch information
Stacyrch140 authored Aug 22, 2024
2 parents 7074a3d + 4133496 commit cc706f0
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 30 deletions.
1 change: 1 addition & 0 deletions exchange/exchange-ps/exchange/New-Label.md
Original file line number Diff line number Diff line change
Expand Up @@ -722,6 +722,7 @@ Accept wildcard characters: False
The DynamicWatermarkDisplay parameter specifies the watermark text to display for a given label. This parameter supports text and the following special tokens:

- `${Consumer.PrincipalName}`: Required. The value is the user principal name (UPN) of the user.
- `${Device.DateTime}`: Optional. The value is current date/time of the device used to view the document.

This parameter is meaningful only when the ApplyDynamicWatermarkingEnabled parameter value is $true.

Expand Down
11 changes: 1 addition & 10 deletions exchange/exchange-ps/exchange/Remove-AuthenticationPolicy.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,7 @@ Accept wildcard characters: False
### -AllowLegacyExchangeTokens
This parameter is available only in the cloud-based service.
The AllowLegacyExchangeTokens switch specifies whether to allow legacy Exchange tokens. You don't need to specify a value with this switch.
Legacy Exchange tokens (for example, Exchange user identity and callback tokens) are used by Outlook add-ins.
**Important**:
- The Microsoft Report Message and Report Phishing add-ins require legacy Exchange tokens to work.
- Legacy Exchange tokens will eventually be blocked by default in all cloud-based organizations.
For more information on the Report Message and Report Phishing add-ins, see [Enable the Microsoft Report Message or the Report Phishing add-ins](https://learn.microsoft.com/microsoft-365/security/office-365-security/submissions-users-report-message-add-in-configure).
This parameter is reserved for internal Microsoft use.
```yaml
Type: SwitchParameter
Expand Down
22 changes: 2 additions & 20 deletions exchange/exchange-ps/exchange/Set-AuthenticationPolicy.md
Original file line number Diff line number Diff line change
Expand Up @@ -354,16 +354,7 @@ Accept wildcard characters: False
### -AllowLegacyExchangeTokens
This parameter is available only in the cloud-based service.

The AllowLegacyExchangeTokens switch specifies whether to allow legacy Exchange tokens. You don't need to specify a value with this switch.

Legacy Exchange tokens (for example, Exchange user identity and callback tokens) are used by Outlook add-ins.

**Important**:

- The Microsoft Report Message and Report Phishing add-ins require legacy Exchange tokens to work.
- Legacy Exchange tokens will eventually be blocked by default in all cloud-based organizations.

For more information on the Report Message and Report Phishing add-ins, see [Enable the Microsoft Report Message or the Report Phishing add-ins](https://learn.microsoft.com/microsoft-365/security/office-365-security/submissions-users-report-message-add-in-configure).
This parameter is reserved for internal Microsoft use.

```yaml
Type: SwitchParameter
Expand Down Expand Up @@ -549,16 +540,7 @@ Accept wildcard characters: False
### -BlockLegacyExchangeTokens
This parameter is available only in the cloud-based service.

The BlockLegacyExchangeTokens switch specifies whether to block legacy Exchange tokens. You don't need to specify a value with this switch.

Legacy Exchange tokens (for example, Exchange user identity and callback tokens) are used by Outlook add-ins.

**Important**:

- The Microsoft Report Message and Report Phishing add-ins require legacy Exchange tokens to work.
- Legacy Exchange tokens will eventually be blocked by default in all cloud-based organizations.

For more information about the Report Message and Report Phishing add-ins, see [Enable the Microsoft Report Message or the Report Phishing add-ins](https://learn.microsoft.com/microsoft-365/security/office-365-security/submissions-users-report-message-add-in-configure).
This parameter is reserved for internal Microsoft use.

```yaml
Type: SwitchParameter
Expand Down
1 change: 1 addition & 0 deletions exchange/exchange-ps/exchange/Set-Label.md
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,7 @@ Accept wildcard characters: False
The DynamicWatermarkDisplay parameter specifies the watermark text to display for a given label. This parameter supports text and the following special tokens:

- **"\`${Consumer.PrincipalName}**": Required. The value is the user principal name (UPN) of the user.
- **"\`${Device.DateTime}**": Optional. The value is current date/time of the device used to view the document.

**Tip** The back quotation mark character ( \` ) is required as an escape character for the dollar sign character ( $ ) in PowerShell. For more information, see [Escape characters in Exchange PowerShell](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax#escape-characters-in-exchange-powershell).

Expand Down

0 comments on commit cc706f0

Please sign in to comment.