Skip to content

Commit bde5bf0

Browse files
authored
Merge branch 'master' into patch-1
2 parents 665b104 + 444a8b0 commit bde5bf0

22 files changed

+54
-24
lines changed

exchange/docs-conceptual/connect-to-scc-powershell.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ If you account uses multi-factor authentication, use the steps in this section.
6363
**This example connects to Security & Compliance Center PowerShell in a Microsoft GCC High organization**.
6464

6565
```powershell
66-
Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
66+
Connect-IPPSSession -UserPrincipalName [email protected] -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndPointUri https://login.microsoftonline.us/common
6767
```
6868

6969
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 DoD organization**.
@@ -122,7 +122,7 @@ If your account doesn't use multi-factor authentication, use the steps in this s
122122
**This example connects to Security & Compliance Center PowerShell in a Microsoft GCC High organization**.
123123

124124
```powershell
125-
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/
125+
Connect-IPPSSession -Credential $UserCredential -ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/
126126
```
127127

128128
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 DoD organization**.

exchange/exchange-ps/exchange/Connect-IPPSSession.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ The ConnectionUri parameter specifies the connection endpoint for the remote Pow
103103
104104
- For Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC, don't use this parameter.
105105
- For Security & Compliance Center PowerShell in Office 365 Germany, use the value <https://ps.compliance.protection.outlook.de/PowerShell-LiveID> for this parameter.
106-
- For Security & Compliance Center PowerShell in Microsoft 365 GCC High, use the value <https://outlook.office365.us/powershell-liveid> for this parameter.
106+
- For Security & Compliance Center PowerShell in Microsoft 365 GCC High, use the value <https://ps.compliance.protection.office365.us/powershell-liveid/> for this parameter.
107107
- For Security & Compliance Center PowerShell in Microsoft 365 DoD, use the value <https://l5.ps.compliance.protection.office365.us/powershell-liveid/> for this parameter.
108108
- For Exchange Online Protection PowerShell in standalone EOP organizations without Exchange Online mailboxes, use the value <https://ps.protection.outlook.com/powershell-liveid/> for this parameter.
109109

skype/skype-ps/skype/Get-CsTeamsEducationAssignmentsAppPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
external help file: Microsoft.Rtc.Management.dll-help.xml
33
online version: https://docs.microsoft.com/powershell/module/skype/get-csteamseducationassignmentsapppolicy
44
applicable: Skype for Business Online
5-
title: Set-CsTeamsEducationAssignmentsAppPolicy
5+
title: Get-CsTeamsEducationAssignmentsAppPolicy
66
schema: 2.0.0
77
ms.reviewer:
88
manager: bulenteg

skype/skype-ps/skype/Get-CsTeamsGuestMeetingConfiguration.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
33
Module Name: Skype for Business Online
44
online version: https://docs.microsoft.com/powershell/module/skype/get-csteamsguestmeetingconfiguration
55
applicable: Skype for Business Online
6-
title: Get-CsTeamsGuestCallingConfiguration
6+
title: Get-CsTeamsGuestMeetingConfiguration
77
schema: 2.0.0
88
manager: bulenteg
99
author: tomkau

skype/skype-ps/skype/Get-CsTeamsMeetingBroadcastPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
33
online version: https://docs.microsoft.com/powershell/module/skype/get-csteamsmeetingbroadcastpolicy
44
applicable: Skype for Business Online
5-
title: Set-CsTeamsMeetingBroadcastPolicy
5+
title: Get-CsTeamsMeetingBroadcastPolicy
66
schema: 2.0.0
77
manager: bulenteg
88
author: tomkau

