fixing conflicts

windows/deployment/update/windows-analytics-get-started.md

@@ -8,8 +8,8 @@ ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: deploy
-author: lomayor
-ms.author: lomayor
+author: jaimeo
+ms.author: jaimeo
 ms.localizationpriority: medium
 ms.collection: M365-analytics
 ms.topic: article
@@ -73,6 +73,10 @@ To enable data sharing, configure your proxy server to whitelist the following e
 >[!NOTE]
 >Proxy authentication and SSL inspections are frequent challenges for enterprises. See the following sections for configuration options.
 
+> [!Important] 
+> For privacy and data integrity, Windows checks for a Microsoft SSL certificate when communicating with the diagnostic data endpoints. SSL interception and inspection aren't possible. To use Desktop Analytics, exclude these endpoints from SSL inspection.<!-- BUG 4647542 --> 
+
+
 ### Configuring endpoint access with SSL inspection
 To ensure privacy and data integrity Windows checks for a Microsoft SSL certificate when communicating with the diagnostic data endpoints. Accordingly SSL interception and inspection is not possible. To use Windows Analytics services you should exclude the above endpoints from SSL inspection.
 
@@ -95,6 +99,15 @@ The compatibility update scans your devices and enables application usage tracki
 
 We also recommend installing the latest [Windows Monthly Rollup](https://catalog.update.microsoft.com/v7/site/Search.aspx?q=security%20monthly%20quality%20rollup) on Windows 7 and Windows 8.1 devices.
 
+### Connected User Experiences and Telemetry service
+With Windows diagnostic data enabled, the Connected User Experience and Telemetry service (DiagTrack) collects system, application, and driver data. Microsoft analyzes this data, and shares it back to you through Windows Analytics. For the best experience, install these updates depending upon the operating system version.
+
+- For Windows 10, install the latest Windows 10 cumulative update.
+- For Windows 8.1, nstall the October 2018 monthly rollup, [KB4462926](https://support.microsoft.com/help/4462926)
+- For Windows 7, install the October 2018 monthly rollup, [KB4462923](https://support.microsoft.com/help/4462923)
+
+
+
 >[!IMPORTANT]
 >Restart devices after you install the compatibility updates for the first time.
 

windows/deployment/windows-autopilot/administer.md

@@ -39,28 +39,28 @@ Several platforms are available to register devices with Windows Autopilot. A su
 </tr>
 
 <tr>
-<td><a href="https://docs.microsoft.com/en-us/partner-center/autopilot">Partner Center</a></td>
+<td><a href="https://docs.microsoft.com/partner-center/autopilot">Partner Center</a></td>
 <td>YES - 1000 at a time max<b><em></b></td>
 <td>YES</td>
 <td>Tuple or PKID or 4K HH</td>
 </tr>
 
 <tr>
-<td><a href="https://docs.microsoft.com/en-us/intune/enrollment-autopilot">Intune</a></td>
+<td><a href="https://docs.microsoft.com/intune/enrollment-autopilot">Intune</a></td>
 <td>YES - 175 at a time max</td>
 <td>YES<b></em></b></td>
 <td>4K HH</td>
 </tr>
 
 <tr>
-<td><a href="https://docs.microsoft.com/en-us/microsoft-store/add-profile-to-devices#manage-autopilot-deployment-profiles">Microsoft Store for Business</a></td>
+<td><a href="https://docs.microsoft.com/microsoft-store/add-profile-to-devices#manage-autopilot-deployment-profiles">Microsoft Store for Business</a></td>
 <td>YES - 1000 at a time max</td>
 <td>YES</td>
 <td>4K HH</td>
 </tr>
 
 <tr>
-<td><a href="https://docs.microsoft.com/en-us/microsoft-365/business/create-and-edit-autopilot-profiles?redirectSourcePath=%252farticle%252fCreate-and-edit-Autopilot-profiles-5cf7139e-cfa1-4765-8aad-001af1c74faa">Microsoft Business 365</a></td>
+<td><a href="https://docs.microsoft.com/microsoft-365/business/create-and-edit-autopilot-profiles">Microsoft Business 365</a></td>
 <td>YES - 1000 at a time max</td>
 <td>YES</td>
 <td>4K HH</td>