Merge branch 'main' into chrisda

Author: chrisda

skype/skype-ps/skype/New-CsAutoAttendant.md

@@ -393,8 +393,8 @@ The VoiceId parameter represents the voice that is used to read text-to-speech (
 You can query the supported voices by using the `Get-CsAutoAttendantSupportedLanguage` cmdlet. You can determine the default voice for a language by issuing the following command:
 
 ```
-$language = Get-CsAutoAttendantSupportedLanguage -Identity "en-US"`
-$defaultVoice = $language.Voices[0].Gender
+$language = Get-CsAutoAttendantSupportedLanguage -Identity "en-US"
+$defaultVoice = $language.Voices[0].Id
 ```
 
 ```yaml

skype/skype-ps/skype/New-CsTeamsMeetingPolicy.md

@@ -954,8 +954,6 @@ Specifies the number of days before meeting recordings will expire and move to t
 
 NOTE: You may opt to set Meeting Recordings to never expire by entering the value -1.
 
-NOTE: This parameter is available to be set, but will not be effective until this feature gets general availability. Please refer to the [roadmap (Feature ID: 84580)](https://www.microsoft.com/microsoft-365/roadmap?filters=&searchterms=84580) for more information on its delivery date.
-
 ```yaml
 Type: Int32
 Parameter Sets: (All)

skype/skype-ps/skype/Set-CsTeamsMeetingPolicy.md

@@ -1003,8 +1003,6 @@ Specifies the number of days before meeting recordings will expire and move to t
 
 NOTE: You may opt to set Meeting Recordings to never expire by entering the value -1.
 
-NOTE: This parameter is available to be set, but will not be effective until this feature gets general availability. Please refer to the [roadmap (Feature ID: 84580)](https://www.microsoft.com/microsoft-365/roadmap?filters=&searchterms=84580) for more information on its delivery date.
-
 ```yaml
 Type: Int32
 Parameter Sets: (All)

teams/teams-ps/teams/Get-CsPhoneNumberAssignment.md

@@ -79,8 +79,7 @@ This example displays information about the Direct Routing phone number +1 (206)
 ```powershell
 Get-CsPhoneNumberAssignment -CapabilitiesContain "VoiceApplicationAssignment,ConferenceAssignment"
 ```
-This example returns all phone numbers that have both the capability VoiceApplicationAssignment and the capability ConferenceAssignment assigned, but phone numbers that have
-only one of these capabilities assigned won't be returned.
+This example returns all phone numbers that have both the capability VoiceApplicationAssignment and the capability ConferenceAssignment assigned, but phone numbers that have only one of these capabilities assigned won't be returned.
 
 ### Example 4
 ```powershell
@@ -106,7 +105,6 @@ Get-CsPhoneNumberAssignment -TelephoneNumberContain "524"
 ```
 This example returns information about all phone numbers that contain the digits 524, including the phone number with extension 524 used in example 2.
 
-
 ## PARAMETERS
 
 ### -ActivationState
@@ -127,7 +125,6 @@ Accept wildcard characters: False
 ### -AssignedPstnTargetId
 Filters the returned results based on the user or resource account ID the phone number is assigned to. Supported values are UserPrincipalName, SIP address, and ObjectId.
 
-
 ```yaml
 Type: System.String
 Parameter Sets: (All)
@@ -141,10 +138,7 @@ Accept wildcard characters: False
 ```
 
 ### -CapabilitiesContain
-Filters the returned results based on the capabilities assigned to the phone number. You can specify one or more capabilities delimited by a comma. Supported capabilities
-
-are ConferenceAssignment, VoiceApplicationAssignment, UserAssignment, and OCMobile.
-
+Filters the returned results based on the capabilities assigned to the phone number. You can specify one or more capabilities delimited by a comma. Supported capabilities are ConferenceAssignment, VoiceApplicationAssignment, UserAssignment, and TeamsPhoneMobile.
 
 If you specify only one capability, you will get all phone numbers returned that have that capability assigned. If you specify a comma separated list for instance like 
 ConferenceAssignment, VoiceApplicationAssignment you will get all phone numbers that have both capabilities assigned, but you won't get phone numbers that have only
@@ -210,7 +204,6 @@ Accept wildcard characters: False
 ### -NumberType
 Filters the returned results based on the number type. Supported values are DirectRouting, CallingPlan, and OperatorConnect.
 
-
 ```yaml
 Type: System.String
 Parameter Sets: (All)
@@ -226,7 +219,6 @@ Accept wildcard characters: False
 ### -PstnAssignmentStatus
 Filters the returned results based on the assignment status. Support values are Unassigned, UserAssigned, ConferenceAssigned, VoiceApplicationAssigned, and ThirdPartyAppAssigned.
 
-
 ```yaml
 Type: System.String
 Parameter Sets: (All)
@@ -242,7 +234,6 @@ Accept wildcard characters: False
 ### -Skip
 Skips the first X returned results and the default value is 0.
 
-
 ```yaml
 Type: System.Int32
 Parameter Sets: (All)
@@ -379,7 +370,6 @@ The ISO country code assigned to the phone number.
 ### IsoSubDivision
 The subdivision within the country assigned to the phone number, for example, the state for US phone numbers.
 
-
 ### LocationId
 The ID of the Location assigned to the phone number.
 

teams/teams-ps/teams/Set-CsPhoneNumberAssignment.md

@@ -55,8 +55,7 @@ This example assigns the Microsoft Calling Plan phone number +1 (206) 555-1234 t
 $loc=Get-CsOnlineLisLocation -City Vancouver
 Set-CsPhoneNumberAssignment -Identity [email protected] -PhoneNumber +12065551224 -PhoneNumberType CallingPlan -LocationId $loc.LocationId
 ```
-This example finds the emergency location defined for the corporate location Vancouver and assigns the Microsoft Calling Plan phone number +1 (206) 555-1224 and location 
-to the user [email protected].
+This example finds the emergency location defined for the corporate location Vancouver and assigns the Microsoft Calling Plan phone number +1 (206) 555-1224 and location to the user [email protected].
 
 ### Example 3
 ```powershell
@@ -84,14 +83,9 @@ This example assigns the Direct Routing phone number +1 (425) 555-1000;ext=100 t
 
 ### Example 7
 ```powershell
-$pn=Set-CsPhoneNumberAssignment -Identity [email protected] -PhoneNumber "+14255551000;ext=100" -PhoneNumberType DirectRouting
-$pn
-Code       Message
-----       -------
-BadRequest Telephone Number '+14255551000;ext=100' has already been assigned to another user
+Try { Set-CsPhoneNumberAssignment -Identity [email protected] -PhoneNumber "+14255551000;ext=100" -PhoneNumberType DirectRouting -ErrorAction Stop } Catch { Write-Host An error occured }
 ```
-In this example the assignment cmdlet fails, because the phone number "+14255551000;ext=100" has already been assigned to another user.
-
+This example shows how to use Try/Catch and ErrorAction to perform error checking on the assignment cmdlet failing.
 
 ## PARAMETERS
 
@@ -145,8 +139,7 @@ Accept wildcard characters: False
 ```
 
 ### -PhoneNumber
-The phone number to assign to the user or resource account. Supports E.164 format like +12065551234 and non-E.164 format like 12065551234. The phone number can not have
-"tel:" prefixed.
+The phone number to assign to the user or resource account. Supports E.164 format like +12065551234 and non-E.164 format like 12065551234. The phone number can not have "tel:" prefixed.
 
 We support Direct Routing numbers with extensions using the formats +1206555000;ext=1234 or 1206555000;ext=1234 assigned to a user, but such phone numbers are
 not supported to be assigned to a resource account.
@@ -165,8 +158,7 @@ Accept wildcard characters: False
 ```
 
 ### -PhoneNumberType
-The type of phone number to assign to the user or resource account. The supported values are DirectRouting, CallingPlan, and OperatorConnect. When you acquire a phone number
-you will typically know which type it is.
+The type of phone number to assign to the user or resource account. The supported values are DirectRouting, CallingPlan, and OperatorConnect. When you acquire a phone number you will typically know which type it is.
 
 ```yaml
 Type: System.String
@@ -195,8 +187,7 @@ The cmdlet is available in Teams PowerShell module 3.0.0 or later.
 
 The cmdlet is only available in commercial and GCC cloud instances.
 
-If a user or resource account has a phone number set in Active Directory on-premises and synched into Microsoft 365, you can't use Set-CsPhoneNumberAssignment to set the phone
-number. You will have to clear the phone number from the on-premises Active Directory and let that change sync into Microsoft 365 first.
+If a user or resource account has a phone number set in Active Directory on-premises and synched into Microsoft 365, you can't use Set-CsPhoneNumberAssignment to set the phone number. You will have to clear the phone number from the on-premises Active Directory and let that change sync into Microsoft 365 first.
 
 The previous command for assigning phone numbers to users Set-CsUser had the parameter HostedVoiceMail. Setting HostedVoiceMail for Microsoft Teams users is no longer
 necessary and that is why the parameter is not available on Set-CsPhoneNumberAssignment.

whiteboard/whiteboard-ps/whiteboard/whiteboard.md

@@ -8,7 +8,7 @@ title: Microsoft Whiteboard
 
 ## Description
 
-The following cmdlet references are for Microsoft Whiteboard. See [Overview](https://learn.microsoft.com/powershell/whiteboard/overview) for details on installing the module. The module can only be run by users with Global Administrator or SharePoint Administrator roles.
+The following cmdlet references are for Microsoft Whiteboard. See [Overview](https://learn.microsoft.com/powershell/whiteboard/overview) for details on installing the module. The module can only be run by users with Global Administrator or SharePoint Administrator roles. The module described here is for Whiteboard content stored in Azure.
 
 ## Microsoft Whiteboard Admin cmdlets