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

merge conflict

Browse Source
This commit is contained in:
Patti Short
2018-11-02 15:27:47 -07:00
parent 286571f150 6c5627aab2
commit 6fa710850f
614 changed files with 4036 additions and 2640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browsers/edge/includes/allow-web-content-new-tab-page-include.md
View File

@ -19,7 +19,7 @@ ms:topic: include
|Group Policy |MDM |Registry |Description |
|---|:---:|:---:|---|
|Disabled |0 |0 |Load a blank page instead of the default New Tab page and prevent users from making changes. |
|Enabled or not configured **(default)** |1 |1 |Load the default New Tab page and let the users make changes. |
|Enabled or not configured **(default)** |1 |1 |Load the default New Tab page and the users make changes. |
---
### ADMX info and settings

10
browsers/edge/includes/configure-home-button-include.md
View File

@ -1,7 +1,7 @@
---
author: shortpatti
ms.author: pashort
ms.date: 10/02/2018
ms.date: 10/28/2018
ms.prod: edge
ms:topic: include
---
@ -18,9 +18,9 @@ ms:topic: include
|Group Policy |MDM |Registry |Description |
|---|:---:|:---:|---|
|Disabled or not configured<br>**(default)** |0 |0 |Show home button and load the Start page. |
|Enabled |1 |1 |Show the home button and load the New Tab page. |
|Enabled |2 |2 |Show the home button and load the custom URL defined in the Set Home Button URL policy. |
|Disabled or not configured<br>**(default)** |0 |0 |Load the Start page. |
|Enabled |1 |1 |Load the New Tab page. |
|Enabled |2 |2 |Load the custom URL defined in the Set Home Button URL policy. |
|Enabled |3 |3 |Hide the home button. |
---
@ -55,4 +55,4 @@ ms:topic: include
- [Unlock Home Button](../available-policies.md#unlock-home-button): [!INCLUDE [unlock-home-button-shortdesc](../shortdesc/unlock-home-button-shortdesc.md)]
<hr>
<hr>