skype/skype-ps/skype/New-CsTenantNetworkSite.md

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ As an Admin, you can use the Windows PowerShell command, New-CsTenantNetworkSite
2020
### Identity (Default)
2121
```
2222
New-CsTenantNetworkSite [-Tenant <System.Guid>] [-Description <String>] [-NetworkRegionID <String>]
23-
[-LocationPolicy <String>] [-EnableLocationBasedRouting <Boolean>] [-OnlineVoiceRoutingPolicy <String>]
23+
[-LocationPolicy <String>] [-EnableLocationBasedRouting <Boolean>] [-EmergencyCallRoutingPolicy <String>] [-EmergencyCallingPolicy <String>] [-OnlineVoiceRoutingPolicy <String>]
2424
[-SiteAddress <String>] [-Identity] <XdsGlobalRelativeIdentity> [-InMemory] [-Force] [-WhatIf] [-Confirm]
2525
[<CommonParameters>]
2626
```
@@ -29,7 +29,7 @@ New-CsTenantNetworkSite [-Tenant <System.Guid>] [-Description <String>] [-Networ
2929
```
3030
New-CsTenantNetworkSite [-Tenant <System.Guid>] -NetworkSiteID <String> [-Description <String>]
3131
[-NetworkRegionID <String>] [-LocationPolicy <String>] [-EnableLocationBasedRouting <Boolean>]
32-
[-OnlineVoiceRoutingPolicy <String>] [-SiteAddress <String>] [-InMemory] [-Force] [-WhatIf] [-Confirm]
32+
[-EmergencyCallRoutingPolicy <String>] [-EmergencyCallingPolicy <String>] [-OnlineVoiceRoutingPolicy <String>] [-SiteAddress <String>] [-InMemory] [-Force] [-WhatIf] [-Confirm]
3333
[<CommonParameters>]
3434
```
3535

@@ -105,6 +105,36 @@ Accept pipeline input: False
105105
Accept wildcard characters: False
106106
```
107107
108+
### -EmergencyCallRoutingPolicy
109+
This parameter is used to assign a custom emergency call routing policy to a network site. For more information see [Assign a custom emergency call routing policy to a network site](https://docs.microsoft.com/microsoftteams/manage-emergency-call-routing-policies#assign-a-custom-emergency-call-routing-policy-to-a-network-site).
110+
111+
```yaml
112+
Type: String
113+
Parameter Sets: (All)
114+
Aliases:
115+
116+
Required: False
117+
Position: Named
118+
Default value: None
119+
Accept pipeline input: False
120+
Accept wildcard characters: False
121+
```
122+
123+
### -EmergencyCallingPolicy
124+
This parameter is used to assign a custom emergency calling policy to a network site. For more information see [Assign a custom emergency calling policy to a network site](https://docs.microsoft.com/microsoftteams/manage-emergency-calling-policies#assign-a-custom-emergency-calling-policy-to-a-network-site).
125+
126+
```yaml
127+
Type: String
128+
Parameter Sets: (All)
129+
Aliases:
130+
131+
Required: False
132+
Position: Named
133+
Default value: None
134+
Accept pipeline input: False
135+
Accept wildcard characters: False
136+
```
137+
108138
### -Force
109139
The Force switch specifies whether to suppress warning and confirmation messages. It can be useful in scripting to suppress interactive prompts. If the Force switch isn't provided in the command, you're prompted for administrative input if required.
110140

skype/skype-ps/skype/Remove-CsOnlineVoiceRoute.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
33
online version: https://docs.microsoft.com/powershell/module/skype/remove-csonlinevoiceroute
44
applicable: Skype for Business Online
5-
title: Get-CsOnlineUser
5+
title: Remove-CsOnlineVoiceRoute
66
schema: 2.0.0
77
manager: bulenteg
88
author: tomkau

skype/skype-ps/skype/Remove-CsOnlineVoiceRoutingPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
33
online version: https://docs.microsoft.com/powershell/module/skype/remove-csonlinevoiceroutingpolicy
44
applicable: Skype for Business Online
5-
title: Get-CsOnlineUser
5+
title: Remove-CsOnlineVoiceRoutingPolicy
66
schema: 2.0.0
77
manager: bulenteg
88
author: tomkau

skype/skype-ps/skype/Remove-CsTeamsPinnedApp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
external help file: Microsoft.Rtc.Management.dll-help.xml
33
online version: https://docs.microsoft.com/powershell/module/skype/remove-csteamspinnedapp
44
applicable: Skype for Business Online
5-
title: Remove-CsTeamsAppSetupPolicy
5+
title: Remove-CsTeamsPinnedApp
66
schema: 2.0.0
77
manager: bulenteg
88
author: tomkau

skype/skype-ps/skype/Set-CsOnlinePstnUsage.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
33
online version: https://docs.microsoft.com/powershell/module/skype/set-csonlinepstnusage
44
applicable: Skype for Business Online
5-
title: Get-CsOnlineUser
5+
title: Set-CsOnlinePstnUsage
66
schema: 2.0.0
77
manager: bulenteg
88
author: tomkau

0 commit comments

Comments
 (0)