Skip to content

Commit 76063b6

Browse files
authored
Merge branch 'main' into patch-34
2 parents e4efc4a + b35135f commit 76063b6

File tree

6 files changed

+221
-20
lines changed

6 files changed

+221
-20
lines changed

exchange/exchange-ps/exchange/New-DlpCompliancePolicy.md

Lines changed: 77 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,13 +88,67 @@ New-DlpCompliancePolicy -Name "GlobalPolicy" -Comment "Primary policy" -SharePoi
8888
This example creates a DLP policy named GlobalPolicy for the specified SharePoint Online and OneDrive for Business locations. The new policy has a descriptive comment and will be enabled on creation.
8989

9090
### Example 3
91-
9291
```powershell
9392
New-DlpCompliancePolicy -Name "PowerBIPolicy" -Comment "Primary policy" -PowerBIDlpLocation "All" -PowerBIDlpLocationException "workspaceID1","workspaceID2","workspaceID3" -Mode Enable
9493
```
9594

9695
This example creates a DLP policy named PowerBIPolicy for all qualifying Power BI workspaces (that is, those hosted on Premium Gen2 capacities) except for the specified workspaces. The new policy has a descriptive comment and will be enabled on creation.
9796

97+
### Example 4
98+
```powershell
99+
Get-Label | Format-List Priority,ContentType,Name,DisplayName,Identity,Guid
100+
101+
$guidVar = "e222b65a-b3a8-46ec-ae12-00c2c91b71c0"
102+
103+
$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","Inclusions":[{Type:"Tenant", Identity:"All"}]}]"
104+
105+
New-DLPCompliancePolicy -Name "Copilot Policy" -Locations $loc
106+
107+
$advRule = @{
108+
"Version" = "1.0"
109+
"Condition" = @{
110+
"Operator" = "And"
111+
"SubConditions" = @(
112+
@{
113+
"ConditionName" = "ContentContainsSensitiveInformation"
114+
"Value" = @(
115+
@{
116+
"groups" = @(
117+
@{
118+
"Operator" = "Or"
119+
"labels" = @(
120+
@{
121+
"name" = $guidVar
122+
"type" = "Sensitivity"
123+
}
124+
)
125+
"name" = "Default"
126+
}
127+
)
128+
}
129+
)
130+
}
131+
)
132+
}
133+
} | ConvertTo-Json -Depth 100
134+
135+
New-DLPComplianceRule -Name "Copilot Rule" -Policy "Copilot Policy" -AdvancedRule $advrule -RestrictAccess @(@{setting="ExcludeContentProcessing";value="Block"})
136+
```
137+
138+
This example creates a DLP policy for Microsoft 365 Copilot (Preview) in several steps:
139+
140+
- The first command returns information about all sensitivity labels. Select the GUID value of the sensitivity label that you want to use. For example, `e222b65a-b3a8-46ec-ae12-00c2c91b71c0`.
141+
142+
- The second command stores the GUID value of the sensitivity label in the variable named `$guidVar`.
143+
144+
- The third command stores the Microsoft 365 Copilot location (`470f2276-e011-4e9d-a6ec-20768be3a4b0`) in the variable named `$loc`. Update the `$loc` value based on the Inclusions/Exclusions scoping that you want to provide.
145+
146+
- The fourth command creates the DLP policy using the `$loc` variable for the value of the Locations parameter, and "Copilot Policy" as the name of the policy (use any unique name).
147+
148+
- The fifth command creates the variable named `$advRule`. The advanced rule needs to be updated depending on the grouping of labels you want to provide as input.
149+
150+
- The last command creates the DLP rule with the name "Copilot Rule" (use any unique name). Use the name of the DLP policy from step four as the value of the Policy parameter.
151+
98152
## PARAMETERS
99153

