Skip to content

Commit a0285bd

Browse files
michelle-paradismichelle-paradis
authored
Merge branch 'main' into patch-4
2 parents 4d986b4 + 290f44d commit a0285bd

File tree

7 files changed

+132
-125
lines changed

7 files changed

+132
-125
lines changed

‎exchange/exchange-ps/exchange/Export-ContentExplorerData.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,8 +110,6 @@ When you use this switch with the TagName, TagType, and Workload parameters, the
110110
- Exchange Online and Microsoft Teams: The list of UPNs.
111111
- The count of items in the folders stamped with relevant tag.
112112
113-
114-
115113
```yaml
116114
Type: SwitchParameter
117115
Parameter Sets: (All)

‎exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ $stringJson = @"
126126
'EmailAddress': '[email protected]'
127127
}]
128128
"@
129-
Set-AppRetentionCompliancePolicy -Identity "Teams Private Channel Retention Policy" -AddExchangeLocationException "[email protected]" -DeletedResources $stringJson
129+
Set-AppRetentionCompliancePolicy -Identity "Teams Private Channel Retention Policy" -AddExchangeLocationException "[email protected]" -DeletedResources $stringJson
130130
```
131131
This example excludes the specified soft-deleted mailbox or mail user from the retention policy configured for Teams private channel messages. You can identify the deleted resources using the mailbox or mail user's email address.
132132

