Skip to content

Commit 83d4146

Browse files
authored
Merge branch 'master' into patch-1
2 parents 703f07b + a0ce9a9 commit 83d4146

File tree

6 files changed

+18
-24
lines changed

6 files changed

+18
-24
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/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.

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 [email protected]
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)