Merge branch 'master' into master

Author: kenwith

.openpublishing.publish.config.json

@@ -265,7 +265,6 @@
       "template_folder": "_themes.pdf"
     }
   },
-  "need_generate_pdf": false,
   "need_generate_intellisense": false,
   "enable_incremental_build": false,
   "dependent_packages": [

exchange/docs-conceptual/exchange-eop/connect-to-exchange-online-protection-powershell.md

@@ -64,7 +64,7 @@ Exchange Online Protection PowerShell allows you to manage your Exchange Online
 2. Run the following command:
 
     ```
-    $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.compliance.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
+    $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
     ```
 
     **Notes**:

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

@@ -19,7 +19,7 @@ description: "Learn how to use remote PowerShell to connect to Exchange Online."
 Exchange Online PowerShell allows you to manage your Exchange Online settings from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to Exchange Online. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Exchange Online cmdlets into your local Windows PowerShell session so that you can use them.
 
 > [!IMPORTANT]
-> If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Exchange Online PowerShell using multi-factor authentication](mfa-connect-to-exchange-online-powershell.md). If you're an Exchange Online Protection (EOP) standalone customer, and you're using the service to protect on-premises mailboxes, use the connection instructions in the topic [Connect to Exchange Online Protection PowerShell](../../exchange-eop/connect-to-exchange-online-protection-powershell.md). If your EOP subscription is Exchange Enterprise CAL with Services (includes data loss prevention (DLP) and reporting using web services), the connection instructions in this topic will work for you. 
+> If you want to use multi-factor authentication (MFA) to connect to Exchange Online PowerShell, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Exchange Online PowerShell using multi-factor authentication](mfa-connect-to-exchange-online-powershell.md). <br/><br/> If you're an Exchange Online Protection (EOP) standalone customer, and you're using the service to protect on-premises mailboxes, use the connection instructions in the topic [Connect to Exchange Online Protection PowerShell](../../exchange-eop/connect-to-exchange-online-protection-powershell.md). If your EOP subscription is Exchange Enterprise CAL with Services (includes data loss prevention (DLP) and reporting using web services), the connection instructions in this topic will work for you.
 
 ## What do you need to know before you begin?
 
@@ -54,7 +54,7 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
   You need to configure this setting only once on your computer, not every time you connect.
 
 > [!TIP]
-> Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351). 
+> Having problems? Ask for help in the Exchange forums. Visit the forums at: [Exchange Online](https://go.microsoft.com/fwlink/p/?linkId=267542), or [Exchange Online Protection](https://go.microsoft.com/fwlink/p/?linkId=285351).
 
 ## Connect to Exchange Online PowerShell
 
@@ -77,13 +77,13 @@ Exchange Online PowerShell allows you to manage your Exchange Online settings fr
    - For Office 365 operated by 21Vianet, use the _ConnectionUri_ value: `https://partner.outlook.cn/PowerShell`
 
    - For Office 365 Germany, use the _ConnectionUri_ value: `https://outlook.office.de/powershell-liveid/`
-    
+
    - For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://outlook.office365.us/powershell-liveid/`
 
    - If you're behind a proxy server, run this command first: `$ProxyOptions = New-PSSessionOption -ProxyAccessType <Value>`, where the _ProxyAccessType_ value is `IEConfig`, `WinHttpConfig`, or `AutoDetect`.
-      
+
      Then, add the following parameter and value to the end of the $Session = ... command: `-SessionOption $ProxyOptions`.
-      
+
      For more information, see [New-PSSessionOption](https://docs.microsoft.com/powershell/module/microsoft.powershell.core/new-pssessionoption).
 
 3. Run the following command.

exchange/docs-conceptual/exchange-server/use-update-exchangehelp.md

@@ -136,11 +136,11 @@ To download all of the update packages, follow these steps.
 
 1. Download all of the .cab files that are defined in the ExchangeHelpInfo.xml manifest file by using the **\<CabinetUrl\>** values. Save the files in a location that's easy to remember.
 
-2. Publish the .cab files on an internal web server (for example `http://intranet.contoso.com/downloads/exchange`).
+2. Publish the .cab files on an internal web server (for example `https://intranet.contoso.com/downloads/exchange`).
 
 3. Modify the URL values of the **\<CabinetUrl\>** keys to point to the internal web server where you published the .cab files.
 
-    For example, change the value `https://download.microsoft.com/download/8/7/0/870FC9AB-6D22-4478-BFBF-66CE775BCD18/ExchangePS_Update_En.cab` to `http://intranet.contoso.com/downloads/exchange/ExchangePS_Update_En.cab`.
+    For example, change the value `https://download.microsoft.com/download/8/7/0/870FC9AB-6D22-4478-BFBF-66CE775BCD18/ExchangePS_Update_En.cab` to `https://intranet.contoso.com/downloads/exchange/ExchangePS_Update_En.cab`.
 
 4. Save the customized ExchangeHelpInfo.xml manifest file.
 
@@ -170,11 +170,11 @@ After you identify the update packages that apply to you, follow these steps:
 
 1. Download the applicable .cab files by using the **\<CabinetUrl\>** values. Save the files in a location that's easy to remember.
 
-2. Publish the .cab files on an internal web server (for example `http://intranet.contoso.com/downloads/exchange`).
+2. Publish the .cab files on an internal web server (for example `https://intranet.contoso.com/downloads/exchange`).
 
 3. Modify the URL values of the **\<CabinetUrl\>** keys to point to the internal web server where you published the .cab files.
 
-    For example, change the value `https://download.microsoft.com/download/8/7/0/870FC9AB-6D22-4478-BFBF-66CE775BCD18/ExchangePS_Update_En.cab` to `http://intranet.contoso.com/downloads/exchange/ExchangePS_Update_En.cab`.
+    For example, change the value `https://download.microsoft.com/download/8/7/0/870FC9AB-6D22-4478-BFBF-66CE775BCD18/ExchangePS_Update_En.cab` to `https://intranet.contoso.com/downloads/exchange/ExchangePS_Update_En.cab`.
 
 4. Optionally, you can delete the **\<HelpInfo\>** sections that don't apply to you.
 
@@ -184,23 +184,23 @@ After you identify the update packages that apply to you, follow these steps:
 
 ### Step 3. Publish the customized ExchangeHelpInfo.xml manifest file on an internal web server
 
-Publish the customized ExchangeHelpInfo.xml manifest file from Step 2 on an internal web server that's accessible to your internal Exchange servers. For example, `http://intranet.contoso.com/downloads/exchange/ExchangeHelpInfo.xml`. You'll use the URL value of this location in Step 4.
+Publish the customized ExchangeHelpInfo.xml manifest file from Step 2 on an internal web server that's accessible to your internal Exchange servers. For example, `https://intranet.contoso.com/downloads/exchange/ExchangeHelpInfo.xml`. You'll use the URL value of this location in Step 4.
 
 Note that there's no relationship between the ExchangeHelpInfo.xml manifest file and .cab file locations. You can have them available at the same URL or on different servers.
 
 [Return to top](use-update-exchangehelp.md#RTT)
 
 ### Step 4. Modify the registry of your Exchange servers to point to the customized ExchangeHelpInfo.xml manifest file
 
-You need the download location of the customized ExchangeHelpInfo.xml manifest file that you configured in Step 3. This example uses the value `http://intranet.contoso.com/downloads/exchange/ExchangeHelpInfo.xml`.
+You need the download location of the customized ExchangeHelpInfo.xml manifest file that you configured in Step 3. This example uses the value `https://intranet.contoso.com/downloads/exchange/ExchangeHelpInfo.xml`.
 
 1. Copy and paste the following text into Notepad, customize the URL for your environment, and save the file as UpdateExchangeHelp.reg in a location that's easy to remember.
 
   ```
   Windows Registry Editor Version 5.00
 
  [HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\ExchangeServer\v15\UpdateExchangeHelp]
- "ManifestUrl"="http://intranet.contoso.com/downloads/exchange/ExchangeHelpInfo.xml"
+ "ManifestUrl"="https://intranet.contoso.com/downloads/exchange/ExchangeHelpInfo.xml"
   ```
 
 2. Run the UpdateExchangeHelp.reg file on your internal Exchange servers.

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

@@ -17,7 +17,7 @@ description: "Learn how to connect to Security & Compliance Center PowerShell."
 Office 365 Security & Compliance Center PowerShell allows you to manage your Office 365 Security & Compliance Center settings from the command line. You use Windows PowerShell on your local computer to create a remote PowerShell session to the Security & Compliance Center. It's a simple three-step process where you enter your Office 365 credentials, provide the required connection settings, and then import the Security & Compliance Center cmdlets into your local Windows PowerShell session so that you can use them.
 
 > [!NOTE]
-> If you want to use multi-factor authentication (MFA) to connect to Security & Compliance Center PowerShell, or if your organization uses federated authentication, you need to download and use the Exchange Online Remote PowerShell Module. For more information, see [Connect to Office 365 Security & Compliance Center PowerShell using multi-factor authentication](mfa-connect-to-scc-powershell.md). For some features (for example, mailbox archiving), the Security & Compliance Center links to existing functionality in the Exchange admin center (EAC). To use PowerShell with these features, you need to connect to Exchange Online instead of the Security & Compliance Center. For more information, see [Connect to Exchange Online PowerShell](../../exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell.md). 
+> The procedures in this topic won't work if: <br/>• Your account uses multi-factor authentication (MFA). <br/>• Your organization uses federated authentication. <br/>• A location condition in an Azure Active Directory conditional access policy restricts your access to trusted IPs. <br/> In these scenarions, you need to download and use the Exchange Online Remote PowerShell Module to connect to Security & Compliance Center PowerShell. For instructions, see [Connect to Office 365 Security & Compliance Center PowerShell using multi-factor authentication](mfa-connect-to-scc-powershell.md). <br/><br/> Some features in the Security & Compliance Center (for example, mailbox archiving) link to existing functionality in the Exchange admin center (EAC). To use PowerShell with these features, you need to connect to Exchange Online PowerShell instead of Security & Compliance Center PowerShell. For instructions, see [Connect to Exchange Online PowerShell](../../exchange-online/connect-to-exchange-online-powershell/connect-to-exchange-online-powershell.md). <br/><br/> 
 
 For more information about the Security & Compliance Center, see [Office 365 Security & Compliance Center](https://go.microsoft.com/fwlink/p/?LinkId=627054).
 
@@ -59,31 +59,31 @@ For more information about the Security & Compliance Center, see [Office 365 Sec
 
 1. On your local computer, open Windows PowerShell and run the following command:
 
-    ```
-    $UserCredential = Get-Credential
-    ```
+   ```
+   $UserCredential = Get-Credential
+   ```
 
-    In the **Windows PowerShell Credential Request** dialog box that appears, type your work or school account and password, and then click **OK**.
+   In the **Windows PowerShell Credential Request** dialog box that appears, type your work or school account and password, and then click **OK**.
 
 2. Run the following command:
 
-    ```
-    $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.compliance.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
-    ```
+   ```
+   $Session = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri https://ps.compliance.protection.outlook.com/powershell-liveid/ -Credential $UserCredential -Authentication Basic -AllowRedirection
+   ```
 
-    **Notes**:
+   **Notes**:
 
-    - For Office 365 Germany, use the _ConnectionUri_ value: `https://ps.compliance.protection.outlook.de/powershell-liveid/`.
+   - For Office 365 Germany, use the _ConnectionUri_ value: `https://ps.compliance.protection.outlook.de/powershell-liveid/`.
 
-    - For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://ps.compliance.protection.office365.us/powershell-liveid/
+   - For Office 365 Government Community Cloud High (GCC High), use the _ConnectionUri_ value: `https://ps.compliance.protection.office365.us/powershell-liveid/
 
-    - 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).
+   - 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).
 
 3. Run the following command:
 
-    ```
-    Import-PSSession $Session -DisableNameChecking
-    ```
+   ```
+   Import-PSSession $Session -DisableNameChecking
+   ```
 
 > [!NOTE]
 > 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. 
@@ -108,9 +108,9 @@ If you receive errors, check the following requirements:
 
 - The **New-PSSession** command (Step 2) might fail to connect if your client IP address changes during the connection request. This can happen if your organization uses a source network address translation (SNAT) pool that contains multiple IP addresses. The connection error looks like this:
 
-    `The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
+  `The request for the Windows Remote Shell with ShellId <ID> failed because the shell was not found on the server. Possible causes are: the specified ShellId is incorrect or the shell no longer exists on the server. Provide the correct ShellId or create a new shell and retry the operation.`
 
-    To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Security & Compliance Center PowerShell endpoint.
+  To fix the issue, use an SNAT pool that contains a single IP address, or force the use of a specific IP address for connections to the Security & Compliance Center PowerShell endpoint.
  
 ## See also
 

exchange/exchange-ps/exchange/advanced-threat-protection/Get-UrlTrace.md

@@ -27,7 +27,7 @@ Get-UrlTrace [-ClickId <Guid>] [-EndDate <DateTime>] [-Expression <Expression>]
 ```
 
 ## DESCRIPTION
-Safe Links is a feature in Advanced Threat Protection that checks links in email messages to see if they lead to malicious web sites. When a user clicks a link in a message, the URL is temporarily rewritten and checked against a list of known, malicious web sites. Safe Links includes the URL trace reporting feature to help determine who has clicked through to a malicious web site.
+Safe Links is a feature in Advanced Threat Protection that checks links in email messages to see if they lead to malicious web sites. When a user clicks a link in a message, the URL is temporarily rewritten and checked against a list of known, malicious web sites. Safe Links includes the URL trace reporting feature to help determine who has clicked through to a malicious web site. For more information about Advanced Threat Protection Safe Links, see [Office 365 ATP Safe Links](https://docs.microsoft.com/office365/securitycompliance/atp-safe-links).
 
 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).