Skip to content

Commit fa66566

Browse files
authored
Merge branch 'master' into dev/TeamsNetworkRoamingPolicy
2 parents 7db8c85 + a0ce9a9 commit fa66566

File tree

9 files changed

+31
-37
lines changed

9 files changed

+31
-37
lines changed

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ Connect-ExchangeOnline
4949
[-PageSize <UInt32>]
5050
[-ShowBanner]
5151
[-ShowProgress <Boolean>]
52-
[-SkipImportSession]
5352
[-TrackPerformance <Boolean>]
5453
[-UseMultithreading <Boolean>]
5554
[-UserPrincipalName <String>]
@@ -582,24 +581,6 @@ Accept pipeline input: False
582581
Accept wildcard characters: False
583582
```
584583

585-
### -SkipImportSession
586-
**Note**: This parameter is available only in version 2.0.4-Preview2 or later.
587-
588-
The SkipImportSession switch skips the import of cmdlets from the remote PowerShell session. You don't need to specify a value with this switch.
589-
590-
```yaml
591-
Type: SwitchParameter
592-
Parameter Sets: (All)
593-
Aliases:
594-
Applicable: Exchange Online
595-
596-
Required: False
597-
Position: Named
598-
Default value: None
599-
Accept pipeline input: False
600-
Accept wildcard characters: False
601-
```
602-
603584
### -TrackPerformance
604585
The TrackPerformance parameter measures additional events (for example, CPU load and memory consumed). Valid values are:
605586

exchange/exchange-ps/exchange/Get-DlpComplianceRule.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Accept wildcard characters: False
8080
{{ Fill IncludeExecutionRuleGuids Description }}
8181
8282
```yaml
83-
Type: $true | $false
83+
Type: Boolean
8484
Parameter Sets: (All)
8585
Aliases:
8686
Applicable: Security & Compliance Center

exchange/exchange-ps/exchange/New-DlpComplianceRule.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ The Disabled parameter specifies whether the DLP rule is disabled. Valid values
446446
- $false: The rule is enabled. This is the default value.
447447

448448
```yaml
449-
Type: $true | $false
449+
Type: Boolean
450450
Parameter Sets: (All)
451451
Aliases:
452452
Applicable: Security & Compliance Center
@@ -465,7 +465,7 @@ The DocumentIsPasswordProtected parameter specifies a condition for the DLP rule
465465
- $false: Don't look for password protected files.
466466

467467
```yaml
468-
Type: $true | $false
468+
Type: Boolean
469469
Parameter Sets: (All)
470470
Aliases:
471471
Applicable: Security & Compliance Center
@@ -484,7 +484,7 @@ The DocumentIsUnsupported parameter specifies a condition for the DLP rule that
484484
- $false: Don't look for unsupported files that can't be scanned.
485485

486486
```yaml
487-
Type: $true | $false
487+
Type: Boolean
488488
Parameter Sets: (All)
489489
Aliases:
490490
Applicable: Security & Compliance Center
@@ -727,7 +727,7 @@ The ExceptIfDocumentIsPasswordProtected parameter specifies an exception for the
727727
- $false: Don't look for password protected files.
728728

729729
```yaml
730-
Type: $true | $false
730+
Type: Boolean
731731
Parameter Sets: (All)
732732
Aliases:
733733
Applicable: Security & Compliance Center
@@ -746,7 +746,7 @@ The ExceptIfDocumentIsUnsupported parameter specifies an exception for the DLP r
746746
- $false: Don't look for unsupported files that can't be scanned.
747747

748748
```yaml
749-
Type: $true | $false
749+
Type: Boolean
750750
Parameter Sets: (All)
751751
Aliases:
752752
Applicable: Security & Compliance Center
@@ -1002,7 +1002,7 @@ The ExceptIfProcessingLimitExceeded parameter specifies an exception for the DLP
10021002
- $false: Don't look for files where scanning couldn't complete.
10031003

10041004
```yaml
1005-
Type: $true | $false
1005+
Type: Boolean
10061006
Parameter Sets: (All)
10071007
Aliases:
10081008
Applicable: Security & Compliance Center
@@ -1888,7 +1888,7 @@ The StopPolicyProcessing parameter specifies an action that stops processing mor
18881888
- $false: Continue processing more rules after this one.
18891889

18901890
```yaml
1891-
Type: $true | $false
1891+
Type: Boolean
18921892
Parameter Sets: (All)
18931893
Aliases:
18941894
Applicable: Security & Compliance Center

exchange/exchange-ps/exchange/New-MailboxImportRequest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ This example imports a recovered .pst file on SERVER01 into the user Ayla's prim
145145

146146
### Example 2
147147
```powershell
148-
New-MailboxImportRequest User2 -FilePath \\server\share\User1.pst -IsArchive -TargetRootFolder /
148+
New-MailboxImportRequest Kweku -FilePath \\server\share\User1.pst -IsArchive -TargetRootFolder /
149149
```
150150

151151
This example imports a .pst file into Kweku's archive folder. The TargetRootFolder isn't specified; therefore, content is merged under existing folders and new folders are created if they don't already exist in the target folder structure.

exchange/exchange-ps/exchange/Set-DlpComplianceRule.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ The Disabled parameter specifies whether the DLP rule is disabled. Valid values
430430
- $false: The rule is enabled. This is the default value.
431431

432432
```yaml
433-
Type: $true | $false
433+
Type: Boolean
434434
Parameter Sets: (All)
435435
Aliases:
436436
Applicable: Security & Compliance Center
@@ -449,7 +449,7 @@ The DocumentIsPasswordProtected parameter specifies a condition for the DLP rule
449449
- $false: Don't look for password protected files.
450450

