Merge branch 'main' into chrisda

Author: chrisda

skype/skype-ps/skype/Get-CsOnlineUser.md

@@ -142,7 +142,7 @@ Accept wildcard characters: False
 ### -Identity
 Indicates the Identity of the user account to be retrieved.
 
-For TeamsOnly customers using the Teams PowerShell Module version 3.0.0 or later, you use the following values to identify the account (note that these changes are currently only rolled out in commercial environments and are currently **not** applicable to government environments):
+For TeamsOnly customers using the Teams PowerShell Module version 3.0.0 or later, you use the following values to identify the account (note that these changes are only rolled out in commercial environments at present and will be applicable to the lastest TPM versions in government environments starting March 31, 2023.):
 
 - GUID
 - SIP address
@@ -211,7 +211,7 @@ The Filter parameter uses the same filtering syntax as the Where-Object cmdlet.
 
 The following updates are applicable for organizations having TeamsOnly users that use Microsoft Teams PowerShell version 3.0.0 and later:
 
-In the Teams PowerShell Module version 3.0.0 or later, filtering functionality is now limited to the following attributes (note that these changes are currently only rolled out in commercial environments and are currently **not** applicable to government environments):
+In the Teams PowerShell Module version 3.0.0 or later, filtering functionality is now limited to the following attributes (note that these changes are only rolled out in commercial environments at present and will be applicable to the lastest TPM versions in government environments starting March 31, 2023.):
 
 - AccountType
 - AccountEnabled
@@ -472,7 +472,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
 
 ### Notes
 
-The following updates are applicable for organizations having TeamsOnly users that use Microsoft Teams PowerShell version 3.0.0 and later (note that these changes are currently only rolled out in commercial environments and are currently **not** applicable to government environments):
+The following updates are applicable for organizations having TeamsOnly users that use Microsoft Teams PowerShell version 3.0.0 and later (note that these changes are only rolled out in commercial environments at present and will be applicable to the lastest TPM versions in government environments starting March 31, 2023.):
 
 *New user attributes*:
 
@@ -637,7 +637,7 @@ In Teams PowerShell Modules 3.0.0 and above OnPremLineURI will only refer to the
 
 ## NOTES
 
-These changes are currently only rolled out in commercial environments and are **not** applicable to government environments.
+These changes are only rolled out in commercial environments at present and will be applicable to the lastest TPM versions in government environments starting March 31, 2023.
 
 ## RELATED LINKS
 

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.
 

skype/skype-ps/skype/Set-CsTeamsGuestMessagingConfiguration.md

@@ -21,15 +21,15 @@ TeamsGuestMessagingConfiguration determines the messaging settings for the guest
 ```
 Set-CsTeamsGuestMessagingConfiguration [-Tenant <Guid>] [-AllowUserEditMessage <Boolean>]
  [-AllowImmersiveReader <Boolean>] [-AllowUserDeleteMessage <Boolean>] [-AllowUserChat <Boolean>] [-AllowGiphy <Boolean>]
- [-GiphyRatingType <String>] [-AllowMemes <Boolean>] [-AllowStickers <Boolean>] [[-Identity] <XdsIdentity>]
+ [-AllowUserDeleteChat <Boolean>] [-GiphyRatingType <String>] [-AllowMemes <Boolean>] [-AllowStickers <Boolean>] [[-Identity] <XdsIdentity>]
  [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
 ### Instance
 ```
 Set-CsTeamsGuestMessagingConfiguration [-Tenant <Guid>] [-AllowUserEditMessage <Boolean>]
  [-AllowImmersiveReader <Boolean>] [-AllowUserDeleteMessage <Boolean>] [-AllowUserChat <Boolean>] [-AllowGiphy <Boolean>]
- [-GiphyRatingType <String>] [-AllowMemes <Boolean>] [-AllowStickers <Boolean>] [-Instance <PSObject>] [-Force]
+ [-AllowUserDeleteChat <Boolean>] [-GiphyRatingType <String>] [-AllowMemes <Boolean>] [-AllowStickers <Boolean>] [-Instance <PSObject>] [-Force]
  [-WhatIf] [-Confirm] [<CommonParameters>]
 ```
 
@@ -166,6 +166,21 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
+### -AllowUserDeleteChat
+Turn this setting on to allow users to permanently delete their one-on-one chat, group chat, and meeting chat as participants (this deletes the chat only for them, not other users in the chat). Set this to TRUE to allow. Set this to FALSE to prohibit.
+
+```yaml
+Type: Boolean
+Parameter Sets: (All)
+Aliases:
+
+Required: False
+Position: Named
+Default value: TRUE
+Accept pipeline input: False
+Accept wildcard characters: False
+```
+
 ### -GiphyRatingType
 Determines Giphy content restrictions. Default value is "Moderate", other options are "NoRestriction" and "Strict"
 

teams/teams-ps/teams/Connect-MicrosoftTeams.md

@@ -161,6 +161,10 @@ A delegated flow, such as Resource Owner Password Credentials (ROPC) or device c
 | Microsoft Graph | Delegated | User.Read.All |
 | Microsoft Graph | Delegated | Group.ReadWrite.All |
 | Microsoft Graph | Delegated | AppCatalog.ReadWrite.All |
+| Microsoft Graph | Delegated | TeamSettings.ReadWrite.All |
+| Microsoft Graph | Delegated | Channel.Delete.All |
+| Microsoft Graph | Delegated | ChannelSettings.ReadWrite.All |
+| Microsoft Graph | Delegated | ChannelMember.ReadWrite.All |
 | Skype and Teams Tenant Admin API | Delegated | user_impersonation |
 
 ```powershell
@@ -203,13 +207,13 @@ Specifies access tokens for "MS Graph" and "Skype and Teams Tenant Admin API" re
    3. Add the following permission to this Application. 
    4. Click API permissions. 
    5. Click Add a permission. 
-   6. Click on the Microsoft MS Graph, and then select Delegated Permission.
-   7. Add the following permissions: "AppCatalog.ReadWrite.All", "Group.ReadWrite.All", "User.Read.All";
+   6. Click on the Microsoft Graph, and then select Delegated permissions.
+   7. Add the following permissions: "AppCatalog.ReadWrite.All", "Group.ReadWrite.All", "User.Read.All", "TeamSettings.ReadWrite.All", "Channel.Delete.All", "ChannelSettings.ReadWrite.All", "ChannelMember.ReadWrite.All".
    8. Next, we need to add "Skype and Teams Tenant Admin API" resource permission. Click Add a permission.
    9. Navigate to "APIs my organization uses" 
-   10. Search for "Skype and Teams Tenant Admin API".
+   10. Search for "Skype and Teams Tenant Admin API", and then select Delegated permissions.
    11. Add all the listed permissions. 
-   12. Grant admin consent to both MS Graph and "Skype and Teams Tenant Admin API" name.
+   12. Grant admin consent to both Microsoft Graph and "Skype and Teams Tenant Admin API" name.
 
 ```yaml
 Type: String[]