Skip to content

Commit 49427af

Browse files
authored
Merge branch 'master' into patch-20
2 parents c6da905 + 8bd2f2a commit 49427af

File tree

8 files changed

+54
-24
lines changed

8 files changed

+54
-24
lines changed

exchange/exchange-ps/exchange/devices/Clear-MobileDevice.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,6 +156,8 @@ Accept wildcard characters: False
156156
### -AccountOnly
157157
The AccountOnly switch specifies whether to perform an account-only remote device wipe where only Exchange mailbox data is removed from the device. You don't need to specify a value with this switch.
158158
159+
You don't need to use this switch for the DeviceType value Outlook, because an account-only remote devices wipe is the only type of wipe that's used on Outlook devices.
160+
159161
```yaml
160162
Type: SwitchParameter
161163
Parameter Sets: (All)

exchange/exchange-ps/exchange/mail-flow/Get-MessageTraceDetail.md

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,26 @@ monikerRange: "exchonline-ps"
1414
## SYNOPSIS
1515
This cmdlet is available only in the cloud-based service.
1616

17-
Use the Get-MessageTraceDetail cmdlet to view the message trace event details for a specific message.
17+
Use the Get-MessageTraceDetail cmdlet to view the message trace event details for a specific message. Note that these detailed results are returned less quickly than the Get-MessageTrace cmdlets.
1818

1919
For information about the parameter sets in the Syntax section below, see Exchange cmdlet syntax (https://technet.microsoft.com/library/bb123552.aspx).
2020

2121
## SYNTAX
2222

2323
```
24-
Get-MessageTraceDetail [-Action <MultiValuedProperty>] [-EndDate <DateTime>] [-Event <MultiValuedProperty>]
25-
[-Expression <Expression>] [-MessageId <String>] [-MessageTraceId <Guid>] [-Page <Int32>] [-PageSize <Int32>]
26-
[-ProbeTag <String>] [-RecipientAddress <String>] [-SenderAddress <String>] [-StartDate <DateTime>]
27-
[<CommonParameters>]
24+
Get-MessageTraceDetail
25+
[-Action <MultiValuedProperty>]
26+
[-EndDate <DateTime>]
27+
[-Event <MultiValuedProperty>]
28+
[-Expression <Expression>]
29+
[-MessageId <String>]
30+
[-MessageTraceId <Guid>]
31+
[-Page <Int32>]
32+
[-PageSize <Int32>]
33+
[-ProbeTag <String>]
34+
[-RecipientAddress <String>]
35+
[-SenderAddress <String>]
36+
[-StartDate <DateTime>] [<CommonParameters>]
2837
```
2938

3039
## DESCRIPTION

exchange/exchange-ps/exchange/mailboxes/Search-Mailbox.md

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ You can use the Search-Mailbox cmdlet to search messages in a specified mailbox
7777

7878
- Clean up the Recoverable Items folder for a mailbox when it has reached the Recoverable Items hard quota.
7979

80-
In Exchange Online, we recommend that you don't use the `Search-Mailbox -DeleteContent` command to delete messages in mailboxes that have auto-expanding archiving enabled. Unexpected data loss may occur.
81-
8280
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).
8381

8482
**Note**: By default, Search-Mailbox is available only in the Mailbox Search or Mailbox Import Export roles, and these roles aren't assigned to *any* role groups. To use this cmdlet, you need to add one or both of the roles to a role group (for example, the Organization Management role group). Only the Mailbox Import Export role gives you access to the DeleteContent parameter. For more information about adding roles to role groups, see the "Add a role to a role group" section in [Manage role groups](https://technet.microsoft.com/library/jj657480.aspx).
@@ -239,8 +237,6 @@ Accept wildcard characters: False
239237
### -DeleteContent
240238
The DeleteContent switch specifies that the messages returned by the search be permanently deleted from the source mailbox. When used with the TargetMailbox parameter, messages are copied to the target mailbox and removed from the source mailbox. If you set the logging level for the search to Basic or Full, you must specify a target mailbox and a target folder to place the log in. To delete messages from the source mailbox without copying them to the target mailbox, don't specify the TargetMailbox, TargetFolder, and LogLevel parameters.
241239
242-
As previously stated, we recommend that you don't use the DeleteContent switch to delete messages in Exchange Online mailboxes that have auto-expanding archiving enabled because unexpected data loss may occur.
243-
244240
You need to be assigned the Mailbox Import Export management role to use this switch. By default, this role isn't assigned to any role group. Typically, you assign a role to a built-in or custom role group. Or you can assign a role to a user, or a universal security group.
245241
246242
Before you use the DeleteContent switch to delete content, we recommend that you test search parameters by using the LogOnly parameter, as shown in Example 2.

exchange/exchange-ps/exchange/users-and-groups/Add-UnifiedGroupLinks.md

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ For information about the parameter sets in the Syntax section below, see Exchan
2222

2323
```
2424
Add-UnifiedGroupLinks [-Identity] <UnifiedGroupIdParameter> -Links <RecipientIdParameter[]>
25-
-LinkType <Members | Owners | Subscribers | Aggregators> [-Confirm] [-WhatIf]
26-
[<CommonParameters>]
25+
-LinkType <LinkType>
26+
[-Confirm]
27+
[-WhatIf] [<CommonParameters>]
2728
```
2829

2930
## DESCRIPTION
@@ -109,8 +110,12 @@ The LinkType parameter specifies the Office 365 Group property that you want to
109110
110111
- Subscribers
111112
113+
- Aggregators
114+
115+
- EventSubscribers
116+
112117
```yaml
113-
Type: Members | Owners | Subscribers | Aggregators
118+
Type: LinkType
114119
Parameter Sets: (All)
115120
Aliases:
116121
Applicable: Exchange Online, Exchange Online Protection

