Skip to content

Commit 774a297

Browse files
authored
Merge pull request MicrosoftDocs#666 from MicrosoftDocs/master
merge Powershell to live
2 parents 2f72583 + 56223eb commit 774a297

19 files changed

+100
-132
lines changed

exchange/exchange-ps/exchange/mailboxes/New-MailboxRestoreRequest.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,11 @@ Accept wildcard characters: False
227227
### -AssociatedMessagesCopyOption
228228
The AssociatedMessagesCopyOption parameter specifies whether associated messages are copied when the request is processed. Associated messages are special messages that contain hidden data with information about rules, views, and forms. By default, associated messages are copied. This parameter accepts the following values:
229229
230-
- DoNotCopy: The associated messages aren't copied.
230+
- DoNotCopy: The associated messages aren't copied. This is the default option.
231231
232232
- MapByMessageClass: This option finds the corresponding associated message by looking up the MessageClass attribute of the source message. If there's an associated message of this class in both source and target folders, it overwrites the associated message in the target. If there isn't an associated message in the target, it creates a copy in the target.
233233
234-
- Copy: This option copies associated messages from the source to the target. If the same message type exists both in the source and the target location, these associated messages are duplicated. This is the default option.
234+
- Copy: This option copies associated messages from the source to the target. If the same message type exists both in the source and the target location, these associated messages are duplicated.
235235
236236
Content filtering doesn't apply to associated messages.
237237

sharepoint/sharepoint-ps/sharepoint-online/Add-SPOHubSiteAssociation.md

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
---
1+
---
22
external help file:
33
applicable: SharePoint Online
44
title: Add-SPOHubSiteAssociation
@@ -71,17 +71,8 @@ Accept pipeline input: False
7171
Accept wildcard characters: False
7272
```
7373
74-
### CommonParameters
75-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
76-
77-
## INPUTS
78-
79-
## OUTPUTS
80-
8174
## NOTES
8275
8376
If the site or hub site doesn’t exist, this cmdlet returns a “File not found” error.
8477
8578
If the site is already a hub site, this cmdlet returns a "This site is already a HubSite" error.
86-
87-
## RELATED LINKS

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ This example begins with the online-marketing site. The cmdlet finds the associa
5555

5656
### -Identity
5757

58-
URL of the hub site. If not specified, the cmdlet lists all site hubs in the tenant.
58+
URL of the hub site. If not specified, the cmdlet lists all hub sites in the tenant.
5959

6060
```yaml
6161
Type: SpoSitePipeBind
@@ -69,14 +69,3 @@ Default value: None
6969
Accept pipeline input: False
7070
Accept wildcard characters: False
7171
```
72-
73-
### CommonParameters
74-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
75-
76-
## INPUTS
77-
78-
## OUTPUTS
79-
80-
## NOTES
81-
82-
## RELATED LINKS

sharepoint/sharepoint-ps/sharepoint-online/Grant-SPOHubSiteRights.md

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,14 +89,3 @@ Default value: None
8989
Accept pipeline input: False
9090
Accept wildcard characters: False
9191
```
92-
93-
### CommonParameters
94-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
95-
96-
## INPUTS
97-
98-
## OUTPUTS
99-
100-
## NOTES
101-
102-
## RELATED LINKS

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -54,19 +54,10 @@ Accept pipeline input: False
5454
Accept wildcard characters: False
5555
```
5656
57-
### CommonParameters
58-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
59-
60-
## INPUTS
61-
62-
## OUTPUTS
63-
6457
## NOTES
6558
6659
If the site doesn’t exist, this cmdlet returns a “File not found” error.
6760
6861
If the site is already a hub site, this cmdlet returns a "This site is already a HubSite" error.
6962
7063
If the site is already associated with another hub site, this cmdlet returns a "This site is currently associated with a HubSite" error. You'll need to run the [Remove-SPOHubSiteAssociation](Remove-SPOHubSiteAssociation.md) cmdlet first before you can make the site a hub site.
71-
72-
## RELATED LINKS

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,3 @@ Default value: None
5353
Accept pipeline input: False
5454
Accept wildcard characters: False
5555
```
56-
57-
### CommonParameters
58-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
59-
60-
## INPUTS
61-
62-
## OUTPUTS
63-
64-
## NOTES
65-
66-
## RELATED LINKS

sharepoint/sharepoint-ps/sharepoint-online/Revoke-SPOHubSiteRights.md

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ This example shows how to revoke rights so that Nestor can no longer join sites
3838

3939
## PARAMETERS
4040

41-
### -SiteUrl
41+
### -Identity
4242

4343
URL of the hub site.
4444