100154
### -Name
@@ -427,7 +481,28 @@ Accept wildcard characters: False
427481
```
428482

429483
### -Locations
430-
{{ Fill Locations Description }}
484+
The Locations parameter specifies to whom, what, and where the DLP policy applies. This parameter uses the following properties:
485+
486+
- Workload: What the DLP policy applies to. Use the value `Applications`.
487+
- Location: Where the DLP policy applies. For Microsoft 365 Copilot, (Preview), use the value `470f2276-e011-4e9d-a6ec-20768be3a4b0`.
488+
- Inclusions: Who the DLP policy applies to. For users, use the email address in this syntax: `{Type:IndividualResource,Identity:<EmailAddress>}`. For security groups or distribution groups, use the ObjectId value of the group from the Microsoft Entra portal in this syntax: `{Type:Group,Identity:<ObjectId>}`. For the entire tenant, use this value: `{Type:"Tenant",Identity:"All"}`.
489+
- Exclusions: Exclude security groups, distribution groups, or users from the scope of this DLP policy. For users, use the email address in this syntax: `{Type:IndividualResource,Identity:<EmailAddress>}`. For groups, use the ObjectId value of the group from the Microsoft Entra portal in this syntax: `{Type:Group, Identity:<ObjectId>}`.
490+
491+
You create and store the properties in a variable as shown in the following examples:
492+
493+
DLP policy scoped to all users in the tenant:
494+
495+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","Inclusions":[{Type:"Tenant",Identity:"All"}]}]"`
496+
497+
DLP policy scoped to the specified user and groups:
498+
499+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","Inclusions":[{"Type":"Group","Identity":"fef0dead-5668-4bfb-9fc2-9879a47f9bdb"},{"Type":"Group","Identity":"b4dc1e1d-8193-4525-b59c-6d6e0f1718d2"},{"Type":"IndividualResource","Identity":"[email protected]"}]}]"`
500+
501+
DLP policy scoped to all users in the tenant except for members of the specified group:
502+
503+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","Inclusions":[{Type:"Tenant",Identity:"All"}]}],"Exclusions":[{"Type":"Group","Identity":"fef0dead-5668-4bfb-9fc2-9879a47f9bdb"}]}]"`
504+
505+
After you create the `$loc` variable as shown in the previous examples, use the value `$loc` for this parameter.
431506

432507
```yaml
433508
Type: String

exchange/exchange-ps/exchange/Set-DlpCompliancePolicy.md

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -743,7 +743,28 @@ Accept wildcard characters: False
743743
```
744744

745745
### -Locations
746-
{{ Fill Locations Description }}
746+
The Locations parameter specifies to whom, what, and where the DLP policy applies. This parameter uses the following properties:
747+
748+
- Workload: What the DLP policy applies to. Use the value `Applications`.
749+
- Location: Where the DLP policy applies. For Microsoft 365 Copilot, (Preview), use the value `470f2276-e011-4e9d-a6ec-20768be3a4b0`.
750+
- AddInclusions or RemoveInclusions: Add or remove security groups, distribution groups, or users to or from the scope of this DLP policy. For users, use the email address in this syntax: `{Type:IndividualResource,Identity:<EmailAddress>}`. For security groups or distribution groups, use the ObjectId value of the group from the Microsoft Entra portal in this syntax: `{Type:Group,Identity:<ObjectId>}`.
751+
- AddExclusions or RemoveExclusions: Add or remove security groups, distribution groups, or users to or from exclusions to the scope of this DLP policy. For users, use the email address in this syntax: `{Type:IndividualResource,Identity:<EmailAddress>}`. For security groups or distribution groups, use the ObjectId value of the group from the Microsoft Entra portal in this syntax: `{Type:Group,Identity:<ObjectId>}`.
752+
753+
You create and store the properties in a variable as shown in the following examples:
754+
755+
DLP policy scoped to all users in the tenant:
756+
757+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","AddInclusions":[{Type:"Tenant",Identity:"All"}]}]"`
758+
759+
DLP policy scoped to the specified user and groups:
760+
761+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","AddInclusions":[{"Type":"Group","Identity":"fef0dead-5668-4bfb-9fc2-9879a47f9bdb"},{"Type":"Group","Identity":"b4dc1e1d-8193-4525-b59c-6d6e0f1718d2"},{"Type":"IndividualResource","Identity":"[email protected]"}]}]"`
762+
763+
DLP policy scoped to all users in the tenant except for members of the specified group:
764+
765+
`$loc = "[{"Workload":"Applications","Location":"470f2276-e011-4e9d-a6ec-20768be3a4b0","AddInclusions":[{Type:"Tenant",Identity:"All"}],"AddExclusions": [{"Type":"Group","Identity":"fef0dead-5668-4bfb-9fc2-9879a47f9bdb"},{"Type":"Group","Identity":"b4dc1e1d-8193-4525-b59c-6d6e0f1718d2"}]}]`
766+
767+
After you create the `$loc` variable as shown in the previous examples, use the value `$loc` for this parameter.
747768

748769
```yaml
749770
Type: String

teams/teams-ps/teams/New-CsTeamsCallingPolicy.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ New-CsTeamsCallingPolicy [-Identity] <string>
5151
[-PopoutForIncomingPstnCalls <string>]
5252
[-PreventTollBypass <boolean>]
5353
[-SpamFilteringEnabledType <string>]
54-
[-VoiceSimulationInInterpretation <string>]
54+
[-VoiceSimulationInInterpreter <string>]
5555
[-WhatIf]
5656
[<CommonParameters>]
5757
```
@@ -105,7 +105,7 @@ Applicable: Microsoft Teams
105105

