Skip to content

Commit 477c98f

Browse files
authored
Merge branch 'master' into patch-1
2 parents 783efac + 2cae0ec commit 477c98f

27 files changed

+223
-44
lines changed

exchange/exchange-ps/exchange/Connect-ExchangeOnline.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ Accept wildcard characters: False
155155
156156
The AzureADAuthorizationEndpointUri parameter specifies the Azure AD Authorization endpoint that can issue OAuth2 access tokens. The following Exchange Online PowerShell environments and related values are supported:
157157
158-
- Microsoft 365 or Microsoft 365 GCC: Don't use this parameter.
158+
- Microsoft 365 or Microsoft 365 GCC: Don't use this parameter. The required value is `https://login.microsoftonline.com/common`, but that's also the default value, so you don't need to use this parameter.
159159
- Office 365 Germany: `https://login.microsoftonline.de/common`
160160
- Microsoft 365 GCC High or Microsoft 365 DoD: `https://login.microsoftonline.us/common`
161161

exchange/exchange-ps/exchange/Connect-IPPSSession.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ This example connects to standalone Exchange Online Protection PowerShell in an
7171
### -ConnectionUri
7272
The ConnectionUri parameter specifies the connection endpoint for the remote PowerShell session. The following PowerShell environments and related values are supported:
7373

74-
- Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC: Don't use this parameter.
74+
- Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC: Don't use this parameter. The required value is `https://ps.compliance.protection.outlook.com/powershell-liveid/`, but that's also the default value, so you don't need to use this parameter.
7575
- Security & Compliance Center PowerShell in Office 365 Germany: `https://ps.compliance.protection.outlook.de/PowerShell-LiveID`
7676
- Security & Compliance Center PowerShell in Microsoft GCC High: `https://ps.compliance.protection.office365.us/powershell-liveid/`
7777
- Security & Compliance Center PowerShell in Microsoft DoD: `https://l5.ps.compliance.protection.office365.us/powershell-liveid/`
@@ -93,7 +93,7 @@ Accept wildcard characters: False
9393
### -AzureADAuthorizationEndpointUri
9494
The AzureADAuthorizationEndpointUri parameter specifies the Azure AD Authorization endpoint that can issue OAuth2 access tokens. The following PowerShell environments and related values are supported:
9595
96-
- Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC: Don't use this parameter.
96+
- Security & Compliance Center PowerShell in Microsoft 365 or Microsoft 365 GCC: Don't use this parameter. The required value is `https://login.microsoftonline.com/common`, but that's also the default value, so you don't need to use this parameter.
9797
- Security & Compliance Center PowerShell in Office 365 Germany: `https://login.microsoftonline.de/common`
9898
- Security & Compliance Center PowerShell in Microsoft GCC High or Microsoft DoD: `https://login.microsoftonline.us/common`
9999

exchange/exchange-ps/exchange/Disable-OutlookProtectionRule.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ms.reviewer:
1212
# Disable-OutlookProtectionRule
1313

1414
## SYNOPSIS
15+
**Note**: This cmdlet is no longer supported in the cloud-based service.
16+
1517
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.
1618

1719
Use the Disable-OutlookProtectionRule cmdlet to disable an existing Microsoft Outlook protection rule.

exchange/exchange-ps/exchange/Enable-OutlookProtectionRule.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ms.reviewer:
1212
# Enable-OutlookProtectionRule
1313

1414
## SYNOPSIS
15+
**Note**: This cmdlet is no longer supported in the cloud-based service.
16+
1517
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.
1618

1719
Use the Enable-OutlookProtectionRule cmdlet to enable an existing Outlook protection rule.

exchange/exchange-ps/exchange/Get-MigrationUserStatistics.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ This example displays the number of mailbox items that failed to migrate, which
5555

5656
### Example 3
5757
```powershell
58-
Get-MigrationUserStatistics -Identity [email protected] -LimitSkippedItemsTo 20 | Format-List SkippedItemCount,SkippedItems
58+
Get-MigrationUserStatistics -Identity [email protected] -IncludeSkippedItems | Select-Object -ExpandProperty SkippedItems | Format-List DateReceived, Subject
5959
```
6060

61-
This example displays results information in the SkippedItems property for a maximum of 20 skipped items.
61+
This example displays results information in the SkippedItems property.
6262

6363
### Example 4
6464
```powershell

exchange/exchange-ps/exchange/Get-OutlookProtectionRule.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ms.reviewer:
1212
# Get-OutlookProtectionRule
1313

1414
## SYNOPSIS
15+
**Note**: This cmdlet is no longer supported in the cloud-based service.
16+
1517
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.
1618

1719
Use the Get-OutlookProtectionRule cmdlet to retrieve Microsoft Outlook protection rules configured in an organization.

exchange/exchange-ps/exchange/New-ComplianceSearchAction.md

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,12 +211,7 @@ Accept wildcard characters: False
211211
```
212212