4545
```yaml
4646
Type: SpoSitePipeBind
4747
Parameter Sets: (All)
48-
Aliases:
48+
Aliases: HubSite
4949
Applicable: SharePoint Online
5050

5151
Required: True
@@ -71,14 +71,3 @@ Default value: None
7171
Accept pipeline input: False
7272
Accept wildcard characters: False
7373
```
74-
75-
### CommonParameters
76-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
77-
78-
## INPUTS
79-
80-
## OUTPUTS
81-
82-
## NOTES
83-
84-
## RELATED LINKS

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

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ URL of the hub site.
5050
```yaml
5151
Type: SpoSitePipeBind
5252
Parameter Sets: (All)
53-
Aliases:
53+
Aliases: HubSite
5454
Applicable: SharePoint Online
5555

5656
Required: True
@@ -110,14 +110,3 @@ Default value: None
110110
Accept pipeline input: False
111111
Accept wildcard characters: False
112112
```
113-
114-
### CommonParameters
115-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
116-
117-
## INPUTS
118-
119-
## OUTPUTS
120-
121-
## NOTES
122-
123-
## RELATED LINKS

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

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ This example disables the hub feature on the marketing site.
3838

3939
## PARAMETERS
4040

41-
### -Site
41+
### -Identity
4242

4343
URL of the site to disable the hub site feature.
4444

