Merge remote-tracking branch 'refs/remotes/origin/master' into jdreboot

windows/deploy/resolve-windows-10-upgrade-errors.md

@@ -18,6 +18,8 @@ localizationpriority: high
 
 This topic provides a brief introduction to Windows 10 installation processes, and provides resolution procedures that IT administrators can use to resolve issues with Windows 10 upgrade.
 
+If you are not an IT administrator, you can try the [quick fixes](#quick-fixes) listed in this topic. If the quick fixes do not resolve your issue, see [Get help with Windows 10 upgrade and installation errors](https://support.microsoft.com/en-us/help/10587/windows-10-get-help-with-upgrade-installation-errors) for more information.
+
 ## In this topic
 
 The following sections and procedures are provided in this guide:
@@ -63,6 +65,7 @@ WIM = Windows image (Microsoft)
 The following steps can resolve many Windows upgrade problems.
 
 <OL>
+<LI>Remove nonessential external hardware, such as docks and USB devices.</LI> 
 <LI>Check all hard drives for errors and attempt repairs. To automatically repair hard drives, open an elevated command prompt, switch to the drive you wish to repair, and type the following command. You will be required to reboot the computer if the hard drive being repaired is also the system drive.
 <UL>
 <LI>chkdsk /F</LI>
@@ -81,14 +84,12 @@ The following steps can resolve many Windows upgrade problems.
   <LI>Verify compatibility information and re-install antivirus applications after the upgrade.</LI></LI>
   </UL>
 <LI>Uninstall all nonessential software.</LI>
-<LI>Remove nonessential external hardware, such as docks and USB devices.</LI> 
 <LI>Update firmware and drivers.</LI>
 <LI>Ensure that "Download and install updates (recommended)" is accepted at the start of the upgrade process.</LI>
 <LI>Verify at least 16 GB of free space is available to upgrade a 32-bit OS, or 20 GB for a 64-bit OS.
 </OL>
 
 
-
 ## Upgrade error codes
 
 If the upgrade process is not successful, Windows Setup will return two codes:

windows/keep-secure/change-history-for-keep-windows-10-secure.md

@@ -16,6 +16,7 @@ This topic lists new and updated topics in the [Keep Windows 10 secure](index.md
 
 | New or changed topic | Description |
 | --- | --- |
+|[Limitations while using Windows Information Protection (WIP)](limitations-with-wip.md) |Added content about using ActiveX controls.|
 |[Unenlightened and enlightened app behavior while using Windows Information Protection (WIP)](app-behavior-with-wip.md) |New |
 |[VPN technical guide](vpn-guide.md) | Multiple new topics, replacing previous **VPN profile options** topic |
 

windows/keep-secure/limitations-with-wip.md

@@ -71,7 +71,12 @@ This table provides info about the most common problems you might encounter whil
     </tr>
     <tr>
         <td>You can't upload an enterprise file to a personal location using Microsoft Edge or Internet Explorer.</td>
-        <td>A message appears stating that the content is marked as **Work** and the user isn't given an option to override to **Personal**.</td>
-        <td>Open File Explorer and change the file ownership to **Personal** before you upload.</td>
+        <td>A message appears stating that the content is marked as <strong>Work</strong> and the user isn't given an option to override to <strong>Personal</strong>.</td>
+        <td>Open File Explorer and change the file ownership to <strong>Personal</strong> before you upload.</td>
+    </tr>
+    <tr>
+        <td>ActiveX controls should be used with caution.</td>
+        <td>Webpages that use ActiveX controls can potentially communicate with other outside processes that aren’t protected by using WIP.</td>
+        <td>We recommend that you switch to using Microsoft Edge, the more secure and safer browser that prevents the use of ActiveX controls. We also recommend that you limit the usage of Internet Explorer 11 to only those line-of-business apps that require legacy technology.<p>For more info, see [Out-of-date ActiveX control blocking](https://technet.microsoft.com/en-us/itpro/internet-explorer/ie11-deploy-guide/out-of-date-activex-control-blocking).</td>
     </tr>
 </table>                 

windows/keep-secure/troubleshoot-windows-defender-advanced-threat-protection.md

@@ -29,6 +29,9 @@ Configure your browser to allow cookies.
 ### No data is shown on the portal
 If no data is displayed on the Dashboard portal even if no errors were encountered in the portal logs or in the browser console, you'll need to whitelist the threat intelligence, data access, and detonation endpoints that also use this protocol.
 
+> [!NOTE]
+> You must use the HTTPS protocol when adding the following endpoints.
+
 Depending on your region, add the following endpoints to the whitelist:
 
 U.S. region: