Skip to content

Commit 507f095

Browse files
authored
Merge pull request MicrosoftDocs#6624 from MicrosoftDocs/master
Publishing to live
2 parents 64beb3a + d23912c commit 507f095

File tree

9 files changed

+15
-7
lines changed

9 files changed

+15
-7
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ If your account uses multi-factor authentication, use the steps in this section.
4949

5050
- _\<UPN\>_ is your account in user principal name format (for example, `[email protected]`).
5151
- The required _ConnectionUri_ value depends on the nature of your Microsoft 365 organization. For more information, see the parameter description in [Connect-IPPSSession](https://docs.microsoft.com/powershell/module/exchange/connect-ippssession).
52-
- When you use the _UserPrincipalName_ parameter, you don't need to use the
52+
- When you use the _UserPrincipalName_ parameter, you don't need to use the _AzureADAuthorizationEndpointUri_ parameter in environments that would otherwise require it.
5353

5454
**This example connects to Security & Compliance Center PowerShell in a Microsoft 365 or Microsoft 365 GCC organization**.
5555

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ Accept wildcard characters: False
7171
### -WebTemplate
7272
7373
Identifies which base template to add the design to. Use the value **64** for the Team site template, and the value **68** for the Communication site template.
74+
For more information, visit [SharePoint site design and site script overview](https://docs.microsoft.com/sharepoint/dev/declarative-customization/site-design-overview).
7475
7576
```yaml
7677
Type: String

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Get-SPOGeoAdministrator [<CommonParameters>]
2525
## DESCRIPTION
2626

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

3030
The `Get-SPOGeoAdministrator` cmdlet has a single parameter set and matches a user or a list of users which has the ability to do changes globally in the geo location that you are connected to.
3131

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Use this cmdlet to remove the current SharePoint Online Home Site setting.
3434
Remove-SPOHomeSite
3535
```
3636

37-
This example removes the current SharerPoint Online Home Site setting.
37+
This example removes the current SharePoint Online Home Site setting.
3838

3939
## PARAMETERS
4040

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ Accept wildcard characters: False
6161
6262
### -Principals
6363
64-
One or more principles to revoke the permissions for.
64+
One or more principals to revoke the permissions for.
6565
6666
```yaml
6767
Type: String[]

sharepoint/sharepoint-ps/sharepoint-online/Set-SPOBrowserIdleSignOut.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-
.
17+
Sets the current configuration values for Idle session sign-out.
1818

1919
## SYNTAX
2020

skype/skype-ps/skype/Grant-CsTeamsUpgradePolicy.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,12 @@ Office 365 provides all relevant instances of TeamsUpgradePolicy via built-in, r
4141
|UpgradeToTeams|TeamsOnly|False|Use this mode to upgrade users to Teams and to prevent chat, calling, and meeting scheduling in Skype for Business.|
4242
|Global|Islands|False||
4343

44+
45+
>[!IMPORTANT]
46+
>TeamsUpgradePolicy can be assigned to any Teams user, whether that user hase an on-premises account in Skype for Business Server or not. However, **TeamsOnly mode can only be assigned to a user who is already homed in Skype for Business Online**. This is because interop with Skype for Business users and federation as well as Microsoft 365 Phone System functionality are only possible if the user is homed in Skype for Business Online. In addition, you cannot assign TeamsOnly mode as the tenant-wide default if you have any Skype for Business on-premises deployment (which is detected by presence of a lyncdiscover DNS record that points to a location other than Office 365. To make these users TeamsOnly you must first move these users individually to the cloud using `Move-CsUser`. Once all users have been moved to the cloud, you can [disable hybrid to complete migration to the cloud] (https://docs.microsoft.com/en-us/skypeforbusiness/hybrid/cloud-consolidation-disabling-hybrid) and then apply TeamsOnly mode at the tenant level to ensure future users are TeamsOnly by default.
47+
48+
49+
4450
**NOTES:**
4551
- TeamsUpgradePolicy is available in both Office 365 and in on-premises versions of Skype for Business Server, but there are differences:
4652
- In Office 365, admins can specify both coexistence mode and whether to trigger notifications of pending upgrade.
@@ -51,7 +57,7 @@ Office 365 provides all relevant instances of TeamsUpgradePolicy via built-in, r
5157
- In Office 365, all relevant instances of TeamsUpgradePolicy are built into the system, so there is no corresponding New cmdlet available. In contrast, Skype for Business Server does not contain built-in instances, so the New cmdlet is available on-premises. Only NotifySfBUsers property is available in on-premises.
5258
- When granting a user a policy with mode=TeamsOnly or mode=SfBWithTeamsCollabAndMeetings, by default, meetings organized by that user will be migrated to Teams. For details, see [Using the Meeting Migration Service (MMS)](https://docs.microsoft.com/skypeforbusiness/audio-conferencing-in-office-365/setting-up-the-meeting-migration-service-mms).
5359

54-
**IMPORTANT**
60+
5561
When users are in any of the Skype for Business modes (SfBOnly, SfBWithTeamsCollab, SfBWithTeamsCollabAndMeetings), calling and chat functionality in the Teams app are disabled (but chat in the context of a Teams meeting is still allowed). Similarly, when users are in the SfBOnly or SfBWithTeamsCollab modes, meeting scheduling is disabled. For more details, see [Migration and interoperability guidance for organizations using Teams together with Skype for Business](https://docs.microsoft.com/microsoftteams/migration-interop-guidance-for-teams-with-skype).
5662

5763
The `Grant-CsTeamsUpgradePolicy` cmdlet checks the configuration of the corresponding settings in TeamsMessagingPolicy, TeamsCallingPolicy, and TeamsMeetingPolicy to determine if those settings would be superceded by TeamsUpgradePolicy and if so, an informational message is provided in PowerShell. It is not necessary to set these other policy settings. This is for informational purposes only. Below is an example of what the PowerShell warning looks like:

skype/skype-ps/skype/Move-CsUser.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ When moving a user to or from Office 365 (either Skype for Business Online or Te
4848
- Moving a user to Teams is achieved by specifying the MoveToTeams switch. This performs the same operations as a move to Skype for Business Online (without the specifying -MoveToTeams) and also performs the following actions:
4949

5050
- TeamsUpgradePolicy with Mode=TeamsOnly is assigned to the online user account.
51-
- Meeting migration is triggered to move meetings to Teams instead of Skype for Business Online. This functionality is currently available to TAP customers only. For customers not in TAP, meetings are always migrated to Skype for Business Online.
51+
- Meeting migration is triggered to move meetings to Teams instead of Skype for Business Online.
5252

5353
- Contacts are moved in all cases, unless -force is specified.
5454

skype/skype-ps/skype/Set-CsTeamsMessagingPolicy.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ All other policy properties will be left as previously assigned.
6868

6969
### -AllowGiphy
7070
Determines whether a user is allowed to access and post Giphys. Set this to TRUE to allow. Set this FALSE to prohibit.
71+
Note: [Optional Connected Experiences](https://docs.microsoft.com/deployoffice/privacy/manage-privacy-controls#policy-setting-for-optional-connected-experiences) must be also enabled for Giphys to be allowed.
7172

7273
```yaml
7374
Type: Boolean

0 commit comments

Comments
 (0)