Merge pull request #15699 from MicrosoftDocs/main

Publish main to live 09/27/2024, 3:30 PM
MicrosoftDocs · Sep 27, 2024 · d0f8199 · d0f8199
2 parents eabae8d + 7346cd3
commit d0f8199
Show file tree

Hide file tree

Showing 22 changed files with 176 additions and 139 deletions.
diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json
@@ -5194,6 +5194,79 @@
   "source_path": "Teams/teams-analytics-and-reports/pstn-blocked-users-report.md",
   "redirect_url": "/microsoftteams/teams-analytics-and-reports/teams-reporting-reference",
   "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/skype-room-system-exchange-and-skype-accounts.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/single-forest-on-premises-deployments.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/multiple-forest-on-premises-deployments.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/provisioning-skype-room-system-accounts-in-office-365.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/hybrid-deployments.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/room-system-and-federated-partners.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/manage-skype-room-system-accounts.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/room-setup-scripts.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/manageability-and-tools.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/skype-for-business-software-liicense.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/domain-joining-considerations.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/migration-considerations.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/trusted-domains.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
+},
+{
+  "source_path": "Skype/SfbServer/deploy/deploy-clients/conferencing-policy.md",
+  "redirect_url": "Teams/rooms/index",
+  "redirect_document_id": false
 }
+
+
+
 ]
 }
diff --git a/...loy/deploy-clients/conferencing-policy.md → ...y-clients/archived/conferencing-policy.md b/...loy/deploy-clients/conferencing-policy.md → ...y-clients/archived/conferencing-policy.md
@@ -57,8 +57,8 @@ The conferencing policy assigned to the Skype Room System account must have cert
 |FileTransferBitRateKb  <br/> |5000  <br/> |N/A  <br/> |
 |TotalReceiveVideoBitRateKb  <br/> |20000  <br/> |We recommend that you set this as high as possible. The effective bandwidth depends on network conditions at the time of conferences.\*  <br/> |
 |EnableMultiViewJoin  <br/> |TRUE  <br/> |Must be TRUE for Skype Room System to ensure multi-view video streams  <br/> |
