Skip to content

Commit

Permalink
Merge pull request #10876 from MicrosoftDocs/repo_sync_working_branch
Browse files Browse the repository at this point in the history
Resolve syncing conflicts from repo_sync_working_branch to public
  • Loading branch information
garycentric authored Nov 23, 2024
2 parents 7034a41 + 96ba286 commit 7368329
Show file tree
Hide file tree
Showing 378 changed files with 7,059 additions and 3,982 deletions.
21 changes: 21 additions & 0 deletions .github/workflows/BuildValidation.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
name: Build validation

permissions:
pull-requests: write
statuses: write

on:
issue_comment:
types: [created]

jobs:

build-status:
uses: MicrosoftDocs/microsoft-365-docs/.github/workflows/Shared-BuildValidation.yml@workflows-test
with:
PayloadJson: ${{ toJSON(github) }}
secrets:
AccessToken: ${{ secrets.GITHUB_TOKEN }}



79 changes: 72 additions & 7 deletions .openpublishing.redirection.json
Original file line number Diff line number Diff line change
Expand Up @@ -5286,8 +5286,8 @@
"redirect_document_id": false
},
{
"source_path": "Skype/SfbPartnerCertification/certification/devices-usb-devices.md",
"redirect_url": "/microsoftteams/devices/usb-devices",
"source_path": "Skype/SfbPartnerCertification/certification/archived/devices-usb-devices.md",
"redirect_url": "/SkypeForBusiness/certification/devices-usb-devices",
"redirect_document_id": false
},
{
Expand Down Expand Up @@ -5324,16 +5324,81 @@
"source_path": "Skype/SfbPartnerCertification/lync-cert/pcs-optimized-for-lync.md",
"redirect_url": "/microsoftteams/devices/certification-overview",
"redirect_document_id": false
},
{
"source_path": "Teams/devices/phones-for-teams.md",
"redirect_url": "/microsoftteams/phones/phones-for-teams",
"redirect_document_id": false
},
{
"source_path": "Teams/devices/plan-device-deployment.md",
"redirect_url": "/microsoftteams/phones/plan-device-deployment",
"redirect_document_id": false
},
{
"source_path": "Teams/devices/teams-ip-phones.md",
"redirect_url": "/microsoftteams/devices/certified-devices-overview",
"redirect_document_id": false
{
"source_path": "Teams/devices/teams-ip-phones.md",
"redirect_url": "/microsoftteams/devices/certified-devices-overview",
"redirect_document_id": false
},
{
"source_path": "Teams/rooms/android-app-firmware.md",
"redirect_url": "/microsoftteams/devices/certified-hardware-android",
"redirect_document_id": false
},
{
"source_path": "Teams/devices/phones-panels-deploy.md",
"redirect_url": "/microsoftteams/devices/mtra-panels-deploy",
"redirect_document_id": false
},
{
"source_path": "Teams/set-up-common-area-phones.md",
"redirect_url": "/microsoftteams/phones/set-up-common-area-phones",
"redirect_document_id": false
},
{
"source_path": "Teams/devices/common-area-mobile-phones.md",
"redirect_url": "/microsoftteams/phones/common-area-mobile-phones",
"redirect_document_id": false
},
{
"source_path": "Teams/sip-gateway-configure.md",
"redirect_url": "/microsoftteams/devices/sip-gateway-configure",
"redirect_document_id": false
},
{
"source_path": "Teams/sip-gateway-plan.md",
"redirect_url": "/microsoftteams/devices/sip-gateway-plan",
"redirect_document_id": false
},
{
"source_path": "Teams/sip-gateway-dynamic-filters.md",
"redirect_url": "/microsoftteams/devices/sip-gateway-dynamic-filters",
"redirect_document_id": false
},
{
"source_path": "Teams/flw-realwear.md",
"redirect_url": "/microsoftteams/devices/usb-devices",
"redirect_document_id": false
},
{
"source_path": "Teams/devices/collab-bar-deploy.md",
"redirect_url": "/microsoftteams/rooms/rooms-deploy",
"redirect_document_id": false
},
{
"source_path": "Teams/devices/teams-android-devices-user-interface.md",
"redirect_url": "/microsoftteams/phones/teams-android-devices-user-interface",
"redirect_document_id": false
},
{
"source_path": "Teams/rooms/admin-center-license-overview.md",
"redirect_url": "/microsoftteams/rooms/rooms-licensing",
"redirect_document_id": false
},
{
"source_path": "Teams/devices/smartvision-admin.md",
"redirect_url": "/microsoftteams/devices/multistream-intelliframe",
"redirect_document_id": false
}
]
}
}
5 changes: 1 addition & 4 deletions Skype/SfBServer2019/virtualization-guidance.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,7 @@ While virtualization is supported, there are some key points to remember:

