diff --git a/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
index 8bf2663621..bc6edfa186 100644
--- a/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
+++ b/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
@@ -56,7 +56,7 @@ See the following table for a summary of the management settings for Windows 10
| Setting | UI | Group Policy | MDM policy | Registry | Command line |
| - | :-: | :-: | :-: | :-: | :-: |
| [1. Certificate trust lists](#certificate-trust-lists) | |  | | | |
-| [2. Cortana and search](#bkmk-cortana) |  |  |  | |  |
+| [2. Cortana and Search](#bkmk-cortana) |  |  |  | |  |
| [3. Date & Time](#bkmk-datetime) |  | | |  | |
| [4. Device metadata retrieval](#bkmk-devinst) | |  | | | |
| [5. Font streaming](#font-streaming) | | | |  | |
@@ -102,53 +102,53 @@ See the following table for a summary of the management settings for Windows 10
See the following table for a summary of the management settings for Windows Server 2016 with Desktop Experience.
-| Setting | UI | Group Policy | MDM policy | Registry | Command line |
-| - | :-: | :-: | :-: | :-: | :-: |
-| [1. Certificate trust lists](#certificate-trust-lists) | |  | | | |
-| [2. Cortana and search](#bkmk-cortana) |  |  |  | |  |
-| [3. Date & Time](#bkmk-datetime) |  | | |  | |
-| [4. Device metadata retrieval](#bkmk-devinst) | |  | | | |
-| [5. Font streaming](#font-streaming) | | | |  | |
-| [6. Insider Preview builds](#bkmk-previewbuilds) |  |  |  | |  |
-| [7. Internet Explorer](#bkmk-ie) |  |  | | | |
-| [8. Live Tiles](#live-tiles) | |  | | | |
-| [10. Microsoft Account](#bkmk-microsoft-account) | | | |  | |
-| [12. Network Connection Status Indicator](#bkmk-ncsi) | |  | | | |
-| [14. OneDrive](#bkmk-onedrive) | |  | |  | |
-| [16. Settings > Privacy](#bkmk-settingssection) | | | | | |
-| [16.1 General](#bkmk-priv-general) |  |  |  |  | |
-| [17. Software Protection Platform](#bkmk-spp) | |  |  | | |
-| [19. Teredo](#bkmk-teredo) | | | | |  |
-| [21. Windows Defender](#bkmk-defender) | |  |  |  | |
-| [22. Windows Media Player](#bkmk-wmp) |  | | | |  |
-| [24. Windows Store](#bkmk-windowsstore) | |  | | | |
-| [26. Windows Update](#bkmk-wu) |  |  |  | | |
+| Setting | UI | Group Policy | Registry | Command line |
+| - | :-: | :-: | :-: | :-: |
+| [1. Certificate trust lists](#certificate-trust-lists) | |  |  | |
+| [2. Cortana and Search](#bkmk-cortana) |  |  | | |
+| [3. Date & Time](#bkmk-datetime) |  | |  | |
+| [4. Device metadata retrieval](#bkmk-devinst) | |  | | |
+| [5. Font streaming](#font-streaming) | | |  | |
+| [6. Insider Preview builds](#bkmk-previewbuilds) |  |  | | |
+| [7. Internet Explorer](#bkmk-ie) |  |  | | |
+| [8. Live Tiles](#live-tiles) | |  | | |
+| [10. Microsoft Account](#bkmk-microsoft-account) | | |  | |
+| [12. Network Connection Status Indicator](#bkmk-ncsi) | |  | | |
+| [14. OneDrive](#bkmk-onedrive) | |  | | |
+| [16. Settings > Privacy](#bkmk-settingssection) | | | | |
+| [16.1 General](#bkmk-priv-general) |  |  |  | |
+| [17. Software Protection Platform](#bkmk-spp) | |  | | |
+| [19. Teredo](#bkmk-teredo) | | | |  |
+| [21. Windows Defender](#bkmk-defender) | |  |  | |
+| [22. Windows Media Player](#bkmk-wmp) | | | |  |
+| [24. Windows Store](#bkmk-windowsstore) | |  | | |
+| [26. Windows Update](#bkmk-wu) | |  |  | |
### Settings for Windows Server 2016 Server Core
See the following table for a summary of the management settings for Windows Server 2016 Server Core.
-| Setting | UI | Group Policy | MDM policy | Registry | Command line |
+| Setting | Group Policy | Registry | Command line |
| - | :-: | :-: | :-: | :-: | :-: |
-| [1. Certificate trust lists](#certificate-trust-lists) | |  | | | |
-| [3. Date & Time](#bkmk-datetime) |  | | |  | |
-| [5. Font streaming](#font-streaming) | | | |  | |
-| [12. Network Connection Status Indicator](#bkmk-ncsi) | |  | | | |
-| [17. Software Protection Platform](#bkmk-spp) | |  |  | | |
-| [19. Teredo](#bkmk-teredo) | | | | |  |
-| [21. Windows Defender](#bkmk-defender) | |  |  |  | |
-| [26. Windows Update](#bkmk-wu) |  |  |  | | |
+| [1. Certificate trust lists](#certificate-trust-lists) |  |  | |
+| [3. Date & Time](#bkmk-datetime) | |  | |
+| [5. Font streaming](#font-streaming) | |  | |
+| [12. Network Connection Status Indicator](#bkmk-ncsi) |  | | |
+| [17. Software Protection Platform](#bkmk-spp) |  | | |
+| [19. Teredo](#bkmk-teredo) | | |  |
+| [21. Windows Defender](#bkmk-defender) |  |  | |
+| [26. Windows Update](#bkmk-wu) |  |  | |
### Settings for Windows Server 2016 Nano Server
See the following table for a summary of the management settings for Windows Server 2016 Nano Server.
-| Setting | UI | Group Policy | MDM policy | Registry | Command line |
+| Setting | Registry | Command line |
| - | :-: | :-: | :-: | :-: | :-: |
-| [1. Certificate trust lists](#certificate-trust-lists) | |  | | | |
-| [3. Date & Time](#bkmk-datetime) |  | | |  | |
-| [19. Teredo](#bkmk-teredo) | | | | |  |
-| [26. Windows Update](#bkmk-wu) |  |  |  | | |
+| [1. Certificate trust lists](#certificate-trust-lists) |  | |
+| [3. Date & Time](#bkmk-datetime) |  | |
+| [19. Teredo](#bkmk-teredo) | |  |
+| [26. Windows Update](#bkmk-wu) |  | |
## Settings
@@ -166,7 +166,7 @@ For Windows 10, Windows Server 2016 with Desktop Experience, and Windows Server
-or-
-- Create a REG\_DWORD registry setting called **DisableRootAutoUpdate** in **HKEY\_LOCAL\_MACHINE\SOFTWARE\Policies\Microsoft\SystemCertificates\AuthRoot**, with a value of 1.
+- Create the registry path **HKEY\_LOCAL\_MACHINE\SOFTWARE\Policies\Microsoft\SystemCertificates\AuthRoot** and then add a REG\_DWORD registry setting, called **DisableRootAutoUpdate**, with a value of 1.
-or-
@@ -175,15 +175,15 @@ For Windows 10, Windows Server 2016 with Desktop Experience, and Windows Server
3. On the **Network Retrieval** tab, select the **Define these policy settings** check box.
4. Clear the **Automatically update certificates in the Microsoft Root Certificate Program (recommended)** check box, and then click **OK**.
-On Windows Server 2016 Server Core:
+On Windows Server 2016 Nano Server:
-- Create a REG\_DWORD registry setting called **DisableRootAutoUpdate** in **HKEY\_LOCAL\_MACHINE\SOFTWARE\Policies\Microsoft\SystemCertificates\AuthRoot**, with a value of 1.
+- Create the registry path **HKEY\_LOCAL\_MACHINE\SOFTWARE\Policies\Microsoft\SystemCertificates\AuthRoot** and then add a REG\_DWORD registry setting, called **DisableRootAutoUpdate**, with a value of 1.
-### 2. Cortana
+### 2. Cortana and Search
Use either Group Policy or MDM policies to manage settings for Cortana. For more info, see [Cortana, Search, and privacy: FAQ](http://go.microsoft.com/fwlink/p/?LinkId=730683).
-### 2.1 Cortana Group Policies
+### 2.1 Cortana and Search Group Policies
Find the Cortana Group Policy objects under **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Search**.
@@ -226,12 +226,9 @@ In Windows 10, version 1507 and Windows 10, version 1511, when you enable the **
If your organization tests network traffic, you should not use Fiddler to test Windows Firewall settings. Fiddler is a network proxy and Windows Firewall does not block proxy traffic. You should use a network traffic analyzer, such as WireShark or Message Analyzer.
-### 2.2 Cortana MDM policies
+### 2.2 Cortana and Search MDM policies
-The following Cortana MDM policies are available in the [Policy CSP](http://msdn.microsoft.com/library/windows/hardware/dn904962.aspx).
-
-> [!NOTE]
-> This does not apply to Windows Server 2016.
+For Windows 10 only, the following Cortana MDM policies are available in the [Policy CSP](http://msdn.microsoft.com/library/windows/hardware/dn904962.aspx).
| Policy | Description |
|------------------------------------------------------|-----------------------------------------------------------------------------------------------------|
@@ -261,14 +258,16 @@ To turn off font streaming, create a REG\_DWORD registry setting called **Disabl
### 6. Insider Preview builds
-To turn off Insider Preview builds for a released version of Windows 10 or Windows Server 2016 with Desktop Experience:
+The Windows Insider Preview program lets you help shape the future of Windows, be part of the community, and get early access to releases of Windows 10.
+
+To turn off Insider Preview builds for a released version of Windows 10:
- Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Data Collection and Preview Builds** > **Toggle user control over Insider builds**.
To turn off Insider Preview builds for Windows 10:
> [!NOTE]
-> If you're running a preview version of Windows 10 or Windows Server 2016, you must roll back to a released version before you can turn off Insider Preview builds.
+> If you're running a preview version of Windows 10, you must roll back to a released version before you can turn off Insider Preview builds.
- Turn off the feature in the UI: **Settings** > **Update & security** > **Windows Insider Program** > **Stop Insider Preview builds**.
@@ -398,9 +397,6 @@ The following Microsoft Edge MDM policies are available in the [Policy CSP](http
| Browser/AllowSearchSuggestionsinAddressBar | Choose whether the address bar shows search suggestions..
Default: Allowed |
| Browser/AllowSmartScreen | Choose whether SmartScreen is turned on or off.
Default: Allowed |
-### 11.3 Microsoft Edge Windows Provisioning
-
-Use Windows ICD to create a provisioning package with the settings for these policies, go to **Runtime settings** > **Policies**.
For a complete list of the Microsoft Edge policies, see [Available policies for Microsoft Edge](http://technet.microsoft.com/library/mt270204.aspx).