Skip to content

Commit d64737e

Browse files
committed
Merge branch 'main' into 38-chrisda
2 parents 452cfcd + b425364 commit d64737e

14 files changed

+539
-172
lines changed

.github/workflows/StaleBranch.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ name: (Scheduled) Stale branch removal
22

33
permissions:
44
contents: write
5+
pull-requests: read
56

67
# This workflow is designed to be run in the days up to, and including, a "deletion day", specified by 'DeleteOnDayOfMonth' in env: in https://github.com/MicrosoftDocs/microsoft-365-docs/blob/workflows-prod/.github/workflows/Shared-StaleBranch.yml.
78
# On the days leading up to "deletion day", the workflow will report the branches to be deleted. This lets users see which branches will be deleted. On "deletion day", those branches are deleted.

exchange/exchange-ps/exchange/Get-FeatureConfiguration.md

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,7 @@ For information about the parameter sets in the Syntax section below, see [Excha
2525

2626
```
2727
Get-FeatureConfiguration [[-Identity] <PolicyIdParameter>] [-FeatureScenario] <PolicyScenario>
28-
[-All]
2928
[-Confirm]
30-
[-GeneralDiscovery]
31-
[-IrmDiscovery]
3229
[-WhatIf]
3330
[<CommonParameters>]
3431
```
@@ -92,22 +89,6 @@ Accept pipeline input: False
9289
Accept wildcard characters: False
9390
```
9491

95-
### -All
96-
This parameter is reserved for internal Microsoft use.
97-
98-
```yaml
99-
Type: SwitchParameter
100-
Parameter Sets: (All)
101-
Aliases:
102-
Applicable: Security & Compliance
103-
104-
Required: False
105-
Position: Named
106-
Default value: None
107-
Accept pipeline input: False
108-
Accept wildcard characters: False
109-
```
110-
11192
### -Confirm
11293
This parameter is reserved for internal Microsoft use.
11394

@@ -124,38 +105,6 @@ Accept pipeline input: False
124105
Accept wildcard characters: False
125106
```
126107

127-
### -GeneralDiscovery
128-
This parameter is reserved for internal Microsoft use.
129-
130-
```yaml
131-
Type: SwitchParameter
132-
Parameter Sets: (All)
133-
Aliases:
134-
Applicable: Security & Compliance
135-
136-
Required: False
137-
Position: Named
138-
Default value: None
139-
Accept pipeline input: False
140-
Accept wildcard characters: False
141-
```
142-
143-
### -IrmDiscovery
144-
This parameter is reserved for internal Microsoft use.
145-
146-
```yaml
147-
Type: SwitchParameter
148-
Parameter Sets: (All)
149-
Aliases:
150-
Applicable: Security & Compliance
151-
152-
Required: False
153-
Position: Named
154-
Default value: None
155-
Accept pipeline input: False
156-
Accept wildcard characters: False
157-
```
158-
159108
### -WhatIf
160109
This parameter is reserved for internal Microsoft use.
161110

exchange/exchange-ps/exchange/New-AppRetentionCompliancePolicy.md

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,9 @@ New-AppRetentionCompliancePolicy [-Name] <String> -Applications <String[]>
5050
```
5151

5252
## DESCRIPTION
53-
\*-AppRetentionCompliance\* cmdlets are used for policies with adaptive policy scopes and all static policies that cover Teams private channels, Viva Engage chats, and Viva Engage community messages. Eventually, you'll use these cmdlets for most retention locations and policy types. The \*-RetentionCompliance\* cmdlets will continue to support Exchange and SharePoint locations primarily. For policies created with the \*-AppRetentionCompliance\* cmdlets, you can only set the list of included or excluded scopes for all included workloads, which means you'll likely need to create one policy per workload.
53+
\*-AppRetentionCompliance\* cmdlets are used for policies with adaptive policy scopes and all static policies in the locations described in [Retention cmdlets for newer locations](https://learn.microsoft.com/purview/retention-cmdlets#retention-cmdlets-for-newer-locations). You can only set the list of included or excluded scopes for all included workloads, which means you likely need to create one policy per workload.
54+
55+
\*-RetentionCompliance\* cmdlets continue to primarily support the locations described in [Retention cmdlets for older locations](https://learn.microsoft.com/purview/retention-cmdlets#retention-cmdlets-for-older-locations).
5456

5557
To use this cmdlet in Security & Compliance PowerShell, you need to be assigned permissions. For more information, see [Permissions in the Microsoft Purview compliance portal](https://learn.microsoft.com/purview/microsoft-365-compliance-center-permissions).
5658

@@ -104,13 +106,31 @@ Accept wildcard characters: False
104106
```
105107
106108
### -Applications
107-
The Applications parameter specifies the applications to include in the policy and is relevant only for the following ___location parameters:
109+
The Applications parameter specifies the applications to include in the policy.
110+
111+
This parameter uses the following syntax: `"LocationType:App1,LocationType:App2,...LocationType:AppN`:
112+
113+
`LocationType` is User or Group.
114+
115+
`App` is a supported value as shown in the following examples.
116+
117+
- **Microsoft 365 apps**: For example:
118+
119+
`"User:Exchange,User:OneDriveForBusiness,Group:Exchange,Group:SharePoint"` or `"User:MicrosoftTeams","User:VivaEngage"`
120+
121+
- **Microsoft Copilot experiences**: Currently in Preview. You must use *all* of the following values at the same time:
122+
123+
`"User:M365Copilot,CopilotForSecurity,CopilotinFabricPowerBI,CopilotStudio,CopilotinBusinessApplicationplatformsSales,SQLCopilot"`
124+
125+
**Note**: Even though you must use `CopilotinBusinessApplicationplatformsSales` and `SQLCopilot`, those values are currently irrelevant.
126+
127+
- **Enterprise AI apps**: Currently in Preview. You must use *all* of the following values at the same time:
128+
129+
`"User:Entrabased3PAIApps,ChatGPTEnterprise,AzureAIServices"`
108130

109-
- ExchangeLocation
110-
- ModernGroupLocation
111-
- AdaptiveScopeLocation
131+
- **Other AI apps**: Currently in Preview. You must use *all* of the following values at the same time:
112132

113-
This parameter uses the following syntax: `"LocationtType:App1,LocationType:App2,...LocationType:AppN` where LocationType is User or Group. For example, `"User:Exchange,User:OneDriveForBusiness,Group:Exchange,Group:SharePoint"` or `"User:MicrosoftTeams","User:VivaEngage"`.
133+
`"User:CloudAIAppChatGPTConsumer,CloudAIAppGoogleGemini,BingConsumer,DeepSeek"`
114134

115135
```yaml
116136
Type: String[]

exchange/exchange-ps/exchange/New-FeatureConfiguration.md

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
2727
New-FeatureConfiguration [-Name] <String> -Mode <PolicyMode> -FeatureScenario <PolicyScenario> -ScenarioConfig <String>
2828
[-Comment <String>]
2929
[-Confirm]
30-
[-GeneralDiscovery]
31-
[-IrmDiscovery]
3230
[-Locations <String>]
3331
[-WhatIf]
3432
[<CommonParameters>]
@@ -176,38 +174,6 @@ Accept pipeline input: False
176174
Accept wildcard characters: False
177175
```
178176

179-
### -GeneralDiscovery
180-
This parameter is reserved for internal Microsoft use.
181-
182-
```yaml
183-
Type: SwitchParameter
184-
Parameter Sets: (All)
185-
Aliases:
186-
Applicable: Security & Compliance
187-
188-
Required: False
189-
Position: Named
190-
Default value: None
191-
Accept pipeline input: False
192-
Accept wildcard characters: False
193-
```
194-
195-
### -IrmDiscovery
196-
This parameter is reserved for internal Microsoft use.
197-
198-
```yaml
199-
Type: SwitchParameter
200-
Parameter Sets: (All)
201-
Aliases:
202-
Applicable: Security & Compliance
203-
204-
Required: False
205-
Position: Named
206-
Default value: None
207-
Accept pipeline input: False
208-
Accept wildcard characters: False
209-
```
210-
211177
### -Locations
212178
The locations parameter specifies where the feature configuration applies.
213179

exchange/exchange-ps/exchange/Remove-FeatureConfiguration.md

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
2626
```
2727
Remove-FeatureConfiguration [-Identity] <PolicyIdParameter>
2828
[-Confirm]
29-
[-GeneralDiscovery]
30-
[-IrmDiscovery]
3129
[-WhatIf]
3230
[<CommonParameters>]
3331
```
@@ -85,38 +83,6 @@ Accept pipeline input: False
8583
Accept wildcard characters: False
8684
```
8785

88-
### -GeneralDiscovery
89-
This parameter is reserved for internal Microsoft use.
90-
91-
```yaml
92-
Type: SwitchParameter
93-
Parameter Sets: (All)
94-
Aliases:
95-
Applicable: Security & Compliance
96-
97-
Required: False
98-
Position: Named
99-
Default value: None
100-
Accept pipeline input: False
101-
Accept wildcard characters: False
102-
```
103-
104-
### -IrmDiscovery
105-
This parameter is reserved for internal Microsoft use.
106-
107-
```yaml
108-
Type: SwitchParameter
109-
Parameter Sets: (All)
110-
Aliases:
111-
Applicable: Security & Compliance
112-
113-
Required: False
114-
Position: Named
115-
Default value: None
116-
Accept pipeline input: False
117-
Accept wildcard characters: False
118-
```
119-
12086
### -WhatIf
12187
The WhatIf switch simulates the actions of the command. You can use this switch to view the changes that would occur without actually applying those changes. You don't need to specify a value with this switch.
12288

exchange/exchange-ps/exchange/Set-AppRetentionCompliancePolicy.md

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ Set-AppRetentionCompliancePolicy [-Identity] <PolicyIdParameter>
108108
```
109109

110110
## DESCRIPTION
111+
\*-AppRetentionCompliance\* cmdlets are used for policies with adaptive policy scopes and all static policies in the locations described in [Retention cmdlets for newer locations](https://learn.microsoft.com/purview/retention-cmdlets#retention-cmdlets-for-newer-locations). You can only set the list of included or excluded scopes for all included workloads, which means you likely need to create one policy per workload.
112+
113+
\*-RetentionCompliance\* cmdlets continue to primarily support the locations described in [Retention cmdlets for older locations](https://learn.microsoft.com/purview/retention-cmdlets#retention-cmdlets-for-older-locations).
114+
111115
To use this cmdlet in Security & Compliance PowerShell, you need to be assigned permissions. For more information, see [Permissions in the Microsoft Purview compliance portal](https://learn.microsoft.com/purview/microsoft-365-compliance-center-permissions).
112116

113117
## EXAMPLES
@@ -322,13 +326,31 @@ Accept wildcard characters: False
322326
```
323327

324328
### -Applications
325-
The Applications parameter specifies the applications to include and is relevant only for the following ___location parameters:
329+
The Applications parameter specifies the applications to include in the policy.
330+
331+
This parameter uses the following syntax: `"LocationType:App1,LocationType:App2,...LocationType:AppN`:
332+
333+
`LocationType` is User or Group.
334+
335+
`App` is a supported value as shown in the following examples.
336+
337+
- **Microsoft 365 apps**: For example:
338+
339+
`"User:Exchange,User:OneDriveForBusiness,Group:Exchange,Group:SharePoint"` or `"User:MicrosoftTeams","User:VivaEngage"`
340+
341+
- **Microsoft Copilot experiences**: Currently in Preview. You must use *all* of the following values at the same time:
342+
343+
`"User:M365Copilot,CopilotForSecurity,CopilotinFabricPowerBI,CopilotStudio,CopilotinBusinessApplicationplatformsSales,SQLCopilot"`
344+
345+
**Note**: Even though you must use `CopilotinBusinessApplicationplatformsSales` and `SQLCopilot`, those values are currently irrelevant.
346+
347+
- **Enterprise AI apps**: Currently in Preview. You must use *all* of the following values at the same time:
348+
349+
`"User:Entrabased3PAIApps,ChatGPTEnterprise,AzureAIServices"`
326350

327-
- ExchangeLocation
328-
- ModernGroupLocation
329-
- AdaptiveScopeLocation
351+
- **Other AI apps**: Currently in Preview. You must use *all* of the following values at the same time:
330352

331-
This parameter uses the following syntax: `"LocationtType:App1,LocationType:App2,...LocationType:AppN` where LocationType is User or Group. For example, `"User:Exchange,User:OneDriveForBusiness,Group:Exchange,Group:SharePoint"` or `"User:MicrosoftTeams","User:VivaEngage"`.
353+
`"User:CloudAIAppChatGPTConsumer,CloudAIAppGoogleGemini,BingConsumer,DeepSeek"`
332354

333355
```yaml
334356
Type: String[]

exchange/exchange-ps/exchange/Set-FeatureConfiguration.md

Lines changed: 0 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ For information about the parameter sets in the Syntax section below, see [Excha
2727
Set-FeatureConfiguration [-Identity] <PolicyIdParameter> [-Locations <String>]
2828
[-Comment <String>]
2929
[-Confirm]
30-
[-GeneralDiscovery]
31-
[-IrmDiscovery]
3230
[-Mode <PolicyMode>]
3331
[-ScenarioConfig <String>]
3432
[-WhatIf]
@@ -118,38 +116,6 @@ Accept pipeline input: False
118116
Accept wildcard characters: False
119117
```
120118

121-
### -GeneralDiscovery
122-
This parameter is reserved for internal Microsoft use.
123-
124-
```yaml
125-
Type: SwitchParameter
126-
Parameter Sets: (All)
127-
Aliases:
128-
Applicable: Security & Compliance
129-
130-
Required: False
131-
Position: Named
132-
Default value: None
133-
Accept pipeline input: False
134-
Accept wildcard characters: False
135-
```
136-
137-
### -IrmDiscovery
138-
This parameter is reserved for internal Microsoft use.
139-
140-
```yaml
141-
Type: SwitchParameter
142-
Parameter Sets: (All)
143-
Aliases:
144-
Applicable: Security & Compliance
145-
146-
Required: False
147-
Position: Named
148-
Default value: None
149-
Accept pipeline input: False
150-
Accept wildcard characters: False
151-
```
152-
153119
### -Locations
154120
The locations parameter specifies where the feature configuration applies.
155121

exchange/exchange-ps/exchange/Set-OwaMailboxPolicy.md

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1750,7 +1750,12 @@ Accept wildcard characters: False
17501750
### -OutlookNewslettersAccessLevel
17511751
This parameter is available only in the cloud-based service.
17521752

1753-
{{ Fill OutlookNewslettersAccessLevel Description }}
1753+
The OutlookNewslettersAccessLevelAccess parameter specifies the access level in Outlook Newsletters. Valid values are:
1754+
1755+
- NoAccess: No access to Outlook Newsletters in the New Outlook for Windows or Outlook on the web. Users can still read email messages sent or forwarded to them.
1756+
- ReadOnly: Read newsletters and browse pages in Outlook Newsletters.
1757+
- ReadWrite: Full authoring permissions to create pages and newsletters in Outlook Newsletters.
1758+
- Undefined: This is the default value. Currently, this value is equivalent to NoAccess.
17541759

17551760
```yaml
17561761
Type: OutlookNewslettersAccessLevel
@@ -1768,9 +1773,9 @@ Accept wildcard characters: False
17681773
### -OutlookDataFile
17691774
This parameter is available only in the cloud-based service.
17701775

1771-
The OutlookDataFile paramater specifies what users can do with .pst files in the new Outlook for Windows. Valid values are:
1776+
The OutlookDataFile parameter specifies what users can do with .pst files in the new Outlook for Windows. Valid values are:
17721777

1773-
- Allow: The defaul value. Users can open .pst files, import from a .pst file to a mailbox, export from a mailbox to a .pst file, and copy items to and from .pst files.
1778+
- Allow: The default value. Users can open .pst files, import from a .pst file to a mailbox, export from a mailbox to a .pst file, and copy items to and from .pst files.
17741779
- NoExport: Users can't export from a mailbox to a .pst file.
17751780
- NoExportNoGrow: Users can't export from a mailbox to a .pst file, or copy items from a mailbox to a .pst file.
17761781
- NoExportNoOpen: Users can't export from a mailbox to a .pst file, or open new .pst files.
@@ -1793,7 +1798,12 @@ Accept wildcard characters: False
17931798
### -OutlookNewslettersReactions
17941799
This parameter is available only in the cloud-based service.
17951800

1796-
{{ Fill OutlookNewslettersReactions Description }}
1801+
The OutlookNewslettersReactions parameter specifies whether reactions are enabled in Outlook Newsletters. Readers can react to individual sections or the entire newsletter. They can also comment using integrated controls at the end of the newsletter. Valid values are:
1802+
1803+
- DefaultOff: The controls are turned off.
1804+
- DefaultOn: The controls are turned on.
1805+
- Disabled: The controls are disabled for users.
1806+
- Undefined: This is the default value.
17971807

17981808
```yaml
17991809
Type: OutlookNewslettersFeatureState
@@ -1811,7 +1821,14 @@ Accept wildcard characters: False
18111821
### -OutlookNewslettersShowMore
18121822
This parameter is available only in the cloud-based service.
18131823

1814-
{{ Fill OutlookNewslettersShowMore Description }}
1824+
The OutlookNewslettersShowMore parameter specifies whether recommendations to other Outlook Newsletters are included in the footer of published newsletter editions. Valid values are:
1825+
1826+
- DefaultOff: Recommendations are turned off.
1827+
- DefaultOn: Recommendations are turned on.
1828+
- Disabled: Recommendations are disabled for users.
1829+
- Undefined: This is the default value.
1830+
1831+
Authors can disable these recommendations for each individual newsletter edition, or admins can use this parameter to globally disable these recommendations.
18151832

18161833
```yaml
18171834
Type: OutlookNewslettersFeatureState
@@ -1830,7 +1847,7 @@ Accept wildcard characters: False
18301847
The OWALightEnabled parameter controls the availability of the light version of Outlook on the web. Valid values are:
18311848

18321849
- $true: The light version of Outlook on the web is available. This is the default value.
1833-
- $false: The light version of Outlook on the web is isn't available. This setting prevents access to Outlook on the web for unsupported browsers that can only use the light version of Outlook on the web.
1850+
- $false: The light version of Outlook on the web isn't available. This setting prevents access to Outlook on the web for unsupported browsers that can only use the light version of Outlook on the web.
18341851

18351852
```yaml
18361853
Type: Boolean

0 commit comments

Comments
 (0)