Skip to content

Commit c2d76d3

Browse files
chrisdachrisda
authored
Merge branch 'main' into patch-1
2 parents d2bd310 + 0622dc2 commit c2d76d3

28 files changed

+328
-125
lines changed

‎.openpublishing.publish.config.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@
220220
"notification_subscribers": [],
221221
"sync_notification_subscribers": [],
222222
"branches_to_filter": [],
223-
"git_repository_branch_open_to_public_contributors": "master",
223+
"git_repository_branch_open_to_public_contributors": "main",
224224
"skip_source_output_uploading": false,
225225
"need_preview_pull_request": true,
226226
"enable_incremental_build": false,
@@ -229,7 +229,7 @@
229229
{
230230
"path_to_root": "_themes",
231231
"url": "https://github.com/Microsoft/templates.docs.msft",
232-
"branch": "master",
232+
"branch": "main",
233233
"branch_mapping": {}
234234
}
235235
],
@@ -257,4 +257,4 @@
257257
"docs_build_engine": {
258258
"name": "docfx_v3"
259259
}
260-
}
260+
}

‎exchange/docs-conceptual/filters-v2.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Although the EXO V2 module supports the majority of filterable attributes, the f
4040
|Cmdlet|Attribute|LDAP Display Name|
4141
|---|---|---|
4242
|[Get-CASMailbox](/powershell/module/exchange/get-casmailbox)|MemberOfGroup <p> ExternalDirectoryObjectId|memberOf <p> msExchExternalDirectoryObjectId|
43-
|[Get-Mailbox](/powershell/module/exchange/get-mailbox)|DeletedItemFlags <p> ExternalDirectoryObjectId <p> LanguagesRaw <p> MasterAccountSid <p> MemberOfGroup <p> RequireAllSendersAreAuthenticated <p> SCLDeleteThresholdInt <p> SCLJunkThresholdInt <p> SCLQuarantineThresholdInt <p> SCLRejectThresholdInt|deletedItemFlags <p> msExchExternalDirectoryObjectId <p> msExchUserCulture <p> msExchMasterAccountSid <p> memberOf <p> msExchRequireAuthToSendTo <p> msExchMessageHygieneSCLDeleteThreshold <p> msExchMessageHygieneSCLJunkThreshold <p> msExchMessageHygieneSCLQuarantineThreshold <p> msExchMessageHygieneSCLRejectThreshold|
43+
|[Get-Mailbox](/powershell/module/exchange/get-mailbox)|DeletedItemFlags <p> LanguagesRaw <p> MasterAccountSid <p> MemberOfGroup <p> RequireAllSendersAreAuthenticated <p> SCLDeleteThresholdInt <p> SCLJunkThresholdInt <p> SCLQuarantineThresholdInt <p> SCLRejectThresholdInt|deletedItemFlags <p> msExchUserCulture <p> msExchMasterAccountSid <p> memberOf <p> msExchRequireAuthToSendTo <p> msExchMessageHygieneSCLDeleteThreshold <p> msExchMessageHygieneSCLJunkThreshold <p> msExchMessageHygieneSCLQuarantineThreshold <p> msExchMessageHygieneSCLRejectThreshold|
4444
|[Get-Recipient](/powershell/module/exchange/get-recipient)|CountryCode <p> ExternalDirectoryObjectId <p> MasterAccountSid <p> MemberOfGroup <p> Members|countryCode <p> msExchExternalDirectoryObjectId <p> msExchMasterAccountSid <p> memberOf <p> member|
4545
|
4646

‎exchange/exchange-ps/exchange/Connect-ExchangeOnline.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ Accept wildcard characters: False
311311
```
312312

313313
### -Certificate
314-
The Certificate parameter specifies the certificate that's used for CBA. A valid value is the X509Certificate2 object value of the certificate.
314+
The Certificate parameter specifies the certificate that's used for certificate-based authentication (CBA). A valid value is the X509Certificate2 object value of the certificate.
315315

316316
Don't use this parameter with the CertificateFilePath or CertificateThumbprint parameters.
317317

@@ -375,6 +375,8 @@ The CertificateThumbprint parameter specifies the certificate that's used for CB
375375

376376
Don't use this parameter with the Certificate or CertificateFilePath parameters.
377377

378+
**Note**: The CertificateThumbprint parameter is supported only in Microsoft Windows.
379+
378380
For more information about CBA, see [App-only authentication for unattended scripts in the EXO V2 module](https://aka.ms/exov2-cba).
379381

380382
```yaml

‎exchange/exchange-ps/exchange/Enable-App.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Enable-App -Identity <GUID for FinanceTestApp> -Mailbox Tony
5252

5353
This example enables the administrator-installed app FinanceTestApp for user Tony.
5454

55-
### Example 1
55+
### Example 3
5656
```powershell
5757
Enable-App -Identity 545d8236-721a-468f-85d8-254eca7cb0da -Mailbox Tony
5858
```