451451
```yaml
452-
Type: $true | $false
452+
Type: Boolean
453453
Parameter Sets: (All)
454454
Aliases:
455455
Applicable: Security & Compliance Center
@@ -468,7 +468,7 @@ The DocumentIsUnsupported parameter specifies a condition for the DLP rule that
468468
- $false: Don't look for unsupported files that can't be scanned.
469469

470470
```yaml
471-
Type: $true | $false
471+
Type: Boolean
472472
Parameter Sets: (All)
473473
Aliases:
474474
Applicable: Security & Compliance Center
@@ -986,7 +986,7 @@ The ExceptIfProcessingLimitExceeded parameter specifies an exception for the DLP
986986
- $false: Don't look for files where scanning couldn't complete.
987987

988988
```yaml
989-
Type: $true | $false
989+
Type: Boolean
990990
Parameter Sets: (All)
991991
Aliases:
992992
Applicable: Security & Compliance Center
@@ -1855,7 +1855,7 @@ The StopPolicyProcessing parameter specifies an action that stops processing mor
18551855
- $false: Continue processing more rules after this one.
18561856

18571857
```yaml
1858-
Type: $true | $false
1858+
Type: Boolean
18591859
Parameter Sets: (All)
18601860
Aliases:
18611861
Applicable: Security & Compliance Center

sharepoint/sharepoint-ps/sharepoint-online/Get-SPOUserAndContentMoveState.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.reviewer:
1414

1515
## SYNOPSIS
1616

17-
This cmdlet allows a SharePoint administrators to check the status of a user or site move across geo locations.
17+
This cmdlet allows SharePoint administrators to check the status of a user or site move across geo locations.
1818

1919
## SYNTAX
2020

sharepoint/sharepoint-ps/sharepoint-online/Start-SPOSiteContentMove.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ Accept wildcard characters: False
136136
137137
### -Reserved
138138
139-
PARAMVALUE: String
139+
Reserved for Microsoft Internal use.
140140
141141
```yaml
142142
Type: String

teams/teams-ps/teams/Connect-MicrosoftTeams.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,20 @@ PS C:\> Connect-MicrosoftTeams -TeamsEnvironmentName TeamsGCCH
6060

6161
Specifies that the organization being managed is in the Teams GCC High environment, so connect to that environment.
6262

63+
### Example 3
64+
```powershell
65+
PS C:\> Connect-MicrosoftTeams -TenantId c3eac90d-eb4b-48ef-ac86-7acac472d3cd -CertificateThumbprint 9b6ac64bfb8b48dbb53cca75fb33ce2d -applicationid daaaf729-aaff-45ba-8055-a39dd618fe24
66+
```
67+
68+
Connects to Microsoft Teams PowerShell using a Certificate and an applicationId.
69+
70+
### Example 4
71+
```powershell
72+
PS C:\> Connect-MicrosoftTeams -AadAccessToken c3eac90deb4b48efac867acac472d3cd -AccountId user@domain.com
73+
```
74+
75+
Connects to Microsoft Teams PowerShell using an Azure Active Directory Graph access token.
76+
6377
## PARAMETERS
6478

6579
### -AadAccessToken

teams/teams-ps/teams/New-CsGroupPolicyAssignment.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Group policy assignment allows you to easily manage policies across different su
3535
Group policy assignments are only propagated to users that are direct members of the group; the assignments are not propagated to members of nested groups.
3636

3737
Group policy assignment is currently limited to the following policy types:
38-
CallingLineIdentity (Caller ID policies), TeamsAppSetupPolicy (App Setup policies), TeamsCallingPolicy (Calling policies), TeamsCallParkPolicy (Call park policies), TeamsChannelsPolicy, TeamsComplianceRecordingPolicy, TenantDialPlan, TeamsEducationAssignmentsAppPolicy, TeamsMeetingBroadcastPolicy (Live Events policies), TeamsMeetingPolicy (Meeting policies), TeamsMessagingPolicy (Messaging policies), TeamsShiftsPolicy, TeamsUpdateManagementPolicy.
38+
TeamsAppSetupPolicy (App Setup policies), TeamsCallingPolicy (Calling policies), TeamsCallParkPolicy (Call park policies), TeamsChannelsPolicy, TeamsComplianceRecordingPolicy, TenantDialPlan, TeamsEducationAssignmentsAppPolicy, TeamsMeetingBroadcastPolicy (Live Events policies), TeamsMeetingPolicy (Meeting policies), TeamsMessagingPolicy (Messaging policies), TeamsShiftsPolicy, TeamsUpdateManagementPolicy.
3939

4040
## EXAMPLES
4141

@@ -108,7 +108,6 @@ Accept wildcard characters: False
108108
### -PolicyType
109109
The type of the policy to be assigned.
110110
Possible values:
111-
- CallingLineIdentity
112111
- TeamsAppSetupPolicy
113112
- TeamsCallingPolicy
114113
- TeamsCallParkPolicy

0 commit comments

Comments
 (0)