Skip to content

Commit 9da5ed7

Browse files
authored
Merge branch 'master' into master
2 parents fed71a8 + 30f5334 commit 9da5ed7

File tree

4 files changed

+144
-43
lines changed

4 files changed

+144
-43
lines changed

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

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,8 @@ Sets or updates one or more properties' values for a site collection.
1616

1717
## SYNTAX
1818

19-
### ParamSet2
20-
```
21-
Set-SPOSite [-Identity] <SpoSitePipeBind> -EnablePWA <Boolean> [-Confirm] [-WhatIf] [<CommonParameters>]
22-
```
23-
2419
### ParamSet1
25-
```
20+
```powershell
2621
Set-SPOSite [-Identity] <SpoSitePipeBind> [-AllowSelfServiceUpgrade <Boolean>] [-Confirm]
2722
[-DenyAddAndCustomizePages <Boolean>] [-LocaleId <UInt32>] [-LockState <String>] [-NoWait] [-Owner <String>]
2823
[-ResourceQuota <Double>] [-ResourceQuotaWarningLevel <Double>]
@@ -38,15 +33,21 @@ Set-SPOSite [-Identity] <SpoSitePipeBind> [-AllowSelfServiceUpgrade <Boolean>] [
3833
[-ShowPeoplePickerSuggestionsForGuestUsers <Boolean>] [-StorageQuotaReset]
3934
[-DefaultSharingLinkType] [-DefaultLinkPermission] [<CommonParameters>]
4035
```
36+
### ParamSet2
37+
```powershell
38+
Set-SPOSite [-Identity] <SpoSitePipeBind> -EnablePWA <Boolean> [-Confirm] [-WhatIf] [<CommonParameters>]
39+
```
40+
41+
4142

4243
### ParamSet3
43-
```
44+
```powershell
4445
Set-SPOSite [-Identity] <SpoSitePipeBind> [-Confirm] [-DisableSharingForNonOwners] [-WhatIf]
4546
[<CommonParameters>]
4647
```
4748

4849
### ParamSet4 (valid for Group Site Collection)
49-
```
50+
```powershell
5051
Set-SPOSite [-Identity] <SpoSitePipeBind> [-AllowSelfServiceUpgrade <Boolean>] [-Confirm]
5152
[-DenyAddAndCustomizePages <Boolean>] [-LocaleId <UInt32>] [-LockState <String>] [-NoWait] [-Owner <String>]
5253
[-ResourceQuota <Double>] [-ResourceQuotaWarningLevel <Double>]
@@ -67,47 +68,57 @@ For permissions and the most current information about Windows PowerShell for Sh
6768
## EXAMPLES
6869

6970
### -----------------------EXAMPLE 1-----------------------------
70-
```
71+
```powershell
7172
Set-SPOSite -Identity https://contoso.sharepoint.com/sites/site1 -Owner [email protected] -NoWait
7273
```
7374

7475
Example 1 updates the owner of site collection https://contoso.sharepoint.com/sites/site1 to the person whose email address is [email protected]. This cmdlet is executed immediately without delay.
7576

7677

7778
### -----------------------EXAMPLE 2-----------------------------
78-
```
79+
```powershell
7980
Set-SPOSite -Identity https://contoso.sharepoint.com/sites/site1 -ResourceQuota 0 -StorageQuota 15000
8081
```
8182

8283
Example 2 updates the settings of site collection https://contoso.sharepoint.com/sites/site1. The storage quota is updated to 15000 megabytes and the resource quota is updated to 0 megabytes.
8384

8485

8586
### -----------------------EXAMPLE 3-----------------------------
86-
```
87+
```powershell
8788
Set-SPOSite -Identity https://contoso.sharepoint.com -StorageQuota 3000 -StorageQuotaWarningLevel 2000
8889
```
8990

9091
This example updates the settings of site collection https://contoso.sharepoint.com. The storage quota is updated to 3000 megabytes and the storage quota warning level is updated to 2000 megabytes.
9192

9293

9394
### -----------------------EXAMPLE 4-----------------------------
94-
```
95+
```powershell
9596
Set-SPOSite -Identity https://contoso.sharepoint.com -DisableSharingForNonOwners
9697
```
9798

9899
Example 4 prevents non-owners of a site from inviting new users to the site.
99100

100101

101102
### -----------------------EXAMPLE 5-----------------------------
102-
```
103+
```powershell
103104
Set-SPOSite -Identity https://contoso.sharepoint.com/sites/groupname -StorageQuota 3000 -StorageQuotaWarningLevel 2000
104105
```
105106

106107
This example sets the quota for the site.
107108

109+
110+
108111
> [!NOTE]
109112
> If Site Collection Storage Management is enabled for the tenant, you will not be able to set quota and will have a generic error returned. To workaround this issue, set the site collection storage management to "manual" temporarily, set your quotas and then set the site collection storage management setting back to its original setting.
110113
114+
115+
### -----------------------EXAMPLE 6-----------------------------
116+
```powershell
117+
Set-SPOSite -Identity https://contoso.sharepoint.com/sites/site1 -EnablePWA $true
118+
```
119+
120+
Example 6 enables the site "site1" to create Project Web Applications (PWA).
121+
111122
## PARAMETERS
112123

113124
### -EnablePWA

skype/skype-ps/skype/New-CsTeamsMessagingPolicy.md

Lines changed: 119 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,14 @@ The CsTeamsMessagingPolicy cmdlets enable administrators to control if a user is
1616
## SYNTAX
1717

1818
```
19-
New-CsTeamsMessagingPolicy [-Tenant <Guid>] [-Description <String>] [-AllowUrlPreviews <Boolean>]
20-
[-AllowOwnerDeleteMessage <Boolean>] [-AllowUserEditMessage <Boolean>] [-AllowUserDeleteMessage <Boolean>]
21-
[-AllowUserChat <Boolean>] [-AllowGiphy <Boolean>] [-GiphyRatingType <String>] [-AllowMemes <Boolean>]
22-
[-AllowStickers <Boolean>] [-AllowUserTranslation <Boolean>] [-ReadReceiptsEnabledType <String>]
23-
[-Identity] <XdsIdentity> [-InMemory] [-Force] [-WhatIf] [-Confirm] [<CommonParameters>]
24-
```
19+
New-CsTeamsMessagingPolicy [-AllowOwnerDeleteMessage <Boolean>] [-Description <String>]
20+
[-AllowUserChat <Boolean>] [[-Identity] <XdsIdentity>] [-InMemory] [-AllowUserDeleteMessage <Boolean>]
21+
[-ChannelsInChatListEnabledType <ChannelsInChatListEnabledTypeEnum>] [-Force] [-AllowStickers <Boolean>] [-AllowUrlPreviews <Boolean>]
22+
[-Tenant <Guid>] [-AllowImmersiveReader <Boolean>] [-AllowUserTranslation <Boolean>]
23+
[-AllowUserEditMessage <Boolean>] [-AudioMessageEnabledType <AudioMessageEnabledTypeEnum>] [-AllowRemoveUser <Boolean>]
24+
[-ReadReceiptsEnabledType <String>] [-AllowMemes <Boolean>] [-Confirm] [-AllowPriorityMessages <Boolean>]
25+
[-WhatIf] [-GiphyRatingType <String>] [-AllowGiphy <Boolean>] [-AsJob]
26+
```
2527

2628
## DESCRIPTION
2729
 The CsTeamsMessagingPolicy cmdlets enable administrators to control if a user is enabled to exchange messages. These also help determine the type of messages users can create and modify. This cmdlet creates a new Teams messaging policy. Custom policies can then be assigned to users using the Grant-CsTeamsMessagingPolicy cmdlet.
@@ -41,7 +43,7 @@ All other policy properties will use the default values.
4143
## PARAMETERS
4244

4345
### -AllowGiphy
44-
Determines whether a user is allowed to access and post Giphys. Set this to TRUE to allow. Set this FALSE to prohibit
46+
Determines whether a user is allowed to access and post Giphys. Set this to TRUE to allow. Set this FALSE to prohibit.
4547

4648
```yaml
4749
Type: Boolean
@@ -56,7 +58,7 @@ Accept wildcard characters: False
5658
```
5759
5860
### -AllowMemes
59-
Determines whether a user is allowed to access and post memes. Set this to TRUE to allow. Set this FALSE to prohibit
61+
Determines whether a user is allowed to access and post memes. Set this to TRUE to allow. Set this FALSE to prohibit.
6062
6163
```yaml
6264
Type: Boolean
@@ -71,7 +73,7 @@ Accept wildcard characters: False
7173
```
7274
7375
### -AllowOwnerDeleteMessage
74-
Determines whether owners are allowed to delete all the messages in their team. Set this to TRUE to allow. Set this to FALSE to prohibit
76+
Determines whether owners are allowed to delete all the messages in their team. Set this to TRUE to allow. Set this to FALSE to prohibit.
7577
7678
```yaml
7779
Type: Boolean
@@ -86,7 +88,7 @@ Accept wildcard characters: False
8688
```
8789
8890
### -AllowStickers
89-
Determines whether a user is allowed to access and post stickers. Set this to TRUE to allow. Set this FALSE to prohibit
91+
Determines whether a user is allowed to access and post stickers. Set this to TRUE to allow. Set this FALSE to prohibit.
9092
9193
```yaml
9294
Type: Boolean
@@ -101,7 +103,7 @@ Accept wildcard characters: False
101103
```
102104
103105
### -AllowUserChat
104-
Determines whether a user is allowed to chat. Set this to TRUE to allow a user to chat across private chat, group chat and in meetings. Set this to FALSE to prohibit all chat
106+
Determines whether a user is allowed to chat. Set this to TRUE to allow a user to chat across private chat, group chat and in meetings. Set this to FALSE to prohibit all chat.
105107
106108
```yaml
107109
Type: Boolean
@@ -116,7 +118,7 @@ Accept wildcard characters: False
116118
```
117119
118120
### -AllowUserDeleteMessage
119-
Determines whether a user is allowed to delete their own messages. Set this to TRUE to allow. Set this to FALSE to prohibit
121+
Determines whether a user is allowed to delete their own messages. Set this to TRUE to allow. Set this to FALSE to prohibit.
120122
121123
```yaml
122124
Type: Boolean
@@ -131,7 +133,7 @@ Accept wildcard characters: False
131133
```
132134
133135
### -AllowUserEditMessage
134-
Determines whether a user is allowed to edit their own messages. Set this to TRUE to allow. Set this to FALSE to prohibit
136+
Determines whether a user is allowed to edit their own messages. Set this to TRUE to allow. Set this to FALSE to prohibit.
135137
136138
```yaml
137139
Type: Boolean
@@ -146,7 +148,7 @@ Accept wildcard characters: False
146148
```
147149
148150
### -AllowUserTranslation
149-
Determines whether a user is allowed to translate messages to their client languages. Set this to TRUE to allow. Set this to FALSE to prohibit
151+
Determines whether a user is allowed to translate messages to their client languages. Set this to TRUE to allow. Set this to FALSE to prohibit.
150152
151153
```yaml
152154
Type: Boolean
@@ -191,6 +193,7 @@ Accept wildcard characters: False
191193
```
192194
193195
### -Force
196+
The Force switch specifies whether to suppress warning and confirmation messages. It can be useful in scripting to suppress interactive prompts. If the Force switch isn't provided in the command, you're prompted for administrative input if required.
194197
195198
```yaml
196199
Type: SwitchParameter
@@ -235,6 +238,7 @@ Accept wildcard characters: False
235238
```
236239
237240
### -InMemory
241+
Creates an object reference without actually committing the object as a permanent change. If you assign the output of this cmdlet called with this parameter to a variable, you can make changes to the properties of the object reference and then commit those changes by calling this cmdlet’s matching Set-.
238242
239243
```yaml
240244
Type: SwitchParameter
@@ -249,6 +253,13 @@ Accept wildcard characters: False
249253
```
250254
251255
### -Tenant
256+
Globally unique identifier (GUID) of the tenant account whose external user communication policy are being created. For example:
257+
258+
-Tenant "38aad667-af54-4397-aaa7-e94c79ec2308"
259+
260+
You can return your tenant ID by running this command:
261+
262+
Get-CsTenant | Select-Object DisplayName, TenantID
252263
253264
```yaml
254265
Type: Guid
@@ -262,6 +273,100 @@ Accept pipeline input: False
262273
Accept wildcard characters: False
263274
```
264275
276+
### -ChannelsInChatListEnabledType
277+
Possible values are: DisabledUserOverride,EnabledUserOverride.
278+
279+
```yaml
280+
Type: ChannelsInChatListEnabledTypeEnum
281+
Parameter Sets: (All)
282+
Aliases:
283+
284+
Required: False
285+
Position: Named
286+
Default value: None
287+
Accept pipeline input: False
288+
Accept wildcard characters: False
289+
```
290+
291+
### -AllowImmersiveReader
292+
Determines whether a user is allowed to use Immersive Reader for reading conversation messages. Set this to TRUE to allow. Set this FALSE to prohibit.
293+
294+
```yaml
295+
Type: Boolean
296+
Parameter Sets: (All)
297+
Aliases:
298+
299+
Required: False
300+
Position: Named
301+
Default value: None
302+
Accept pipeline input: False
303+
Accept wildcard characters: False
304+
```
305+
306+
### -AudioMessageEnabledType
307+
Determines whether a user is allowed to send audio messages. Possible values are: ChatsAndChannels,ChatsOnly,Disabled.
308+
309+
```yaml
310+
Type: AudioMessageEnabledTypeEnum
311+
Parameter Sets: (All)
312+
Aliases:
313+
314+
Required: False
315+
Position: Named
316+
Default value: None
317+
Accept pipeline input: False
318+
Accept wildcard characters: False
319+
```
320+
321+
### -AllowRemoveUser
322+
Determines whether a user is allowed to remove a user from a conversation. Set this to TRUE to allow. Set this FALSE to prohibit.
323+
324+
```yaml
325+
Type: Boolean
326+
Parameter Sets: (All)
327+
Aliases:
328+
329+
Required: False
330+
Position: Named
331+
Default value: None
332+
Accept pipeline input: False
333+
Accept wildcard characters: False
334+
```
335+
336+
### -AllowPriorityMessages
337+
Determines whether a user is allowed to send priorities messages. Set this to TRUE to allow. Set this FALSE to prohibit.
338+
339+
```yaml
340+
Type: Boolean
341+
Parameter Sets: (All)
342+
Aliases:
343+
344+
Required: False
345+
Position: Named
346+
Default value: None
347+
Accept pipeline input: False
348+
Accept wildcard characters: False
349+
```
350+
351+
### -AsJob
352+
Indicates that this cmdlet runs as a background job.
353+
354+
When you specify the AsJob parameter, the command immediately returns an object that represents the background job. You can continue to work in the session while the job finishes. The job is created on the local computer and the results from the Skype for Business Online session are automatically returned to the local computer. To get the job results, use the Receive-Job cmdlet.
355+
356+
For more information about Windows PowerShell background jobs, see [about_Jobs](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_jobs?view=powershell-6) and [about_Remote_Jobs](https://docs.microsoft.com/en-us/powershell/module/microsoft.powershell.core/about/about_remote_jobs?view=powershell-6).
357+
358+
```yaml
359+
Type: SwitchParameter
360+
Parameter Sets: (All)
361+
Aliases:
362+
363+
Required: False
364+
Position: Named
365+
Default value: False
366+
Accept pipeline input: False
367+
Accept wildcard characters: False
368+
```
369+
265370
### -WhatIf
266371
Shows what would happen if the cmdlet runs.
267372
The cmdlet is not run.

skype/skype-ps/skype/skype.md

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,6 @@ The following cmdlet references are for Skype for Business and Microsoft Teams.
254254
### [Get-CsBusyOptions](Get-CsBusyOptions.md)
255255
{{Manually Enter Get-CsBusyOptions Description Here}}
256256

257-
### [Get-CsCallerIdPolicy](Get-CsCallerIdPolicy.md)
258-
{{Manually Enter Get-CsCallerIdPolicy Description Here}}
259-
260257
### [Get-CsCallingLineIdentity](Get-CsCallingLineIdentity.md)
261258
{{Manually Enter Get-CsCallingLineIdentity Description Here}}
262259

@@ -917,9 +914,6 @@ The following cmdlet references are for Skype for Business and Microsoft Teams.
917914
### [Grant-CsBroadcastMeetingPolicy](Grant-CsBroadcastMeetingPolicy.md)
918915
{{Manually Enter Grant-CsBroadcastMeetingPolicy Description Here}}
919916

920-
### [Grant-CsCallerIdPolicy](Grant-CsCallerIdPolicy.md)
921-
{{Manually Enter Grant-CsCallerIdPolicy Description Here}}
922-
923917
### [Grant-CsCallingLineIdentity](Grant-CsCallingLineIdentity.md)
924918
{{Manually Enter Grant-CsCallingLineIdentity Description Here}}
925919

@@ -1163,9 +1157,6 @@ The following cmdlet references are for Skype for Business and Microsoft Teams.
11631157
### [New-CsBlockedDomain](New-CsBlockedDomain.md)
11641158
{{Manually Enter New-CsBlockedDomain Description Here}}
11651159

1166-
### [New-CsCallerIdPolicy](New-CsCallerIdPolicy.md)
1167-
{{Manually Enter New-CsCallerIdPolicy Description Here}}
1168-
11691160
### [New-CsCallingLineIdentity](New-CsCallingLineIdentity.md)
11701161
{{Manually Enter New-CsCallingLineIdentity Description Here}}
11711162

@@ -1712,9 +1703,6 @@ The following cmdlet references are for Skype for Business and Microsoft Teams.
17121703
### [Remove-CsBusyOptions](Remove-CsBusyOptions.md)
17131704
{{Manually Enter Remove-CsBusyOptions Description Here}}
17141705

1715-
### [Remove-CsCallerIdPolicy](Remove-CsCallerIdPolicy.md)
1716-
{{Manually Enter Remove-CsCallerIdPolicy Description Here}}
1717-
17181706
### [Remove-CsCallingLineIdentity](Remove-CsCallingLineIdentity.md)
17191707
{{Manually Enter Remove-CsCallingLineIdentity Description Here}}
17201708

@@ -2234,9 +2222,6 @@ The following cmdlet references are for Skype for Business and Microsoft Teams.
22342222
### [Set-CsBusyOptions](Set-CsBusyOptions.md)
22352223
{{Manually Enter Set-CsBusyOptions Description Here}}
22362224

2237-
### [Set-CsCallerIdPolicy](Set-CsCallerIdPolicy.md)
2238-
{{Manually Enter Set-CsCallerIdPolicy Description Here}}
2239-
22402225
### [Set-CsCallingLineIdentity](Set-CsCallingLineIdentity.md)
22412226
{{Manually Enter Set-CsCallingLineIdentity Description Here}}
22422227

teams/teams-ps/teams/New-Team.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ Accept wildcard characters: False
153153
```
154154
155155
### -Group
156-
Use this parameter to specify the GroupId of a group you would like to convert to a team.
156+
Use this parameter to specify the ExternalDirectoryObjectId of a group you would like to convert to a team.
157157
If you are using this parameter, do not specify other parameters.
158158
159159
```yaml

0 commit comments

Comments
 (0)