Skip to content

Commit 85a72c8

Browse files
authored
Merge pull request MicrosoftDocs#1603 from MicrosoftDocs/master
Merges Master to Live. See commits for details.
2 parents 8a78e25 + 8a28f3d commit 85a72c8

12 files changed

+708
-143
lines changed

sharepoint/sharepoint-ps/sharepoint-online/Invoke-SPOSiteDesign.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ schema: 2.0.0
99

1010
## SYNOPSIS
1111

12-
Applies a published site design to a specified site collection target. This allows a site design to be applied to an existing site collection.
12+
Applies a published site design to a specified site collection target. This allows a site design to be applied to an existing site collection. The supported site templates you can apply a site design to include: “modern” team site (with O365 group), “modern” team site (without an O365 group); communication site; classic team site; and classic publishing site.
1313

1414
## SYNTAX
1515

sharepoint/sharepoint-ps/sharepoint-server/Export-SPBusinessDataCatalogModel.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ For permissions and the most current information about Windows PowerShell for Sh
3333

3434
### ------------------EXAMPLE------------------
3535
```
36-
C:\PS>$Model = Get-SPBusinessDataCatalogMetadataObject -BdcObjectType "Model" -Name "ContosoModel" -ServiceConext http://contoso
36+
C:\PS>$Model = Get-SPBusinessDataCatalogMetadataObject -BdcObjectType "Model" -Name "ContosoModel" -ServiceContext http://contoso
3737
C:\PS>Export-SPBusinessDataCatalogModel -Identity $Model -Path "C:\folder\model.bdcm"
3838
```
3939

skype/skype-ps/skype/Get-CsOnlineEnhancedEmergencyServiceDisclaimer.md

Lines changed: 12 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,11 @@ Use the Get-CsOnlineEnhancedEmergencyServiceDisclaimer cmdlet to determine wheth
1313
## SYNTAX
1414

1515
```
16-
Get-CsOnlineEnhancedEmergencyServiceDisclaimer [-CountryOrRegion <Object>] [-BypassDualWrite <Object>]
17-
[-DomainController <Object>] [-Force] [-Tenant <Object>] [-Version <Object>] [-AsJob] [<CommonParameters>]
16+
Get-CsOnlineEnhancedEmergencyServiceDisclaimer [-CountryOrRegion <CountryInfo>] [-DomainController <Fqdn>] [-Force] [-Tenant <Guid>] [-Version <String>] [-AsJob] [<CommonParameters>]
1817
```
1918

2019
## DESCRIPTION
21-
{{Fill in the Description}}
20+
You can use this cmdlet to determine whether your organization has accepted the terms and conditions of enhanced emergency service. The United States is currently the only country supported.
2221

2322
## EXAMPLES
2423

@@ -37,23 +36,7 @@ Specifies the region or country whose terms and conditions you wish to verify.
3736
The United States is currently the only country supported, but it must be specified as "US".
3837

