Skip to content

Commit

Permalink
Merge pull request MicrosoftDocs#5898 from MicrosoftDocs/master
Browse files Browse the repository at this point in the history
Merges Master to Live. See commits for details.
  • Loading branch information
kenwith committed Jun 12, 2020
2 parents eeee1e5 + 785a296 commit 066bc1f
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 33 deletions.
2 changes: 0 additions & 2 deletions exchange/exchange-ps/exchange/Set-Mailbox.md
Expand Up @@ -1698,8 +1698,6 @@ The AuditDelegate parameter specifies the mailbox operations to log for delegate

- Update (Enabled by default only in the cloud-based service.)

- UpdateCalendarDelegation (Available only in the cloud-based service.)

- UpdateFolderPermissions (Available only in Exchange 2019 and the cloud-based service; enabled by default.)

- UpdateInboxRules (Available only in Exchange 2019 and the cloud-based service; enabled by default.)
Expand Down
Expand Up @@ -19,22 +19,18 @@ Returns the current configuration status.
## SYNTAX

```powershell
Get-SPOTenantSyncClientRestriction [<CommonParameters>]
Get-SPOTenantSyncClientRestriction
```

## DESCRIPTION

You must be a SharePoint Online administrator or Global Administrator to run the cmdlet.

Requires a valid `Connect-SPOService` context to identify the tenant. For information on how to connect to the tenant, see `Connect-SPOService`.

The `Get-SPOTenantSyncClientRestriction` cmdlet returns whether the TenantRestrictionEnabled property is true or false and DomainGUIDs that are currently in the safe recipient list which is represented by the AllowedDomainList property.

The `Get-SPOTenantSyncClientRestriction` cmdlet also returns the current state of the BlockMacSync parameter.
This cmdlet, that does not take any input, also returns the current state of the BlockMacSync and GrooveBlockOption properties.

The `Get-SPOTenantSyncClientRestriction` cmdlet also returns the current state of the GrooveBlockOption parameter.
You must be a SharePoint Online administrator or Global Administrator to run the cmdlet.

The `Get-SPOTenantSyncClientRestriction` cmdlet does not have any parameters.
Requires a valid `Connect-SPOService` context to identify the tenant. For information on how to connect to the tenant, see `Connect-SPOService`.

## EXAMPLES

Expand Down
8 changes: 4 additions & 4 deletions sharepoint/sharepoint-ps/sharepoint-online/Set-SPOSite.md
Expand Up @@ -614,7 +614,7 @@ Accept wildcard characters: False

Specifies a list of email domains that is allowed for sharing with the external collaborators. Use the space character as the delimiter for entering multiple values. For example, "contoso.com fabrikam.com".