SfB Server 2019 is supported on Windows Server 2016 and Windows Server 2019.

For third-party hypervisors, you need a hypervisor that has passed the Server Virtualization Validation Program (SVVP) testing for the relevant OS.

- See the [Windows Server 2016 versions](https://www.windowsservercatalog.com/results.aspx?&bCatID=1521&cpID=0&avc=86&ava=88&avt=0&avq=0&OR=1&PGS=25) in the SVVP list.
- See the [Windows Server 2019 versions](https://www.windowsservercatalog.com/results.aspx?&bCatID=1521&cpID=0&avc=86&ava=130&avt=0&avq=0&OR=1&PGS=25) in the SVVP list.
For third-party hypervisors, you need a hypervisor that has passed the Server Virtualization Validation Program (SVVP) testing for the relevant OS. For more information, see [Support partners for non-Microsoft hardware virtualization software](/troubleshoot/windows-server/virtualization/non-microsoft-hardware-virtualization-software).

## Stress and performance tool

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@ To see a list of those countries/regions that have phone numbers automatically a
- You can set up to four languages for each audio conferencing phone number - one primary and three secondary. And you can also set languages on a dedicated audio conferencing phone number.

- To set the dial-in phone number for a user, see [Set the phone numbers included on invites](set-the-phone-numbers-included-on-invites.md).

[!INCLUDE [LinkedIn Learning Info](../../common/office/linkedin-learning-info.md)]

## Related topics

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,6 @@ After you enable external communication for your entire business, you can turn i

> [!NOTE]
> You may have to wait for up to 24 hours for your changes to take effect.
[!INCLUDE [LinkedIn Learning Info](../../common/office/linkedin-learning-info.md)]
## Related topics

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,6 @@ To configure these settings in bulk, use PowerShell. See [Set up your computer f

To configure these settings in bulk, use PowerShell. See [Set the phone numbers included on invites](../audio-conferencing-in-office-365/set-the-phone-numbers-included-on-invites.md) [Set up your computer for Windows PowerShell](../set-up-your-computer-for-windows-powershell/set-up-your-computer-for-windows-powershell.md).


[!INCLUDE [LinkedIn Learning Info](../../common/office/linkedin-learning-info.md)]


## Related topics

[Set up Skype for Business Online](set-up-skype-for-business-online.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,14 +97,9 @@ Skype contacts who signed in with their Microsoft account (formerly Windows Live
|:-----|:-----|
| Video conversations <br/> Person-to-person instant messaging <br/> Presence <br/> | Multi-party IM conversations <br/> Audio and video conversations with three or more people <br/> Desktop and program sharing <br/> |

[!INCLUDE [LinkedIn Learning Info](../../common/office/linkedin-learning-info.md)]

## Related topics

[Allow users to contact external Skype for Business users](allow-users-to-contact-external-skype-for-business-users.md)

[Set up Skype for Business Online](set-up-skype-for-business-online.md)




Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,6 @@ The quality of audio, video, and application sharing in Skype for Business is gr

[Make and receive a video call using Skype for Business](https://support.office.com/article/abf62493-670f-4b0d-b2cf-fe03b49caf42)

[!INCLUDE [LinkedIn Learning Info](../../common/office/linkedin-learning-info.md)]

## Related topics
<a name="bkmk_more"> </a>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,6 @@ If you want to use your existing Calling Plan, buy the **Phone System** add-on a

If you are using on-premises PSTN connectivity for hybrid users, you *only* assign **Phone System** licenses to your users. **DO NOT** also assign a Calling Plan.

[!INCLUDE [LinkedIn Learning Info](../../common/office/linkedin-learning-info.md)]

## Related topics

- [Set up Skype for Business Online](../set-up-skype-for-business-online/set-up-skype-for-business-online.md)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ Use the following table to find the tools for testing USB peripherals, PCs, and

[Phones and devices home](devices-ip-phones.md)

[USB Audio and Video devices](devices-usb-devices.md)

If you are a vendor seeking to join the certification program, see [How to Join](how-to-join.md) for requirements and available programs.

View the [Microsoft Teams devices store](https://products.office.com/microsoft-teams/across-devices/devices) to see products certified for Microsoft Teams and Skype for Business.
Expand Down
4 changes: 2 additions & 2 deletions Teams/CQD-PSTN-report.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
---
title: "Using the CQD PSTN Direct Routing report"
author: CarolynRowe
ms.author: crowe
author: sfrancis206
ms.author: scottfrancis
manager: pamgreen
ms.reviewer: siunies
ms.date: 03/06/2020
Expand Down
Loading

0 comments on commit 7368329

Please sign in to comment.