exchange/exchange-ps/exchange/users-and-groups/Remove-UnifiedGroupLinks.md

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ For information about the parameter sets in the Syntax section below, see Exchan
2222

2323
```
2424
Remove-UnifiedGroupLinks [-Identity] <UnifiedGroupIdParameter> -Links <RecipientIdParameter[]>
25-
-LinkType <Members | Owners | Subscribers | Aggregators> [-Confirm] [-WhatIf]
26-
[<CommonParameters>]
25+
-LinkType <LinkType>
26+
[-Confirm]
27+
[-WhatIf] [<CommonParameters>]
2728
```
2829

2930
## DESCRIPTION
@@ -103,14 +104,18 @@ Accept wildcard characters: False
103104
### -LinkType
104105
The LinkType parameter specifies the Office 365 Group property that you want to modify. Valid values are:
105106
106-
- EventSubscribers
107-
108107
- Members
109108
110109
- Owners
111110
111+
- Subscribers
112+
113+
- Aggregators
114+
115+
- EventSubscribers
116+
112117
```yaml
113-
Type: Members | Owners | Subscribers | Aggregators
118+
Type: LinkType
114119
Parameter Sets: (All)
115120
Aliases:
116121
Applicable: Exchange Online

sharepoint/sharepoint-ps/sharepoint-pnp/Get-PnPNavigationNode.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Returns all navigation nodes in the quicklaunch navigation
4444

4545
### ------------------EXAMPLE 3------------------
4646
```powershell
47-
Get-PnPNavigationNode -TopNavigationBar
47+
Get-PnPNavigationNode -Location TopNavigationBar
4848
```
4949

5050
Returns all navigation nodes in the top navigation bar
@@ -121,4 +121,4 @@ Accept pipeline input: False
121121
122122
## RELATED LINKS
123123
124-
[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)
124+
[SharePoint Developer Patterns and Practices](https://aka.ms/sppnp)

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Set-SPTrustedRootAuthority [-Identity] <SPTrustedRootAuthorityPipeBind>
3232

3333
## DESCRIPTION
3434
The `Set-SPTrustedRootAuthority` cmdlet creates a new trusted root authority.
35-
If a certificate file is used, the certificate must be an X509 certificate with private keys, otherwise an exception is raised.
35+
If a certificate file is used, the certificate must be an X509 certificate without private keys, otherwise an exception is raised.
3636

3737
For permissions and the most current information about Windows PowerShell for SharePoint Products, see the online documentation at [SharePoint Server Cmdlets](https://docs.microsoft.com/powershell/sharepoint/sharepoint-server/sharepoint-server-cmdlets).
3838

@@ -41,8 +41,9 @@ For permissions and the most current information about Windows PowerShell for Sh
4141

4242
### ------------------EXAMPLE------------------
4343
```
44-
C:\PS>$cert = Get-PfxCertificate C:\LiveIDSigningCert.pfx
45-
Get - SPTrustedRootAuthority -Name "WFEFarm1" | Set- SPTrustedRootAuthority -Certificate $cert
44+
C:\PS>$cert = New-Object System.Security.Cryptography.X509Certificates.X509Certificate2
45+
$cert.Import('C:\LiveIDSigningCert.pfx')
46+
Get-SPTrustedRootAuthority -Name "WFEFarm1" | Set-SPTrustedRootAuthority -Certificate $cert
4647
```
4748

4849
This example updates the certificate of the trusted root authority WFEFarm1.

sharepoint/sharepoint-ps/sharepoint-server/Split-SPScaleOutDatabase.md

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ For permissions and the most current information about Windows PowerShell for Sh
4343

4444
## EXAMPLES
4545

46-
### ---------------EXAMPLE---------------
46+
### ---------------EXAMPLE 1---------------
4747
```
4848
$databases = Get-SPScaleOutDatabase -ServiceApplication $serviceApplication
4949
$database = $databases[0]
@@ -52,7 +52,19 @@ Split-SPScaleOutDatabase -NewDatabaseName Database2 -NewDatabaseServer MyDatabas
5252

5353
This example creates a new scale-out database named Database2 on the MyDatabaseServer database server in the given service application.
5454

55-
The example also moves 30 percent of the data from the upper side of the data range in the first scale-out database of the given service application.
55+
The example also moves 30% of the data from the upper side of the data range in the first scale-out database of the given service application.
56+
57+
### ---------------EXAMPLE 2---------------
58+
59+
```
60+
$ssa = Get-SPEnterpriseSearchServiceApplication
61+
62+
$newReportingDb = "Search_AnalyticsReporting2"
63+
$reportingDb = Get-SPScaleOutDatabase -SearchApplication $ssa
64+
Split-SPServerScaleOutDatabase -SourceServiceApplication $ssa -SourceDatabase $reportingDb -NewDatabaseName $newReportingDb -SourcePercentage 33
65+
66+
```
67+
This example scales out the Search Analytics database, moving 33% of data to the new databases.
5668

5769
## PARAMETERS
5870

0 commit comments

Comments
 (0)