4545
```yaml
46-
Type: SpoSitePipeBind
46+
Type: SpoHubSitePipeBind
4747
Parameter Sets: (All)
48-
Aliases:
48+
Aliases: HubSite
4949
Applicable: SharePoint Online
5050

5151
Required: True
@@ -55,13 +55,36 @@ Accept pipeline input: False
5555
Accept wildcard characters: False
5656
```
5757
58-
### CommonParameters
59-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see about_CommonParameters (http://go.microsoft.com/fwlink/?LinkID=113216).
58+
### -WhatIf
6059
61-
## INPUTS
60+
Shows what would happen if the cmdlet runs. The cmdlet is not run.
6261
63-
## OUTPUTS
62+
```yaml
63+
Type: SwitchParameter
64+
Parameter Sets: (All)
65+
Aliases: wi
66+
Applicable: SharePoint Online
67+
68+
Required: False
69+
Position: Named
70+
Default value: None
71+
Accept pipeline input: False
72+
Accept wildcard characters: False
73+
```
74+
75+
### -Confirm
6476
65-
## NOTES
77+
Prompts you for confirmation before running the cmdlet.
6678
67-
## RELATED LINKS
79+
```yaml
80+
Type: SwitchParameter
81+
Parameter Sets: (All)
82+
Aliases: cf
83+
Applicable: SharePoint Online
84+
85+
Required: False
86+
Position: Named
87+
Default value: None
88+
Accept pipeline input: False
89+
Accept wildcard characters: False
90+
```

sharepoint/sharepoint-ps/sharepoint-server/Copy-SPActivitiesToWorkflowService.md

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,9 @@ schema: 2.0.0
88
# Copy-SPActivitiesToWorkflowService
99

1010
## SYNOPSIS
11-
Copies SharePoint 2013 workflow activities from SharePoint to Workflow Manager.
11+
This cmdlet copies the Workflow Activities from SharePoint Server to the Workflow Manager farm. Activities are defined within Microsoft provided or custom coded assemblies.
12+
13+
1214

1315
## SYNTAX
1416

@@ -19,31 +21,32 @@ Copy-SPActivitiesToWorkflowService [-ActivityName <String>] [-AssignmentCollecti
1921
```
2022

2123
## DESCRIPTION
22-
{{Fill in the Description}}
24+
Copies Workflow activites from SharePoint Server to Workflow Manager.
2325

2426
## EXAMPLES
2527

2628
### Example 1
2729
```
2830
PS C:\>$credential = [System.Net.CredentialCache]::DefaultNetworkCredentials
29-
PS C:\>$site = Get-SPSite(https://siteCollection)
30-
PS C:\>$proxy = Get-SPWorkflowServiceApplicationProxy
31-
PS C:\>$svcAddress = $proxy.GetWorkflowServiceAddress($site)
32-
PS C:\>Copy-SPActivitiesToWorkflowService -WorkflowServiceAddress $svcAddress -Credential $credential -Force $true
31+
PS C:\>$site = Get-SPSite <siteurl>
3332
```
3433

35-
Copies Worklow Activities from the specified Site Collection to Workflow Manager.
34+
35+
Copies the Workflow activities from SharePoint to the Workflow Manager farm using the specified Site Collection URL as a reference.
36+
3637

3738
## PARAMETERS
3839

3940
### -ActivityName
40-
{{Fill ActivityName Description}}
41+
Copies a specific ActivityName. If not specified, all Activities are copied.
4142

4243
```yaml
4344
Type: String
4445
Parameter Sets: (All)
4546
Aliases:
46-
Applicable: SharePoint Server 2013, SharePoint Server 2016
47+
48+
Applicable: SharePoint Server 2013, SharePoint Server 2016
49+
4750

4851
Required: False
4952
Position: Named
@@ -53,13 +56,15 @@ Accept wildcard characters: False
5356
```
5457
5558
### -AssignmentCollection
56-
{{Fill AssignmentCollection Description}}
59+
Manages objects for the purpose of proper disposal. Use of objects, such as SPWeb or SPSite, can use large amounts of memory and use of these objects in Windows PowerShell scripts requires proper memory management. Using the SPAssignment object, you can assign objects to a variable and dispose of the objects after they are needed to free up memory. When SPWeb, SPSite, or SPSiteAdministration objects are used, the objects are automatically disposed of if an assignment collection or the Global parameter is not used.
60+
61+
When the Global parameter is used, all objects are contained in the global store. If objects are not immediately used, or disposed of by using the Stop-SPAssignment command, an out-of-memory scenario can occur.
5762
5863
```yaml
5964
Type: SPAssignmentCollection
6065
Parameter Sets: (All)
6166
Aliases:
62-
Applicable: SharePoint Server 2013, SharePoint Server 2016
67+
Applicable: SharePoint Server 2013, SharePoint Server 2016
6368

6469
Required: False
6570
Position: Named
@@ -75,7 +80,7 @@ Prompts you for confirmation before running the cmdlet.
7580
Type: SwitchParameter
7681
Parameter Sets: (All)
7782
Aliases: cf
78-
Applicable: SharePoint Server 2013, SharePoint Server 2016
83+
Applicable: SharePoint Server 2013, SharePoint Server 2016
7984

8085
Required: False
8186
Position: Named
@@ -85,13 +90,13 @@ Accept wildcard characters: False
8590
```
8691
8792
### -Credential
88-
{{Fill Credential Description}}
93+
The credential used to connect to Workflow Manager.
8994
9095
```yaml
9196
Type: ICredentials
9297
Parameter Sets: (All)
9398
Aliases:
94-
Applicable: SharePoint Server 2013, SharePoint Server 2016
99+
Applicable: SharePoint Server 2013, SharePoint Server 2016
95100

96101
Required: False
97102
Position: Named
@@ -101,13 +106,13 @@ Accept wildcard characters: False
101106
```
102107
103108
### -Force
104-
{{Fill Force Description}}
109+
Forces a specific Activity to be copied to Workflow Manager.
105110
106111
```yaml
107112
Type: Boolean
108113
Parameter Sets: (All)
109114
Aliases:
110-
Applicable: SharePoint Server 2013, SharePoint Server 2016
115+
Applicable: SharePoint Server 2013, SharePoint Server 2016
111116

112117
Required: False
113118
Position: Named
@@ -124,7 +129,7 @@ The cmdlet is not run.
124129
Type: SwitchParameter
125130
Parameter Sets: (All)
126131
Aliases: wi
127-
Applicable: SharePoint Server 2013, SharePoint Server 2016
132+
Applicable: SharePoint Server 2013, SharePoint Server 2016
128133

129134
Required: False
130135
Position: Named
@@ -134,13 +139,14 @@ Accept wildcard characters: False
134139
```
135140
136141
### -WorkflowServiceAddress
137-
The URL of the registered Workflow Manager service.
142+
The Workflow Manager farm endpoint URL.
143+
138144
139145
```yaml
140146
Type: String
141147
Parameter Sets: (All)
142148
Aliases:
143-
Applicable: SharePoint Server 2013, SharePoint Server 2016
149+
Applicable: SharePoint Server 2013, SharePoint Server 2016
144150

145151
Required: False
146152
Position: Named

sharepoint/sharepoint-ps/sharepoint-server/Get-SPTimerJob.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ schema: 2.0.0
1111

1212
Returns timer jobs.
1313

14-
15-
1614
## SYNTAX
1715

1816
```
@@ -22,20 +20,22 @@ Get-SPTimerJob [[-Identity] <SPTimerJobPipeBind>] [-AssignmentCollection <SPAssi
2220

2321
## DESCRIPTION
2422
The Get-SPTimerJob cmdlet reads a specified timer job, timer jobs of a specified type, or timer jobs defined for a specified scope.
23+
2524
If no parameters are specified, this cmdlet returns all timer job definitions for the farm.
2625

2726
For permissions and the most current information about Windows PowerShell for SharePoint Products, see the online documentation at http://go.microsoft.com/fwlink/p/?LinkId=251831 (http://go.microsoft.com/fwlink/p/?LinkId=251831).
2827

2928
## EXAMPLES
3029
### ---------------------EXAMPLE 01---------------------
3130
```
32-
Get-SPTimerJob -WebApplication "http://servername/" | select Name, DisplayName
31+
PS C:\>Get-SPTimerJob -WebApplication "http://servername/" | select Name, DisplayName
3332
```
3433

3534
This example displays all timer jobs for a specified Web application.
35+
3636
### ---------------------EXAMPLE 02---------------------
3737
```powershell
38-
Get-SPTimerJob | select -ExpandProperty HistoryEntries
38+
PS C:\>Get-SPTimerJob | select -ExpandProperty HistoryEntries
3939
```
4040
The above example will show you timer job run history
4141

0 commit comments

Comments
 (0)