Skip to content

Commit 4ea6700

Browse files
committed
Merge branch 'main' into chrisda
2 parents bbdc28c + 166d3e8 commit 4ea6700

File tree

6 files changed

+12
-11
lines changed

6 files changed

+12
-11
lines changed

exchange/exchange-ps/exchange/New-Label.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,8 @@ Some of the settings that you configure with this parameter are supported only b
171171
172172
Supported settings for built-in labeling:
173173
174+
- **BlockContentAnalysisServices**: Specifies a privacy setting to allow or prevent content in Word, Excel, PowerPoint, and Outlook from being sent to Microsoft for content analysis. Available values are True, and False (the default). This setting impacts services such as data loss prevention policy tips, automatic and recommended labeling, and Microsoft Copilot for Microsoft 365. Example: `New-Label -Identity Confidential -AdvancedSettings @{BlockContentAnalysisServices="True"}`. For more information, see [Prevent some connected experiences that analyze content](https://learn.microsoft.com/purview/sensitivity-labels-office-apps#prevent-some-connected-experiences-that-analyze-content).
175+
174176
- **Color**: Specifies a label color as a hex triplet code for the red, green, and blue (RGB) components of the color. Example: `New-Label -DisplayName "General" -Name "General" -Tooltip "Business data that is not intended for public consumption." -AdvancedSettings @{color="#40e0d0"}`. For more information, see [Configuring custom colors by using PowerShell](https://learn.microsoft.com/purview/sensitivity-labels-office-apps#configuring-custom-colors-by-using-powershell).
175177

176178
- **DefaultSharingScope**: Specifies the default sharing link type for a site when the label scope includes **Groups & sites**, and the default sharing link type for a document when the label scope includes **Files & emails**. Available values are SpecificPeople, Organization, and Anyone. Example: `New-Label DisplayName "General" -Name "General" -Tooltip "Business data that is not intended for public consumption." -AdvancedSettings @{DefaultSharingScope="SpecificPeople"}`. For more information, see [Use sensitivity labels to configure the default sharing link type for sites and documents in SharePoint and OneDrive](https://learn.microsoft.com/purview/sensitivity-labels-default-sharing-link).

exchange/exchange-ps/exchange/Set-CalendarProcessing.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -412,6 +412,8 @@ The BookInPolicy parameter specifies users or groups who are allowed to submit i
412412
413413
Query-based groups (for example, dynamic distribution groups) aren't supported.
414414
415+
In delegate and principal scenarios, if the delegate or principal is specified by the BookInPolicy parameter, in-policy meeting requests to the resource mailbox are automatically approved.
416+
415417
You can enter multiple values separated by commas. If the values contain spaces or otherwise require quotation marks, use the following syntax: `"Value1","Value2",..."ValueN"`.
416418

417419
```yaml

exchange/exchange-ps/exchange/Set-Label.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ Some of the settings that you configure with this parameter are supported only b
151151
152152
Supported settings for built-in labeling:
153153
154+
- **BlockContentAnalysisServices**: Specifies a privacy setting to allow or prevent content in Word, Excel, PowerPoint, and Outlook from being sent to Microsoft for content analysis. Available values are True, and False (the default). This setting impacts services such as data loss prevention policy tips, automatic and recommended labeling, and Microsoft Copilot for Microsoft 365. Example: `Set-Label -Identity Confidential -AdvancedSettings @{BlockContentAnalysisServices="True"}`. For more information, see [Prevent some connected experiences that analyze content](https://learn.microsoft.com/purview/sensitivity-labels-office-apps#prevent-some-connected-experiences-that-analyze-content).
155+
154156
- **Color**: Specifies a label color as a hex triplet code for the red, green, and blue (RGB) components of the color. Example: `Set-Label -Identity 8faca7b8-8d20-48a3-8ea2-0f96310a848e -AdvancedSettings @{color="#40e0d0"}`. For more information, see [Configuring custom colors by using PowerShell](https://learn.microsoft.com/purview/sensitivity-labels-office-apps#configuring-custom-colors-by-using-powershell).
155157

156158
- **DefaultSharingScope**: Specifies the default sharing link type for a site when the label scope includes **Groups & sites**, and the default sharing link type for a document when the label scope includes **Files & emails**. Available values are SpecificPeople, Organization, and Anyone. Example: `Set-Label -Identity General -AdvancedSettings @{DefaultSharingScope="SpecificPeople"}`. For more information, see [Use sensitivity labels to configure the default sharing link type for sites and documents in SharePoint and OneDrive](https://learn.microsoft.com/purview/sensitivity-labels-default-sharing-link).

teams/teams-ps/teams/New-CsOnlineLisCivicAddress.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
---
22
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
33
online version: https://learn.microsoft.com/powershell/module/teams/new-csonlineliscivicaddress
4+
Module Name: MicrosoftTeams
45
applicable: Microsoft Teams
56
title: New-CsOnlineLisCivicAddress
67
schema: 2.0.0
@@ -240,31 +241,31 @@ Accept wildcard characters: False
240241
```
241242
242243
### -Latitude
243-
Specifies the angular distance of a place north or south of the earth's equator using the decimal degrees format.
244+
Specifies the angular distance of a place north or south of the earth's equator using the decimal degrees format. Required for all countries except Australia and Japan where it's optional.
244245
245246
```yaml
246247
Type: String
247248
Parameter Sets: (All)
248249
Aliases:
249250
applicable: Microsoft Teams
250251

251-
Required: True (Required for all countries except Australia and Japan where it's optional)
252+
Required: True
252253
Position: Named
253254
Default value: None
254255
Accept pipeline input: False
255256
Accept wildcard characters: False
256257
```
257258
258259
### -Longitude
259-
Specifies the angular distance of a place east or west of the meridian at Greenwich, England, using the decimal degrees format.
260+
Specifies the angular distance of a place east or west of the meridian at Greenwich, England, using the decimal degrees format. Required for all countries except Australia and Japan where it's optional.
260261
261262
```yaml
262263
Type: String
263264
Parameter Sets: (All)
264265
Aliases:
265266
applicable: Microsoft Teams
266267

267-
Required: True (Required for all countries except Australia and Japan where it's optional)
268+
Required: True
268269
Position: Named
269270
Default value: None
270271
Accept pipeline input: False

teams/teams-ps/teams/New-CsTeamsEmergencyCallingExtendedNotification.md

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ New-CsTeamsEmergencyCallingExtendedNotification -EmergencyDialString <string> [-
2222
```
2323

2424
## DESCRIPTION
25-
26-
**Note**: The use of extended notifications for emergency calling and this cmdlet is currently not supported.
27-
2825
This cmdlet supports creating specific emergency calling notification settings per emergency phone number. It is used with TeamsEmergencyCallingPolicy.
2926

3027
## EXAMPLES
@@ -54,7 +51,7 @@ Accept wildcard characters: False
5451
```
5552
5653
### -NotificationGroup
57-
NotificationGroup is an email list of users and groups to be notified of an emergency call. Individual users or groups are separated by ";", for instance, "[email protected];[email protected]". A maximum of 50 users can be notified.
54+
NotificationGroup is an email list of users and groups to be notified of an emergency call. Individual users or groups are separated by ";", for instance, "[email protected];[email protected]". A maximum of 10 entries consisting of users and/or groups can be added to the NotificationGroup. The total number of users notified cannot exceed 50.
5855
5956
```yaml
6057
Type: String

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,9 +86,6 @@ Accept wildcard characters: False
8686
```
8787
8888
### -ExtendedNotifications
89-
90-
**Note**: The use of extended notifications and this parameter is currently not supported.
91-
9289
A list of one or more instances of TeamsEmergencyCallingExtendedNotification. Each TeamsEmergencyCallingExtendedNotification should use a unique EmergencyDialString.
9390
9491
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.

0 commit comments

Comments
 (0)