Skip to content

Commit 2147611

Browse files
authored
Merge branch 'main' into patch-1
2 parents 17fc7bf + 9d25cec commit 2147611

File tree

1,385 files changed

+17939
-14387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,385 files changed

+17939
-14387
lines changed

.github/workflows/TierManagement.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,15 @@ name: Tier management
22

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

77
on:
88
issue_comment:
99
types: [created, edited]
1010

11+
pull_request_target:
12+
types: [opened, reopened]
13+
1114
jobs:
1215

1316
tier-mgmt:

.openpublishing.redirection.teams.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3014,6 +3014,11 @@
30143014
"source_path": "teams/virtual-folder/teams/index.md",
30153015
"redirect_url": "/powershell/module/microsoftteams/",
30163016
"redirect_document_id": true
3017+
},
3018+
{
3019+
"source_path": "teams/virtual-folder/MicrosoftTeams/Set-CsGroupPolicyAssignment.md",
3020+
"redirect_url": "/powershell/module/microsoftteams/",
3021+
"redirect_document_id": false
30173022
}
30183023
]
30193024
}

exchange/docs-conceptual/app-only-auth-powershell-v2.md

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
title: App-only authentication in Exchange Online PowerShell and Security & Compliance PowerShell
33
ms.author: chrisda
44
author: chrisda
5-
manager: deniseb
6-
ms.date: 12/12/2023
5+
manager: orspodek
6+
ms.date: 08/11/2025
77
ms.audience: Admin
88
audience: Admin
99
ms.topic: article
@@ -69,11 +69,18 @@ The following examples show how to use the Exchange Online PowerShell module wit
6969
>
7070
> The following connection commands have many of the same options available as described in [Connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md) and [Connect to Security & Compliance PowerShell](connect-to-scc-powershell.md). For example:
7171
>
72-
> - Microsoft 365 GCC High or Microsoft 365 DoD environments require the following additional parameters and values:
73-
> - **Connect-ExchangeOnline in GCC High**: `-ExchangeEnvironmentName O365USGovGCCHigh`.
74-
> - **Connect-IPPSSession in GCC High**: `-ConnectionUri https://ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.us/common`.
75-
> - **Connect-ExchangeOnline in DoD**: `-ExchangeEnvironmentName O365USGovDoD`.
76-
> - **Connect-IPPSSession in DoD**: `-ConnectionUri https://l5.ps.compliance.protection.office365.us/powershell-liveid/ -AzureADAuthorizationEndpointUri https://login.microsoftonline.us/common`.
72+
> - Microsoft 365 GCC High, Microsoft 365 DoD or Microsoft 365 China (operated by 21Vianet) environments require the following additional parameters and values:
73+
> - **Microsoft 365 GCC High**
74+
> - `Connect-ExchangeOnline -ExchangeEnvironmentName O365USGovGCCHigh`
75+
> - `Connect-IPPSSession -ConnectionUri https://compliance.usgcc.microsoft.com/powershell-liveid -AzureADAuthorizationEndpointUri https://login.microsoftonline.us`
76+
>
77+
> - **Microsoft 365 DoD**
78+
> - `Connect-ExchangeOnline -ExchangeEnvironmentName O365USGovDoD`
79+
> - `Connect-IPPSSession -ConnectionUri https://compliance.dod.microsoft.com/powershell-liveid -AzureADAuthorizationEndpointUri https://login.microsoftonline.us`
80+
>
81+
> - **Microsoft 365 operated by 21Vianet (China)**
82+
> - `Connect-ExchangeOnline -ExchangeEnvironmentName O365China`
83+
> - `Connect-IPPSSession -ConnectionUri https://ps.compliance.protection.partner.outlook.cn/powershell-liveid -AzureADAuthorizationEndpointUri https://login.chinacloudapi.cn/common`
7784
>
7885
> - If a **Connect-IPPSSession** command presents a login prompt, run the command: `$Global:IsWindows = $true` before the **Connect-IPPSSession** command.
7986

exchange/docs-conceptual/client-advanced-settings.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -317,11 +317,11 @@ Use this advanced setting in conjunction with *ScannerMinCPU* to limit CPU consu
317317

318318
- Value: \<number>**
319319

320-
The value is set to **100** by default, which means there is no limit of maximum CPU consumption. In this case, the scanner process will try to use all available CPU time to maximize your scan rates.
320+
The value is set to **100** by default, which means there is no limit of maximum CPU consumption. In this case, the scanner process tries to use all available CPU time to maximize your scan rates.
321321

322-
If you set **ScannerMaxCPU** to less than 100, the scanner will monitor the CPU consumption over the last 30 minutes. If the average CPU crossed the limit you set, it will start to reduce the number of threads allocated for new files.
322+
If you set **ScannerMaxCPU** to less than 100, the scanner monitors the CPU consumption over the last 30 minutes. If the average CPU crossed the limit you set, it starts to reduce the number of threads allocated for new files.
323323

324-
The limit on the number of threads will continue as long as CPU consumption is higher than the limit set for **ScannerMaxCPU**.
324+
The limit on the number of threads continues as long as CPU consumption is higher than the limit set for **ScannerMaxCPU**.
325325

326326
## ScannerMinCPU
327327

@@ -334,7 +334,7 @@ Used only if *ScannerMaxCPU* is not equal to 100, and cannot be set to a number
334334

335335
We recommend keeping **ScannerMinCPU** set at least 15 points lower than the value of *ScannerMaxCPU*.
336336

337-
The value is set to **50** by default, which means that if CPU consumption in the last 30 minutes when lower than this value, the scanner will start adding new threads to scan more files in parallel, until the CPU consumption reaches the level you have set for *ScannerMaxCPU*-15.
337+
The value is set to **50** by default, which means that if CPU consumption in the last 30 minutes when lower than this value, the scanner starts adding new threads to scan more files in parallel, until the CPU consumption reaches the level you have set for *ScannerMaxCPU*-15.
338338