-   
-* For information about bandwidth planning, see [Network bandwidth requirements for media traffic](../../plan-your-deployment/network-requirements/network-requirements.md#network-bandwidth-requirements-for-media-traffic).
+
+* For information about bandwidth planning, see [Network bandwidth requirements for media traffic](../../../plan-your-deployment/network-requirements/network-requirements.md#network-bandwidth-requirements-for-media-traffic).
 
 > [!NOTE]
 > If the Skype Room System client tries to join a scheduled meeting organized by a user who is homed on a Lync Server 2010 pool, the meeting organizer's conferencing policy could prevent the Skype Room System client from performing collaboration. 

diff --git a/...-clients/domain-joining-considerations.md → ...archived/domain-joining-considerations.md b/...-clients/domain-joining-considerations.md → ...archived/domain-joining-considerations.md
@@ -64,6 +64,6 @@ You might have multiple approaches to solving these problems. We advise you to c
 
 ## See also
 
-[Device Configuration: Create New or Edit Existing](../../help-topics/help-lscp/device-configuration-create-new-or-edit-existing.md)
+[Device Configuration: Create New or Edit Existing](../../../help-topics/help-lscp/device-configuration-create-new-or-edit-existing.md#device-configuration-create-new-or-edit-existing)
 
-[Managing Quality of Service](../../plan-your-deployment/network-requirements/network-requirements.md#managing-quality-of-service)
+[Managing Quality of Service](../../../plan-your-deployment/network-requirements/network-requirements.md#managing-quality-of-service)
diff --git a/...ploy/deploy-clients/hybrid-deployments.md → ...oy-clients/archived/hybrid-deployments.md b/...ploy/deploy-clients/hybrid-deployments.md → ...oy-clients/archived/hybrid-deployments.md
diff --git a/...ents/manage-skype-room-system-accounts.md → ...ived/manage-skype-room-system-accounts.md b/...ents/manage-skype-room-system-accounts.md → ...ived/manage-skype-room-system-accounts.md
diff --git a/...deploy-clients/manageability-and-tools.md → ...ients/archived/manageability-and-tools.md b/...deploy-clients/manageability-and-tools.md → ...ients/archived/manageability-and-tools.md
@@ -25,14 +25,13 @@ For Skype for Business Server on-premises deployments, you can use the Skype Roo
 
 See the following article for more details:
 
-- [Deploy SRS v1 Administrative Web Portal in Skype for Business Server](../deploy-conferencing/room-system-v1-administrative-web-portal.md)
-
-
+- [Deploy SRS v1 Administrative Web Portal in Skype for Business Server](../../deploy-conferencing/room-system-v1-administrative-web-portal.md#deploy-srs-v1-administrative-web-portal-in-skype-for-business-server)
+
 ## Exchange Checklist
 
 - Confirm Autodiscover is set up and an internal DNS A/CNAME RECORD is available for autodiscover.domain.com.
 
-- Ping autodiscover (e.g., Ping Autodiscover.contoso.com).
+- Ping autodiscover (for example, Ping Autodiscover.contoso.com).
 
 - Test your Autodiscover service with the Microsoft Connectivity Analyzer Tool. Choose the first test, "I can't log on with Office Outlook."
 
@@ -88,15 +87,15 @@ Skype Room System is an embedded system that can be fully integrated in a Window
 
   - Skype for Business uses end-to-end encryption and authorization for all modes of communication
 
-  - Skype Room System supports Skype for Business security and compliance standards. See [Plan for security in Skype For Business Server](../../plan-your-deployment/security/security.md) for more information.
+  - Skype Room System supports Skype for Business security and compliance standards. See [Plan for security in Skype For Business Server](../../../plan-your-deployment/security/security.md#plan-for-security-in-skype-for-business-server) for more information.
 
 ## License
 
 Verify that you use a KMS for activating software. If so, you might need to check or add the Skype for Business client KMS key to it. If you aren't using KMS, then request the volume licensing key for the Skype for Business client MAK.
 
 ## License keys
 
-Skype Room System runs the Skype for Business desktop client in the background. If Skype Room System is a domain member, it will discover your KMS. (and if it has the Volume Licensing KMS Key it will activate automatically). Volume Licensing also provides a MAK, which you enter as it displays xxxxx-xxxxx-xxxxx-xxxxx. (You need Internet access to activate using MAK but not KMS). For more information, see Volume activation of Office 2013.
+Skype Room System runs the Skype for Business desktop client in the background. If Skype Room System is a domain member, it will discover your KMS. (and if it has the Volume Licensing KMS Key it activates automatically). Volume Licensing also provides a MAK, which you enter as it displays xxxxx-xxxxx-xxxxx-xxxxx. (You need Internet access to activate using MAK but not KMS). For more information, see Volume activation of Office 2013.
 
 - To enter the MAK key, go to OEM Settings \> SRS Licensing Tool. Click Check Status. When the status says "product isn't activated," enter the key.
 
@@ -128,7 +127,8 @@ Import the .crt file to the Skype Room System under Trusted Room Certification A
 
 Import the .crl files on the Skype Room System under the Intermediate Certificate Authorities folder. (You need to change the file extension filter in Certificate Manager to .crl to see the files).
 
-Note: The Office Web Apps 2013 server may share the same CA as Skype for Business. If it doesn't you won't be able to share PowerPoint in a meeting. Check with IT and obtain the CRT and CRL files off the CA network share CertEnroll as explained above. 
+> [!NOTE]
+> The Office Web Apps 2013 server may share the same CA as Skype for Business. If it doesn't, you can't share PowerPoint in a meeting. Check with IT and obtain the CRT and CRL files off the CA network share CertEnroll as explained above. 
   
 Domain membership can simplify some things because you can treat the Skype Room System as a Windows system and it can rely on Active Directory for some of the certificate aspects. However, it's best to manually manage this.
 
diff --git a/...eploy-clients/migration-considerations.md → ...ents/archived/migration-considerations.md b/...eploy-clients/migration-considerations.md → ...ents/archived/migration-considerations.md
diff --git a/...ultiple-forest-on-premises-deployments.md → ...ultiple-forest-on-premises-deployments.md b/...ultiple-forest-on-premises-deployments.md → ...ultiple-forest-on-premises-deployments.md
diff --git a/...ype-room-system-accounts-in-office-365.md → ...ype-room-system-accounts-in-office-365.md b/...ype-room-system-accounts-in-office-365.md → ...ype-room-system-accounts-in-office-365.md
@@ -56,7 +56,7 @@ For the Skype Room account, the following licensing is required:
 
 The following diagram provides an overview of the Skype Room System account provisioning flow.
 
-![Skype Room System Provisioning steps.](../../media/354c5659-317b-4e85-a1bc-c60c07f305a4.png)
+:::image type="content" source="../../../media/354c5659-317b-4e85-a1bc-c60c07f305a4.png" alt-text="Screenshot that shows the overview image of Skype Room System account provisioning flow." lightbox="../../../media/354c5659-317b-4e85-a1bc-c60c07f305a4.png":::
 
 ## Identify a new conference room
 

diff --git a/...ploy/deploy-clients/room-setup-scripts.md → ...oy-clients/archived/room-setup-scripts.md b/...ploy/deploy-clients/room-setup-scripts.md → ...oy-clients/archived/room-setup-scripts.md
@@ -22,7 +22,7 @@ description: "Read this article to find sample scripts for provisioning Skype Ro
 
 Read this article to find sample scripts for provisioning Skype Room System accounts.
 
-This section illustrates sample scripts that can be used to provision Skype Room System accounts. These scripts are only for illustrative purposes. They should be used only after you consult with your IT expert or domain administrator.
+This section illustrates sample scripts that can be used to provision Skype Room System accounts. These scripts are only for illustrative purposes. They should be used only after you consult your IT expert or domain administrator.
 
 ## Example Setup Script: Skype for Business and Exchange Server (On Premises)
 
@@ -40,7 +40,7 @@ Set-CsMeetingRoom -Identity "conference room" -LineURI "tel:+14255551669;ext=166
 
 ## Example Setup Script: Skype for Business and Exchange Server Online
 
-Make sure you've reviewed the following prerequisites before running the script:
+Make sure you review the following prerequisites before running the script:
 
 - Microsoft Online Services Sign in Assistant for IT Professionals BETA
 

diff --git a/...nts/room-system-and-federated-partners.md → ...ved/room-system-and-federated-partners.md b/...nts/room-system-and-federated-partners.md → ...ved/room-system-and-federated-partners.md
diff --git a/.../single-forest-on-premises-deployments.md → .../single-forest-on-premises-deployments.md b/.../single-forest-on-premises-deployments.md → .../single-forest-on-premises-deployments.md
@@ -23,7 +23,7 @@ This section provides an overview of the steps for provisioning the Skype Room S
 
 ## Single forest on-premises deployments
 
-If you already have a resource mailbox account for the conferencing room, you can use it. Otherwise, you will need to create a new one. You can use either Exchange Management Shell (PowerShell) or Exchange Management Console to create a new resource mailbox account. We recommend using a new (delete old mailbox and re-create) resource mailbox for Skype Room System. Make sure to back up mailbox data before deleting and then export it back to the re-created mailbox using the Outlook client (see Export or back up messages, calendar, tasks, and contacts for more information). To restore the meetings lost by deleting the mailbox, see [Connect or restore a deleted mailbox](/exchange/connect-or-restore-a-deleted-mailbox-exchange-2013-help). 
+If you already have a resource mailbox account for the conferencing room, you can use it. Otherwise, you'll need to create a new one. You can use either Exchange Management Shell (PowerShell) or Exchange Management Console to create a new resource mailbox account. We recommend using a new (delete old mailbox and re-create) resource mailbox for Skype Room System. Make sure to back up mailbox data before deleting and then export it back to the re-created mailbox using the Outlook client (see Export or back up messages, calendar, tasks, and contacts for more information). To restore the meetings lost by deleting the mailbox, see [Connect or restore a deleted mailbox](/exchange/connect-or-restore-a-deleted-mailbox-exchange-2013-help). 
 
 To use an existing resource mailbox account (for example, LRS-01) follow the steps below:
 
@@ -33,7 +33,7 @@ To use an existing resource mailbox account (for example, LRS-01) follow the ste
    Set-Mailbox -Name 'LRS-01' -Alias 'LRS01' -Room -EnableRoomMailboxAccount $true -RoomMailboxPassword (ConvertTo-SecureString -String <password> -AsPlainText -Force)
    ```
 
-2. If you plan to create a new mailbox, then, for a single forest on-premises Exchange organization, run the following command:
+2. If you plan to create a new mailbox then for a single forest on-premises Exchange organization, run the following command:
 
    ```powershell
    New-Mailbox -UserPrincipalName [email protected] -Alias LRS01 -Name "LRS-01" -Room -EnableRoomMailboxAccount $true -RoomMailboxPassword (ConvertTo-SecureString -String <password> -AsPlainText -Force)

diff --git a/...s/skype-for-business-software-liicense.md → ...d/skype-for-business-software-liicense.md b/...s/skype-for-business-software-liicense.md → ...d/skype-for-business-software-liicense.md
@@ -23,7 +23,7 @@ Skype Room System uses an installed Skype for Business client, which requires a
 
 ## Key Management Servers (KMS)
 
-If KMS are in place and will distribute Skype for Business Volume License activations, the Skype Room System will automatically activate the Skype for Business client. To find out if KMS are in place:
+If KMSs are in place and will distribute Skype for Business Volume License activations, the Skype Room System will automatically activate the Skype for Business client. To find out if KMSs are in place:
 
 From a command prompt, run:  `nslookup -type=srv _vlmcs._tcp >%temp%\kms.txt`
 

diff --git a/...oom-system-exchange-and-skype-accounts.md → ...oom-system-exchange-and-skype-accounts.md b/...oom-system-exchange-and-skype-accounts.md → ...oom-system-exchange-and-skype-accounts.md
@@ -24,7 +24,7 @@ Read these topics to learn how to provision Exchange and Skype accounts for Skyp
 > Microsoft Teams Rooms is a different product with different dependencies and deployment procedures. For information on Microsoft Teams Rooms, see the Microsoft Teams Rooms [deployment overview](/MicrosoftTeams/rooms/rooms-deploy).
   
 > [!NOTE]
-> Skype Room System account provisioning depends on the type of topology your organization has. To know more about Active Directory topologies, see [Environmental requirements for Skype for Business Server 2015](../../plan-your-deployment/requirements-for-your-environment/environmental-requirements.md). 
+> Skype Room System account provisioning depends on the type of topology your organization has. To know more about Active Directory topologies, see [Environmental requirements for Skype for Business Server 2015](../../../plan-your-deployment/requirements-for-your-environment/environmental-requirements.md). 
   
 ## Provisioning of Skype Room System Exchange &amp; Skype for Business Accounts
 

diff --git a/.../deploy/deploy-clients/trusted-domains.md → ...eploy-clients/archived/trusted-domains.md b/.../deploy/deploy-clients/trusted-domains.md → ...eploy-clients/archived/trusted-domains.md
diff --git a/Skype/SfbServer/sfbstoc/toc.yml b/Skype/SfbServer/sfbstoc/toc.yml
@@ -624,49 +624,6 @@
               href: ../deploy/deploy-clients/ios.md
             - name: Configure Smart contacts list
               href: ../deploy/deploy-clients/configure-smart-contacts-list.md
-              items: 
-                - name: Skype Room System Exchange and Skype Accounts
-                  href: ../deploy/deploy-clients/skype-room-system-exchange-and-skype-accounts.md
-                  items: 
-                    - name: Single forest on-premises deployments
-                      href: ../deploy/deploy-clients/single-forest-on-premises-deployments.md
-                    - name: Multiple forest on-premises deployments
-                      href: ../deploy/deploy-clients/multiple-forest-on-premises-deployments.md
-                    - name: Provisioning Skype Room System accounts in Office 365
-                      href: ../deploy/deploy-clients/provisioning-skype-room-system-accounts-in-office-365.md
-                    - name: Hybrid deployments
-                      href: ../deploy/deploy-clients/hybrid-deployments.md
-                    - name: Room System and federated partners
-                      href: ../deploy/deploy-clients/room-system-and-federated-partners.md
-                    - name: Manage Skype Room System accounts
-                      href: ../deploy/deploy-clients/manage-skype-room-system-accounts.md
-                - name: Conferencing policy
-                  href: ../deploy/deploy-clients/conferencing-policy.md
-                - name: Trusted domains
-                  href: ../deploy/deploy-clients/trusted-domains.md
-                - name: Migration considerations
-                  href: ../deploy/deploy-clients/migration-considerations.md
-                - name: Domain joining considerations
-                  href: ../deploy/deploy-clients/domain-joining-considerations.md
-                - name: Skype for Business software license
-                  href: ../deploy/deploy-clients/skype-for-business-software-liicense.md
-                - name: Manageability and tools
-                  href: ../deploy/deploy-clients/manageability-and-tools.md
-                - name: Room setup scripts
-                  href: ../deploy/deploy-clients/room-setup-scripts.md
-            - name: Room Systems v2
-              href: /MicrosoftTeams/rooms/rooms-deploy
-              items: 
-                - name: With Office 365
-                  href: /MicrosoftTeams/rooms/with-office-365
-                - name: With Skype for Business Server 2015
-                  href: /MicrosoftTeams/rooms/with-skype-for-business-server-2015
-                - name: With Exchange Online
-                  href: /MicrosoftTeams/rooms/with-exchange-online
-                - name: With Exchange On Premises
-                  href: /MicrosoftTeams/rooms/with-exchange-on-premises
-                - name: Console
-                  href: /MicrosoftTeams/rooms/console
             - name: Deploy the Lync VDI plug-in
               href: ../deploy/deploy-clients/deploy-the-lync-vdi-plug-in.md
             - name: Deploy Web downloadable clients