Skip to content

Commit 9185bf9

Browse files
authored
Merge pull request MicrosoftDocs#5480 from MicrosoftDocs/master
Merges Master to Live. See commits for details.
2 parents 409bdd3 + 02abd1d commit 9185bf9

27 files changed

+103
-64
lines changed

exchange/docs-conceptual/exchange-online/exchange-online-powershell-v2/app-only-auth-powershell-v2.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ The following examples show how to use the Exchange Online PowerShell V2 module
3737
- Connect using a certificate thumbprint:
3838

3939
```powershell
40-
Connect-ExchangeOnline -CertificateThumbPrint "012THISISADEMOTHUMBPRINT" -AppID "alpha-beta-gamma-123456" -TenantID "contosoelectronics.onmicrosoft.com" -RoutingHintUPN "admin_exo@contosoelectronics.com"
40+
Connect-ExchangeOnline -CertificateThumbPrint "012THISISADEMOTHUMBPRINT" -AppID "alpha-beta-gamma-123456" -TenantID "contosoelectronics.onmicrosoft.com"
4141
```
4242
When you use the _CertificateThumbPrint_ parameter, the certificate needs to be installed on the computer where you are running the command. The certificate should be installed in the user certificate store.
4343

@@ -90,6 +90,8 @@ For a detailed visual flow bout creating applications in Azure AD, see <https://
9090
- Security reader
9191
- Security administrator
9292
- Helpdesk administrator
93+
- Exchange Service administrator
94+
- Global Reader
9395
9496
## Appendix
9597

exchange/docs-conceptual/office-365-scc/connect-to-scc-powershell/connect-to-scc-powershell.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,15 @@ For more information about the Security & Compliance Center, see [Office 365 Sec
9696

9797
- For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://ps.compliance.protection.office365.us/powershell-liveid/`.
9898

99-
- If you want to connect to Security & Compliance Center PowerShell in the same window as an active Exchange Online PowerShell connection, you need to add the Prefix parameter and value (for example, `-Prefix "CC"`) to the end of this command to prevent cmdlet name collisions (both environments share some cmdlets with the same names).
100-
10199
3. Run the following command:
102100

103101
```PowerShell
104102
Import-PSSession $Session -DisableNameChecking
105103
```
104+
105+
**Notes**:
106+
107+
- If you want to connect to Security & Compliance Center PowerShell in the same window as an active Exchange Online PowerShell connection, you need to add the Prefix parameter and value (for example, `-Prefix "CC"`) to the end of this command to prevent cmdlet name collisions (both environments share some cmdlets with the same names).
106108

107109
> [!NOTE]
108110
> Be sure to disconnect the remote PowerShell session when you're finished. If you close the Windows PowerShell window without disconnecting the session, you could use up all the remote PowerShell sessions available to you, and you'll need to wait for the sessions to expire. To disconnect the remote PowerShell session, run the following command:

exchange/exchange-ps/exchange/client-access/Set-OwaMailboxPolicy.md

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ Set-OwaMailboxPolicy [-Identity] <MailboxPolicyIdParameter>
3333
[-AllowOfflineOn <AllowOfflineOnEnum>]
3434
[-BlockedFileTypes <MultiValuedProperty>]
3535
[-BlockedMimeTypes <MultiValuedProperty>]
36+
[-BookingsMailboxCreationEnabled <Boolean>]
3637
[-CalendarEnabled <Boolean>]
3738
[-ChangePasswordEnabled <Boolean>]
3839
[-ClassicAttachmentsEnabled <Boolean>]
@@ -456,6 +457,24 @@ Accept pipeline input: False
456457
Accept wildcard characters: False
457458
```
458459
460+
### -BookingsMailboxCreationEnabled
461+
This parameter is available only in the cloud-based service.
462+
463+
The BookingsMailboxCreationEnabled parameter allows you disable Microsoft Bookings.
464+
465+
```yaml
466+
Type: Boolean
467+
Parameter Sets: (All)
468+
Aliases:
469+
Applicable: Exchange Online
470+
471+
Required: False
472+
Position: Named
473+
Default value: None
474+
Accept pipeline input: False
475+
Accept wildcard characters: False
476+
```
477+
459478
### -CalendarEnabled
460479
This parameter is functional only in on-premises Exchange.
461480

exchange/exchange-ps/exchange/organization/New-ApplicationAccessPolicy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ For example:
152152
153153
- GUID
154154
155-
This parameter only accepts recipients that are security principals (users or groups that can have permissions assigned to them). The following types of recipients are not security principals, so you can't use them with this parameter::
155+
This parameter only accepts recipients that are security principals (users or groups that can have permissions assigned to them). The following types of recipients are not security principals, so you can't use them with this parameter:
156156
157157
- Discovery mailboxes
158158

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,4 +76,4 @@ Accept wildcard characters: False
7676
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/p/?LinkID=113216).
7777
7878
## NOTES
79-
"SPOHubToHubAssociation is just a placeholder and not yet ready for production.
79+
SPOHubToHubAssociation is just a placeholder and not yet ready for production.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.reviewer:
1414

1515
## SYNOPSIS
1616

17-
{{ Fill in the Synopsis }}
17+
Note: Currently this cmdlet is part of pre-release functionality and may not function in your tenant.
1818

1919
## SYNTAX
2020

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ ms.reviewer:
1515

1616
## SYNOPSIS
1717

18-
{{ Fill in the Synopsis }}
18+
Note: Currently this cmdlet is part of pre-release functionality and may not function in your tenant.
1919

2020
## SYNTAX
2121

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.reviewer:
1414

1515
## SYNOPSIS
1616

17-
{{ Fill in the Synopsis }}
17+
Note: Currently this cmdlet is part of pre-release functionality and may not function in your tenant.
1818

1919
## SYNTAX
2020

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@ Get-SPOUser [-LoginName <String>] -Site <SpoSitePipeBind> [<CommonParameters>]
4040

4141
This cmdlet contains more than one parameter set.
4242
You may only use parameters from one parameter set and you may not combine parameters from different parameter sets.
43-
For more information about how to use parameter sets, see Cmdlet Parameter Sets (<https://go.microsoft.com/fwlink/?LinkID=187810).>
43+
For more information about how to use parameter sets, see [Cmdlet Parameter Sets](https://docs.microsoft.com/powershell/scripting/developer/cmdlet/cmdlet-parameter-sets).
4444

4545
The `Get-SPOUser` cmdlet matches one and only one user or security group.
4646

4747
You must be a SharePoint Online global administrator and a site collection administrator to run the `Get-SPOUser` cmdlet.
4848

49-
For permissions and the most current information about Windows PowerShell for SharePoint Online, see the online documentation at <https://go.microsoft.com/fwlink/p/?LinkId=251832> (<https://go.microsoft.com/fwlink/p/?LinkId=251832).>
49+
For permissions and the most current information about Windows PowerShell for SharePoint Online, see the online documentation at <https://go.microsoft.com/fwlink/p/?LinkId=251832>.
5050

5151
## EXAMPLES
5252

@@ -56,23 +56,23 @@ For permissions and the most current information about Windows PowerShell for Sh
5656
Get-SPOUser -Site https://contoso.sharepoint.com/sites/finance
5757
```
5858

59-
Example 1 returns all user or security group accounts from the site collection <https://contoso.sharepoint.com/sites/finance.>
59+
Example 1 returns all user or security group accounts from the site collection <https://contoso.sharepoint.com/sites/finance>.
6060

6161
### -----------------------EXAMPLE 2-----------------------------
6262

6363
```powershell
6464
Get-SPOUser -Site https://contoso.sharepoint.com/sites/finance -LoginName melissa.kerr@contoso.com
6565
```
6666

67-
Example 2 returns one user or security group account whose user name is HYPERLINK "mailto:melissa.kerr@contoso.com" melissa.kerr@contoso.com from the site collection <https://contoso.sharepoint.com/sites/finance.>
67+
Example 2 returns one user or security group account whose user name is HYPERLINK "mailto:melissa.kerr@contoso.com" melissa.kerr@contoso.com from the site collection <https://contoso.sharepoint.com/sites/finance>.
6868

6969
### -----------------------EXAMPLE 3-----------------------------
7070

7171
```powershell
7272
Get-SPOUser -Site https://contoso.sharepoint.com/sites/finance -Group "Team Site Members"
7373
```
7474

75-
Example 3 returns one user or security group account inside group Team Site Members from the site collection <https://contoso.sharepoint.com/sites/finance.>
75+
Example 3 returns one user or security group account inside group Team Site Members from the site collection <https://contoso.sharepoint.com/sites/finance>.
7676

7777
## PARAMETERS
7878

@@ -146,7 +146,7 @@ Accept wildcard characters: False
146146
147147
### CommonParameters
148148
149-
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [about_CommonParameters](https://go.microsoft.com/fwlink/?LinkID=113216).
149+
This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable, -InformationAction, -InformationVariable, -OutVariable, -OutBuffer, -PipelineVariable, -Verbose, -WarningAction, and -WarningVariable. For more information, see [About_CommonParameters](https://go.microsoft.com/fwlink/?LinkID=113216).
150150
151151
## INPUTS
152152
@@ -156,7 +156,7 @@ This cmdlet supports the common parameters: -Debug, -ErrorAction, -ErrorVariable
156156
157157
## RELATED LINKS
158158
159-
[Getting started with SharePoint Online Management Shell](https://docs.microsoft.com/powershell/sharepoint/sharepoint-online/connect-sharepoint-online?view=sharepoint-ps)
159+
[Get started with SharePoint Online Management Shell](https://docs.microsoft.com/powershell/sharepoint/sharepoint-online/connect-sharepoint-online?view=sharepoint-ps)
160160
161161
[Get-SPOAppErrors](Get-SPOAppErrors.md)
162162

sharepoint/sharepoint-ps/sharepoint-online/New-SPOTenantOrgRelation.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ ms.reviewer:
1414

1515
## SYNOPSIS
1616

17-
{{ Fill in the Synopsis }}
17+
Note: Currently this cmdlet is part of pre-release functionality and may not function in your tenant.
1818

1919
## SYNTAX
2020

0 commit comments

Comments
 (0)