Skip to content

Commit d39768c

Browse files
authored
Merge pull request MicrosoftDocs#2238 from MicrosoftDocs/master
Merges Master to Live. See commits for details.
2 parents 9329a39 + c58f65c commit d39768c

20 files changed

+146
-63
lines changed

exchange/exchange-ps/exchange/mailboxes/Remove-CalendarEvents.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Remove-CalendarEvents [-Identity] <MailboxIdParameter> [-CancelOrganizedMeetings
2323
```
2424

2525
## DESCRIPTION
26-
This cmdlet cancels meetings in the specified mailbox where the mailbox is the meeting organizer, and the meeting has one or more attendees or resources. It doesn't cancel appointments or meetings without attendees or resources.
26+
This cmdlet cancels meetings in the specified mailbox where the mailbox is the meeting organizer, and the meeting has one or more attendees or resources. It doesn't cancel appointments or meetings without attendees or resources. Because meeting cancellations must be sent out, the mailbox must still be enabled to send mail.
2727

2828
You need to be assigned permissions before you can run this cmdlet. Although this topic lists all parameters for the cmdlet, you may not have access to some parameters if they're not included in the permissions assigned to you. To find the permissions required to run any cmdlet or parameter in your organization, see Find the permissions required to run any Exchange cmdlet (https://technet.microsoft.com/library/mt432940.aspx).
2929

sharepoint/sharepoint-ps/sharepoint-online/Remove-SPOSite.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Remove-SPOSite [-Confirm] -Identity <SpoSitePipeBind> [-NoWait] [-WhatIf] [<Comm
2020
## DESCRIPTION
2121
The `Remove-SPOSite` cmdlet does not delete a site collection from the site collections list permanently.
2222
Instead, the removed site collection is moved to the Recycle Bin.
23-
You can use the `Restore-SPODeletedSitecmdlet` to restore a site collection from the Recycle Bin.
23+
You can use the `Restore-SPODeletedSite`cmdlet to restore a site collection from the Recycle Bin.
2424
To delete a site collection permanently, first move the site collection to the Recycle Bin by using the `Remove-SPOSite` cmdlet and then delete it from the Recycle Bin by using the `Remove-SPODeletedSite` cmdlet.
2525

2626
You must be a SharePoint Online global administrator and a site collection administrator to run the cmdlet.

sharepoint/sharepoint-ps/sharepoint-online/Set-SPOHubSite.md

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ Set-SPOHubSite [-Identity] <SpoHubSitePipeBind>
1717
[-Title <string>]
1818
[-LogoUrl <string>]
1919
[-Description <string>]
20+
[-SiteDesignId <guid>]
21+
[-RequiresJoinApproval <bool>]
2022
[<CommonParameters>]
2123
```
2224

@@ -107,3 +109,37 @@ Default value: None
107109
Accept pipeline input: False
108110
Accept wildcard characters: False
109111
```
112+
113+
### -SiteDesignId
114+
115+
A description of the hub site.
116+
117+
```yaml
118+
Type: String
119+
Parameter Sets: (All)
120+
Aliases:
121+
Applicable: SharePoint Online
122+
123+
Required: False
124+
Position: Named
125+
Default value: None
126+
Accept pipeline input: False
127+
Accept wildcard characters: False
128+
```
129+
130+
### -RequiresJoinApproval
131+
132+
A description of the hub site.
133+
134+
```yaml
135+
Type: Boolean
136+
Parameter Sets: (All)
137+
Aliases:
138+
Applicable: SharePoint Online
139+
140+
Required: False
141+
Position: Named
142+
Default value: None
143+
Accept pipeline input: False
144+
Accept wildcard characters: False
145+
```

sharepoint/sharepoint-ps/sharepoint-online/Set-SPOSite.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@ Accept wildcard characters: False
210210
```
211211
212212
### -DisabledWebpartIds
213-
This parameter is used for eanbling disabled web parts that use third-party service (Amazon Kindle, YouTube, Twitter). The GUIDs that can be used are 46698648-fcd5-41fc-9526-c7f7b2ace919 (Amazon Kindle), 544dd15b-cf3c-441b-96da-004d5a8cea1d (YouTube), f6fdf4f8-4a24-437b-a127-32e66a5dd9b4 (Twitter).
213+
This parameter is used for enabling disabled web parts that use third-party service (Amazon Kindle, YouTube, Twitter). The GUIDs that can be used are 46698648-fcd5-41fc-9526-c7f7b2ace919 (Amazon Kindle), 544dd15b-cf3c-441b-96da-004d5a8cea1d (YouTube), f6fdf4f8-4a24-437b-a127-32e66a5dd9b4 (Twitter).
214214
215215
The Set-SPOTenant cmdlet is used for disabling these web parts with third-party services.
216216

sharepoint/sharepoint-ps/sharepoint-server/New-SPSubscriptionSettingsServiceApplication.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ For permissions and the most current information about Windows PowerShell for Sh
3434
```
3535
3636
PS C:\>$sa = New-SPSubscriptionSettingsServiceApplication -ApplicationPool 'SharePoint Web Services Default' -Name 'Subscriptions Settings Service Application' -DatabaseName 'Subscription'
37+
PS C:\>New-SPSubscriptionSettingsServiceApplicationProxy -ServiceApplication $sa
3738
3839
```
3940

sharepoint/sharepoint-ps/sharepoint-server/Set-SPUser.md

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,21 @@ For permissions and the most current information about Windows PowerShell for Sh
2828

2929
## EXAMPLES
3030

31-
### ------------------EXAMPLE-----------------------
31+
### ------------------EXAMPLE 1-----------------------
3232
```
33-
PS C:\>Set-SPUser -Identity 'Contoso\jdow' -Web http:// test -AddPermissionLevel "Contributor"
33+
PS C:\>Set-SPUser -Identity 'Contoso\jdoe' -Web https://intranet.contoso.com -AddPermissionLevel "Contributor"
3434
```
3535

36-
This example sets a user (Contoso\jdow) to be a contributor on http://test.
36+
This example sets a user (Contoso\jdoe) to be a contributor on https://intranet.contoso.com.
3737

3838

39+
### ------------------EXAMPLE 2-----------------------
40+
```
41+
PS C:\>Set-SPUser -Identity 'Contoso\jdoe' -Web https://intranet.contoso.com -SyncFromAD
42+
```
43+
44+
This updates the User Information List for the user 'contoso\jdoe' with the current `displayName` and `mail` attribute values from the user's Active Directory account.
45+
3946
## PARAMETERS
4047

4148
### -Identity
@@ -250,7 +257,7 @@ Accept wildcard characters: False
250257
```
251258

252259
### -SyncFromAD
253-
If provided, specifies that user information will be synchronized from the user directory store.
260+
If provided, specifies that user information will be synchronized from the user directory store. This switch only retrieves the `displayName` and `mail` value from the directory store. It supports Active Directory (Classic or Windows authentication), Forms-based Authentication, and SAML. FBA and SAML providers must support resolving from their directory store for this switch to work. The switch only supports SharePoint User objects.
254261

255262
```yaml
256263
Type: SwitchParameter

sharepoint/sharepoint-ps/sharepoint-server/Update-SPRepopulateMicroblogFeedCache.md

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,27 @@ PS C:\>$proxy = Get-SPServiceApplicationProxy | ?{$_.TypeName -eq 'User Profile
5151
PS C:\>Update-SPRepopulateMicroblogFeedCache -ProfileServiceApplicationProxy $proxy -AccountName contoso\userName
5252
```
5353

54-
This example refreshes the feeds for a specific user by using the AccountName parameter.
54+
This example refreshes the feed for a specific user by using the AccountName parameter.
5555

5656
### ------------EXAMPLE 2------------
5757
```
58+
PS C:\>$site = (Get-SPWebApplication -IncludeCentralAdministration | ?{$_.IsAdministrationWebApplication -eq $true}).Sites[0]
59+
PS C:\>$context = Get-SPServiceContext $site
60+
PS C:\>$upm = New-Object Microsoft.Office.Server.UserProfiles.UserProfileManager($context)
61+
PS C:\>$profiles = $upm.GetEnumerator()
5862
PS C:\>$proxy = Get-SPServiceApplicationProxy | ?{$_.TypeName -eq 'User Profile Service Application Proxy'}
59-
PS C:\>Update-SPRepopulateMicroblogFeedCache -ProfileServiceApplicationProxy $proxy -AccountName contoso\userName -SiteSubscription 0C37852B-34D0-418e-91C6-2AC25AF4BE5B
63+
PS C:\>while($profiles.MoveNext()) {
64+
$profile = $profiles.Current
65+
Update-SPRepopulateMicroblogFeedCache -ProfileServiceApplicationProxy $proxy -AccountName $profile.AccountName }
6066
```
6167

62-
This example refreshes the feeds for a specific user by using the AccountName parameter.
68+
This example refreshes the feeds for all users in the User Profile Service Application.
69+
70+
### ------------EXAMPLE 3------------
71+
```
72+
PS C:\>Update-SPRepopulateMicroblogFeedCache -ProfileServiceApplicationProxy $proxy -SiteUrl https://sharepoint.contoso.com
73+
```
74+
This example refreshes the feed on the site https://sharepoint.contoso.com.
6375

6476
## PARAMETERS
6577

skype/skype-ps/skype/Grant-CsTeamsCallingPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Grant-CsTeamsCallingPolicy [-PolicyName] <String> [-Tenant <Guid>] [-DomainContr
2828
```
2929

3030
## DESCRIPTION
31-
The Teams Calling Policies designate which users are able to use calling functionality within teams and determine the interopability state with Skype for Business. This cmdlet allows admins to grant user level policies to individual users.
31+
The Teams Calling Policies designate which users are able to use calling functionality within teams and determine the interoperability state with Skype for Business. This cmdlet allows admins to grant user level policies to individual users.
3232

3333
## EXAMPLES
3434

skype/skype-ps/skype/Grant-CsTeamsInteropPolicy.md

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -23,15 +23,13 @@ Grant-CsTeamsInteropPolicy [-PassThru] [-Confirm] [[-PolicyName] <Object>] [[-Id
2323

2424
## DESCRIPTION
2525

26-
IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. It is no longer honored by the system, except if TeamsUpgradePolicy has mode=Lgeacy. Legacy mode is being deprecated. Customers that are still using Legacy mode should update their configurations to use a mode other than Legacy. Granting mode=Legacy is now blocked by default, although admins can override this using -Force for the time being. Eventually, the -Force switch will be removed and granting mode=Legacy will not be possible.
26+
IMPORTANT: TeamsInteropPolicy has been replaced by TeamsUpgradePolicy. It is no longer honored by the system, except if TeamsUpgradePolicy has mode=Legacy. Legacy mode is being deprecated. Customers that are still using Legacy mode should update their configurations to use a mode other than Legacy. Granting mode=Legacy is now blocked by default, although admins can override this using -Force for the time being. Eventually, the -Force switch will be removed and granting mode=Legacy will not be possible.
2727

2828
Any customers still using Legacy mode must ensure the following:
29-
- The global policy must have CallingDefaultClient=ChatDefaultClient, and AllowEndUserClientOverride must be false. If you customized the built-in global policy, undo this by running `Remove-CsTeamsInteropPolicy`. This will remove the tenant-specific global policy and revert back to the system-wide built-in policy (which cannot be removed). Use the following syntax:
30-
31-
Remove-CsTeamsInteropPolicy -Identity Global
3229

33-
- If TeamsInteropPolicy is explicitly assigned to any users, one of these three built-in instances for which CallingDefaultClient = ChatDefaultClient, and for which AllowEndUserClientOverride = false. The other instances are no longer valid configurations, are not supported, and will soon be removed from the system. The valid instances are:
30+
- The global policy must have CallingDefaultClient=ChatDefaultClient, and AllowEndUserClientOverride must be false. If you customized the built-in global policy, undo this by running `Remove-CsTeamsInteropPolicy`. This will remove the tenant-specific global policy and revert back to the system-wide built-in policy (which cannot be removed). Use the following syntax: `Remove-CsTeamsInteropPolicy -Identity Global`.
3431

32+
- If TeamsInteropPolicy is explicitly assigned to any users, one of these three built-in instances for which CallingDefaultClient = ChatDefaultClient, and for which AllowEndUserClientOverride = false. The other instances are no longer valid configurations, are not supported, and will soon be removed from the system. The valid instances are:
3533

3634
**Identity: DisallowOverrideCallingDefaultChatDefault**
3735
**AllowEndUserClientOverride: False**
@@ -48,10 +46,7 @@ Remove-CsTeamsInteropPolicy -Identity Global
4846
**CallingDefaultClient: Teams**
4947
**ChatDefaultClient: Teams**
5048

51-
52-
Use the following cmdlet syntax, where $policy is one of the above values of identity:
53-
`Grant-CsTeamsInteropPolicy -PolicyName $policy -Identity $SipAddress`
54-
49+
Use the following cmdlet syntax, where $policy is one of the above values of identity: `Grant-CsTeamsInteropPolicy -PolicyName $policy -Identity $SipAddress`.
5550

5651
For comprehensive documentation on this policy and its settings, see [Microsoft Teams and Skype for Business Interoperability](https://docs.microsoft.com/MicrosoftTeams/teams-and-skypeforbusiness-interoperability).
5752

@@ -112,7 +107,7 @@ Accept wildcard characters: False
112107
```
113108
114109
### -Identity
115-
For this cmdlet, the full UserPrincipleName/SIP address is required. If you don't provide the full UPN/SIP and instead provide an Alias, the cmdlet can throw an "Object reference not set to an instance of an object" error.
110+
For this cmdlet, the full UserPrincipalName/SIP address is required. If you don't provide the full UPN/SIP and instead provide an Alias, the cmdlet can throw an "Object reference not set to an instance of an object" error.
116111
117112
```yaml
118113
Type: Object
@@ -217,7 +212,7 @@ Accept wildcard characters: False
217212
### System.Object
218213
219214
## NOTES
220-
This policy has been deprecated. Customters should use TeamsUpgradePolicy to control interop and routing.
215+
This policy has been deprecated. Customers should use TeamsUpgradePolicy to control interop and routing.
221216
222217
## RELATED LINKS
223218

skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,13 @@ Office 365 provides all relevant instances of TeamsUpgradePolicy via built-in, r
5252
NOTES:
5353
- TeamsUpgradePolicy is available in both Office 365 and in on-premises versions of Skype for Business Server, but there are differences:
5454
- In Office 365, admins can specify both coexistence mode and whether to trigger notifications of pending upgrade.
55-
- In on-premises with Skype for Business Server, the only availble option is to trigger notifications.
55+
- In on-premises with Skype for Business Server, the only available option is to trigger notifications.
5656
- TeamsUpgradePolicy in Office 365 can be granted to users homed on-premises in hybrid deployments of Skype for Business as follows:
5757
- Coexistence mode is honored by users homed on-premises, however on-premises users cannot be granted the UpgradeToTeams instance (mode=TeamsOnly) of TeamsUpgradePolicy. Users must be either homed in Skype for Business Online or have no Skype account anywhere to be upgraded to TeamsOnly mode.
58-
- The NotifySfBUsers setting of Office 365 TeamsUpgradePolicy is not honored by users homed on-premises. Instead, the on-premise version of TeamsUpgradePolicy must be used.
59-
- In Office 365, all relevant instances of TeamsUpgradePolicy are built into the system, so there is no corresponding New cmdlet avaiable. In contrast, Skype for Business Server does not contain built-in instances, so the New cmdlet is available on-premises. Only NotifySfBUsers property is available in on-premises.
58+
- The NotifySfBUsers setting of Office 365 TeamsUpgradePolicy is not honored by users homed on-premises. Instead, the on-premises version of TeamsUpgradePolicy must be used.
59+
- In Office 365, all relevant instances of TeamsUpgradePolicy are built into the system, so there is no corresponding New cmdlet available. In contrast, Skype for Business Server does not contain built-in instances, so the New cmdlet is available on-premises. Only NotifySfBUsers property is available in on-premises.
6060
- Instances with mode set to SfBWithTeamsCollab are not yet functional. From a routing perspective, this will behave like SfBOnly mode.
61-
- The Action property is redundnant with the combination of NotifySfBUsers and Mode. It will eventually be removed.
61+
- The Action property is redundant with the combination of NotifySfBUsers and Mode. It will eventually be removed.
6262

6363

6464
## EXAMPLES
@@ -68,14 +68,14 @@ NOTES:
6868
PS C:\> Grant-CsTeamsUpgradePolicy -PolicyName UpgradeToTeams -Identity [email protected]
6969
```
7070

71-
The above cmdlet assigns the "UpgradeToTeams" policy to user [email protected]. This effectively upgrades the user to Teams only mode. This command will only succeed if the user does not have on-premises Skype for Business account.
71+
The above cmdlet assigns the "UpgradeToTeams" policy to user [email protected]. This effectively upgrades the user to Teams only mode. This command will only succeed if the user does not have an on-premises Skype for Business account.
7272

7373
### Example 2: Grant Policy to the entire tenant
7474
```
7575
PS C:\> Grant-CsTeamsUpgradePolicy -PolicyName SfBOnly
7676
```
7777

78-
To grant a policy to all users in the org (except any that have an explicit policy assinged), omit the identity parameter.
78+
To grant a policy to all users in the org (except any that have an explicit policy assigned), omit the identity parameter.
7979

8080
## PARAMETERS
8181

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ Grant-CsTeamsVideoInteropServicePolicy [-PolicyName] <String> [-Tenant <System.G
2929
## DESCRIPTION
3030
Cloud Video Interop for Teams enables 3rd party VTC devices to be able to join Teams meetings. You can use the TeamsVideoInteropServicePolicy cmdlets to enable Cloud Video Interop for particular users or for your entire organization. Microsoft provides pre-constructed policies for each of our supported partners that allow you to designate which of the partners to use for cloud video interop.
3131

32-
The Grant-CsTeamsVideoInteropServicePolicy cmdlet allows you to assign a pre-constructed policies for use in your organization or assign the policy to specific users.
32+
The Grant-CsTeamsVideoInteropServicePolicy cmdlet allows you to assign a pre-constructed policy across your whole organization or only to specific users.
3333

3434
## EXAMPLES
3535

3636
### Example 1
3737
```powershell
38-
PS C:\> Grant-CsTeamsVideoInteropServicePolicy -PolicyName ServiceProviderDisabled
38+
PS C:\> Grant-CsTeamsVideoInteropServicePolicy -PolicyName ServiceProviderDisabled
3939
```
4040

4141
In this example, Cloud Video Interop has been disabled for the entire tenant, except for those users that have an explicit policy assigned to them.
@@ -125,7 +125,7 @@ Accept wildcard characters: False
125125
```
126126
127127
### -PolicyName
128-
Specify the pre-constructed policy that you would like to assign to your tenant or a particular user. You can get the policies available for your organization using the cmdlet Get-CsTeamsVideoInteropServicePolicy
128+
Specify the pre-constructed policy that you would like to assign to your tenant or a particular user. You can get the policies available for your organization using the cmdlet Get-CsTeamsVideoInteropServicePolicy.
129129
130130
```yaml
131131
Type: String

skype/skype-ps/skype/Grant-CsTenantDialPlan.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,14 @@ A tenant dial plan determines such things as how normalization rules are applied
2626
You can check whether a user has been granted a per-user tenant dial plan by calling a command in this format: `Get-CsOnlineUser "\<user name\>" | Select-Object TenantDialPlan.`
2727
## EXAMPLES
2828

29-
### -------------------------- Example 1 -------------------------- (Skype for Business Online)
29+
### -------------------------- Example 1 --------------------------
30+
31+
(Skype for Business Online)
3032
```
3133
Grant-CsTenantDialPlan -PolicyName Vt1tenantDialPlan9 -Identity (Get-CsOnlineUser Vt1_User1).SipAddress
3234
```
3335

34-
This example grants the Vt1tenantDialPlan 9 dial plan to Vt1_User1.
36+
This example grants the Vt1tenantDialPlan9 dial plan to Vt1_User1.
3537

3638

3739
## PARAMETERS
@@ -102,7 +104,6 @@ Accept wildcard characters: False
102104
```
103105
104106
### -PassThru
105-
PARAMVALUE: SwitchParameter
106107
107108
```yaml
108109
Type: SwitchParameter
@@ -136,8 +137,7 @@ Accept wildcard characters: False
136137
```
137138

138139
### -WhatIf
139-
The WhatIf switch causes the command to simulate its results.
140-
By using this switch, you can view what changes would occur without having to commit those changes.
140+
Shows what would happen if the cmdlet runs. The cmdlet is not run.
141141

142142
```yaml
143143
Type: SwitchParameter

skype/skype-ps/skype/Grant-CsThirdPartyVideoSystemPolicy.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ One key management task related to VTC devices is to enable (or disable) the abi
2727
By default, VTC devices are allowed to send low-resolution video.
2828
However, administrators can create third-party video system policies that disable the use of low-resolution video.
2929
This might be useful for devices located in conference rooms or other areas where low-resolution video is not considered acceptable.
30-
The Grant-CsThirdPartyVideoSystem cmdlet provides a way for administrators to assign (or unassign) third-party video system policies created at the per-user scope.
30+
The Grant-CsThirdPartyVideoSystemPolicy cmdlet provides a way for administrators to assign (or unassign) third-party video system policies created at the per-user scope.
3131

3232
Note that this cmdlet can only be used to assign per-user policies; that's because policies at the global or the site scope do not need to be assigned.
3333
If you want a VTC device to be managed by the global policy or (if available) the device site policy, simply unassign any per-user policy previously assigned to the device.
@@ -48,7 +48,7 @@ This device is then piped to the Grant-CsThirdPartyVideoSystemPolicy cmdlet, whi
4848
### -------------------------- Example 2 --------------------------
4949
```
5050
51-
Get-CsThirdPartyVideoSystem -Filter {DisplayName -eq "Redmond Video Contact"} | Grant-CsThirdPartyVideoSystemPolicy -PolicyName $Null
51+
Get-CsThirdPartyVideoSystem -Filter {DisplayName -eq "Redmond Video Device"} | Grant-CsThirdPartyVideoSystemPolicy -PolicyName $Null
5252
```
5353

5454
The command shown in Example 2 is effectively the inverse of the command shown in Example 1: in this case, any per-user policy previously assigned to Redmond Video Device is removed.

0 commit comments

Comments
 (0)