Merge pull request #10379 from JensTrier/JensUpdates2

Small updates

Author: tiburd

skype/skype-ps/skype/New-CsCallingLineIdentity.md

@@ -24,6 +24,9 @@ New-CsCallingLineIdentity [-Identity] <string> [-BlockIncomingPstnCallerID <bool
 ```
 
 ## DESCRIPTION
+
+**Note**: The use of CallingIDSubstitute Service will be deprecated. You should start using CallingIDSubstitute Resource as soon as possible.
+
 You can either change or block the Caller ID (also called a Calling Line ID) for a user. By default, the Teams or Skype for Business Online user's phone number can be seen when that user makes a call to a PSTN phone, or when a call comes in. You can create a Caller ID policy to provide an alternate displayed number, or to block any number from being displayed.
 
 Note:  
@@ -41,29 +44,22 @@ New-CsCallingLineIdentity -Identity Anonymous -Description "anonymous policy" -C
 
 This example creates a new Caller ID policy that sets the Caller ID to Anonymous.
 
-###  Example 2
-```
-New-CsCallingLineIdentity -Identity "UKOrgAA" -CallingIdSubstitute "Service" -ServiceNumber "14258828080" -EnableUserOverride $false -Verbose 
-```
-
-This example creates a new Caller ID policy that sets the Caller ID to a specified service number.
-
-### Example 3
+### Example 2
 ```
 New-CsCallingLineIdentity -Identity Anonymous -Description "anonymous policy" -CallingIDSubstitute Anonymous -EnableUserOverride $false -BlockIncomingPstnCallerID $true
 ```
 
 This example creates a new Caller ID policy that blocks the incoming Caller ID.
 
-### Example 4
+### Example 3
 ```
 $ObjId = (Get-CsOnlineApplicationInstance -Identity [email protected]).ObjectId
 New-CsCallingLineIdentity -Identity DKCQ -CallingIDSubstitute Resource -EnableUserOverride $false -ResourceAccount $ObjId -CompanyName "Contoso"
 ```
 
 This example creates a new Caller ID policy that sets the Caller ID to the phone number of the specified resource account and sets the Calling party name to Contoso
 
-### Example 5
+### Example 4
 ```
 New-CsCallingLineIdentity -Identity AllowAnonymousForUsers -EnableUserOverride $true
 ```
@@ -107,6 +103,8 @@ Accept wildcard characters: False
 ```
 
 ### -CallingIDSubstitute
+**Note**: The use of CallingIDSubstitute Service will be deprecated. You should start using CallingIDSubstitute Resource as soon as possible.
+
 The CallingIDSubstitute parameter lets you specify an alternate Caller ID. The default value is LineUri. Supported values are Anonymous, Service, LineUri, and Resource.
 
 ```yaml

skype/skype-ps/skype/New-CsOnlineLisCivicAddress.md

@@ -66,7 +66,7 @@ NumberOfVoiceUsers : 0
 
 ### Example 1
 ```powershell
-New-CsOnlineLisCivicAddress -HouseNumber 1 -StreetName 'Microsoft Way' -City Redmond -StateorProvince Washington -Country US -PostalCode 98052 -Description "West Coast Headquarters" -CompanyName Contoso -Latitude 47.63952 -Longitude -122.12781 -Elin MICROSOFT_ELIN 
+New-CsOnlineLisCivicAddress -HouseNumber 1 -StreetName 'Microsoft Way' -City Redmond -StateorProvince Washington -CountryOrRegion US -PostalCode 98052 -Description "West Coast Headquarters" -CompanyName Contoso -Latitude 47.63952 -Longitude -122.12781 -Elin MICROSOFT_ELIN 
 ```
 
 This example creates a new civic address described as "West Coast Headquarters": 1 Microsoft Way, Redmond WA, 98052 and sets the geo-coordinates.

skype/skype-ps/skype/Set-CsCallingLineIdentity.md

@@ -24,6 +24,9 @@ Set-CsCallingLineIdentity [[-Identity] <string>] [-BlockIncomingPstnCallerID <bo
 ```
 
 ## DESCRIPTION
+
+**Note**: The use of CallingIDSubstitute Service will be deprecated. You should start using CallingIDSubstitute Resource as soon as possible.
+
 You can either change or block the Caller ID (also called a Calling Line ID) for a user.
 By default, the Microsoft Teams or Skype for Business Online user's phone number can be seen when that user makes a call to a PSTN phone, or when a call comes in.
 You can modify a Caller ID policy to provide an alternate displayed number, or to block any number from being displayed.
@@ -46,27 +49,20 @@ The user can override this setting.
 
 ### Example 2
 ```
-PS C:\> Set-CsCallingLineIdentity -Identity "UKOrgAA" -CallingIdSubstitute "Service" -ServiceNumber "14258828080"
-```
-
-This example modifies the UKOrgAA Caller ID policy to sets the Caller ID to a specified service number.
-
-### Example 3
-```
 PS C:\> Set-CsCallingLineIdentity -Identity Anonymous -Description "anonymous policy" -CallingIDSubstitute Anonymous -EnableUserOverride $false -BlockIncomingPstnCallerID $true
 ```
 
 This example modifies the new Anonymous Caller ID policy that blocks the incoming Caller ID.
 
-### Example 4
+### Example 3
 ```
 $ObjId = (Get-CsOnlineApplicationInstance -Identity [email protected]).ObjectId
 Set-CsCallingLineIdentity -Identity DKCQ -CallingIDSubstitute Resource -ResourceAccount $ObjId -CompanyName "Contoso"
 ```
 
 This example modifies the Caller ID policy that sets the Caller ID to the phone number of the specified resource account and sets the Calling party name to Contoso
 
-### Example 5
+### Example 4
 ```
 Set-CsCallingLineIdentity -Identity AllowAnonymousForUsers -EnableUserOverride $true
 ```
@@ -96,6 +92,8 @@ Accept wildcard characters: False
 ```
 
 ### -CallingIDSubstitute
+**Note**: The use of CallingIDSubstitute Service will be deprecated. You should start using CallingIDSubstitute Resource as soon as possible.
+
 The CallingIDSubstitute parameter lets you specify an alternate Caller ID.
 The possible values are Anonymous, Service, LineUri and Resource.
 

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

@@ -77,13 +77,13 @@ This example assigns the Direct Routing phone number +1 (425) 555-1225 to the re
 
 ### Example 6
 ```powershell
-Set-CsPhoneNumberAssignment -Identity [email protected] -PhoneNumber "+14255551000;ext=100" -PhoneNumberType DirectRouting
+Set-CsPhoneNumberAssignment -Identity [email protected] -PhoneNumber "+14255551000;ext=1234" -PhoneNumberType DirectRouting
 ```
-This example assigns the Direct Routing phone number +1 (425) 555-1000;ext=100 to the user [email protected].
+This example assigns the Direct Routing phone number +1 (425) 555-1000;ext=1234 to the user [email protected].
 
 ### Example 7
 ```powershell
-Try { Set-CsPhoneNumberAssignment -Identity [email protected] -PhoneNumber "+14255551000;ext=100" -PhoneNumberType DirectRouting -ErrorAction Stop } Catch { Write-Host An error occured }
+Try { Set-CsPhoneNumberAssignment -Identity [email protected] -PhoneNumber "+14255551000;ext=1234" -PhoneNumberType DirectRouting -ErrorAction Stop } Catch { Write-Host An error occured }
 ```
 This example shows how to use Try/Catch and ErrorAction to perform error checking on the assignment cmdlet failing.
 
@@ -141,8 +141,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.
 
-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.
+We support Direct Routing numbers with extensions using the formats +1206555000;ext=1234 or 1206555000;ext=1234 assigned to a user or resource account.
 
 Setting a phone number will automatically set EnterpriseVoiceEnabled to True.