213213
### -EnableDedupe
214-
This parameter is available only in the cloud-based service.
215-
216-
The EnableDedupe parameter eliminates duplication of messages when you export content search results. Valid values are:
217-
218-
- $true: Export a single copy of a message if the same message exists in multiple folders or mailboxes.
219-
- $false: Export all copies of a message if the same message exists in multiple folders or mailboxes. This is the default value.
214+
This parameter is reserved for internal Microsoft use.
220215

221216
```yaml
222217
Type: Boolean

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,13 @@ Accept wildcard characters: False
601601
```
602602

603603
### -ContentType
604-
{{ Fill ContentType Description }}
604+
The ContentType parameter specifies where the sensivity label can be applied. Valid values are:
605+
606+
- File, Email
607+
- Site, UnifiedGroup
608+
- PurviewAssets
609+
610+
Values can be combined, for example: "File, Email, PurviewAssets". Splitting related content types like "File, Email" into just "File" or just "Email" is not supported.
605611

606612
```yaml
607613
Type: MipLabelContentType

exchange/exchange-ps/exchange/New-OutlookProtectionRule.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ms.reviewer:
1212
# New-OutlookProtectionRule
1313

1414
## SYNOPSIS
15+
**Note**: This cmdlet is no longer supported in the cloud-based service.
16+
1517
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.
1618

1719
Use the New-OutlookProtectionRule cmdlet to create a Microsoft Outlook protection rule.

exchange/exchange-ps/exchange/Remove-OutlookProtectionRule.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ms.reviewer:
1212
# Remove-OutlookProtectionRule
1313

1414
## SYNOPSIS
15+
**Note**: This cmdlet is no longer supported in the cloud-based service.
16+
1517
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.
1618

1719
Use the Remove-OutlookProtectionRule cmdlet to remove Outlook protection rules.

exchange/exchange-ps/exchange/Set-FederationTrust.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ This example configures the federation trust Microsoft Federation Gateway to use
7878

7979
### Example 3
8080
```powershell
81-
Set-FederationTrust -Identity "Azure AD Authentication" -MetadataUrl https://login.microsoftonline.us/FederationMetadata/2006-12/FederationMetadata.xml
81+
Set-FederationTrust -Identity "Azure AD Authentication" -MetadataUrl https://nexus.microsoftonline-p.com/federationmetadata/2006-12/federationmetadata.xml
8282
```
8383

8484
This example updates the configuration if the tenant is hosted in Microsoft 365 U.S. Government GCC High or DoD environment.
@@ -177,7 +177,7 @@ Accept wildcard characters: False
177177
```
178178

179179
### -MetadataUrl
180-
The MetadataUrl parameter specifies the URL where WS-FederationMetadata is published by the Microsoft Federation Gateway. <br/><br/> **Note**: For GCC High or DoD tenants, use the value https://login.microsoftonline.us/FederationMetadata/2006-12/FederationMetadata.xml.
180+
The MetadataUrl parameter specifies the URL where WS-FederationMetadata is published by the Microsoft Federation Gateway.
181181

182182
```yaml
183183
Type: Uri

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -581,7 +581,13 @@ Accept wildcard characters: False
581581
```
582582

583583
### -ContentType
584-
{{ Fill ContentType Description }}
584+
The ContentType parameter specifies where the sensivity label can be applied. Valid values are:
585+
586+
- File, Email
587+
- Site, UnifiedGroup
588+
- PurviewAssets
589+
590+
Values can be combined, for example: "File, Email, PurviewAssets". Splitting related content types like "File, Email" into just "File" or just "Email" is not supported.
585591