339339
## ScannerConcurrencyLevel
340340

@@ -361,17 +361,17 @@ Set-LabelPolicy -Identity Scanner -AdvancedSettings @{ScannerConcurrencyLevel="8
361361

362362
By default, the information protection scanner scans all relevant files. However, you might want to define specific files to be skipped, such as for archived files or files that have been moved.
363363

364-
Enable the scanner to skip specific files based on their file attributes by using the **ScannerFSAttributesToSkip** advanced setting. In the setting value, list the file attributes that will enable the file to be skipped when they are all set to **true**. This list of file attributes uses the AND logic.
364+
Enable the scanner to skip specific files based on their file attributes by using the **ScannerFSAttributesToSkip** advanced setting. In the setting value, list the file attributes that enable the file to be skipped when they are all set to **true**. This list of file attributes uses the AND logic.
365365

366366
Example PowerShell commands, where your label policy is named "Global".
367367

368-
**Skip files that are both read-only and archived**
368+
**Skip files that are both read-only and archived**:
369369

370370
```PowerShell
371371
Set-LabelPolicy -Identity Global -AdvancedSettings @{ ScannerFSAttributesToSkip =" FILE_ATTRIBUTE_READONLY, FILE_ATTRIBUTE_ARCHIVE"}
372372
```
373373

374-
**Skip files that are either read-only or archived**
374+
**Skip files that are either read-only or archived**:
375375

376376
To use an OR logic, run the same property multiple times. For example:
377377

exchange/docs-conceptual/cmdlet-property-sets.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Property sets in Exchange Online PowerShell module cmdlets
33
ms.author: chrisda
44
author: chrisda
5-
manager: deniseb
5+
manager: orspodek
66
ms.date: 9/1/2023
77
ms.audience: Admin
88
audience: Admin

exchange/docs-conceptual/connect-exo-powershell-managed-identity.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Use Azure managed identities to connect to Exchange Online PowerShell
33
ms.author: chrisda
44
author: chrisda
5-
manager: deniseb
5+
manager: orspodek
66
ms.date: 8/24/2023
77
ms.audience: Admin
88
audience: Admin
@@ -68,7 +68,7 @@ The first command in the PowerShell runbook must be the `Connect-ExchangeOnline.
6868
Connect-ExchangeOnline -ManagedIdentity -Organization contoso.onmicrosoft.com
6969
```
7070

71-
After that, as a test, you can start with as simple, low-impact command in the runbook before moving on to more complex commands or scripts. For example:
71+
After that, as a test, you can start with as simple, low risk command in the runbook before moving on to more complex commands or scripts. For example:
7272

7373
```powershell
7474
Get-AcceptedDomain | Format-Table Name
@@ -118,7 +118,7 @@ Connect-ExchangeOnline -ManagedIdentity -Organization contoso.onmicrosoft.com -M
118118

119119
You get the ManagedIdentityAccount value from [Step 3: Store the user-assigned managed identity in a variable](#step-3-store-the-user-assigned-managed-identity-in-a-variable).
120120

121-
After that, as a test, you can start with as simple, low-impact command in the runbook before moving on to more complex commands or scripts. For example:
121+
After that, as a test, you can start with as simple, low risk command in the runbook before moving on to more complex commands or scripts. For example:
122122

123123
```powershell
124124
Get-AcceptedDomain | Format-Table Name
@@ -285,7 +285,7 @@ To verify that the module imported successfully, run the following command:
285285
Get-AzAutomationModule -ResourceGroupName ContosoRG -AutomationAccountName ContosoAzAuto1 -Name ExchangeOnlineManagement
286286
```
287287

288-
During the import, the ProvisioningState property will have the value Creating. When the module import is complete, the value will change to Succeeded.
288+
During the import, the ProvisioningState property has the value Creating. When the module import is complete, the value changes to Succeeded.
289289

290290
For detailed syntax and parameter information, see [New-AzAutomationModule](/powershell/module/az.automation/new-azautomationmodule).
291291

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Connect to Exchange Online PowerShell
33
author: chrisda
4-
manager: deniseb
4+
manager: orspodek
55
ms.date: 07/11/2025
66
ms.audience: Admin
77
audience: Admin

exchange/docs-conceptual/connect-to-exchange-servers-using-remote-powershell.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: "Connect to Exchange servers using remote PowerShell"
33
ms.author: chrisda
44
author: chrisda
5-
manager: deniseb
5+
manager: orspodek
66
ms.date: 9/7/2023
77
ms.audience: ITPro
88
audience: ITPro

exchange/docs-conceptual/connect-to-exo-powershell-c-sharp.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
title: Use C# to connect to Exchange Online PowerShell
33
ms.author: chrisda
44
author: chrisda
5-
manager: deniseb
5+
manager: orspodek
66
ms.date: 8/21/2023
77
ms.audience: Admin
88
audience: Admin
@@ -207,7 +207,7 @@ void ParallelConnectionsToExchangeOnline()
207207

208208
// Set the ThreadOptions to reuse the same threads for the runspaces so that
209209
210-
// the Exchange Online cmdlets will be available after running Connect-ExchangeOnline in each runspace.
210+
// the Exchange Online cmdlets are available after running Connect-ExchangeOnline in each runspace.
211211
212212
pool.ThreadOptions = PSThreadOptions.ReuseThread;
213213

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
title: Connect to Security & Compliance PowerShell
33
author: chrisda
4-
manager: deniseb
4+
manager: orspodek
55
ms.date: 07/11/2025
66
ms.audience: Admin
77
audience: Admin

0 commit comments

Comments
 (0)