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

fixed merge conflict

Browse Source
This commit is contained in:
Patti Short
2018-05-04 08:34:29 -07:00
parent 373d574a88 9e17c85535
commit 2981ee1f5f
495 changed files with 14703 additions and 6224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
browsers/edge/available-policies.md
View File

@ -9,7 +9,7 @@ ms.mktglfcycl: explore
ms.sitesec: library
title: Group Policy and Mobile Device Management settings for Microsoft Edge (Microsoft Edge for IT Pros)
ms.localizationpriority: high
ms.date: 4/20/2018 #Previous release date 09/13/2017
ms.date: 4/30/2018 #Previsou release date 09/13/2017
---
# Group Policy and Mobile Device Management (MDM) settings for Microsoft Edge

38
browsers/internet-explorer/ie11-ieak/licensing-version-and-features-ieak11.md
View File

@ -2,14 +2,14 @@
ms.localizationpriority: low
ms.mktglfcycl: plan
description: Learn about which version of the IEAK 11 you should run, based on your license agreement.
author: shortpatti
ms.author: pashort
author: pashort
ms.author: shortpatti
ms.manager: elizapo
ms.prod: ie11
ms.prod: ie11, ieak11
ms.assetid: 69d25451-08af-4db0-9daa-44ab272acc15
title: Determine the licensing version and features to use in IEAK 11 (Internet Explorer Administration Kit 11 for IT Pros)
ms.sitesec: library
ms.date: 04/24/2018
ms.date: 05/02/2018
---
@ -24,6 +24,36 @@ During installation, you must pick a version of IEAK 11, either **External** or
- **Internal Distribution via a Corporate Intranet.** This version is for network admins that plan to directly deploy IE11 into a corporate environment.
## Available features by version
|Internal |External |
|------------------------------------------|------------------------------------------|
|Welcome screen |Welcome screen |
|File locations |File locations |
|Platform selection |Platform selection |
|Language selection |Language selection |
|Package type selection |Package type selection |
|Feature selection |Feature selection |
|Automatic Version Synchronization (AVS) |Automatic Version Synchronization (AVS) |
|Custom components |Custom components |
|Internal install |Not available |
|User experience |Not available |
|Browser user interface |Browser user interface |
|Search providers |Search providers |
|Important URLs – Home page and support |Important URLs – Home page and support |
|Accelerators |Accelerators |
|Favorites, Favorites bar, and feeds |Favorites, Favorites bar, and feeds |
|Browsing options |Not available |
|First Run wizard and Welcome page options |First Run wizard and Welcome page options |
|Connection manager |Connection manager |
|Connection settings |Connection settings |
|Automatic configuration |Not available |
|Proxy settings |Proxy settings |
|Security and privacy settings |Not available |
|Add a root certificate |Not available |
|Programs |Programs |
|Additional settings |Not available |
|Wizard complete |Wizard complete |
## Customization guidelines

3
browsers/internet-explorer/ie11-ieak/troubleshooting-custom-browser-pkg-ieak11.md
View File

@ -2,7 +2,8 @@
ms.localizationpriority: low
ms.mktglfcycl: support
description: Info about some of the known issues using the Internet Exporer Customization Wizard and a custom Internet Explorer install package.
author: eross-msft
author: shortpatti
ms.author: pashort
ms.prod: ie11
ms.assetid: 9e22cc61-6c63-4cab-bfdf-6fe49db945e4
title: Troubleshoot custom package and IEAK 11 problems (Internet Explorer Administration Kit 11 for IT Pros)