Skip to content

Commit 29a3a48

Browse files
authored
Merge branch 'main' into patch-2
2 parents ec2c660 + 7db8abc commit 29a3a48

File tree

4 files changed

+58
-0
lines changed

4 files changed

+58
-0
lines changed

exchange/exchange-ps/exchange/New-TransportRule.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -676,6 +676,8 @@ The ApplyHtmlDisclaimerFallbackAction parameter specifies what to do if the HTML
676676

677677
If the process of inserting the original message as an attachment in the new message fails, the original message isn't delivered. The original message is returned to the sender in an NDR.
678678

679+
In Microsoft 365, don't use this value in rules that affect incoming messages from external senders. Use the value Reject instead. The effects of the value Wrap interfere with Safe Attachments scanning of messages from external senders.
680+
679681
- Ignore: The rule is ignored and the original message is delivered without the disclaimer.
680682
- Reject: The original message is returned to the sender in an NDR.
681683

exchange/exchange-ps/exchange/Set-TransportRule.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -674,6 +674,8 @@ The ApplyHtmlDisclaimerFallbackAction parameter specifies what to do if the HTML
674674

675675
If the process of inserting the original message as an attachment in the new message fails, the original message isn't delivered. The original message is returned to the sender in an NDR.
676676

677+
In Microsoft 365, don't use this value in rules that affect incoming messages from external senders. Use the value Reject instead. The effects of the value Wrap interfere with Safe Attachments scanning of messages from external senders.
678+
677679
- Ignore: The rule is ignored and the original message is delivered without the disclaimer.
678680
- Reject: The original message is returned to the sender in an NDR.
679681

teams/teams-ps/teams/Get-CsTeamsAcsFederationConfiguration.md

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ This cmdlet is used to retrieve the federation configuration between Teams and A
1818

1919
```powershell
2020
Get-CsTeamsAcsFederationConfiguration
21+
[-Identity <String[]>]
22+
[-Filter <String>]
2123
```
2224

2325
## DESCRIPTION
@@ -56,6 +58,43 @@ EnableAcsUsers : False
5658

5759
## PARAMETERS
5860

61+
### -Filter
62+
Enables you to use wildcards when specifying the Teams and ACS federation configuration settings to be returned.
63+
Because you can only have a single, global instance of these settings there is little reason to use the Filter parameter.
64+
However, if you prefer, you can use syntax similar to this to retrieve the global settings: -Identity "g*".
65+
66+
```yaml
67+
Type: String
68+
Parameter Sets: Filter
69+
Aliases:
70+
71+
Required: False
72+
Position: Named
73+
Default value: None
74+
Accept pipeline input: False
75+
Accept wildcard characters: False
76+
```
77+
78+
### -Identity
79+
Specifies the collection of tenant federation configuration settings to be modified. Because each tenant is limited to a single, global collection of federation settings there is no need include this parameter when calling the Set-CsTenantFederationConfiguration cmdlet. If you do choose to use the Identity parameter you must also include the Tenant parameter. For example:
80+
81+
`Set-CsTenantFederationConfiguration -Tenant "bf19b7db-6960-41e5-a139-2aa373474354" -Identity "global"`
82+
83+
```yaml
84+
Type: String
85+
Parameter Sets: Identity
86+
Aliases:
87+
88+
Required: False
89+
Position: Named
90+
Default value: None
91+
Accept pipeline input: False
92+
Accept wildcard characters: False
93+
```
94+
95+
### CommonParameters
96+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](http://go.microsoft.com/fwlink/?LinkID=113216).
97+
5998
## INPUTS
6099

61100
## OUTPUTS

teams/teams-ps/teams/Set-CsTeamsMeetingBroadcastConfiguration.md

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,21 @@ Accept pipeline input: False
180180
Accept wildcard characters: False
181181
```
182182
183+
### -SdnRuntimeConfiguration
184+
Specifies connection parameters used to connect with a 3rd party eCDN provider. These parameters should be obtained from the SDN provider to be used.
185+
186+
```yaml
187+
Type: String
188+
Parameter Sets: (All)
189+
Aliases:
190+
191+
Required: False
192+
Position: Named
193+
Default value: None
194+
Accept pipeline input: False
195+
Accept wildcard characters: False
196+
```
197+
183198
### -SupportURL
184199
Specifies a URL where broadcast event attendees can find support information or FAQs specific to that event. The URL will be displayed to the attendees during the broadcast.
185200

0 commit comments

Comments
 (0)