106106
Required: False
107107
Position: Named
108-
Default value: None
108+
Default value: Enabled
109109
Accept pipeline input: False
110110
Accept wildcard characters: False
111111
```
@@ -644,7 +644,7 @@ Accept pipeline input: False
644644
Accept wildcard characters: False
645645
```
646646

647-
### -VoiceSimulationInInterpretation
647+
### -VoiceSimulationInInterpreter
648648

649649
>[!NOTE]
650650
>This feature has not been released yet and will have no changes if it is enabled or disabled.
@@ -653,10 +653,8 @@ Enables the user to use the voice simulation feature while being AI interpreted.
653653

654654
Possible Values:
655655

656-
- DisabledUserOverride
657656
- Disabled
658657
- Enabled
659-
- EnabledUserOverride
660658

661659
```yaml
662660
Type: String
@@ -666,7 +664,7 @@ Applicable: Microsoft Teams
666664
667665
Required: False
668666
Position: Named
669-
Default value: None
667+
Default value: Disabled
670668
Accept pipeline input: False
671669
Accept wildcard characters: False
672670
```

teams/teams-ps/teams/New-CsTeamsMeetingPolicy.md

Lines changed: 63 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ ms.date: 11/12/2024
1919

2020
```powershell
2121
New-CsTeamsMeetingPolicy [-Identity] <XdsIdentity>
22+
[-AIInterpreter <string>]
2223
[-AllowAnonymousUsersToDialOut <Boolean>]
2324
[-AllowAnonymousUsersToJoinMeeting <Boolean>]
2425
[-AllowAnonymousUsersToStartMeeting <Boolean>]
@@ -112,6 +113,7 @@ New-CsTeamsMeetingPolicy [-Identity] <XdsIdentity>
112113
[-UsersCanAdmitFromLobby <String>]
113114
[-VideoFiltersMode <String>]
114115
[-VoiceIsolation <String>]
116+
[-VoiceSimulationInInterpreter <string>]
115117
[-WatermarkForAnonymousUsers <String>]
116118
[-WatermarkForCameraVideoOpacity <Int64>]
117119
[-WatermarkForCameraVideoPattern <String>]
@@ -162,6 +164,30 @@ Accept pipeline input: False
162164
Accept wildcard characters: False
163165
```
164166
167+
### -AIInterpreter
168+
>[!NOTE]
169+
>This feature has not been released yet and will have no changes if it is enabled or disabled.
170+
171+
Enables the user to use the AI Interpreter related features
172+
173+
Possible values:
174+
175+
- Disabled
176+
- Enabled
177+
178+
```yaml
179+
Type: String
180+
Parameter Sets: (All)
181+
Aliases:
182+
Applicable: Microsoft Teams
183+
184+
Required: False
185+
Position: Named
186+
Default value: Enabled
187+
Accept pipeline input: False
188+
Accept wildcard characters: False
189+
```
190+
165191
### -AllowAnonymousUsersToDialOut
166192
Determines whether anonymous users are allowed to dial out to a PSTN number. Set this to TRUE to allow anonymous users to dial out. Set this to FALSE to #prohibit anonymous users from dialing out.
167193
@@ -951,7 +977,8 @@ Accept wildcard characters: False
951977
```
952978
953979
### -AutomaticallyStartCopilot
954-
*Note: This feature has not been fully released yet, so the setting will have no effect.*
980+
> [!Note]
981+
> This feature has not been fully released yet, so the setting will have no effect.*
955982
956983
This setting gives admins the ability to auto-start Copilot.
957984
@@ -1401,7 +1428,9 @@ Accept wildcard characters: False
14011428
14021429
### -MeetingInviteLanguages
14031430
Controls how the join information in meeting invitations is displayed by enforcing a common language or enabling up to two languages to be displayed.
1404-
Note: All Teams supported languages can be specified using language codes. For more information about its delivery date, see the [roadmap (Feature ID: 81521)](https://www.microsoft.com/microsoft-365/roadmap?filters=&searchterms=81521).
1431+
1432+
> [!NOTE]
1433+
> All Teams supported languages can be specified using language codes. For more information about its delivery date, see the [roadmap (Feature ID: 81521)](https://www.microsoft.com/microsoft-365/roadmap?filters=&searchterms=81521).
14051434
14061435
The preliminary list of available languages is shown below:
14071436
@@ -1423,7 +1452,8 @@ Accept wildcard characters: False
14231452
### -NewMeetingRecordingExpirationDays
14241453
Specifies the number of days before meeting recordings will expire and move to the recycle bin. Value can be from 1 to 99,999 days.
14251454

1426-
NOTE: You may opt to set Meeting Recordings to never expire by entering the value -1.
1455+
> [!NOTE]
1456+
> You may opt to set Meeting Recordings to never expire by entering the value -1.
14271457

14281458
```yaml
14291459
Type: Int32
@@ -1516,7 +1546,8 @@ This parameter can take two possible values:
15161546
- Stream
15171547
- OneDriveForBusiness
15181548

