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

Merge remote-tracking branch 'refs/remotes/origin/master' into Aug2

Browse Source 
fix conflict
This commit is contained in:
Joey Caparas
2016-08-02 03:50:43 +10:00
parent 7704de6a7c 92ef5ebaaa
commit 70592b98bd
9 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
browsers/edge/Index.md
View File

@ -14,7 +14,6 @@ title: Microsoft Edge - Deployment Guide for IT Pros (Microsoft Edge for IT Pros
- Windows 10
- Windows 10 Mobile
- Windows Server 2016
Microsoft Edge is the new, default web browser for Windows 10, helping you to experience modern web standards, better performance, improved security, and increased reliability. Microsoft Edge also introduces new features like Web Note, Reading View, and Cortana that you can use along with your normal web browsing abilities.

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

@ -14,7 +14,6 @@ title: Available policies for Microsoft Edge (Microsoft Edge for IT Pros)
- Windows 10
- Windows 10 Mobile
- Windows Server 2016
Microsoft Edge works with Group Policy and Microsoft Intune to help you manage your organization's computer settings. Group Policy objects (GPO's) can include registry-based Administrative Template policy settings, security settings, software deployment information, scripts, folder redirection, and preferences.

2
browsers/edge/change-history-for-microsoft-edge.md
View File

@ -14,7 +14,7 @@ For a detailed feature list of what's in the current Microsoft Edge releases, th
## July 2016
|New or changed topic | Description |
|----------------------|-------------|
|[Microsoft Edge - Deployment Guide for IT Pros](index.md)| Updated various topics to include support for Windows Server 2016 and a note about the Long Term Servicing Branch (LTSB) |
|[Microsoft Edge requirements and language support](hardware-and-software-requirements.md)| Updated to include a note about the Long Term Servicing Branch (LTSB). |
## July 2016
|New or changed topic | Description |

1
browsers/edge/emie-to-improve-compatibility.md
View File

@ -14,7 +14,6 @@ title: Use Enterprise Mode to improve compatibility (Microsoft Edge for IT Pros)
**Applies to:**
- Windows 10
- Windows Server 2016
If you have specific web sites and apps that you know have compatibility problems with Microsoft Edge, you can use the Enterprise Mode site list so that the web sites will automatically open using Internet Explorer 11. Additionally, if you know that your intranet sites aren't going to work properly with Microsoft Edge, you can set all intranet sites to automatically open using IE11.

3
browsers/edge/hardware-and-software-requirements.md
View File

@ -15,7 +15,6 @@ title: Microsoft Edge requirements and language support (Microsoft Edge for IT P
- Windows 10
- Windows 10 Mobile
- Windows Server 2016
Microsoft Edge is pre-installed on all Windows 10-capable devices that meet the minimum system requirements and are on the supported language list.
@ -29,7 +28,7 @@ Some of the components in this table might also need additional system resources
| Item | Minimum requirements |
| ------------------ | -------------------------------------------- |
| Computer/processor | 1 gigahertz (GHz) or faster (32-bit (x86) or 64-bit (x64)) |
| Operating system | <ul><li>Windows 10 (32-bit or 64-bit)</li><li>Windows 10 Mobile</li><li>Windows Server 2016</li></ul><p>**Note**<br> For specific Windows 10 Mobile requirements, see the [Minimum hardware requirements for Windows 10 Mobile](http://go.microsoft.com/fwlink/p/?LinkID=699266) topic. |
| Operating system | <ul><li>Windows 10 (32-bit or 64-bit)</li><li>Windows 10 Mobile</li></ul><p>**Note**<br> For specific Windows 10 Mobile requirements, see the [Minimum hardware requirements for Windows 10 Mobile](http://go.microsoft.com/fwlink/p/?LinkID=699266) topic. |
| Memory | <ul><li>Windows 10 (32-bit) - 1 GB</li><li>Windows 10 (64-bit) - 2 GB</li></ul> |
| Hard drive space | <ul><li>Windows 10 (32-bit) - 16 GB</li><li>Windows 10 (64-bit) - 20 GB</li></ul> |
| DVD drive | DVD-ROM drive (if installing from a DVD-ROM) |

1
browsers/edge/security-enhancements-microsoft-edge.md
View File

@ -13,7 +13,6 @@ title: Security enhancements for Microsoft Edge (Microsoft Edge for IT Pros)
- Windows 10
- Windows 10 Mobile
- Windows Server 2016
Microsoft Edge is designed with significant security improvements, helping to defend people from increasingly sophisticated and prevalent web-based attacks against Windows.

2
devices/surface-hub/create-and-test-a-device-account-surface-hub.md
View File

@ -116,8 +116,6 @@ You can check online for updated versions at [Surface Hub device account scripts
Your infrastructure will likely fall into one of three configurations. Which configuration you have will affect how you prepare for device setup.
![Image showing deployment options: online, on-premises, or hybrid.](images/deploymentoptions-01.png)
- [Online deployment (Office 365)](online-deployment-surface-hub-device-accounts.md): Your organization’s environment is deployed entirely on Office 365.
- [On-premises deployment](on-premises-deployment-surface-hub-device-accounts.md): Your organization has servers that it controls, where Active Directory, Exchange, and Skype for Business (or Lync) are hosted.
- [Hybrid deployment](hybrid-deployment-surface-hub-device-accounts.md): Your organization has a mix of services, with some hosted on-premises and some hosted online through Office 365.

2
windows/keep-secure/change-history-for-keep-windows-10-secure.md
View File

@ -23,7 +23,7 @@ The topics in this library have been updated for Windows 10, version 1607 (also
- [Enable the Block at First Sight feature in Windows 10](windows-defender-block-at-first-sight.md)
- [Configure enhanced notifications for Windows Defender in Windows 10](windows-defender-enhanced-notifications.md)
- [Run a Windows Defender scan from the command line](run-cmd-scan-windows-defender-for-windows-10.md)
- [Detect and block Potentially Unwanted Applications with Windows Defender](enable-pua-windows-defender-for-windows-10.md)
- [Detect and block Potentially Unwanted Applications](enable-pua-windows-defender-for-windows-10.md)
## July 2016

2
windows/keep-secure/manage-identity-verification-using-microsoft-passport.md
View File

@ -73,7 +73,7 @@ Hello also enables Windows 10 Mobile devices to be used as [a remote credential
- PIN entry and biometric gesture both trigger Windows 10 to verify the user's identity and authenticate using Hello keys or certificates.
- Personal (Microsoft account) and corporate (Active Directory or Azure AD) accounts use a single container for keys. All keys are separated by identity providers' domains to help ensure user privacy.
- Certificates are added to the Hello container and are protected by the Hello gesture.
- Windows Update behavior: After a reboot is required by Windows Update, the last interactive user is automatically signed on without any user gesture and the session is locked so the user's lock screen apps can run.
## Comparing key-based and certificate-based authentication