For additional information about how to restrict a domain sharing, see Restricted Domains Sharing in Office 365 SharePoint Online and OneDrive for Business.
For additional information about how to restrict a domain sharing, see [Restrict sharing of SharePoint and OneDrive content by domain](https://docs.microsoft.com/sharepoint/restricted-domains-sharing).

```yaml
Type: String
Expand All @@ -632,7 +632,7 @@ Accept wildcard characters: False

Specifies a list of email domains that is blocked or prohibited for sharing with the external collaborators. Use space character as the delimiter for entering multiple values. For example, "contoso.com fabrikam.com".

For additional information about how to restrict a domain sharing, see Restricted Domains Sharing in Office 365 SharePoint Online and OneDrive for Business.
For additional information about how to restrict a domain sharing, see [Restrict sharing of SharePoint and OneDrive content by domain](https://docs.microsoft.com/sharepoint/restricted-domains-sharing).

```yaml
Type: String
Expand Down Expand Up @@ -868,7 +868,7 @@ Accept wildcard characters: False
```
### -AddInformationSegment

This parameter allows you to add a segment to a SharePoint site. This parameter is only applicable for tenants who have enabled Microsoft 365 Information barriers capability. Please read https://docs.microsoft.com/microsoft-365/compliance/information-barriers documentation to understand Information barriers in SharePoint Online.
This parameter allows you to add a segment to a SharePoint site. This parameter is only applicable for tenants who have enabled Microsoft 365 Information barriers capability. Please read https://docs.microsoft.com/sharepoint/information-barriers documentation to understand Information barriers in SharePoint Online.

**Note**: This parameter is available only in SharePoint Online Management Shell Version 16.0.19927.12000 or later.

Expand All @@ -880,7 +880,7 @@ Default value: None
```

### -RemoveInformationSegment
This parameter allows you to remove a segment from a SharePoint site. This parameter is only applicable for tenants who have enabled Microsoft 365 Information barriers capability. Please read (https://<kaarin to provide the link ) documentation to understand Information barriers with SharePoint Online.
This parameter allows you to remove a segment from a SharePoint site. This parameter is only applicable for tenants who have enabled Microsoft 365 Information barriers capability. Please read https://docs.microsoft.com/sharepoint/information-barriers documentation to understand Information barriers with SharePoint Online.

**Note**: This parameter is available only in SharePoint Online Management Shell Version 16.0.19927.12000 or later.

Expand Down
Expand Up @@ -33,7 +33,7 @@ For permissions and the most current information about Windows PowerShell for Sh

### -------------------EXAMPLE----------------------
```
$subscription = Get-SPSIteSubscription -Identity https://site_url
$subscription = Get-SPSiteSubscription -Identity https://site_url
$proxy = Get-SPServiceApplicationProxy | ?{$_.TypeName -eq 'Managed Metadata Service Connection'}
Import-SPMetadataWebServicePartitionData -Identity $subscription -ServiceProxy $proxy -Path "\\server_name\folder_name\file_name.cab"
```
Expand Down Expand Up @@ -138,7 +138,7 @@ Accept wildcard characters: False
```

### -NoCompression
{{Fill NoCompression Description}}
Do not use.

```yaml
Type: SwitchParameter
Expand All @@ -154,7 +154,7 @@ Accept wildcard characters: False
```

### -ToContentDatabase
{{Fill ToContentDatabase Description}}
Do not use.

```yaml
Type: SPContentDatabasePipeBind
Expand All @@ -170,7 +170,7 @@ Accept wildcard characters: False
```

### -ToServiceDatabase
{{Fill ToServiceDatabase Description}}
Do not use.

```yaml
Type: SwitchParameter
Expand Down
Expand Up @@ -2,7 +2,7 @@
external help file: sharepointserver.xml
Module Name: Microsoft.Sharepoint.Powershell
online version: https://docs.microsoft.com/powershell/module/sharepoint-server/migrate-spprojectdatabase
applicable: Project Server 2016, Project Server 2019
applicable: Project Server 2016
title: Migrate-SPProjectDatabase
schema: 2.0.0
author: techwriter40
Expand All @@ -13,7 +13,7 @@ ms.reviewer:
# Migrate-SPProjectDatabase

## SYNOPSIS
Copies the data from the Project Server 2013 database into the corresponding SharePoint Server 2016, SharePoint Server 2019 content database containing the migrated site collection.
Copies the data from the Project Server 2013 database into the corresponding SharePoint Server 2016 content database containing the migrated site collection.

## SYNTAX

Expand All @@ -24,15 +24,15 @@ Migrate-SPProjectDatabase [-AssignmentCollection <SPAssignmentCollection>] [-Con
```

## DESCRIPTION
Copies the data from the Project Server 2013 database into the corresponding SharePoint Server 2016, SharePoint Server 2019 content database containing the migrated site collection.
Copies the data from the Project Server 2013 database into the corresponding SharePoint Server 2016 content database containing the migrated site collection.

Both the Project Server 2013 database and the SharePoint Server 2016, SharePoint Server 2019 database must be on the same instance of SQL
Both the Project Server 2013 database and the SharePoint Server 2016 database must be on the same instance of SQL
Server and the SharePoint farm account must have full access to the Project Server 2013 database. During the migration process the Project Server 2013 database will be modified and cannot be mounted back to a Project Server 2013.
## EXAMPLES

### Example 1
```
Migrate-SPProjectDatabase -Name ProjectDB1 -SiteCollection "https://contoso1/sites/PWA"
Migrate-SPProjectDatabase -DatabaseName ProjectDB1 -SiteCollection "https://contoso1/sites/PWA"
```

This example will look for a Project Server 2013 database named ProjectDB1 on the same instance of SQL Server where the content database containing https://contoso1/sites/PWA is located. The data will be upgraded and copied into the site collection.
Expand All @@ -48,7 +48,7 @@ When the Global parameter is used, all objects are contained in the global store
Type: SPAssignmentCollection
Parameter Sets: (All)
Aliases:
Applicable: Project Server 2016, Project Server 2019
Applicable: Project Server 2016

Required: False
Position: Named
Expand All @@ -64,7 +64,7 @@ Prompts you for confirmation before running the cmdlet.
Type: SwitchParameter
Parameter Sets: (All)
Aliases: cf
Applicable: Project Server 2016, Project Server 2019
Applicable: Project Server 2016

Required: False
Position: Named
Expand All @@ -80,7 +80,7 @@ The name of the Project Server 2013 database.
Type: String
Parameter Sets: (All)
Aliases:
Applicable: Project Server 2016, Project Server 2019
Applicable: Project Server 2016

Required: True
Position: Named
Expand All @@ -96,7 +96,7 @@ The name of the instance of SQL Server hosting the Project Server 2013 database.
Type: String
Parameter Sets: (All)
Aliases:
Applicable: Project Server 2016, Project Server 2019
Applicable: Project Server 2016

Required: False
Position: Named
Expand All @@ -112,7 +112,7 @@ The name of the SQL Server failover partner for the Project Server 2013 database
Type: String
Parameter Sets: (All)
Aliases:
Applicable: Project Server 2016, Project Server 2019
Applicable: Project Server 2016

Required: False
Position: Named
Expand All @@ -128,7 +128,7 @@ Specifies to overwrite any Project data from previous attempts.
Type: SwitchParameter
Parameter Sets: (All)
Aliases:
Applicable: Project Server 2016, Project Server 2019
Applicable: Project Server 2016

Required: False
Position: Named
Expand All @@ -144,7 +144,7 @@ SQL Server authentication credentials if needed.
Type: PSCredential
Parameter Sets: (All)
Aliases:
Applicable: Project Server 2016, Project Server 2019
Applicable: Project Server 2016

Required: False
Position: Named
Expand All @@ -160,7 +160,7 @@ The URL of the site collection to which you want to copy the Project data.
Type: SPSitePipeBind
Parameter Sets: (All)
Aliases:
Applicable: Project Server 2016, Project Server 2019
Applicable: Project Server 2016

Required: True
Position: Named
Expand All @@ -177,7 +177,7 @@ The cmdlet is not run.
Type: SwitchParameter
Parameter Sets: (All)
Aliases: wi
Applicable: Project Server 2016, Project Server 2019
Applicable: Project Server 2016

Required: False
Position: Named
Expand Down
2 changes: 1 addition & 1 deletion skype/skype-ps/skype/Grant-CsExternalAccessPolicy.md
Expand Up @@ -17,7 +17,7 @@ ms.reviewer: rogupta
Enables you to assign an external access policy to a user or a group of users.
External access policies determine whether or not your users can: 1) communicate with users who have Session Initiation Protocol (SIP) accounts with a federated organization; 2) communicate with users who have SIP accounts with a public instant messaging (IM) provider such as MSN; and, 3) access Skype for Business Server over the Internet, without having to log on to your internal network.
This cmdlet was introduced in Lync Server 2010.

Please note: althought the _Applies to_ section does not mention it, this cmdlet also applies to Microsoft Teams.

## SYNTAX

Expand Down

0 comments on commit 066bc1f

Please sign in to comment.