mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-06-18 03:43:39 +00:00
merge conflict
This commit is contained in:
@ -96,4 +96,4 @@ We have discontinued the **Configure Favorites** group policy, so use the [Provi
|
||||
|----------------------|-------------|
|
||||
|[Available Policies for Microsoft Edge](available-policies.md) | Added new policies and the Supported versions column for Windows 10 Insider Preview. |
|
||||
|
||||
---
|
||||
---
|
||||
|
@ -36,7 +36,7 @@ sections:
|
||||
|
||||
- type: markdown
|
||||
|
||||
text: Some of the features in Microsoft Edge gives you the ability to set a custom URL for the New Tab page or Home button. Another new feature allows you to hide or show the Favorites bar, giving you more control over the favorites bar. Microsoft Edge works with Group Policy and Microsoft Intune to help you manage your organization's computer settings. Group Policy objects (GPOs) can include registry-based Administrative Template policy settings, security settings, software deployment information, scripts, folder redirection, and preferences.
|
||||
text: Microsoft Edge works with Group Policy and Microsoft Intune to help you manage your organization's computer settings. Group Policy objects (GPOs) can include registry-based Administrative Template policy settings, security settings, software deployment information, scripts, folder redirection, and preferences.
|
||||
|
||||
- items:
|
||||
|
||||
|
@ -12,7 +12,7 @@ ms.date: 10/25/2018
|
||||
|
||||
# Deploy Microsoft Edge kiosk mode
|
||||
|
||||
>Applies to: Microsoft Edge on Windows 10, version 1809
|
||||
>Applies to: Microsoft Edge on Windows 10, version 1809
|
||||
|
||||
In the Windows 10 October 2018 Update, we added the capability to use Microsoft Edge as a kiosk using [assigned access](https://docs.microsoft.com/en-us/windows-hardware/customize/enterprise/assigned-access) and also added new policies to enhance the kiosk experience. With assigned access, IT admins can create a tailored browsing experience locking down a Windows 10 device to only run as a single-app or multi-app kiosk. It also prevents users from accessing the file system and running executables or other apps from Microsoft Edge.
|
||||
|
||||
@ -323,4 +323,4 @@ In the following table, we show you the features available in both Microsoft Edg
|
||||
**\*Windows Defender Firewall**<p>
|
||||
To prevent access to unwanted websites on your kiosk device, use Windows Defender Firewall to configure a list of allowed websites, blocked websites or both. For more details, see [Windows Defender Firewall with Advanced Security Deployment](https://docs.microsoft.com/en-us/windows/security/identity-protection/windows-firewall/windows-firewall-with-advanced-security-deployment-guide).
|
||||
|
||||
---
|
||||
---
|
||||
|
Reference in New Issue
Block a user