Skip to content

Commit c3e7578

Browse files
authored
Merge branch 'master' into Phish-chrisda
2 parents ecfc762 + 8009417 commit c3e7578

File tree

5 files changed

+26
-7
lines changed

5 files changed

+26
-7
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,6 +753,8 @@ Accept wildcard characters: False
753753
```
754754
755755
### -ExplicitLogonEnabled
756+
This parameter is available only in on-premises Exchange.
757+
756758
The ExplicitLogonEnabled parameter specifies whether to allow a user to open someone else's mailbox in Outlook on the web (provided that user has permissions to the mailbox). Valid values are:
757759
758760
- $true: A user with the required permissions is able to open someone else's mailbox in Outlook on the web. This is the default value.
@@ -763,7 +765,7 @@ The ExplicitLogonEnabled parameter specifies whether to allow a user to open som
763765
Type: Boolean
764766
Parameter Sets: (All)
765767
Aliases:
766-
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019, Exchange Online
768+
Applicable: Exchange Server 2010, Exchange Server 2013, Exchange Server 2016, Exchange Server 2019
767769

768770
Required: False
769771
Position: Named

exchange/exchange-ps/exchange/move-and-migration/Set-MigrationBatch.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,8 @@ Accept wildcard characters: False
464464
```
465465
466466
### -StartAfter
467+
This parameter is available only in the cloud-based service.
468+
467469
The StartAfter parameter specifies a delay before the data migration for the users within the batch is started. The migration will be prepared, but the actual data migration for users within the batch won't start until the date/time you specify with this parameter.
468470
469471
Use the short date format that's defined in the Regional Options settings on the computer where you're running the command. For example, if the computer is configured to use the short date format mm/dd/yyyy, enter 09/01/2018 to specify September 1, 2018. You can enter the date only, or you can enter the date and time of day. If you enter the date and time of day, enclose the value in quotation marks ("), for example, "09/01/2018 5:00 PM".

exchange/exchange-ps/exchange/policy-and-compliance-content-search/New-ComplianceSearchAction.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -484,7 +484,7 @@ The PurgeType parameter specifies how to remove items when the action is Purge.
484484
485485
- SoftDelete: Purged items are recoverable by users until the deleted item retention period expires.
486486
487-
- HardDelete: Purged items are marked for permanent removal from the mailbox and will be permanently removed the next time the mailbox is processed by the Managed Folder Assistant. If single item recovery is enabled on the mailbox, purged items will be permanently removed after the deleted item retention period expires.
487+
- HardDelete (cloud only): Purged items are marked for permanent removal from the mailbox and will be permanently removed the next time the mailbox is processed by the Managed Folder Assistant. If single item recovery is enabled on the mailbox, purged items will be permanently removed after the deleted item retention period expires.
488488
489489
```yaml
490490
Type: ComplianceDestroyType

skype/skype-ps/skype/Set-CsTenantNetworkSite.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,10 @@ The network region 'RegionRedmond' is created beforehand and 'MicrosoftSite1' wi
4949

5050
###-------------------------- Example 2 --------------------------
5151
```powershell
52-
PS C:\> Set-CsTenantNetworkSite -Identity "site2" -Description "site 2" -NetworkRegionID "RedmondRegion" -LocationPolicy "TestLocationPolicy" -EnableLocationBasedRouting $true -SiteAddress "One Microsoft way" -OnlineVoiceRoutingPolicy "OVRP1"
52+
PS C:\> Set-CsTenantNetworkSite -Identity "site2" -Description "site 2" -NetworkRegionID "RedmondRegion" -LocationPolicy "TestLocationPolicy" -EnableLocationBasedRouting $true -SiteAddress "One Microsoft way"
5353
```
5454

55-
The command shown in Example 2 set the network site 'site2' with description 'site 2'. This site is enabled for LBR, and associates with network region 'RedmondRegion', with location policy 'TestLocationPolicy', and with OnlineVoiceRoutingPolicy "OVRP1"
55+
The command shown in Example 2 sets the network site 'site2' with description 'site 2'. This site is enabled for LBR. The example associates the site with network region 'RedmondRegion' and with location policy 'TestLocationPolicy'.
5656

5757
## PARAMETERS
5858

@@ -178,9 +178,7 @@ Accept wildcard characters: False
178178
```
179179

180180
### -OnlineVoiceRoutingPolicy
181-
This parameter determines the unique name of existing OnlineVoiceRoutingPolicy that the current network site associates to.
182-
183-
OnlineVoiceRoutingPolicy is used to associate a user with the appropriate PSTN usages.
181+
This parameter is deprecated and should not be used.
184182

185183
```yaml
186184
Type: String

spmt/spmt-ps/spmt/Register-SPMTMigration.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,23 @@ Accept pipeline input: False
152152
Accept wildcard characters: False
153153
```
154154
155+
### -IgnoreUpdate
156+
The default setting is OFF.
157+
158+
Skip the checking and installation of new updates, even when a new version of PowerShell SPMT is available.
159+
160+
```yaml
161+
Type: SwitchParameter
162+
Parameter Sets: (All)
163+
Aliases:
164+
165+
Required: False
166+
Position: Named
167+
Default value: False
168+
Accept pipeline input: False
169+
Accept wildcard characters: False
170+
```
171+
155172
### -EnableMultiRound
156173
The default setting is Off.
157174
This means the migration will only do one check round to make sure no new changes or additions were made since the previous run.

0 commit comments

Comments
 (0)