Skip to content

Commit 0f1ea87

Browse files
Merge pull request #12919 from MicrosoftDocs/main
[AutoPublish] main to live - 07/28 13:34 PDT | 07/29 02:04 IST
2 parents df23f8b + 0f076e7 commit 0f1ea87

File tree

2 files changed

+75
-3
lines changed

2 files changed

+75
-3
lines changed

.openpublishing.redirection.exchange.json

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6602,8 +6602,8 @@
66026602
},
66036603
{
66046604
"source_path": "exchange/docs-conceptual/exchange-eop/connect-to-exchange-online-protection-powershell.md",
6605-
"redirect_url": "/powershell/exchange/connect-to-exchange-online-protection-powershell",
6606-
"redirect_document_id": true
6605+
"redirect_url": "/powershell/exchange/connect-to-exchange-online-powershell",
6606+
"redirect_document_id": false
66076607
},
66086608
{
66096609
"source_path": "exchange/docs-conceptual/exchange-eop/exchange-online-protection-powershell.md",
@@ -6842,7 +6842,7 @@
68426842
},
68436843
{
68446844
"source_path": "exchange/docs-conceptual/basic-auth-connect-to-eop-powershell.md",
6845-
"redirect_url": "/powershell/exchange/connect-to-exchange-online-protection-powershell",
6845+
"redirect_url": "/powershell/exchange/connect-to-exchange-online-powershell",
68466846
"redirect_document_id": false
68476847
},
68486848
{
@@ -7194,6 +7194,11 @@
71947194
"source_path": "exchange/virtual-folder/exchange/Remove-RecordLabel.md",
71957195
"redirect_url": "/powershell/module/exchange/remove-label",
71967196
"redirect_document_id": false
7197+
},
7198+
{
7199+
"source_path": "exchange/docs-conceptual/connect-to-exchange-online-protection-powershell.md",
7200+
"redirect_url": "/powershell/exchange/connect-to-exchange-online-powershell",
7201+
"redirect_document_id": false
71977202
}
71987203
]
71997204
}

teams/teams-ps/teams/Set-CsTeamsAcsFederationConfiguration.md

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,12 @@ This cmdlet is used to manage the federation configuration between Teams and Azu
2020
Set-CsTeamsAcsFederationConfiguration
2121
[-Identity <String[]>]
2222
[-EnableAcsUsers <Boolean>]
23+
[-AllowAllAcsResources <Boolean>]
2324
[-AllowedAcsResources <String[]>]
25+
[-BlockedAcsResources <String[]>]
26+
[-RequireAcsFederationForMeeting <Boolean>]
27+
[-LabelForAllowedAcsUsers <String>]
28+
[-HideBannerForAllowedAcsUsers <Boolean>]
2429
[-WhatIf]
2530
[-Confirm]
2631
[<CommonParameters>]
@@ -65,6 +70,32 @@ Accept pipeline input: False
6570
Accept wildcard characters: False
6671
```
6772
73+
### -AllowAllAcsResources
74+
75+
DEPRECATED. Do not use.
76+
77+
```yaml
78+
Type: Boolean
79+
Position: Named
80+
Default value: False
81+
Accept pipeline input: False
82+
Accept wildcard characters: False
83+
```
84+
85+
### -BlockedAcsResources
86+
87+
List of blocked Azure Communication Services resources.
88+
89+
The ACS resources are listed using their immutable resource id, which is a guid that can be found on the Azure portal.
90+
91+
```yaml
92+
Type: String[]
93+
Position: Named
94+
Default value: Empty/Null
95+
Accept pipeline input: False
96+
Accept wildcard characters: False
97+
```
98+
6899
### -AllowedAcsResources
69100
70101
The list of the ACS resources (at least one) for which federation is enabled, when EnableAcsUsers is set to true. If EnableAcsUsers is set to false, then this list is ignored and should be null/empty.
@@ -79,6 +110,42 @@ Accept pipeline input: False
79110
Accept wildcard characters: False
80111
```
81112
113+
### -LabelForAllowedAcsUsers
114+
115+
This configuration controls the user label that is displayed for Azure Communication Services users when they join Teams meetings or calls. Possible values are: Unverified, External. When the value is set to Unverified, the ACS user label is displayed as 'Unverified' when an ACS user joins Teams meetings or calls. When the value is set to External, if an ACS user joins a Teams meeting or call from a resource listed in AllowAllAcsResources, their label should be displayed as 'External'.
116+
117+
```yaml
118+
Type: String
119+
Position: Named
120+
Default value: Unverified
121+
Accept pipeline input: False
122+
Accept wildcard characters: False
123+
```
124+
125+
### -RequireAcsFederationForMeeting
126+
127+
This configuration controls whether ACS Federation is required for meetings. Possibles values are: True, False.
128+
129+
```yaml
130+
Type: Boolean
131+
Position: Named
132+
Default value: False
133+
Accept pipeline input: False
134+
Accept wildcard characters: False
135+
```
136+
137+
### -HideBannerForAllowedAcsUsers
138+
139+
This configuration controls the display of the 'limited call features' banner for Azure Communication Services users participating in Teams meetings or calls. Possible values are: True, False. Set to True to hide the banner for allowed ACS users in Teams meetings or calls.
140+
141+
```yaml
142+
Type: Boolean
143+
Position: Named
144+
Default value: False
145+
Accept pipeline input: False
146+
Accept wildcard characters: False
147+
```
148+
82149
### -Identity
83150
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:
84151

0 commit comments

Comments
 (0)