Skip to content

Commit f3fa03a

Browse files
authored
Merge branch 'master' into chrisda
2 parents bc22376 + f3cf95a commit f3fa03a

File tree

6 files changed

+14
-20
lines changed

6 files changed

+14
-20
lines changed

exchange/docs-conceptual/exchange-online/connect-to-exchange-online-powershell/mfa-connect-to-exchange-online-powershell.md

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
4242

4343
<sup>*</sup> For older versions of Windows, you need to install the Microsoft.NET Framework 4.5 or later and then an updated version of the Windows Management Framework: 3.0, 4.0, or 5.1 (only one). For more information, see [Installing the .NET Framework](https://go.microsoft.com/fwlink/p/?LinkId=257868), [Windows Management Framework 3.0](https://go.microsoft.com/fwlink/p/?LinkId=272757), [Windows Management Framework 4.0](https://go.microsoft.com/fwlink/p/?LinkId=391344), and [Windows Management Framework 5.1](https://aka.ms/wmf5download).
4444

45-
- The Exchange Online Remote PowerShell Module needs to be installed on your computer:
45+
- The Exchange Online Remote PowerShell Module needs to be installed on your computer. You need to do the following steps in a browser that supports ClickOnce (for example, Internet Explorer or the non-Chromium version of Edge):
4646

47-
1. In Internet Explorer or Edge, open the Exchange admin center (EAC) for your Exchange Online organization. For instructions, see [Exchange admin center in Exchange Online](https://docs.microsoft.com/exchange/exchange-admin-center).
48-
49-
**Note**: A browser that uses ClickOnce to download (like Internet Explorer or Edge) is needed to complete the next step.
47+
1. Open the Exchange admin center (EAC) for your Exchange Online organization. For instructions, see [Exchange admin center in Exchange Online](https://docs.microsoft.com/exchange/exchange-admin-center).
5048

5149
2. In the EAC, go to **Hybrid** > **Setup** and click the appropriate **Configure** button to download the Exchange Online Remote PowerShell Module for multi-factor authentication.
5250

@@ -70,7 +68,7 @@ If you want to use multi-factor authentication (MFA) to connect to Exchange Onli
7068

7169
If basic authentication is disabled, you'll get this error when you try to connect:
7270

73-
`The WinRM client cannot process the request. Basic authentication is currently disabled in the client configuration. Change the client configuration and try the request again.`
71+
> The WinRM client cannot process the request. Basic authentication is currently disabled in the client configuration. Change the client configuration and try the request again.
7472
7573
- When you use the Exchange Online Remote PowerShell Module, your session will end after one hour, which can be problematic for long-running scripts or processes. To avoid this issue, use [Trusted IPs](https://docs.microsoft.com/azure/active-directory/authentication/howto-mfa-mfasettings#trusted-ips) to bypass MFA for connections from your intranet. Trusted IPs allow you to connect to Exchange Online PowerShell from your intranet using the old instructions at [Connect to Exchange Online PowerShell](connect-to-exchange-online-powershell.md). Also, if you have servers in a datacenter, be sure to add their public IP addresses to Trusted IPs as described [here](https://docs.microsoft.com/azure/active-directory/authentication/howto-mfa-mfasettings#enable-the-trusted-ips-feature-by-using-service-settings).
7674

exchange/exchange-ps/exchange/advanced-threat-protection/Set-AtpPolicyForO365.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,8 +145,8 @@ Accept pipeline input: False
145145
Accept wildcard characters: False
146146
```
147147
148-
### -EnableSafeLinksForO365Clients
149-
The EnableSafeLinksForO365Clients parameter specifies whether Safe Links is enabled for Office 365 apps on desktop clients and on the web. Valid values are:
148+
### -EnableSafeLinksForClients
149+
The EnableSafeLinksForClients parameter specifies whether Safe Links is enabled for Office 365 apps on desktop clients and on the web. Valid values are:
150150
151151
- $true: Safe Links are enabled for Office 365 apps. This is the default value.
152152

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1212,11 +1212,7 @@ Accept wildcard characters: False
12121212
### -LinkedInEnabled
12131213
This parameter is available only in the cloud-based service.
12141214
1215-
The LinkedInEnabled parameter specifies whether users can synchronize their LinkedIn contacts to their Contacts folder. Valid values are:
1216-
1217-
- $true: LinkedIn integration is enabled. This is the default value.
1218-
1219-
- $false: LinkedIn integration is disabled.
1215+
LinkedIn integration is no longer supported.
12201216
12211217
```yaml
12221218
Type: Boolean

exchange/exchange-ps/exchange/encryption-and-certificates/New-ExchangeCertificate.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ Exchange uses certificates for SSL and TLS encryption.
6767

6868
There are many factors to consider when you configure certificates for Transport Layer Security (TLS) and Secure Sockets Layer (SSL) services. You need to understand how these factors might affect your overall configuration. For more information, see [Digital certificates and encryption in Exchange Server](https://docs.microsoft.com/Exchange/architecture/client-access/certificates).
6969

70-
Secure Sockets Layer (SSL) is being replaced by Transport Layer Security (TLS) as the protocol that's used to encrypt data sent between computer systems. They're so closely related that the terms "SSL" and "TLS" (without versions) are often used interchangeably. Because of this similarity, references to "SSL" in Exchange topics, the Exchange admin center, and the Exchange Management Shell have often been used to encompass both the SSL and TLS protocols. Typically, "SSL" refers to the actual SSL protocol only when a version is also provided (for example, SSL 3.0). To find out why you should disable the SSL protocol and switch to TLS, check out [Protecting you against the SSL 3.0 vulnerability](https://blogs.office.com/2014/10/29/protecting-ssl-3-0-vulnerability/).
70+
Secure Sockets Layer (SSL) is being replaced by Transport Layer Security (TLS) as the protocol that's used to encrypt data sent between computer systems. They're so closely related that the terms "SSL" and "TLS" (without versions) are often used interchangeably. Because of this similarity, references to "SSL" in Exchange topics, the Exchange admin center, and the Exchange Management Shell have often been used to encompass both the SSL and TLS protocols. Typically, "SSL" refers to the actual SSL protocol only when a version is also provided (for example, SSL 3.0). To find out why you should disable the SSL protocol and switch to TLS, check out [Protecting you against the SSL 3.0 vulnerability](https://azure.microsoft.com/blog/protecting-against-the-ssl-3-0-vulnerability/).
7171

7272
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://docs.microsoft.com/powershell/exchange/exchange-server/find-exchange-cmdlet-permissions).
7373

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ Accept wildcard characters: False
696696
### -DisabledWebPartIds
697697
PARAMVALUE: <Guid>[,<Guid>,...]
698698
699-
Allows administrators prevent certain, specific web parts from being added to pages or rendering on pages on which they were previously added. Only web parts that utilize third-party services (Amazon Kindle, YouTube, Twitter) can be disabled in such a manner.
699+
Allows administrators prevent certain, specific web parts from being added to pages or rendering on pages on which they were previously added. Currently, only Amazon Kindle, YouTube and Twitter web parts can be disabled in such a manner.
700700
701701
To disable a specific web part you need to enter its GUID as the parameter: Amazon Kindle (46698648-fcd5-41fc-9526-c7f7b2ace919), YouTube (544dd15b-cf3c-441b-96da-004d5a8cea1d), Twitter (f6fdf4f8-4a24-437b-a127-32e66a5dd9b4). If you are looking for a GUID for any other web part, easiest way to achieve is to place the web part on a SharePoint page and move to maintenance mode. See more details around the [web part maintenance mode from Microsoft Support](https://support.office.com/en-us/article/Open-and-use-the-Web-Part-Maintenance-Page-EFF9CE22-D04A-44DD-AE83-AC29A5E396C2).
702702

sharepoint/sharepoint-ps/sharepoint-online/Start-SPOSiteContentMove.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,21 +44,21 @@ This command starts the information and the status of a move request of a user b
4444

4545
### EXAMPLE 1
4646
```powershell
47-
Start-SPOSiteContentMove -Url $url -DestinationDataLocation $DestLocation -PreferredMoveBeginDate ((Get-Date).AddHours(1)) -PreferredMoveEndDate ((Get-Date).AddHour(12))
47+
Start-SPOSiteContentMove -Url https://contosoenergy.sharepoint.com/sites/hr -DestinationDataLocation EUR -PreferredMoveBeginDate ((Get-Date).AddHours(1)) -PreferredMoveEndDate ((Get-Date).AddHour(12))
4848
```
49-
Starts the movement of the content on $url to the destination defined on $DestLocation variable preferred to start 1 hour ahead from now, until 12 hours to that relative time.
49+
Starts the movement of the content on https://contosoenergy.sharepoint.com/sites/hr to the EUR destination preferred to start 1 hour ahead from now, until 12 hours to that relative time.
5050

5151
### EXAMPLE 2
5252
```powershell
53-
Start-SPOSiteContentMove -GroupName [email protected] -DestinationDataLocation $destlocation
53+
Start-SPOSiteContentMove -GroupName [email protected] -DestinationDataLocation JPN
5454
```
55-
Starts the movement of a group of users called [email protected] to the destination location called $destlocation
55+
Starts the movement of a group of users called [email protected] to the JPN location
5656

5757
### EXAMPLE 3
5858
```powershell
59-
Start-SPOSiteContentMove -Url $url -DestinationUrl $destlocation
59+
Start-SPOSiteContentMove -Url https://contosoenergy.sharepoint.com/sites/hr -DestinationUrl https://contosoenergyEUR.sharepoint.com/sites/hr
6060
```
61-
Starts the movement from a $url and set it to the location defined on $destlocation
61+
Starts the movement from https://contosoenergy.sharepoint.com/sites/hr and set it to the location https://contosoenergyEUR.sharepoint.com/sites/hr
6262

6363

6464
## PARAMETERS

0 commit comments

Comments
 (0)