deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-06-15 10:23:37 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

conflict fixed

Browse Source
This commit is contained in:
Patti Short
2018-08-07 09:50:19 -07:00
parent b674c3fde0 5fa3b7b039
commit 45d1f0fa32
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
browsers/edge/includes/do-not-sync-browser-settings-include.md
View File

@ -27,7 +27,11 @@ For more details about configuring the browser syncing options, see [Sync browse
- **GP ADMX file name:** SettingSync.admx
#### MDM settings
<<<<<<< HEAD
- **MDM name:** [Experience/DoNotSyncBrowserSettings](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-donotsyncbrowsersetting)
=======
- **MDM name:** [Experience/DoNotSyncBrowserSettings](../available-policies.md#do-not-sync-browser-settings)
>>>>>>> 5fa3b7b039c599d82dd9013a4b2092f20578f503
- **Supported devices:** Desktop
- **URI full path:** ./Vendor/MSFT/Policy/Config/Experience/DoNotSyncBrowserSettings
- **Data type:** Integer
@ -48,4 +52,4 @@ For more details about configuring the browser syncing options, see [Sync browse
[About sync setting on Microsoft Edge on Windows 10 devices](http://windows.microsoft.com/windows-10/about-sync-settings-on-windows-10-devices)
<p><p>
<hr>
<hr>

4
browsers/edge/new-policies.md
View File

@ -44,7 +44,11 @@ We are discontinuing the **Configure Favorites** group policy. Use the **[Provis
| [Configure kiosk mode](#configure-kiosk-mode) | New | [ConfigureKioskMode](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurekioskmode) | New |
| [Configure kiosk reset after idle timeout](#configure-kiosk-reset-after-idle-timeout) | New | [ConfigureKioskResetAfterIdleTimeout](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configurekioskresetafteridletimeout) | New |
| [Configure Open Microsoft Edge With](#configure-open-microsoft-edge-with) | New | [ConfigureOpenEdgeWith](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-configureopenmicrosoftedgewith) | New |
<<<<<<< HEAD
| [Do not sync browser settings](available-policies.md#do-not-sync-browser-settings) | -- | [Experience/DoNotSyncBrowserSettings](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-donotsyncbrowsersetting) | New |
=======
| [Do not sync browser settings](available-policies.md#do-not-sync-browser-settings) | -- | Experience/DoNotSyncBrowserSettings | New |
>>>>>>> 5fa3b7b039c599d82dd9013a4b2092f20578f503
| [Prevent certificate error overrides](#prevent-certificate-error-overrides) | New | [PreventCertErrorOverrides](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-browser#browser-preventcerterroroverrides) | New |
| [Prevent users from turning on browser syncing](#preventusersfromturningonbrowsersyncing) | New | Experience/PreventUsersFromTurningOnBrowserSyncing | New |
| [Prevent turning off required extensions](#prevent-turning-off-required-extensions) | New | [PreventTurningOffRequiredExtensions](https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-experience#experience-preventusersfromturningonbrowsersyncing) | New |