‎skype/skype-ps/skype/Clear-CsOnlineTelephoneNumberReservation.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ ms.reviewer:
1616
Use the `Clear-CsOnlineTelephoneNumberReservation` cmdlet to clear a reserved list of telephone numbers before they are acquired.
1717
The telephone numbers will then be available for search and reservation again.
1818

19+
**Note**:
20+
21+
As of April 30, 2022, the existing Skype for Business PowerShell cmdlets for telephone number search and related activities will be deprecated and will no longer be available for use. The new Teams PowerShell cmdlets for telephone number search and related activities are already available. For more details, see [New-CsOnlineTelephoneNumberOrder](https://docs.microsoft.com/powershell/module/teams/new-csonlinetelephonenumberorder?view=teams-ps).
22+
1923
## SYNTAX
2024

2125
```

‎skype/skype-ps/skype/Get-CsOnlineDirectoryTenantNumberCities.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ ms.reviewer:
1515
## SYNOPSIS
1616
Use the Get-CsOnlineDirectoryTenantNumberCities cmdlet to retrieve the cities for which telephone numbers have been acquired by your organization.
1717

18+
**Note**:
19+
20+
As of April 30, 2022, the existing Skype for Business PowerShell cmdlets for telephone number search and related activities will be deprecated and will no longer be available for use. The new Teams PowerShell cmdlets for telephone number search and related activities are already available. For more details, see [New-CsOnlineTelephoneNumberOrder](https://docs.microsoft.com/powershell/module/teams/new-csonlinetelephonenumberorder?view=teams-ps).
21+
1822
## SYNTAX
1923

2024
```

‎skype/skype-ps/skype/Get-CsOnlineTelephoneNumberAvailableCount.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ ms.reviewer:
1515
## SYNOPSIS
1616
Use the Get-CsOnlineTelephoneNumberAvailableCount cmdlet to retrieve the total telephone numbers your organization is licensed to acquire.
1717

18+
**Note**:
19+
20+
As of April 30, 2022, the existing Skype for Business PowerShell cmdlets for telephone number search and related activities will be deprecated and will no longer be available for use. The new Teams PowerShell cmdlets for telephone number search and related activities are already available. For more details, see [New-CsOnlineTelephoneNumberOrder](https://docs.microsoft.com/powershell/module/teams/new-csonlinetelephonenumberorder?view=teams-ps).
21+
1822
## SYNTAX
1923
```
2024
Get-CsOnlineTelephoneNumberAvailableCount [[-Tenant] <Guid>] [-InventoryType <String>]

‎skype/skype-ps/skype/Get-CsOnlineTelephoneNumberInventoryAreas.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ ms.reviewer:
1515
## SYNOPSIS
1616
Use the `Get-CsOnlineTelephoneNumberInventoryAreas` cmdlet to retrieve the geographical areas where specified inventory types are supported.
1717

18+
**Note**:
19+
20+
As of April 30, 2022, the existing Skype for Business PowerShell cmdlets for telephone number search and related activities will be deprecated and will no longer be available for use. The new Teams PowerShell cmdlets for telephone number search and related activities are already available. For more details, see [New-CsOnlineTelephoneNumberOrder](https://docs.microsoft.com/powershell/module/teams/new-csonlinetelephonenumberorder?view=teams-ps).
21+
1822
## SYNTAX
1923

2024
```

‎skype/skype-ps/skype/Get-CsOnlineTelephoneNumberInventoryCities.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ ms.reviewer:
1515
## SYNOPSIS
1616
Use the `Get-CsOnlineTelephoneNumberInventoryCities` to retrieve the cities that support a given inventory type within a geographical area.
1717

18+
**Note**:
19+
20+
As of April 30, 2022, the existing Skype for Business PowerShell cmdlets for telephone number search and related activities will be deprecated and will no longer be available for use. The new Teams PowerShell cmdlets for telephone number search and related activities are already available. For more details, see [New-CsOnlineTelephoneNumberOrder](https://docs.microsoft.com/powershell/module/teams/new-csonlinetelephonenumberorder?view=teams-ps).
21+
1822
## SYNTAX
1923

2024
```

‎skype/skype-ps/skype/Get-CsOnlineTelephoneNumberInventoryCountries.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ ms.reviewer:
1515
## SYNOPSIS
1616
Use the `Get-CsOnlineTelephoneNumberInventoryCountries` cmdlet to retrieve a list of countries with telephone number inventories by specified region and telephone number inventory types.
1717

18+
**Note**:
19+
20+
As of April 30, 2022, the existing Skype for Business PowerShell cmdlets for telephone number search and related activities will be deprecated and will no longer be available for use. The new Teams PowerShell cmdlets for telephone number search and related activities are already available. For more details, see [New-CsOnlineTelephoneNumberOrder](https://docs.microsoft.com/powershell/module/teams/new-csonlinetelephonenumberorder?view=teams-ps).
21+
1822
## SYNTAX
1923

2024
```

0 commit comments

Comments
 (0)