diff --git a/.openpublishing.redirection.exchange.json b/.openpublishing.redirection.exchange.json index 10c412f96e..7eb756dfc2 100644 --- a/.openpublishing.redirection.exchange.json +++ b/.openpublishing.redirection.exchange.json @@ -6602,8 +6602,8 @@ }, { "source_path": "exchange/docs-conceptual/exchange-eop/connect-to-exchange-online-protection-powershell.md", - "redirect_url": "/powershell/exchange/connect-to-exchange-online-protection-powershell", - "redirect_document_id": true + "redirect_url": "/powershell/exchange/connect-to-exchange-online-powershell", + "redirect_document_id": false }, { "source_path": "exchange/docs-conceptual/exchange-eop/exchange-online-protection-powershell.md", @@ -6842,7 +6842,7 @@ }, { "source_path": "exchange/docs-conceptual/basic-auth-connect-to-eop-powershell.md", - "redirect_url": "/powershell/exchange/connect-to-exchange-online-protection-powershell", + "redirect_url": "/powershell/exchange/connect-to-exchange-online-powershell", "redirect_document_id": false }, { @@ -7194,6 +7194,11 @@ "source_path": "exchange/virtual-folder/exchange/Remove-RecordLabel.md", "redirect_url": "/powershell/module/exchange/remove-label", "redirect_document_id": false + }, + { + "source_path": "exchange/docs-conceptual/connect-to-exchange-online-protection-powershell.md", + "redirect_url": "/powershell/exchange/connect-to-exchange-online-powershell", + "redirect_document_id": false } ] } \ No newline at end of file diff --git a/teams/teams-ps/teams/Set-CsTeamsAcsFederationConfiguration.md b/teams/teams-ps/teams/Set-CsTeamsAcsFederationConfiguration.md index d5d3e1c8a6..dcc0f7acf6 100644 --- a/teams/teams-ps/teams/Set-CsTeamsAcsFederationConfiguration.md +++ b/teams/teams-ps/teams/Set-CsTeamsAcsFederationConfiguration.md @@ -20,7 +20,12 @@ This cmdlet is used to manage the federation configuration between Teams and Azu Set-CsTeamsAcsFederationConfiguration [-Identity ] [-EnableAcsUsers ] + [-AllowAllAcsResources ] [-AllowedAcsResources ] + [-BlockedAcsResources ] + [-RequireAcsFederationForMeeting ] + [-LabelForAllowedAcsUsers ] + [-HideBannerForAllowedAcsUsers ] [-WhatIf] [-Confirm] [] @@ -65,6 +70,32 @@ Accept pipeline input: False Accept wildcard characters: False ``` +### -AllowAllAcsResources + +DEPRECATED. Do not use. + +```yaml +Type: Boolean +Position: Named +Default value: False +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -BlockedAcsResources + +List of blocked Azure Communication Services resources. + +The ACS resources are listed using their immutable resource id, which is a guid that can be found on the Azure portal. + +```yaml +Type: String[] +Position: Named +Default value: Empty/Null +Accept pipeline input: False +Accept wildcard characters: False +``` + ### -AllowedAcsResources 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 Accept wildcard characters: False ``` +### -LabelForAllowedAcsUsers + +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'. + +```yaml +Type: String +Position: Named +Default value: Unverified +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -RequireAcsFederationForMeeting + +This configuration controls whether ACS Federation is required for meetings. Possibles values are: True, False. + +```yaml +Type: Boolean +Position: Named +Default value: False +Accept pipeline input: False +Accept wildcard characters: False +``` + +### -HideBannerForAllowedAcsUsers + +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. + +```yaml +Type: Boolean +Position: Named +Default value: False +Accept pipeline input: False +Accept wildcard characters: False +``` + ### -Identity 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: