Skip to content

Commit 39eb774

Browse files
authored
Merge branch 'master' into patch-3
2 parents 63ea4ce + 6d4e1c7 commit 39eb774

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+640
-1382
lines changed

sharepoint/docs-conceptual/sharepoint-pnp/sharepoint-pnp-cmdlets.md

Lines changed: 64 additions & 60 deletions
Large diffs are not rendered by default.

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPDataRowsToProvisioningTemplate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Accept pipeline input: False
7777
```
7878
7979
### -Path
80-
Filename of the .PNP Open XML provisioning template to read from, optionally including full path.
80+
Filename of the .PNP Open XML site template to read from, optionally including full path.
8181
8282
```yaml
8383
Type: String

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPFileToProvisioningTemplate.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,28 +27,28 @@ Add-PnPFileToProvisioningTemplate -Path <String>
2727
Add-PnPFileToProvisioningTemplate -Path template.pnp -Source $sourceFilePath -Folder $targetFolder
2828
```
2929

30-
Adds a file to a PnP Provisioning Template
30+
Adds a file to a PnP Site Template
3131

3232
### ------------------EXAMPLE 2------------------
3333
```powershell
3434
Add-PnPFileToProvisioningTemplate -Path template.xml -Source $sourceFilePath -Folder $targetFolder
3535
```
3636

37-
Adds a file reference to a PnP Provisioning XML Template
37+
Adds a file reference to a PnP Site XML Template
3838

3939
### ------------------EXAMPLE 3------------------
4040
```powershell
4141
Add-PnPFileToProvisioningTemplate -Path template.pnp -Source "./myfile.png" -Folder "folderinsite" -FileLevel Published -FileOverwrite:$false
4242
```
4343

44-
Adds a file to a PnP Provisioning Template, specifies the level as Published and defines to not overwrite the file if it exists in the site.
44+
Adds a file to a PnP Site Template, specifies the level as Published and defines to not overwrite the file if it exists in the site.
4545

4646
### ------------------EXAMPLE 4------------------
4747
```powershell
4848
Add-PnPFileToProvisioningTemplate -Path template.pnp -Source $sourceFilePath -Folder $targetFolder -Container $container
4949
```
5050

51-
Adds a file to a PnP Provisioning Template with a custom container for the file
51+
Adds a file to a PnP Site Template with a custom container for the file
5252

5353
## PARAMETERS
5454

@@ -101,7 +101,7 @@ Accept pipeline input: False
101101
```
102102
103103
### -Path
104-
Filename of the .PNP Open XML provisioning template to read from, optionally including full path.
104+
Filename of the .PNP Open XML site template to read from, optionally including full path.
105105
106106
```yaml
107107
Type: String

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPListFoldersToProvisioningTemplate.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,21 +27,21 @@ Add-PnPListFoldersToProvisioningTemplate -Path <String>
2727
Add-PnPListFoldersToProvisioningTemplate -Path template.pnp -List 'PnPTestList'
2828
```
2929

30-
Adds top level folders from a list to an existing template and returns an in-memory PnP Provisioning Template
30+
Adds top level folders from a list to an existing template and returns an in-memory PnP Site Template
3131

3232
### ------------------EXAMPLE 2------------------
3333
```powershell
3434
Add-PnPListFoldersToProvisioningTemplate -Path template.pnp -List 'PnPTestList' -Recursive
3535
```
3636

37-
Adds all folders from a list to an existing template and returns an in-memory PnP Provisioning Template
37+
Adds all folders from a list to an existing template and returns an in-memory PnP Site Template
3838

3939
### ------------------EXAMPLE 3------------------
4040
```powershell
4141
Add-PnPListFoldersToProvisioningTemplate -Path template.pnp -List 'PnPTestList' -Recursive -IncludeSecurity
4242
```
4343

44-
Adds all folders from a list with unique permissions to an in-memory PnP Provisioning Template
44+
Adds all folders from a list with unique permissions to an in-memory PnP Site Template
4545

4646
## PARAMETERS
4747

@@ -70,7 +70,7 @@ Accept pipeline input: False
7070
```
7171
7272
### -Path
73-
Filename of the .PNP Open XML provisioning template to read from, optionally including full path.
73+
Filename of the .PNP Open XML site template to read from, optionally including full path.
7474
7575
```yaml
7676
Type: String

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPProvisioningTemplate.md

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,48 +6,50 @@ schema: 2.0.0
66
# Add-PnPProvisioningTemplate
77

88
## SYNOPSIS
9-
Adds a provisioning template object to a provisioning hierarchy
9+
Adds a PnP Provisioning Template object to a tenant template
1010

1111
## SYNTAX
1212

1313
```powershell
14-
Add-PnPProvisioningTemplate -Template <ProvisioningTemplate>
15-
-Hierarchy <ProvisioningHierarchy>
14+
Add-PnPProvisioningTemplate -SiteTemplate <ProvisioningTemplate>
15+
-TenantTemplate <ProvisioningHierarchy>
1616
```
1717

1818
## EXAMPLES
1919

2020
### ------------------EXAMPLE 1------------------
2121
```powershell
22-
Add-PnPProvisioningTemplate -Hierarchy $myhierarchy -Template $mytemplate
22+
Add-PnpProvisioningTemplate -TenantTemplate $tenanttemplate -SiteTemplate $sitetemplate
2323
```
2424

25-
Adds an existing sequence object to an existing hierarchy object
25+
Adds an existing site template to an existing tenant template object
2626

2727
## PARAMETERS
2828

29-
### -Hierarchy
30-
The hierarchy to add the template to
29+
### -SiteTemplate
30+
The template to add to the tenant template
3131

3232
```yaml
33-
Type: ProvisioningHierarchy
33+
Type: ProvisioningTemplate
3434
Parameter Sets: (All)
35+
Aliases: Template
3536

3637
Required: True
3738
Position: Named
38-
Accept pipeline input: True
39+
Accept pipeline input: False
3940
```
4041
41-
### -Template
42-
The template to add to the hierarchy
42+
### -TenantTemplate
43+
The tenant template to add the template to
4344
4445
```yaml
45-
Type: ProvisioningTemplate
46+
Type: ProvisioningHierarchy
4647
Parameter Sets: (All)
48+
Aliases: Hierarchy
4749

4850
Required: True
4951
Position: Named
50-
Accept pipeline input: False
52+
Accept pipeline input: True
5153
```
5254
5355
## RELATED LINKS

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPTaxonomyField.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ Accept pipeline input: False
190190
```
191191
192192
### -TermSetPath
193-
The path to the term that this needs to be bound to
193+
The path to the term that this needs be be bound
194194
195195
```yaml
196196
Type: String
@@ -231,4 +231,4 @@ Accept pipeline input: False
231231
232232
## RELATED LINKS
233233
234-
[SharePoint Developer Patterns and Practices](http://aka.ms/sppnp)
234+
[SharePoint Developer Patterns and Practices](http://aka.ms/sppnp)

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPTenantCdnOrigin.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ Add a new origin to the public or private CDN, on either Tenant level or on a si
2121

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

24-
Once you've completed the setup steps, you can add new assets, and update or remove existing assets whenever you want. Just make your changes to the assets in the folder or SharePoint library that you identified as an origin. If you add a new asset, it is available through the CDN immediately. However, if you update the asset, it will take up to 15 minutes for the new copy to propagate and become available in the CDN.
25-
2624
## EXAMPLES
2725

2826
### ------------------EXAMPLE 1------------------
@@ -73,5 +71,5 @@ Accept pipeline input: False
7371
```
7472
7573
## RELATED LINKS
76-
[Use the Office 365 content delivery network with SharePoint Online](https://docs.microsoft.com/en-us/office365/enterprise/use-office-365-cdn-with-spo)
77-
[SharePoint Developer Patterns and Practices](http://aka.ms/sppnp)
74+
75+
[SharePoint Developer Patterns and Practices](http://aka.ms/sppnp)

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPProvisioningSequence.md renamed to sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPTenantSequence.md

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,58 +3,59 @@ external help file:
33
applicable: SharePoint Online
44
schema: 2.0.0
55
---
6-
# Add-PnPProvisioningSequence
6+
# Add-PnPTenantSequence
77

88
## SYNOPSIS
9-
Adds a provisioning sequence object to a provisioning hierarchy
9+
Adds a tenant sequence object to a tenant template
1010

1111
## SYNTAX
1212

1313
```powershell
14-
Add-PnPProvisioningSequence -Hierarchy <ProvisioningHierarchy>
15-
-Sequence <ProvisioningSequence>
14+
Add-PnPTenantSequence -Template <ProvisioningHierarchy>
15+
-Sequence <ProvisioningSequence>
1616
```
1717

1818
## EXAMPLES
1919

2020
### ------------------EXAMPLE 1------------------
2121
```powershell
22-
Add-PnPProvisioningSequence -Hierarchy $myhierarchy -Sequence $mysequence
22+
Add-PnPTenantSequence -Template $mytemplate -Sequence $mysequence
2323
```
2424

2525
Adds an existing sequence object to an existing hierarchy object
2626

2727
### ------------------EXAMPLE 2------------------
2828
```powershell
29-
New-PnPProvisioningSequence -Id "MySequence" | Add-PnPProvisioningSequence -Hierarchy $hierarchy
29+
New-PnPTenantSequence -Id "MySequence" | Add-PnPTenantSequence -Template $template
3030
```
3131

3232
Creates a new instance of a provisioning sequence object and sets the Id to the value specified, then the sequence is added to an existing hierarchy object
3333

3434
## PARAMETERS
3535

36-
### -Hierarchy
37-
The hierarchy to add the sequence to
36+
### -Sequence
37+
Optional Id of the sequence
3838

3939
```yaml
40-
Type: ProvisioningHierarchy
40+
Type: ProvisioningSequence
4141
Parameter Sets: __AllParameterSets
4242

4343
Required: True
4444
Position: Named
45-
Accept pipeline input: False
45+
Accept pipeline input: True
4646
```
4747
48-
### -Sequence
49-
Optional Id of the sequence
48+
### -Template
49+
The template to add the sequence to
5050
5151
```yaml
52-
Type: ProvisioningSequence
52+
Type: ProvisioningHierarchy
5353
Parameter Sets: __AllParameterSets
54+
Aliases: Hierarchy
5455

5556
Required: True
5657
Position: Named
57-
Accept pipeline input: True
58+
Accept pipeline input: False
5859
```
5960
6061
## RELATED LINKS

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPProvisioningSite.md renamed to sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPTenantSequenceSite.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,23 +3,23 @@ external help file:
33
applicable: SharePoint Online
44
schema: 2.0.0
55
---
6-
# Add-PnPProvisioningSite
6+
# Add-PnPTenantSequenceSite
77

88
## SYNOPSIS
9-
Adds a provisioning sequence object to a provisioning hierarchy
9+
Adds a existing tenant sequence site object to a tenant template
1010

1111
## SYNTAX
1212

1313
```powershell
14-
Add-PnPProvisioningSite -Site <ProvisioningSitePipeBind>
15-
-Sequence <ProvisioningSequence>
14+
Add-PnPTenantSequenceSite -Site <ProvisioningSitePipeBind>
15+
-Sequence <ProvisioningSequence>
1616
```
1717

1818
## EXAMPLES
1919

2020
### ------------------EXAMPLE 1------------------
2121
```powershell
22-
Add-PnPProvisioningSite -Site $myteamsite -Sequence $mysequence
22+
Add-PnPTenantSequenceSite -Site $myteamsite -Sequence $mysequence
2323
```
2424

2525
Adds an existing site object to an existing hierarchy sequence

sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPProvisioningSubSite.md renamed to sharepoint/sharepoint-ps/sharepoint-pnp/Add-PnPTenantSequenceSubSite.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,26 @@ external help file:
33
applicable: SharePoint Online
44
schema: 2.0.0
55
---
6-
# Add-PnPProvisioningSubSite
6+
# Add-PnPTenantSequenceSubSite
77

88
## SYNOPSIS
9-
Adds a provisioning sequence object to a provisioning site object
9+
Adds a tenant sequence sub site object to a tenant sequence site object
1010

1111
## SYNTAX
1212

1313
```powershell
14-
Add-PnPProvisioningSubSite -SubSite <TeamNoGroupSubSite>
15-
-Site <SiteCollection>
14+
Add-PnPTenantSequenceSubSite -SubSite <TeamNoGroupSubSite>
15+
-Site <SiteCollection>
1616
```
1717

1818
## EXAMPLES
1919

2020
### ------------------EXAMPLE 1------------------
2121
```powershell
22-
Add-PnPProvisioningSubSite -Site $mysite -SubSite $mysubsite
22+
Add-PnPTenantSequenceSubSite -Site $mysite -SubSite $mysubsite
2323
```
2424

25-
Adds an existing subsite object to an existing hierarchy sequence site object
25+
Adds an existing subsite object to an existing sequence site object
2626

2727
## PARAMETERS
2828

0 commit comments

Comments
 (0)