Skip to content

Commit 6185a58

Browse files
authored
Merge branch 'main' into patch-2
2 parents 5e8ab9b + 05cf733 commit 6185a58

File tree

7 files changed

+36
-353
lines changed

7 files changed

+36
-353
lines changed

exchange/exchange-ps/exchange/Test-Message.md

Lines changed: 0 additions & 348 deletions
This file was deleted.

skype/skype-ps/skype/Disable-CsMeetingRoom.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ When you disable a meeting room object you remove all the Skype for Business Ser
1919
However, the Active Directory user account itself is not deleted.
2020
This cmdlet was introduced in Lync Server 2013.
2121

22+
**Note**: This cmdlet is not supported for managing Microsoft Teams Rooms. You must use the methods described in the [Microsoft Teams Rooms](/microsoftteams/rooms) documentation to manage Microsoft Teams Rooms.
23+
2224

2325
## SYNTAX
2426

skype/skype-ps/skype/Enable-CsMeetingRoom.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ This cmdlet was introduced in Lync Server 2013.
2121

2222
The process for creating and updating meeting rooms differs depending on your deployment of Skype for Business Online and Skype for Business Server. Make sure you are following the guidance here to set up your meeting rooms properly: https://docs.microsoft.com/skypeforbusiness/deploy/deploy-clients/with-office-365
2323

24+
**Note**: This cmdlet is not supported for managing Microsoft Teams Rooms. You must use the methods described in the [Microsoft Teams Rooms](/microsoftteams/rooms) documentation to manage Microsoft Teams Rooms.
25+
2426

2527
## SYNTAX
2628

skype/skype-ps/skype/Get-CsMeetingRoom.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ A meeting room is a conferencing device designed to address video conferencing a
1818
This cmdlet was introduced in Lync Server 2013.
1919

2020

21+
**Note**: This cmdlet is not supported for managing Microsoft Teams Rooms. You must use the methods described in the [Microsoft Teams Rooms](/microsoftteams/rooms) documentation to manage Microsoft Teams Rooms.
22+
23+
2124
## SYNTAX
2225

2326
```

0 commit comments

Comments
 (0)