1519-
Note: The change of storing Teams meeting recordings from Classic Stream to OneDrive and SharePoint (ODSP) has been completed as of August 30th, 2021. All recordings are now stored in ODSP. This change overrides the RecordingStorageMode parameter, and modifying the setting in PowerShell no longer has any impact.
1549+
> [!Note]
1550+
> The change of storing Teams meeting recordings from Classic Stream to OneDrive and SharePoint (ODSP) has been completed as of August 30th, 2021. All recordings are now stored in ODSP. This change overrides the RecordingStorageMode parameter, and modifying the setting in PowerShell no longer has any impact.
15201551

15211552
```yaml
15221553
Type: String
@@ -1551,7 +1582,9 @@ Accept wildcard characters: False
15511582

15521583
### -RoomPeopleNameUserOverride
15531584
Enabling people recognition requires the tenant CsTeamsMeetingPolicy roomPeopleNameUserOverride to be "On" and roomAttributeUserOverride to be Attribute for allowing individual voice and face profiles to be used for recognition in meetings.
1554-
**Note**: In some locations, people recognition can't be used due to local laws or regulations.
1585+
1586+
> [!Note]
1587+
> In some locations, people recognition can't be used due to local laws or regulations.
15551588
Possible values:
15561589

15571590
- On
@@ -1731,6 +1764,31 @@ Accept pipeline input: False
17311764
Accept wildcard characters: False
17321765
```
17331766

1767+
### -VoiceSimulationInInterpreter
1768+
1769+
> [!NOTE]
1770+
> This feature has not been released yet and will have no changes if it is enabled or disabled.
1771+
1772+
Enables the user to use the voice simulation feature while being AI interpreted.
1773+
1774+
Possible Values:
1775+
1776+
- Disabled
1777+
- Enabled
1778+
1779+
```yaml
1780+
Type: String
1781+
Parameter Sets: (All)
1782+
Aliases:
1783+
Applicable: Microsoft Teams
1784+
1785+
Required: False
1786+
Position: Named
1787+
Default value: Disabled
1788+
Accept pipeline input: False
1789+
Accept wildcard characters: False
1790+
```
1791+
17341792
### -WatermarkForAnonymousUsers
17351793
Determines the meeting experience and watermark content of an anonymous user.
17361794

teams/teams-ps/teams/Set-CsTeamsCallingPolicy.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ Set-CsTeamsCallingPolicy [-Identity] <string>
4848
[-PopoutForIncomingPstnCalls <string>]
4949
[-PreventTollBypass <boolean>]
5050
[-SpamFilteringEnabledType <string>]
51-
[-VoiceSimulationInInterpretation <string>]
51+
[-VoiceSimulationInInterpreter <string>]
5252
[-WhatIf]
5353
[<CommonParameters>]
5454
```
@@ -111,7 +111,7 @@ Applicable: Microsoft Teams
111111

112112
Required: False
113113
Position: Named
114-
Default value: None
114+
Default value: Enabled
115115
Accept pipeline input: False
116116
Accept wildcard characters: False
117117
```
@@ -614,7 +614,7 @@ Accept pipeline input: False
614614
Accept wildcard characters: False
615615
```
616616

617-
### -VoiceSimulationInInterpretation
617+
### -VoiceSimulationInInterpreter
618618

619619
> [!NOTE]
620620
> This feature has not been released yet and will have no changes if it is enabled or disabled.
@@ -623,10 +623,8 @@ Enables the user to use the voice simulation feature while being AI interpreted.
623623

624624
Possible Values:
625625

626-
- DisabledUserOverride
627626
- Disabled
628627
- Enabled
629-
- EnabledUserOverride
630628

631629
```yaml
632630
Type: String
@@ -636,7 +634,7 @@ Applicable: Microsoft Teams
636634
637635
Required: False
638636
Position: Named
639-
Default value: None
637+
Default value: Disabled
640638
Accept pipeline input: False
641639
Accept wildcard characters: False
642640
```

0 commit comments

Comments
 (0)