Merge branch 'master' into apps-in-windows-10-update

This commit is contained in:
Heidi Lohr 2018-03-12 08:51:49 -07:00
commit 5c9a4c39cf
2 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@ By using Group Policy and Intune, you can set up a policy setting once, and then
> For more info about the tools you can use to change your Group Policy objects, see the Internet Explorer 11 topics, [Group Policy and the Group Policy Management Console (GPMC)](https://go.microsoft.com/fwlink/p/?LinkId=617921), [Group Policy and the Local Group Policy Editor](https://go.microsoft.com/fwlink/p/?LinkId=617922), [Group Policy and the Advanced Group Policy Management (AGPM)](https://go.microsoft.com/fwlink/p/?LinkId=617923), and [Group Policy and Windows PowerShell](https://go.microsoft.com/fwlink/p/?LinkId=617924).
## Group Policy settings
Microsoft Edge works with the following Group Policy settings to help you manager your company's web browser configurations. The Group Policy settings are found in the Group Policy Editor in the following location:
Microsoft Edge works with the following Group Policy settings to help you manage your company's web browser configurations. The Group Policy settings are found in the Group Policy Editor in the following location:
`Computer Configuration\Administrative Templates\Windows Components\Microsoft Edge\`
@ -1007,4 +1007,4 @@ These are additional Windows 10-specific MDM policy settings that work with Mic
- **1 (default).** Employees can sync between PCs.
## Related topics
* [Mobile Device Management (MDM) settings]( https://go.microsoft.com/fwlink/p/?LinkId=722885)
* [Mobile Device Management (MDM) settings]( https://go.microsoft.com/fwlink/p/?LinkId=722885)

View File

@ -35,7 +35,7 @@ sections:
image:
src: https://docs.microsoft.com/media/common/i_upgrade.svg
title: Windows as a service
- href: upgrade/windows-analytics-overview
- href: update/windows-analytics-overview
html: <p>Windows Analytics provides deep insights into your Windows 10 environment.</p>
image:
src: https://docs.microsoft.com/media/common/i_investigate.svg