586592
```yaml
587593
Type: MipLabelContentType

exchange/exchange-ps/exchange/Set-MailboxCalendarFolder.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,19 @@ Accept wildcard characters: False
283283
### -SharedCalendarSyncStartDate
284284
This parameter is available only in the cloud-based service.
285285

286-
{{ Fill SharedCalendarSyncStartDate Description }}
286+
**Note**: This parameter is supported only for shared calendars that have been upgraded as described in [Calendar sharing in Microsoft 365](https://support.microsoft.com/office/365-b576ecc3-0945-4d75-85f1-5efafb8a37b4), and is not applicable to any other type of calendar or mailbox folder.
287+
288+
The SharedCalendarSyncStartDate parameter specifies the limit for past events that are visible to users who have access to the specified shared calendar. A copy of the shared calendar with events that go back as far as the value specified by this parameter is stored in the user's mailbox.
289+
290+
To specify a date/time value for this parameter, use either of the following options:
291+
292+
- Specify the date/time value in UTC: For example, "2021-05-06 14:30:00z".
293+
- Specify the date/time value as a formula that converts the date/time in your local time zone to UTC: For example, `(Get-Date "5/6/2021 9:30 AM").ToUniversalTime()`. For more information, see [Get-Date](https://docs.microsoft.com/powershell/module/Microsoft.PowerShell.Utility/Get-Date).
294+
295+
**Notes**:
296+
297+
- Users need to have FullDetails, Editor, or Delegate access to the specified shared calendar.
298+
- Setting this parameter might cause events in the shared calendar to briefly disappear from view while the calendar is resynchronized.
287299

288300
```yaml
289301
Type: DateTime

exchange/exchange-ps/exchange/Set-OrganizationConfig.md

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2935,7 +2935,14 @@ Accept wildcard characters: False
29352935
### -SendFromAliasEnabled
29362936
This parameter is available only in the cloud-based service.
29372937

