Skip to content

Commit 96e48b5

Browse files
authored
Merge branch 'main' into patch-9
2 parents df482f3 + d23697c commit 96e48b5

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
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': 'SalesUser@contoso.onmicrosoft.com'
127127
}]
128128
"@
129-
Set-AppRetentionCompliancePolicy -Identity "Teams Private Channel Retention Policy" -AddExchangeLocationException "SalesUser@contoso.onmicrosoft.com" -DeletedResources $stringJson
129+
Set-AppRetentionCompliancePolicy -Identity "Teams Private Channel Retention Policy" -AddExchangeLocationException "SalesUser@contoso.onmicrosoft.com" -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': 'SalesUser2@contoso.onmicrosoft.com'
145145
}]
146146
"@
147-
Set-AppRetentionCompliancePolicy -Identity "Teams Private Chat Retention Policy" -AddExchangeLocationException "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -DeletedResources $stringJson
147+
Set-AppRetentionCompliancePolicy -Identity "Teams Private Chat Retention Policy" -AddExchangeLocationException "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -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 "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -DeletedResources $stringJson
215+
Set-RetentionCompliancePolicy -Identity "Teams Chat Retention Policy" -AddTeamsChatLocationException "SalesUser1@contoso.onmicrosoft.com", "SalesUser2@contoso.onmicrosoft.com" -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/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)

0 commit comments

Comments
 (0)