Merged PR 2967: 8/30 PM Publish

.openpublishing.redirection.json

@@ -228,6 +228,11 @@
 {
 "source_path": "windows/manage/set-up-a-device-for-anyone-to-use.md",
 "redirect_url": "/windows/configuration/kiosk-shared-pc",
+"redirect_document_id": false
+},
+{
+"source_path": "windows/configuration/set-up-a-device-for-anyone-to-use.md",
+"redirect_url": "/windows/configuration/kiosk-shared-pc",
 "redirect_document_id": true
 },
 {

education/windows/test-windows10s-for-edu.md

@@ -9,7 +9,7 @@ ms.sitesec: library
 ms.localizationpriority: high
 author: CelesteDG
 ms.author: celested
-ms.date: 08/29/2017
+ms.date: 08/30/2017
 ---
 
 # Test Windows 10 S on existing Windows 10 education devices
@@ -85,13 +85,14 @@ Check with your device manufacturer before trying Windows 10 S on your device to
 | <a href="http://www.lucoms.com/v2/cs/cs_windows10.asp" target="_blank">Daewoo</a> | <a href="http://www.daten.com.br/suportes/windows10s/" target="_blank">Daten</a> | <a href="http://www.dell.com/support/article/us/en/19/sln307174/dell-computers-tested-for-windows-10-s?lang=en" target="_blank">Dell</a> | 
 | <a href="http://www.epson.jp/support/misc/windows10s.htm" target="_blank">Epson</a> | <a href="http://exo.com.ar/actualizaciones-de-windows-10" target="_blank">EXO</a> | <a href="http://www.fujitsu.com/au/products/computing/pc/microsoft/s-compatible/" target="_blank">Fujitsu</a> |
 | <a href="http://apac.getac.com/support/windows10s.html" target="_blank">Getac</a> | <a href="http://compaq.com.br/sistemas-compativeis-com-windows-10-s.html" target="_blank">Global K</a> | <a href="https://support.hp.com/us-en/document/c05588871" target="_blank">HP</a> | 
-| <a href="http://consumer.huawei.com/cn/support/notice/detail/index.htm?id=1541" target="_blank">Huawei</a> | <a href="http://www.inet-tek.com/en/product-qadetail-86.html" target="_blank">iNET</a> | <a href="http://irbis-digital.ru/support/podderzhka-windows-10-s/" target="_blank">LANIT Trading</a> | 
+| <a href="http://consumer.huawei.com/cn/support/notice/detail/index.htm?id=1541" target="_blank">Huawei</a> | <a href="http://www.inet-tek.com/en/product-qadetail-86.html" target="_blank">iNET</a> | <a href="https://www.intel.com/content/www/us/en/support/boards-and-kits/000025096.html" target="_blank">Intel</a> |
-| <a href="https://support.lenovo.com/us/en/solutions/ht504589" target="_blank">Lenovo</a> | <a href="http://www.lg.com/us/content/html/hq/windows10update/Win10S_UpdateInfo.html" target="_blank">LG</a> | <a href="https://www2.mouse-jp.co.jp/ssl/user_support2/info.asp?N_ID=361" target="_blank">MCJ</a> | 
+| <a href="http://irbis-digital.ru/support/podderzhka-windows-10-s/" target="_blank">LANIT Trading</a> | <a href="https://support.lenovo.com/us/en/solutions/ht504589" target="_blank">Lenovo</a> | <a href="http://www.lg.com/us/content/html/hq/windows10update/Win10S_UpdateInfo.html" target="_blank">LG</a> | 
-| <a href="http://support.linxtablets.com/WindowsSupport/Articles/Windows_10_S_Supported_Devices.aspx" target="_blank">Micro P/Exertis</a> | <a href="https://www.microsoft.com/surface/en-us/support/windows-and-office/surface-devices-that-work-with-windows-10-s" target="_blank">Microsoft</a> | <a href="https://www.msi.com/Landing/Win10S" target="_blank">MSI</a> | 
+| <a href="https://www2.mouse-jp.co.jp/ssl/user_support2/info.asp?N_ID=361" target="_blank">MCJ</a> | <a href="http://support.linxtablets.com/WindowsSupport/Articles/Windows_10_S_Supported_Devices.aspx" target="_blank">Micro P/Exertis</a> | <a href="https://www.microsoft.com/surface/en-us/support/windows-and-office/surface-devices-that-work-with-windows-10-s" target="_blank">Microsoft</a> | 
-| <a href="https://panasonic.net/cns/pc/Windows10S/" target="_blank">Panasonic</a> | <a href="http://www.bangho.com.ar/windows10s" target="_blank">PC Arts</a> | <a href="http://www.positivoinformatica.com.br/atualizacao-windows-10" target="_blank">Positivo SA</a> |
+| <a href="https://www.msi.com/Landing/Win10S" target="_blank">MSI</a> | <a href="https://panasonic.net/cns/pc/Windows10S/" target="_blank">Panasonic</a> | <a href="http://www.bangho.com.ar/windows10s" target="_blank">PC Arts</a> | 
-| <a href="http://www.br.vaio.com/atualizacao-windows-10/" target="_blank">Positivo da Bahia</a> | <a href="http://www.samsung.com/us/support/windows10s/" target="_blank">Samsung</a> | <a href="http://www.dospara.co.jp/support/share.php?contents=about_windows10s" target="_blank">Thirdwave</a> | 
+| <a href="http://www.positivoinformatica.com.br/atualizacao-windows-10" target="_blank">Positivo SA</a> | <a href="http://www.br.vaio.com/atualizacao-windows-10/" target="_blank">Positivo da Bahia</a> | <a href="http://www.samsung.com/us/support/windows10s/" target="_blank">Samsung</a> | 
-| <a href="http://www.tongfangpc.com/service/win10.aspx" target="_blank">Tongfang</a> | <a href="http://win10upgrade.toshiba.com/win10s/information?region=TAIS&country=US&lang=en" target="_blank">Toshiba</a> | <a href="http://www.trekstor.de/windows-10-s-en.html" target="_blank">Trekstor</a> | | <a href="http://www.trigem.co.kr/windows/win10S.html" target="_blank">Trigem</a> | <a href="http://us.vaio.com/support/knowledge-base/windows-10-s-compatibility-information/" target="_blank">Vaio</a> | <a href="https://www.wortmann.de/en-gb/content/+windows-10-s-supportinformation/windows-10-s-supportinformation.aspx" target="_blank">Wortmann</a> | 
+| <a href="http://www.teclast.com/zt/aboutwin10s/" target="_blank">Teclast</a> | <a href="http://www.dospara.co.jp/support/share.php?contents=about_windows10s" target="_blank">Thirdwave</a> | <a href="http://www.tongfangpc.com/service/win10.aspx" target="_blank">Tongfang</a> | 
-| <a href="http://www.yifangdigital.com/Customerservice/win10s.aspx" target="_blank">Yifang</a> |   |   |
+| <a href="http://win10upgrade.toshiba.com/win10s/information?region=TAIS&country=US&lang=en" target="_blank">Toshiba</a> | <a href="http://www.trekstor.de/windows-10-s-en.html" target="_blank">Trekstor</a> | <a href="http://www.trigem.co.kr/windows/win10S.html" target="_blank">Trigem</a> | 
+| <a href="http://us.vaio.com/support/knowledge-base/windows-10-s-compatibility-information/" target="_blank">Vaio</a> | <a href="https://www.wortmann.de/en-gb/content/+windows-10-s-supportinformation/windows-10-s-supportinformation.aspx" target="_blank">Wortmann</a> | <a href="http://www.yifangdigital.com/Customerservice/win10s.aspx" target="_blank">Yifang</a> |
 
 
 > [!NOTE]

windows/configuration/set-up-a-device-for-anyone-to-use.md

@@ -1,89 +0,0 @@
----
-title: Set up a device for anyone to use in kiosk mode (Windows 10)
-description: You can configure Windows 10 as a kiosk device, so that users can only interact with a single app.
-ms.assetid: F1F4FF19-188C-4CDC-AABA-977639C53CA8
-keywords: ["kiosk", "lockdown", "assigned access"]
-ms.prod: w10
-ms.mktglfcycl: manage
-ms.sitesec: library
-author: jdeckerms
-ms.localizationpriority: high
----
-
-# Set up a device for anyone to use (kiosk mode)
-
-
-**Applies to**
-
--   Windows 10
--   Windows 10 Mobile
-
-**Looking for Windows Embedded 8.1 Industry information?**
-
--   [Assigned Access]( https://go.microsoft.com/fwlink/p/?LinkId=613653)
-
-You can configure a device running Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile, or Windows 10 Mobile Enterprise as a kiosk device, so that users can only interact with a single application that you select.
-
-Do you need a computer that can only do one thing? For example:
-
--   A device in the lobby that customers can use to view your product catalog.
-
--   A portable device that drivers can use to check a route on a map.
-
--   A device that a temporary worker uses to enter data.
-
-The following table identifies the type of application that can be used on each Windows 10 edition to create a kiosk device.
-
-> [!NOTE]  
-> A Universal Windows app is built on the Universal Windows Platform (UWP), which was first introduced in Windows 8 as the Windows Runtime. A Classic Windows application uses the Classic Windows Platform (CWP) (e.g., COM, Win32, WPF, WinForms, etc.) and is typically launched using an .EXE or .DLL file.
-
- 
-
-| Windows 10 edition | Universal Windows app              | Classic Windows application          |
-|--------------------|------------------------------------|--------------------------------------|
-| Mobile             | ![supported](images/checkmark.png) | ![unsupported](images/crossmark.png) |
-| Mobile Enterprise  | ![supported](images/checkmark.png) | ![unsupported](images/crossmark.png) |
-| Pro                | ![supported](images/checkmark.png) | ![unsupported](images/crossmark.png) |
-| Enterprise         | ![supported](images/checkmark.png) | ![supported](images/checkmark.png)   |
-| Education          | ![supported](images/checkmark.png) | ![supported](images/checkmark.png)   |
-
- 
-
-## In this section
-
-
-<table>
-<colgroup>
-<col width="50%" />
-<col width="50%" />
-</colgroup>
-<thead>
-<tr class="header">
-<th align="left">Topic</th>
-<th align="left">Description</th>
-</tr>
-</thead>
-<tbody>
-<tr class="odd">
-<td align="left"><p>[Set up a kiosk on Windows 10 Pro, Enterprise, or Education](set-up-a-kiosk-for-windows-10-for-desktop-editions.md)</p></td>
-<td align="left"><p>A single-use device is easy to set up in Windows 10 for desktop editions (Pro, Enterprise, and Education). For a kiosk device to run a Universal Windows app, use the <strong>assigned access</strong> feature. For a kiosk device (Windows 10 Enterprise or Education) to run a Classic Windows application, use <strong>Shell Launcher</strong> to set a custom user interface as the shell.</p></td>
-</tr>
-<tr class="even">
-<td align="left"><p>[Set up a kiosk on Windows 10 Mobile or Windows 10 Mobile Enterprise](mobile-devices/set-up-a-kiosk-for-windows-10-for-mobile-edition.md)</p></td>
-<td align="left"><p>A device in kiosk mode runs a specified app with no access to other device functions, menus, or settings. You configure a device running Windows 10 Mobile or Windows 10 Mobile Enterprise for kiosk mode by using the Apps Corner feature. You can also use the Enterprise Assigned Access configuration service provider (CSP) to configure a kiosk experience.</p></td>
-</tr>
-</tbody>
-</table>
-
- ## Learn more
-
-[Customizing Your Device Experience with Assigned Access](https://channel9.msdn.com/Events/Build/2016/P508)
-
- 
-
- 
-
-
-
-
-

windows/device-security/TOC.md

@@ -89,7 +89,7 @@
 #### [AppLocker Settings](applocker\applocker-settings.md)
 
 ## [BitLocker](bitlocker\bitlocker-overview.md)
-### [Overview of BitLocker and device encryption in Windows 10](bitlocker\bitlocker-device-encryption-overview-windows-10.md)
+### [Overview of BitLocker Device Encryption in Windows 10](bitlocker\bitlocker-device-encryption-overview-windows-10.md)
 ### [BitLocker frequently asked questions (FAQ)](bitlocker\bitlocker-frequently-asked-questions.md)
 ### [Prepare your organization for BitLocker: Planning and policies](bitlocker\prepare-your-organization-for-bitlocker-planning-and-policies.md)
 ### [BitLocker basic deployment](bitlocker\bitlocker-basic-deployment.md)

windows/threat-protection/windows-defender-exploit-guard/audit-windows-defender-exploit-guard.md

@@ -1,5 +1,5 @@
 ---
-title: Test how Windows Defender EG features will work in your organization
+title: Test how Windows Defender EG features work
 description: Audit mode lets you use the event log to see how Windows Defender Exploit Guard would protect your devices if it were enabled
 keywords: exploit guard, audit, auditing, mode, enabled, disabled, test, demo, evaluate, lab
 search.product: eADQiWindows 10XVcnh

windows/threat-protection/windows-defender-exploit-guard/controlled-folders-exploit-guard.md

@@ -1,6 +1,6 @@
 ---
-title: Prevent ransomware and other threats from encrypting and changing important files
+title: Help prevent ransomware and threats from encrypting and changing files
-description: Files in default folders, such as Documents and Desktop, can be protected from being changed by malicious apps. This can help prevent ransomware encrypting your files.
+description: Files in default folders can be protected from being changed by malicious apps. This can help prevent ransomware encrypting your files.
 keywords: controlled folder access, windows 10, windows defender, ransomware, protect, files, folders
 search.product: eADQiWindows 10XVcnh
 ms.pagetype: security

windows/threat-protection/windows-defender-exploit-guard/customize-attack-surface-reduction.md

@@ -1,5 +1,5 @@
 ---
-title: Configure how ASR works so you can finetune the protection in your network
+title: Configure how ASR works to finetune protection in your network
 description: You can individually set rules in audit, block, or disabled modes, and add files and folders that should be excluded from ASR
 keywords: Attack Surface Reduction, hips, host intrusion prevention system, protection rules, anti-exploit, antiexploit, exploit, infection prevention, customize, configure, exclude
 search.product: eADQiWindows 10XVcnh

windows/threat-protection/windows-defender-exploit-guard/enable-controlled-folders-exploit-guard.md

@@ -77,7 +77,6 @@ For further details on how audit mode works, and when you might want to use it,
     - **Disable (Default)** - The Controlled Folder Access feature will not work. All apps can make changes to files in protected folders.
     - **Audit Mode** - If a malicious or suspicious app attempts to make a change to a file in a protected folder, the change will be allowed but will be recorded in the Windows event log. This allows you to assess the impact of this feature on your organization.
 
-
     ![](images/cfa-gp-enable.png)
 
 >[!IMPORTANT]

windows/threat-protection/windows-defender-exploit-guard/evaluate-attack-surface-reduction.md

@@ -1,5 +1,5 @@
 ---
-title: Use a demo tool to see how ASR could help protect your organization's devices
+title: Use a demo to see how ASR can help protect your devices
 description: The custom demo tool lets you create sample malware infection scenarios so you can see how ASR would block and prevent attacks
 keywords: Attack Surface Reduction, hips, host intrusion prevention system, protection rules, anti-exploit, antiexploit, exploit, infection prevention, evaluate, test, demo
 search.product: eADQiWindows 10XVcnh

windows/threat-protection/windows-defender-exploit-guard/evaluate-controlled-folder-access.md

@@ -1,5 +1,5 @@
 ---
-title: See how Windows 10 can protect your files from being changed by malicious apps
+title: See how CFA can help protect files from being changed by malicious apps
 description: Use a custom tool to see how Controlled Folder Access works in Windows 10.
 keywords: controlled folder access, windows 10, windows defender, ransomware, protect, evaluate, test, demo, try
 search.product: eADQiWindows 10XVcnh

windows/threat-protection/windows-defender-exploit-guard/evaluate-windows-defender-exploit-guard.md

@@ -1,5 +1,5 @@
 ---
-title: Evaluate the impact of each of the four features in Windows Defender Exploit Guard
+title: Evaluate the impact of Windows Defender Exploit Guard
 description: Use our evaluation guides to quickly enable and configure features, and test them against common attack scenarios
 keywords: evaluate, guides, evaluation, exploit guard, controlled folder access, attack surface reduction, exploit protection, network protection, test, demo
 search.product: eADQiWindows 10XVcnh

windows/threat-protection/windows-defender-exploit-guard/event-views-exploit-guard.md

@@ -1,5 +1,5 @@
 ---
-title: Import custom views in XML to see Windows Defender Exploit Guard events
+title: Import custom views to see Windows Defender Exploit Guard events
 description: Use Windows Event Viewer to import individual views for each of the features.
 keywords: event view, exploit guard, audit, review, events
 search.product: eADQiWindows 10XVcnh

windows/threat-protection/windows-defender-exploit-guard/exploit-protection-exploit-guard.md

@@ -1,5 +1,5 @@
 ---
-title: Apply mitigations that help prevent attacks that use vulnerabilities in software
+title: Apply mitigations to help prevent attacks through vulnerabilities
 keywords: mitigations, vulnerabilities, vulnerability, mitigation, exploit, exploits, emet
 description: Exploit Protection in Windows 10 provides advanced configuration over the settings offered in EMET.
 search.product: eADQiWindows 10XVcnh

windows/threat-protection/windows-defender-exploit-guard/network-protection-exploit-guard.md

@@ -1,5 +1,5 @@
 ---
-title: Use Network Protection to prevent connections to suspicious domains
+title: Use Network Protection to help prevent connections to bad sites
 description: Protect your network by preventing users from accessing known malicious and suspicious network addresses
 keywords: Network Protection, exploits, malicious website, ip, domain, domains
 search.product: eADQiWindows 10XVcnh

windows/threat-protection/windows-defender-exploit-guard/windows-defender-exploit-guard.md

@@ -1,6 +1,6 @@
 ---
-title: Use Windows Defender Exploit Guard to protect your corporate network
+title: Use Windows Defender Exploit Guard to protect your network
-description: Windows Defender Exploit Guard consists of features that can protect your network from malware and threat infection, including helping to prevent ransomware encryption and exploit attacks
+description: Windows Defender EG employs features that help protect your network from threats, including helping prevent ransomware encryption and exploit attacks
 keywords: emet, exploit guard, Controlled Folder Access, Network Protection, Exploit Protection, Attack Surface Reduction, hips, host intrusion prevention system
 search.product: eADQiWindows 10XVcnh
 ms.pagetype: security