2938-
{{ Fill SendFromAliasEnabled Description }}
2938+
The SendFromAliasEnabled parameter allows mailbox users to send messages and reply to messages in Outlook on the web using any of the proxy addresses (secondary email addresses) that are configured on the mailbox. Valid values are:
2939+
2940+
- $true: Users in Outlook on the web get an option to send messages and reply to messages with a proxy addresses.
2941+
- $false: Users can only send messages and reply to messages using their primary email address. This is the default value.
2942+
2943+
For more information about the availability of this feature, see the [Microsoft 365 roadmap](https://www.microsoft.com/microsoft-365/roadmap?filters=Exchange&searchterms=59437).
2944+
2945+
**Note**: This feature doesn't work in Outlook for Windows or Mac.
29392946

29402947
```yaml
29412948
Type: Boolean

exchange/exchange-ps/exchange/Set-OutlookProtectionRule.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ ms.reviewer:
1212
# Set-OutlookProtectionRule
1313

1414
## SYNOPSIS
15+
**Note**: This cmdlet is no longer supported in the cloud-based service.
16+
1517
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.
1618

1719
Use the Set-OutlookProtectionRule cmdlet to modify an existing Microsoft Outlook protection rule.

skype/skype-ps/skype/Disable-CsOnlineSipDomain.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ This cmdlet facilitates consolidation of multiple Skype for Business Server depl
4343
This cmdlet may also be useful for organizations with on-premises deployments of Skype for Business Server that have not properly configured Azure AD Connect. If the organization does not sync msRTCSIP-DeploymentLocator for its users, then Skype for Business Online will attempt to provision online any users with an assigned Skype for Business license, despite there being users on-premises. While the correct fix is to update the configuration for Azure AD Connect to sync those attributes, using Disable-CsOnlineSipDomain can also mitigate the problem until that configuration change can be made. If this cmdlet is run, any users that were previously provisioned online in that domain will be de-provisioned in Skype for Business Online.
4444

4545
> [!IMPORTANT]
46-
> This cmdlet should not be run for domains that contain users hosted in Skype for Business Online. Any users in a sip domain that are already provisioned *online* will cease to function if you disable the online sip domain:
46+
> This cmdlet should not be run for domains that contain users hosted in Skype for Business Online or Microsoft Teams. Any users in a sip domain that are already provisioned *online* will cease to function if you disable the online sip domain:
4747
>
4848
> - Their SIP addresses will be removed.
49-
> - All contacts and meetings for these users hosted in Skype for Business Online will be deleted.
50-
> - These users will no longer be able to login to the Skype for Business Online environment.
49+
> - All contacts and meetings for these users hosted in Skype for Business Online or Microsoft Teams will be deleted.
50+
> - These users will no longer be able to login to the Skype for Business Online or Microsoft Teams environment.
5151
> - If these users use Teams, they will no longer be able to inter-operate with Skype for Business users, nor will they be able to federate with any users in other organizations.
5252
5353
> [!NOTE]

skype/skype-ps/skype/Grant-CsTeamsVideoInteropServicePolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ A: The policy is cached for 6 hours. Changes to the policy are updated after the
5959
### Example 1: The whole tenant has the same provider
6060

6161
```powershell
62-
Grant-CsTeamsVideoInteropServicePolicy -PolicyName <Identity of the Policy | $null>
62+
Grant-CsTeamsVideoInteropServicePolicy -PolicyName <Identity of the Policy | $null> -Global
6363
```
6464

6565
Specify the provider for the whole tenant or use the value $null to remove the tenant-level provider and let the whole tenant fall back to the Global policy.

skype/skype-ps/skype/New-CsCallQueue.md

Lines changed: 36 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,22 +22,23 @@ New-CsCallQueue -Name <String> [-AgentAlertTime <Int16>] [-AllowOptOut <Boolean>
2222
[-Tenant <Guid>] [-UseDefaultMusicOnHold <Boolean>] [-WelcomeMusicAudioFileId <Guid>] [-MusicOnHoldAudioFileId <Guid>]
2323
[-OverflowAction <Object>] [-OverflowActionTarget <Guid>] [-OverflowThreshold <Int16>]
2424
[-TimeoutAction <Object>] [-TimeoutActionTarget <Guid>] [-TimeoutThreshold <Int16>]
25-
[-RoutingMethod <Object>] [-PresenceBasedRouting <Boolean>] [-ConferenceMode <Boolean>] [-Users <List>] [-LanguageId <String>] [-LineUri <String>] [-OverflowSharedVoicemailTextToSpeechPrompt <String>] [-OverflowSharedVoicemailAudioFilePrompt <Guid>] [-EnableOverflowSharedVoicemailTranscription <Boolean>] [-TimeoutSharedVoicemailTextToSpeechPrompt <String>] [-TimeoutSharedVoicemailAudioFilePrompt <Guid>] [-EnableTimeoutSharedVoicemailTranscription <Boolean>] [<CommonParameters>]
25+
[-RoutingMethod <Object>] [-PresenceBasedRouting <Boolean>] [-ConferenceMode <Boolean>] [-Users <List>] [-LanguageId <String>] [-LineUri <String>] [-OverflowSharedVoicemailTextToSpeechPrompt <String>] [-OverflowSharedVoicemailAudioFilePrompt <Guid>] [-EnableOverflowSharedVoicemailTranscription <Boolean>] [-TimeoutSharedVoicemailTextToSpeechPrompt <String>] [-TimeoutSharedVoicemailAudioFilePrompt <Guid>] [-EnableTimeoutSharedVoicemailTranscription <Boolean>]
26+
[-ChannelId <String>] [-ChannelUserObjectId <Guid>] [<CommonParameters>]
2627
```
2728

2829
## DESCRIPTION
2930
The New-CsCallQueue cmdlet creates a new Call Queue.
3031

3132
## EXAMPLES
3233

33-
### -------------------------- Example 1 --------------------------
34+
### Example 1
3435
```
3536
New-CsCallQueue -Name "Help Desk" -UseDefaultMusicOnHold $true
3637
```
3738

3839
This example creates a Call Queue for the organization named "Help Desk" using default music on hold.
3940

40-
### -------------------------- Example 2 --------------------------
41+
### Example 2
4142
```
4243
New-CsCallQueue -Name "Help desk" -RoutingMethod Attendant -DistributionLists @("8521b0e3-51bd-4a4b-a8d6-b219a77a0a6a", "868dccd8-d723-4b4f-8d74-ab59e207c357") -AllowOptOut $false -AgentAlertTime 30 -OverflowThreshold 15 -OverflowAction Forward -OverflowActionTarget 7fd04db1-1c8e-4fdf-9af5-031514ba1358 -TimeoutThreshold 30 -TimeoutAction Disconnect -MusicOnHoldAudioFileId 1e81adaf-7c3e-4db1-9d61-5d135abb1bcc -WelcomeMusicAudioFileId 0b31bbe5-e2a0-4117-9b6f-956bca6023f8
4344
@@ -477,6 +478,38 @@ Accept pipeline input: False
477478
Accept wildcard characters: False
478479
```
479480
481+
### -ChannelId
482+
Id of the channel to connect a call queue to.
483+
484+
```yaml
485+
Type: String
486+
Parameter Sets: (All)
487+
Aliases:
488+
Applicable: Skype for Business Online
489+
490+
Required: False
491+
Position: Named
492+
Default value: None
493+
Accept pipeline input: False
494+
Accept wildcard characters: False
495+
```
496+
497+
### -ChannelUserObjectId
498+
Guid should contain 32 digits with 4 dashes (xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx).
499+
500+
```yaml
501+
Type: Guid
502+
Parameter Sets: (All)
503+
Aliases:
504+
Applicable: Skype for Business Online
505+
506+
Required: False
507+
Position: Named
508+
Default value: None
509+
Accept pipeline input: False
510+
Accept wildcard characters: False
511+
```
512+
480513
### CommonParameters
481514
This cmdlet supports the common parameters: `-Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (https://go.microsoft.com/fwlink/?LinkID=113216).`
482515

0 commit comments

Comments
 (0)