3938
```yaml
40-
Type: Object
41-
Parameter Sets: (All)
42-
Aliases:
43-
Applicable: Skype for Business Online
44-
45-
Required: False
46-
Position: Named
47-
Default value: None
48-
Accept pipeline input: False
49-
Accept wildcard characters: False
50-
```
51-
52-
### -BypassDualWrite
53-
PARAMVALUE: $true | $false
54-
55-
```yaml
56-
Type: Object
39+
Type: CountryInfo
5740
Parameter Sets: (All)
5841
Aliases:
5942
Applicable: Skype for Business Online
@@ -69,7 +52,7 @@ Accept wildcard characters: False
6952
This parameter is reserved for internal Microsoft use.
7053
7154
```yaml
72-
Type: Object
55+
Type: Fqdn
7356
Parameter Sets: (All)
7457
Aliases: DC
7558
Applicable: Skype for Business Online
@@ -103,7 +86,7 @@ Accept wildcard characters: False
10386
This parameter is reserved for internal Microsoft use.
10487
10588
```yaml
106-
Type: Object
89+
Type: Guid
10790
Parameter Sets: (All)
10891
Aliases:
10992
Applicable: Skype for Business Online
@@ -119,7 +102,7 @@ Accept wildcard characters: False
119102
This parameter is reserved for internal Microsoft use.
120103
121104
```yaml
122-
Type: Object
105+
Type: String
123106
Parameter Sets: (All)
124107
Aliases:
125108
Applicable: Skype for Business Online
@@ -132,7 +115,11 @@ Accept wildcard characters: False
132115
```
133116
134117
### -AsJob
135-
{{Fill AsJob Description}}
118+
Indicates that this cmdlet runs as a background job.
119+
120+
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.
121+
122+
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).
136123
137124
```yaml
138125
Type: SwitchParameter
@@ -165,4 +152,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
165152
166153
167154
## RELATED LINKS
168-
155+
[Set-CsOnlineEnhancedEmergencyServiceDisclaimer](https://docs.microsoft.com/en-us/powershell/module/skype/set-csonlineenhancedemergencyservicedisclaimer?view=skype-ps)
Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
---
2+
external help file: Microsoft.Rtc.Management.Hosted.dll-help.xml
3+
applicable: Skype for Business Online
4+
Module Name: Skype for Business Online
5+
title: Get-CsTeamsClientConfiguration
6+
schema: 2.0.0
7+
---
8+
9+
# Get-CsTeamsClientConfiguration
10+
11+
## SYNOPSIS
12+
The TeamsClientConfiguration allows IT admins to control the settings that can be accessed via Teams clients across their organization. This configuration includes settings like which third party cloud storage your organization allows, whether or not guest users can access the teams client, and how Surface Hub devices can interact with Skype for Business meetings. This cmdlet allows IT admins to retrieve the effective configuration for their organization.
13+
14+
## SYNTAX
15+
16+
### Identity (Default)
17+
```
18+
Get-CsTeamsClientConfiguration [-Tenant <System.Guid>] [[-Identity] <XdsIdentity>] [-LocalStore]
19+
[<CommonParameters>]
20+
```
21+
22+
### Filter
23+
```
24+
Get-CsTeamsClientConfiguration [-Tenant <System.Guid>] [-Filter <String>] [-LocalStore] [<CommonParameters>]
25+
```
26+
27+
## DESCRIPTION
28+
The TeamsClientConfiguration allows IT admins to control the settings that can be accessed via Teams clients across their organization. This configuration includes settings like which third party cloud storage your organization allows, whether or not guest users can access the teams client, and how Surface Hub devices can interact with Skype for Business meetings. This cmdlet allows IT admins to retrieve the effective configuration for their organization.
29+
30+
Use in conjunction with Set-CsTeamsClientConfiguration to update the settings in your organization.
31+
32+
## EXAMPLES
33+
34+
### Example 1
35+
```powershell
36+
PS C:\> Get-CsTeamsClientConfiguration
37+
```
38+
39+
Retrieves the effective client configuration in the tenant.
40+
41+
## PARAMETERS
42+
43+
### -Filter
44+
Microsoft internal use only.
45+
46+
```yaml
47+
Type: String
48+
Parameter Sets: Filter
49+
Aliases:
50+
51+
Required: False
52+
Position: Named
53+
Default value: None
54+
Accept pipeline input: False
55+
Accept wildcard characters: False
56+
```
57+
58+
### -Identity
59+
The only valid input is Global, as you can have only one effective configuration in your organization.
60+
61+
```yaml
62+
Type: XdsIdentity
63+
Parameter Sets: Identity
64+
Aliases:
65+
66+
Required: False
67+
Position: 1
68+
Default value: None
69+
Accept pipeline input: False
70+
Accept wildcard characters: False
71+
```
72+
73+
### -LocalStore
74+
Internal Microsoft use only.
75+
76+
```yaml
77+
Type: SwitchParameter
78+
Parameter Sets: (All)
79+
Aliases:
80+
81+
Required: False
82+
Position: Named
83+
Default value: None
84+
Accept pipeline input: False
85+
Accept wildcard characters: False
86+
```
87+
88+
### -Tenant
89+
Internal Microsoft use only.
90+
91+
```yaml
92+
Type: System.Guid
93+
Parameter Sets: (All)
94+
Aliases:
95+
96+
Required: False
97+
Position: Named
98+
Default value: None
99+
Accept pipeline input: False
100+
Accept wildcard characters: False
101+
```
102+
103+
### CommonParameters
104+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable.
105+
For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
106+
107+
## INPUTS
108+
109+
### None
110+
111+
112+
## OUTPUTS
113+
114+
### System.Object
115+
116+
## NOTES
117+
118+
## RELATED LINKS

skype/skype-ps/skype/Get-CsTenantMigrationConfiguration.md

Lines changed: 21 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -8,51 +8,36 @@ schema: 2.0.0
88
# Get-CsTenantMigrationConfiguration
99

1010
## SYNOPSIS
11-
Provide the topic introduction here.
11+
Use the Get-CsTenantMigrationConfiguration cmdlet to check if Meeting Migration Service (MMS) is enabled in your organization.
1212

1313
## SYNTAX
1414

1515
```
16-
Get-CsTenantMigrationConfiguration [[-Identity] <Object>] [-BypassDualWrite <Object>] [-Filter <Object>]
17-
[-LocalStore] [-Tenant <Object>] [-AsJob] [<CommonParameters>]
16+
Get-CsTenantMigrationConfiguration [-LocalStore] [[-Identity] <XdsIdentity>] [-Tenant <Guid>] [-Filter <String>]
17+
[-AsJob] [<CommonParameters>]
1818
```
1919

2020
## DESCRIPTION
21-
Provide the detailed description here.
21+
Meeting Migration Service (MMS) is a Skype for Business service that runs in the background and automatically updates Skype for Business and Microsoft Teams meetings for users. MMS is designed to eliminate the need for users to run the Meeting Migration Tool to update their Skype for Business and Microsoft Teams meetings. This tool does not migrate Skype for Business meetings into Microsoft Teams meetings.
22+
23+
The Get-CsTenantMigrationConfiguration cmdlet retrieves the Meeting Migration Service configuration in your organization.
2224

2325
## EXAMPLES
2426

2527
### -------------------------- Example 1 --------------------------
2628
```
27-
Insert example commands for example 1.
29+
PS C:\> Get-CsTenantMigrationConfiguration
2830
```
2931

30-
Insert descriptive text for example 1.
31-
32+
This example shows the MMS configuration in your organization.
3233

3334
## PARAMETERS
3435

35-
### -BypassDualWrite
36-
PARAMVALUE: $true | $false
37-
38-
```yaml
39-
Type: Object
40-
Parameter Sets: (All)
41-
Aliases:
42-
Applicable: Skype for Business Online
43-
44-
Required: False
45-
Position: Named
46-
Default value: None
47-
Accept pipeline input: False
48-
Accept wildcard characters: False
49-
```
50-
5136
### -Filter
52-
PARAMVALUE: String
37+
This parameter is reserved for internal Microsoft use.
5338

5439
```yaml
55-
Type: Object
40+
Type: String
5641
Parameter Sets: (All)
5742
Aliases:
5843
Applicable: Skype for Business Online
@@ -65,10 +50,10 @@ Accept wildcard characters: False
6550
```
6651
6752
### -Identity
68-
PARAMVALUE: XdsIdentity
53+
This parameter is reserved for internal Microsoft use.
6954
7055
```yaml
71-
Type: Object
56+
Type: XdsIdentity
7257
Parameter Sets: (All)
7358
Aliases:
7459
Applicable: Skype for Business Online
@@ -81,7 +66,7 @@ Accept wildcard characters: False
8166
```
8267
8368
### -LocalStore
84-
PARAMVALUE: SwitchParameter
69+
This parameter is reserved for internal Microsoft use.
8570
8671
```yaml
8772
Type: SwitchParameter
@@ -97,10 +82,10 @@ Accept wildcard characters: False
9782
```
9883
9984
### -Tenant
100-
PARAMVALUE: Guid
85+
This parameter is reserved for internal Microsoft use.
10186
10287
```yaml
103-
Type: Object
88+
Type: Guid
10489
Parameter Sets: (All)
10590
Aliases:
10691
Applicable: Skype for Business Online
@@ -113,7 +98,11 @@ Accept wildcard characters: False
11398
```
11499
115100
### -AsJob
116-
{{Fill AsJob Description}}
101+
Indicates that this cmdlet runs as a background job.
102+
103+
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.
104+
105+
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).
117106
118107
```yaml
119108
Type: SwitchParameter
@@ -138,4 +127,4 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
138127
## NOTES
139128
140129
## RELATED LINKS
141-
130+
[Set-CsTenantMigrationConfiguration](https://docs.microsoft.com/en-us/powershell/module/skype/set-cstenantmigrationconfiguration?view=skype-ps)

0 commit comments

Comments
 (0)