@@ -144,7 +144,7 @@ $stringJson = @"
144144
'EmailAddress': '[email protected]'
145145
}]
146146
"@
147-
Set-AppRetentionCompliancePolicy -Identity "Teams Private Chat Retention Policy" -AddExchangeLocationException "[email protected]", "[email protected]" -DeletedResources $stringJson
147+
Set-AppRetentionCompliancePolicy -Identity "Teams Private Chat Retention Policy" -AddExchangeLocationException "[email protected]", "[email protected]" -DeletedResources $stringJson
148148
```
149149

150150
This example is similar to Example 2, except multiple deleted resources are specified.

‎exchange/exchange-ps/exchange/Set-ArcConfig.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ $y = @($x.Split(","))
8282
$DomainsRemove = [System.Collections.ArrayList]($y)
8383
$DomainsRemove.Remove($arcSealer)
8484
85-
if ($DomainsToRemove.Count -eq 0) {
85+
if ($DomainsToRemove.Count -eq 0) {
8686
Set-ArcConfig -Identity Default -ArcTrustedSealers " "
8787
}
8888
else {

‎exchange/exchange-ps/exchange/Set-RetentionCompliancePolicy.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ The example excludes the specified deleted Microsoft 365 Group and site from the
166166

167167
**IMPORTANT**: Before you run this command, make sure you read the Caution information for the [DeletedResources parameter](#-deletedresources) about duplicate SMTP addresses.
168168

169-
170169
### Example 4
171170
```powershell
172171
$stringJson = @"
@@ -213,7 +212,7 @@ $stringJson = @"
213212
}]
214213
"@
215214
216-
Set-RetentionCompliancePolicy -Identity "Teams Chat Retention Policy" -AddTeamsChatLocationException "[email protected]", "[email protected]" -DeletedResources $stringJson
215+
Set-RetentionCompliancePolicy -Identity "Teams Chat Retention Policy" -AddTeamsChatLocationException "[email protected]", "[email protected]" -DeletedResources $stringJson
217216
```
218217

219218
This example is similar to Example 5, except multiple deleted resources are specified.
@@ -222,7 +221,6 @@ This example is similar to Example 5, except multiple deleted resources are spec
222221

223222
Policy exclusions must remain within the supported limits for retention policies: [Limits for Microsoft 365 retention policies and retention label policies](https://learn.microsoft.com/purview/retention-limits#maximum-number-of-items-per-policy)
224223

225-
226224
## PARAMETERS
227225

228226
### -Identity

‎teams/teams-ps/teams/Get-CsHybridTelephoneNumber.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ manager:
1717
## SYNOPSIS
1818
This cmdlet displays information about one or more hybrid telephone numbers.
1919

20+
> [!IMPORTANT]
21+
> This cmdlet is being deprecated. Use the **Get-CsPhoneNumberAssignment** cmdlet to display information about one or more phone numbers. Detailed instructions on how to use the new cmdlet can be found at [Get-CsPhoneNumberAssignment](/powershell/module/teams/get-csphonenumberassignment?view=teams-ps)
22+
2023
## SYNTAX
2124

2225
### Assignment (Default)

‎teams/teams-ps/teams/New-CsHybridTelephoneNumber.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ manager:
1616
## SYNOPSIS
1717
This cmdlet adds a hybrid telephone number to the tenant.
1818

19+
> [!IMPORTANT]
20+
> This cmdlet is being deprecated. Use the **New-CsOnlineDirectRoutingTelephoneNumberUploadOrder** cmdlet to add a telephone number for Audio Conferencing with Direct Routing in Microsoft 365 GCC High and DoD clouds. Detailed instructions on how to use the new cmdlet can be found at [New-CsOnlineDirectRoutingTelephoneNumberUploadOrder](/powershell/module/teams/new-csonlinedirectroutingtelephonenumberuploadorder?view=teams-ps)
21+
1922
## SYNTAX
2023

2124
### Identity (Default)

‎teams/teams-ps/teams/Remove-CsHybridTelephoneNumber.md

Lines changed: 122 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -1,117 +1,122 @@
1-
---
2-
external help file: Microsoft.Open.Teams.CommonLibrary.dll-Help.xml
3-
Module Name: MicrosoftTeams
4-
online version: https://learn.microsoft.com/powershell/module/teams/remove-cshybridtelephonenumber
5-
applicable: Microsoft Teams
6-
author: serdarsoysal
7-
ms.author: serdars
8-
ms.reviewer:
9-
manager:
10-
title: Remove-CsHybridTelephoneNumber
11-
schema: 2.0.0
12-
---
13-
14-
# Remove-CsHybridTelephoneNumber
15-
16-
## SYNOPSIS
17-
This cmdlet removes a hybrid telephone number.
18-
19-
## SYNTAX
20-
21-
### Identity (Default)
22-
```powershell
23-
Remove-CsHybridTelephoneNumber -TelephoneNumber <string> [-Force] [-WhatIf] [-Confirm][<CommonParameters>]
24-
```
25-
26-
## DESCRIPTION
27-
This cmdlet removes a hybrid telephone number used for Audio Conferencing with Direct Routing for GCC High and DoD clouds.
28-
29-
## EXAMPLES
30-
31-
### Example 1
32-
```powershell
33-
Remove-CsHybridTelephoneNumber -TelephoneNumber 14025551234
34-
```
35-
This example removes the hybrid phone number +1 (402) 555-1234.
36-
37-
## PARAMETERS
38-
39-
### -TelephoneNumber
40-
The telephone number to remove. The number should be specified without a prefixed "+". The phone number can't have "tel:" prefixed.
41-
42-
```yaml
43-
Type: System.String
44-
Parameter Sets: (All)
45-
Aliases:
46-
Applicable: Microsoft Teams
47-
48-
Required: True
49-
Default value: None
50-
Accept pipeline input: False
51-
Accept wildcard characters: False
52-
```
53-
54-
### -Force
55-
Suppresses the display of any non-fatal error message that might arise when running the command.
56-
57-
```yaml
58-
Type: SwitchParameter
59-
Parameter Sets: (All)
60-
Aliases:
61-
62-
Required: False
63-
Position: Named
64-
Default value: None
65-
Accept pipeline input: False
66-
Accept wildcard characters: False
67-
```
68-
69-
### -WhatIf
70-
Shows what would happen if the cmdlet runs. The cmdlet is not run.
71-
72-
```yaml
73-
Type: SwitchParameter
74-
Parameter Sets: (All)
75-
Aliases: wi
76-
77-
Required: False
78-
Position: Named
79-
Default value: None
80-
Accept pipeline input: False
81-
Accept wildcard characters: False
82-
```
83-
84-
### -Confirm
85-
Prompts you for confirmation before running the cmdlet.
86-
87-
```yaml
88-
Type: SwitchParameter
89-
Parameter Sets: (All)
90-
Aliases: cf
91-
92-
Required: False
93-
Position: Named
94-
Default value: None
95-
Accept pipeline input: False
96-
Accept wildcard characters: False
97-
```
98-
99-
### CommonParameters
100-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/?LinkID=113216).
101-
102-
## INPUTS
103-
104-
### None
105-
106-
## OUTPUTS
107-
108-
### None
109-
110-
## NOTES
111-
112-
The cmdlet is only available in GCC High and DoD cloud instances.
113-
114-
## RELATED LINKS
115-
[New-CsHybridTelephoneNumber](https://learn.microsoft.com/powershell/module/teams/new-cshybridtelephonenumber)
116-
117-
[Get-CsHybridTelephoneNumber](https://learn.microsoft.com/powershell/module/teams/get-cshybridtelephonenumber)
1+
---
2+
external help file: Microsoft.Open.Teams.CommonLibrary.dll-Help.xml
3+
Module Name: MicrosoftTeams
4+
online version: https://learn.microsoft.com/powershell/module/teams/remove-cshybridtelephonenumber
5+
applicable: Microsoft Teams
6+
author: serdarsoysal
7+
ms.author: serdars
8+
ms.reviewer:
9+
manager:
10+
title: Remove-CsHybridTelephoneNumber
11+
schema: 2.0.0
12+
---
13+
14+
# Remove-CsHybridTelephoneNumber
15+
16+
## SYNOPSIS
17+
This cmdlet removes a hybrid telephone number.
18+
19+
> [!IMPORTANT]
20+
> This cmdlet is being deprecated. Use the new **New-CsOnlineTelephoneNumberReleaseOrder** cmdlet to remove a telephone number for Audio Conferencing with Direct Routing in Microsoft 365 GCC High and DoD clouds. Detailed instructions on how to use the new cmdlet can be found at [New-CsOnlineTelephoneNumberReleaseOrder](/powershell/module/teams/new-csonlinetelephonenumberreleaseorder?view=teams-ps).
21+
22+
## SYNTAX
23+
24+
### Identity (Default)
25+
```powershell
26+
Remove-CsHybridTelephoneNumber -TelephoneNumber <string> [-Force] [-WhatIf] [-Confirm][<CommonParameters>]
27+
```
28+
29+
## DESCRIPTION
30+
This cmdlet removes a hybrid telephone number used for Audio Conferencing with Direct Routing for GCC High and DoD clouds.
31+
32+
## EXAMPLES
33+
34+
### Example 1
35+
```powershell
36+
Remove-CsHybridTelephoneNumber -TelephoneNumber 14025551234
37+
```
38+
This example removes the hybrid phone number +1 (402) 555-1234.
39+
40+
## PARAMETERS
41+
42+
### -TelephoneNumber
43+
The telephone number to remove. The number should be specified without a prefixed "+". The phone number can't have "tel:" prefixed.
44+
45+
```yaml
46+
Type: System.String
47+
Parameter Sets: (All)
48+
Aliases:
49+
Applicable: Microsoft Teams
50+
51+
Required: True
52+
Default value: None
53+
Accept pipeline input: False
54+
Accept wildcard characters: False
55+
```
56+
57+
### -Force
58+
Suppresses the display of any non-fatal error message that might arise when running the command.
59+
60+
```yaml
61+
Type: SwitchParameter
62+
Parameter Sets: (All)
63+
Aliases:
64+
65+
Required: False
66+
Position: Named
67+
Default value: None
68+
Accept pipeline input: False
69+
Accept wildcard characters: False
70+
```
71+
72+
### -WhatIf
73+
Shows what would happen if the cmdlet runs. The cmdlet is not run.
74+
75+
```yaml
76+
Type: SwitchParameter
77+
Parameter Sets: (All)
78+
Aliases: wi
79+
80+
Required: False
81+
Position: Named
82+
Default value: None
83+
Accept pipeline input: False
84+
Accept wildcard characters: False
85+
```
86+
87+
### -Confirm
88+
Prompts you for confirmation before running the cmdlet.
89+
90+
```yaml
91+
Type: SwitchParameter
92+
Parameter Sets: (All)
93+
Aliases: cf
94+
95+
Required: False
96+
Position: Named
97+
Default value: None
98+
Accept pipeline input: False
99+
Accept wildcard characters: False
100+
```
101+
102+
### CommonParameters
103+
104+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/?LinkID=113216).
105+
106+
## INPUTS
107+
108+
### None
109+
110+
## OUTPUTS
111+
112+
### None
113+
114+
## NOTES
115+
116+
The cmdlet is only available in GCC High and DoD cloud instances.
117+
118+
## RELATED LINKS
119+
120+
[New-CsHybridTelephoneNumber](https://learn.microsoft.com/powershell/module/teams/new-cshybridtelephonenumber)
121+
122+
[Get-CsHybridTelephoneNumber](https://learn.microsoft.com/powershell/module/teams/get-cshybridtelephonenumber)

0 commit comments

Comments
 (0)