Skip to content

Commit 5306806

Browse files
committed
Merge branch 'main' into QuarAS-chrisda
2 parents fc4199a + 778bbe6 commit 5306806

File tree

4 files changed

+62
-12
lines changed

4 files changed

+62
-12
lines changed

exchange/exchange-ps/exchange/Get-Group.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.reviewer:
1414
## SYNOPSIS
1515
This cmdlet is available in on-premises Exchange and in the cloud-based service. Some parameters and settings may be exclusive to one environment or the other.
1616

17-
Use the Get-Group cmdlet to view existing group objects in your organization. This cmdlet returns security groups, mail-enabled security groups, distribution groups, and role groups.
17+
Use the Get-Group cmdlet to view existing group objects in your organization. In all environments, this cmdlet returns mail-enabled security groups, distribution groups, role groups, and room lists. For details about other supported group types in on-premises Exchange environments, see the RecipientTypeDetails parameter description.
1818

1919
For information about the parameter sets in the Syntax section below, see [Exchange cmdlet syntax](https://learn.microsoft.com/powershell/exchange/exchange-cmdlet-syntax).
2020

teams/teams-ps/teams/Get-CsOnlineUser.md

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Get-CsOnlineUser [[-Identity] <UserIdParameter>]
2929
[-OU <OUIdParameter>]
3030
[-ResultSize <Unlimited>]
3131
[-SkipUserPolicies]
32+
[-SoftDeletedUser]
3233
[-Sort]
3334
[-UnassignedUser]
3435
[-UsePreferredDC]
@@ -494,6 +495,23 @@ Accept pipeline input: False
494495
Accept wildcard characters: False
495496
```
496497

498+
### -SoftDeletedUser
499+
500+
This parameter enables you to return a collection of all the users who are deleted and can be restored within 30 days from their deletion time
501+
502+
```yaml
503+
Type: SwitchParameter
504+
Parameter Sets: (All)
505+
Aliases:
506+
applicable: Microsoft Teams
507+
508+
Required: False
509+
Position: Named
510+
Default value: None
511+
Accept pipeline input: False
512+
Accept wildcard characters: False
513+
```
514+
497515
### -Sort
498516

499517
Sorting will now be enabled in Teams PowerShell Module 5.9.0 and later by using the "-Sort" or "-OrderBy" parameters in GCC High and DoD environments. These updates will be applicable to older Teams PowerShell versions starting from 15th March 2024 in GCC High and DoD environments(note that this parameter is already rolled out in commercial environments). For example:
@@ -506,7 +524,7 @@ Sorting will now be enabled in Teams PowerShell Module 5.9.0 and later by using
506524
```yaml
507525
Type: String
508526
Parameter Sets: (All)
509-
Aliases:
527+
Aliases: OrderBy
510528
Applicable: Microsoft Teams
511529
512530
Required: False

teams/teams-ps/teams/New-CsTeamsEmergencyCallingPolicy.md

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,20 +27,37 @@ This cmdlet creates a new Teams Emergency Calling policy. Emergency calling poli
2727

2828
## EXAMPLES
2929

30-
### Example 1
30+
### Emergency calling policy Example 1
31+
In the following example, ECP1, an emergency calling policy with identify ECP1 is configured with full security desk configuration. Extended notifications for the test emergency number, 933, are set to null.
32+
**ECP1**
33+
<ul>
34+
<li>Notification group: [email protected]</li>
35+
<li>Notification Dial Out Number - 14255551234</li>
36+
<li>Notification Mode - Conferenced in and are unmuted</li>
37+
<li>External Lookup Mode - On</li>
38+
</ul>
39+
3140
```powershell
32-
New-CsTeamsEmergencyCallingPolicy -Identity TestECP -Description "Test ECP" -NotificationGroup "[email protected]" -NotificationDialOutNumber "+14255551234" -NotificationMode NotificationOnly -ExternalLocationLookupMode Enabled
41+
$en1 = New-CsTeamsEmergencyCallingExtendedNotification -EmergencyDialString "933"
42+
New-CsTeamsEmergencyCallingPolicy -Identity ECP1 -Description "Test ECP1" -NotificationGroup "[email protected]" -NotificationDialOutNumber "+14255551234" -NotificationMode ConferenceUnMuted -ExternalLocationLookupMode Enabled -ExtendedNotifications @{add=$en1}
3343
```
3444

35-
This example creates a Teams Emergency Calling policy that has an identity of TestECP, where a notification group and number is being defined, the external location lookup mode is enabled and also the type of notification.
45+
### Emergency calling policy Example 2
46+
In the following example, ECP2, an emergency calling policy with identify ECP2 is configured with both 911 and 933 in the extended notification settings. Extended notifications for the test emergency number 911 are set to notify two groups separated by ";" and for 933 are set to null.
47+
**ECP2**
48+
<ul>
49+
<li>Notification group: null</li>
50+
<li>Notification Dial Out Number - null</li>
51+
<li>Notification Mode - null</li>
52+
<li>External Lookup Mode - On</li>
53+
</ul>
3654

37-
### Example 2
3855
```powershell
39-
New-CsTeamsEmergencyCallingPolicy -Identity "TestECP2" -NotificationGroup "[email protected];[email protected]"
56+
$en1 = New-CsTeamsEmergencyCallingExtendedNotification -EmergencyDialString "911" -NotificationGroup "[email protected];[email protected]" -NotificationDialOutNumber "+14255551234" -NotificationMode ConferenceUnMuted
57+
$en2 = New-CsTeamsEmergencyCallingExtendedNotification -EmergencyDialString "933"
58+
New-CsTeamsEmergencyCallingPolicy -Identity ECP2 -Description "Test ECP2" -ExternalLocationLookupMode Enabled -ExtendedNotifications @{add=$en1,$en2}
4059
```
4160

42-
This example creates a Teams Emergency Calling policy that has an identity of TestECP2, with default settings, except for the Notification Group. This parameter expects a single string with all users and groups separated by ";".
43-
4461
## PARAMETERS
4562

4663
### -Identity
@@ -90,8 +107,6 @@ Accept wildcard characters: False
90107
91108
### -ExtendedNotifications
92109
93-
**Note**: The use of extended notifications and this parameter is currently not supported.
94-
95110
A list of one or more instances of TeamsEmergencyCallingExtendedNotification. Each TeamsEmergencyCallingExtendedNotification should use a unique EmergencyDialString.
96111
97112
If an extended notification is found for an emergency phone number based on the EmergencyDialString parameter the extended notification will be controlling the notification. If no extended notification is found the notification settings on the policy instance itself will be used.

teams/teams-ps/teams/Set-CsTeamsEmergencyCallingPolicy.md

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,24 @@ This cmdlet modifies an existing Teams Emergency Calling policy. Emergency calli
3434
Set-CsTeamsEmergencyCallingPolicy -Identity "TestECP" -NotificationGroup "[email protected];[email protected]"
3535
```
3636

37-
This example modifies an existing policy instance with identity TestECP.
37+
This example modifies NotificationGroup of an existing policy instance with identity TestECP.
38+
39+
### Example 2
40+
```powershell
41+
$en1 = New-CsTeamsEmergencyCallingExtendedNotification -EmergencyDialString "911" -NotificationGroup "[email protected]" -NotificationMode ConferenceUnMuted
42+
Set-CsTeamsEmergencyCallingPolicy -Identity "TestECP" -ExtendedNotifications @{remove=$en1}
43+
```
44+
45+
This example first creates a new Teams Emergency Calling Extended Notification object and then removes that Teams Emergency Calling Extended Notification from an existing Teams Emergency Calling policy.
46+
47+
### Example 3
48+
```powershell
49+
$en1 = New-CsTeamsEmergencyCallingExtendedNotification -EmergencyDialString "911" -NotificationGroup "[email protected]" -NotificationDialOutNumber "+14255551234" -NotificationMode ConferenceUnMuted
50+
$en2 = New-CsTeamsEmergencyCallingExtendedNotification -EmergencyDialString "933"
51+
Set-CsTeamsEmergencyCallingPolicy -Identity "TestECP" -ExtendedNotifications @{add=$en1,$en2}
52+
```
53+
54+
This example first creates two new Teams Emergency Calling Extended Notification objects and then adds them to an existing Teams Emergency Calling policy with identity TestECP.
3855

3956
## PARAMETERS
4057

0 commit comments

Comments
 (0)