Skip to content

Commit 8361d79

Browse files
authored
Merge branch 'master' into patch-2
2 parents 8b62751 + accb40a commit 8361d79

File tree

4 files changed

+24
-5
lines changed

4 files changed

+24
-5
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,13 @@ Accept wildcard characters: False
601601
```
602602

603603
### -ContentType
604-
{{ Fill ContentType Description }}
604+
The ContentType parameter specifies where the sensivity label can be applied. Valid values are:
605+
606+
- File, Email
607+
- Site, UnifiedGroup
608+
- PurviewAssets
609+
610+
Values can be combined, for example: "File, Email, PurviewAssets". Splitting related content types like "File, Email" into just "File" or just "Email" is not supported.
605611

606612
```yaml
607613
Type: MipLabelContentType

exchange/exchange-ps/exchange/Set-FederationTrust.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ This example configures the federation trust Microsoft Federation Gateway to use
7878

7979
### Example 3
8080
```powershell
81-
Set-FederationTrust -Identity "Azure AD Authentication" -MetadataUrl https://login.microsoftonline.us/FederationMetadata/2006-12/FederationMetadata.xml
81+
Set-FederationTrust -Identity "Azure AD Authentication" -MetadataUrl https://nexus.microsoftonline-p.com/federationmetadata/2006-12/federationmetadata.xml
8282
```
8383

8484
This example updates the configuration if the tenant is hosted in Microsoft 365 U.S. Government GCC High or DoD environment.
@@ -177,7 +177,7 @@ Accept wildcard characters: False
177177
```
178178

179179
### -MetadataUrl
180-
The MetadataUrl parameter specifies the URL where WS-FederationMetadata is published by the Microsoft Federation Gateway. <br/><br/> **Note**: For GCC High or DoD tenants, use the value https://login.microsoftonline.us/FederationMetadata/2006-12/FederationMetadata.xml.
180+
The MetadataUrl parameter specifies the URL where WS-FederationMetadata is published by the Microsoft Federation Gateway.
181181

182182
```yaml
183183
Type: Uri

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,13 @@ Accept wildcard characters: False
581581
```
582582

583583
### -ContentType
584-
{{ Fill ContentType Description }}
584+
The ContentType parameter specifies where the sensivity label can be applied. Valid values are:
585+
586+
- File, Email
587+
- Site, UnifiedGroup
588+
- PurviewAssets
589+
590+
Values can be combined, for example: "File, Email, PurviewAssets". Splitting related content types like "File, Email" into just "File" or just "Email" is not supported.
585591

586592
```yaml
587593
Type: MipLabelContentType

exchange/exchange-ps/exchange/Set-OrganizationConfig.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2935,7 +2935,14 @@ Accept wildcard characters: False
29352935
### -SendFromAliasEnabled
29362936
This parameter is available only in the cloud-based service.
29372937

2938-
{{ Fill SendFromAliasEnabled Description }}
2938+
The SendFromAliasEnabled parameter allows mailbox users to send messages and reply to messages in Outlook on the web using any of the proxy addresses (secondary email addresses) that are configured on the mailbox. Valid values are:
2939+
2940+
- $true: Users in Outlook on the web get an option to send messages and reply to messages with a proxy addresses.
2941+
- $false: Users can only send messages and reply to messages using their primary email address. This is the default value.
2942+
2943+
For more information about the availability of this feature, see the [Microsoft 365 roadmap](https://www.microsoft.com/microsoft-365/roadmap?filters=Exchange&searchterms=59437).
2944+
2945+
**Note**: This feature doesn't work in Outlook for Windows or Mac.
29392946

29402947
```yaml
29412948
Type: Boolean

0 commit comments

Comments
 (0)