Merge remote-tracking branch 'origin/master'

# Conflicts:
#	windows/manage/manage-cortana-in-enterprise.md
This commit is contained in:
LizRoss
2016-04-06 14:57:38 -07:00
95 changed files with 129 additions and 176 deletions

View File

@ -5,7 +5,7 @@ ms.assetid: 580E18B1-2FFD-4EE4-8CC5-6F375BE224EA
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Add unsigned app to code integrity policy

View File

@ -5,7 +5,7 @@ ms.assetid: 44211937-801B-4B85-8810-9CA055CDB1B2
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# App inventory management for Windows Store for Business

View File

@ -5,7 +5,7 @@ ms.assetid: CC5641DA-3CEA-4950-AD81-1AF1AE876926
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Apps in Windows Store for Business

View File

@ -5,7 +5,7 @@ ms.assetid: A0DF4EC2-BE33-41E1-8832-DBB0EBECA31A
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Assign apps to employees

View File

@ -3,7 +3,7 @@ title: Change history for Manage and update Windows 10 (Windows 10)
description: This topic lists new and updated topics in the Manage and update Windows 10 documentation for Windows 10 and Windows 10 Mobile.
ms.assetid: 29144AFA-1DA9-4532-B07D-1EBE34B7E1E0
ms.prod: W10
ms.mktglfcycl: deploy
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
---
@ -17,10 +17,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
</colgroup>
<thead>
<tr class="header">
<th align="left">New or changed topic</th>
@ -41,10 +38,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
</colgroup>
<thead>
<tr class="header">
<th align="left">New or changed topic</th>
@ -73,10 +67,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
</colgroup>
<thead>
<tr class="header">
<th align="left">New or changed topic</th>
@ -118,10 +109,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
</colgroup>
<thead>
<tr class="header">
<th align="left">New or changed topic</th>
@ -138,7 +126,7 @@ This topic lists new and updated topics in the [Manage and update Windows 10](in
<td align="left">New</td>
</tr>
<tr class="odd">
<td align="left">Customize Windows 10 Start with mobile device management (MDM)</td>
<td align="left">[Customize Windows 10 Start with mobile device management (MDM)](customize-windows-10-start-screens-by-using-mobile-device-management.md)</td>
<td align="left"></td>
</tr>
</tbody>

View File

@ -24,10 +24,7 @@ Windows 10 has a brand new Start experience. As a result, there are changes to
These policy settings are available in **Administrative Templates\\Start Menu and Taskbar** under **User Configuration**.
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
</colgroup>
<thead>
<tr class="header">
<th align="left">Policy</th>

View File

@ -1,6 +1,6 @@
---
title: Configure devices without MDM (Windows 10)
description: Create a runtime provisioning package to apply settings, profiles, and file assets to a device running Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile, or Windows 10 Mobile Enterprise.
description: Create a runtime provisioning package to apply settings, profiles, and file assets to a device running Windows 10.
ms.assetid: 66D14E97-E116-4218-8924-E2A326C9367E
keywords: ["runtime provisioning", "provisioning package"]
ms.prod: W10

View File

@ -5,7 +5,7 @@ ms.assetid: B3A45C8C-A96C-4254-9659-A9B364784673
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Configure an MDM provider

View File

@ -1,6 +1,6 @@
---
title: Customize and export Start layout (Windows 10)
description: The easiest method for creating a customized Start layout to apply to other Windows 10 devices is to set up the Start screen on a test computer and then export the layout.
description: The easiest method for creating a customized Start layout is to set up the Start screen and export the layout.
ms.assetid: CA8DF327-5DD4-452F-9FE5-F17C514B6236
keywords: ["start screen"]
ms.prod: W10

View File

@ -83,19 +83,8 @@ This example uses Microsoft Intune to configure an MDM policy that applies a cus
Example of the same layout file with escape characters replacing the markup characters:
<span codelanguage="XML"></span>
<table>
<colgroup>
<col width="100%" />
</colgroup>
<thead>
<tr class="header">
<th align="left">XML</th>
</tr>
</thead>
<tbody>
<tr class="odd">
<td align="left"><pre><code>&amp;lt;wdcml:p xmlns:wdcml=&amp;quot;http://microsoft.com/wdcml&amp;quot;&amp;gt;Example of a layout file produced by Export-StartLayout:&amp;lt;/wdcml:p&amp;gt;&amp;lt;wdcml:snippet xmlns:wdcml=&amp;quot;http://microsoft.com/wdcml&amp;quot;&amp;gt;&amp;lt;![CDATA[&amp;lt;LayoutModificationTemplate Version=&amp;quot;1&amp;quot; xmlns=&amp;quot;http://schemas.microsoft.com/Start/2014/LayoutModification&amp;quot;&amp;gt;
```
&amp;lt;wdcml:p xmlns:wdcml=&amp;quot;http://microsoft.com/wdcml&amp;quot;&amp;gt;Example of a layout file produced by Export-StartLayout:&amp;lt;/wdcml:p&amp;gt;&amp;lt;wdcml:snippet xmlns:wdcml=&amp;quot;http://microsoft.com/wdcml&amp;quot;&amp;gt;&amp;lt;![CDATA[&amp;lt;LayoutModificationTemplate Version=&amp;quot;1&amp;quot; xmlns=&amp;quot;http://schemas.microsoft.com/Start/2014/LayoutModification&amp;quot;&amp;gt;
&amp;lt;DefaultLayoutOverride&amp;gt;
&amp;lt;StartLayoutCollection&amp;gt;
&amp;lt;defaultlayout:StartLayout GroupCellWidth=&amp;quot;6&amp;quot; xmlns:defaultlayout=&amp;quot;http://schemas.microsoft.com/Start/2014/FullDefaultLayout&amp;quot;&amp;gt;
@ -107,10 +96,8 @@ This example uses Microsoft Intune to configure an MDM policy that applies a cus
&amp;lt;/defaultlayout:StartLayout&amp;gt;
&amp;lt;/StartLayoutCollection&amp;gt;
&amp;lt;/DefaultLayoutOverride&amp;gt;
&amp;lt;/LayoutModificationTemplate&amp;gt;]]&amp;gt;&amp;lt;/wdcml:snippet&amp;gt;</code></pre></td>
</tr>
</tbody>
</table>
&amp;lt;/LayoutModificationTemplate&amp;gt;]]&amp;gt;&amp;lt;/wdcml:snippet&amp;gt;
```
2. In the Microsoft Intune administration console, click **Policy** &gt; **Add Policy**.
@ -122,8 +109,8 @@ This example uses Microsoft Intune to configure an MDM policy that applies a cus
6. In **Add or Edit OMA-URI Setting**, enter the following information.
| Item | Information |
|------------------------------|-------------------------------------------------------------------------------------------------------------------|
| Item | Information |
|----|----|
| **Setting name** | Enter a unique name for the OMA-URI setting to help you identify it in the list of settings. |
| **Setting description** | Provide a description that gives an overview of the setting and other relevant information to help you locate it. |
| **Data type** | **String** |

View File

@ -1,6 +1,6 @@
---
title: Customize Windows 10 Start with ICD and provisioning packages (Windows 10)
description: In Windows 10 Enterprise and Windows 10 Education, you can use a provisioning package that you create with Windows Imaging and Configuration Designer (ICD) tool to deploy a customized Start layout to users.
description: In Windows 10, you can use a provisioning package to deploy a customized Start layout to users.
ms.assetid: AC952899-86A0-42FC-9E3C-C25F45B1ACAC
keywords: ["Start layout", "start menu"]
ms.prod: W10

View File

@ -5,7 +5,7 @@ ms.assetid: 8D9CD2B9-5FC6-4C3D-AA96-F135AFEEBB78
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Device Guard signing

View File

@ -5,7 +5,7 @@ ms.assetid: C4644035-845C-4C84-87F0-D87EA8F5BA19
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Distribute apps using your private store

View File

@ -5,7 +5,7 @@ ms.assetid: E591497C-6DFA-49C1-8329-4670F2164E9E
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Distribute apps to your employees from the Windows Store for Business

View File

@ -5,7 +5,7 @@ ms.assetid: 006F5FB1-E688-4769-BD9A-CFA6F5829016
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Distribute apps with a management tool

View File

@ -5,7 +5,7 @@ ms.assetid: 6B9F6876-AA66-4EE4-A448-1371511AC95E
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Distribute offline apps

View File

@ -5,7 +5,7 @@ ms.assetid: 274A5003-5F15-4635-BB8B-953953FD209A
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Find and acquire apps

View File

@ -1,6 +1,6 @@
---
title: Introduction to configuration service providers (CSPs) for IT pros (Windows 10)
description: Configuration service providers (CSPs) expose device configuration settings in Windows 10. This topic is written for people who have no experience with CSPs.
description: Configuration service providers (CSPs) expose device configuration settings in Windows 10.
ms.assetid: 25C1FDCA-0E10-42A1-A368-984FFDB2B7B6
ms.prod: W10
ms.mktglfcycl: manage

View File

@ -18,10 +18,7 @@ Learn about managing and updating Windows 10.
<table>
<colgroup>
<col width="50%" />
<col width="50%" />
</colgroup>
<thead>
<tr class="header">
<th align="left">Topic</th>

View File

@ -1,6 +1,6 @@
---
title: Windows 10 servicing options for updates and upgrades (Windows 10)
description: This article describes the new servicing options available in Windows 10, Windows 10 Mobile, and IoT Core and how they enable enterprises to keep their devices current with the latest feature upgrades.
description: This article describes the new servicing options available in Windows 10.
ms.assetid: D1DEB7C0-283F-4D7F-9A11-EE16CB242B42
keywords: ["update", "LTSB", "lifecycle", "Windows update", "upgrade"]
ms.prod: W10

View File

@ -1,6 +1,6 @@
---
title: Lock down Windows 10 (Windows 10)
description: Enterprises often need to manage how people use corporate devices. Windows 10 provides a number of features and methods to help you lock down specific parts of a Windows 10 device.
description: Windows 10 provides a number of features and methods to help you lock down specific parts of a Windows 10 device.
ms.assetid: 955BCD92-0A1A-4C48-98A8-30D7FAF2067D
keywords: ["lockdown"]
ms.prod: W10

View File

@ -87,7 +87,7 @@ To support pinning applications in multiple app packages, an AUMID parameter can
The following example shows how to pin both Outlook Mail and Outlook Calendar:
``` syntax
```
<Apps>
<!-- Outlook Calendar -->
<Application productId="{A558FEBA-85D7-4665-B5D8-A2FF9C19799B}" aumid="microsoft.windowscommunicationsapps_8wekyb3d8bbwe!microsoft.windowslive.calendar">

View File

@ -2,7 +2,7 @@
title: Manage access to private store (Windows 10)
description: You can manage access to your private store in Windows Store for Business.
ms.assetid: 4E00109C-2782-474D-98C0-02A05BE613A5
author: jdeckerMS
author: TrudyHa
---
# Manage access to private store

View File

@ -5,7 +5,7 @@ ms.assetid: 2F65D4C3-B02C-41CC-92F0-5D9937228202
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Manage apps in Windows Store for Business

View File

@ -5,7 +5,7 @@ ms.assetid: 2D501538-0C6E-4408-948A-2BF5B05F7A0C
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Manage private store settings

View File

@ -5,7 +5,7 @@ ms.assetid: E3283D77-4DB2-40A9-9479-DDBC33D5A895
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Manage settings for the Windows Store for Business

View File

@ -5,7 +5,7 @@ ms.assetid: 5E7FA071-CABD-4ACA-8AAE-F549EFCE922F
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Manage user accounts in Windows Store for Business

View File

@ -5,7 +5,7 @@ ms.assetid: CEBC6870-FFDD-48AD-8650-8B0DC6B2651D
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Prerequisites for Windows Store for Business

View File

@ -24,11 +24,7 @@ You can use the product ID and Application User Model (AUMID) in Lockdown.xml to
The following table lists the product ID and AUMID for each app that is included in Windows 10 Mobile.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="33%" />
</colgroup>
<thead>
<tr class="header">
<th align="left">App</th>

View File

@ -50,7 +50,8 @@ To perform a "wipe and persist" reset, preserving the provisioning applied to th
<SyncBody>
<Exec>
<CmdID>3</CmdID>
<Item> <Target><LocURI>./Vendor/MSFT/RemoteWipe/DoWipePersistProvisionedData</LocURI></Target>
<Item>
<Target><LocURI>./Vendor/MSFT/RemoteWipe/DoWipePersistProvisionedData</LocURI></Target>
</Item>
</Exec>
<Final/>

View File

@ -5,7 +5,7 @@ ms.assetid: CB6281E1-37B1-4B8B-991D-BC5ED361F1EE
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Roles and permissions in Windows Store for Business

View File

@ -1,6 +1,6 @@
---
title: Set up a device for anyone to use (kiosk mode) (Windows 10)
description: 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.
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

View File

@ -288,27 +288,21 @@ Alternatively, you can turn on Shell Launcher using the Deployment Image Servici
**To set your custom shell**
- Modify the following PowerShell script as appropriate and run the script on the kiosk device.
Modify the following PowerShell script as appropriate and run the script on the kiosk device.
<span codelanguage=""></span>
<table>
<colgroup>
<col width="100%" />
</colgroup>
<tbody>
<tr class="odd">
<td align="left"><pre><code>$COMPUTER = &quot;localhost&quot;
```
$COMPUTER = &quot;localhost&quot;
$NAMESPACE = &quot;root\standardcimv2\embedded&quot;
# Create a handle to the class instance so we can call the static methods.
# Create a handle to the class instance so we can call the static methods.
$ShellLauncherClass = [wmiclass]&quot;\\$COMPUTER\${NAMESPACE}:WESL_UserSetting&quot;
# This well-known security identifier (SID) corresponds to the BUILTIN\Administrators group.
# This well-known security identifier (SID) corresponds to the BUILTIN\Administrators group.
$Admins_SID = &quot;S-1-5-32-544&quot;
# Create a function to retrieve the SID for a user account on a machine.
# Create a function to retrieve the SID for a user account on a machine.
function Get-UsernameSID($AccountName) {
@ -319,56 +313,53 @@ Alternatively, you can turn on Shell Launcher using the Deployment Image Servici
}
# Get the SID for a user account named &quot;Cashier&quot;. Rename &quot;Cashier&quot; to an existing account on your system to test this script.
# Get the SID for a user account named &quot;Cashier&quot;. Rename &quot;Cashier&quot; to an existing account on your system to test this script.
$Cashier_SID = Get-UsernameSID(&quot;Cashier&quot;)
# Define actions to take when the shell program exits.
# Define actions to take when the shell program exits.
$restart_shell = 0
$restart_device = 1
$shutdown_device = 2
# Examples
# Examples
# Set the command prompt as the default shell, and restart the device if it&#39;s closed.
# Set the command prompt as the default shell, and restart the device if it&#39;s closed.
$ShellLauncherClass.SetDefaultShell(&quot;cmd.exe&quot;, $restart_device)
# Display the default shell to verify that it was added correctly.
# Display the default shell to verify that it was added correctly.
$DefaultShellObject = $ShellLauncherClass.GetDefaultShell()
&quot;`nDefault Shell is set to &quot; + $DefaultShellObject.Shell + &quot; and the default action is set to &quot; + $DefaultShellObject.defaultaction
# Set Internet Explorer as the shell for &quot;Cashier&quot;, and restart the machine if it&#39;s closed.
# Set Internet Explorer as the shell for &quot;Cashier&quot;, and restart the machine if it&#39;s closed.
$ShellLauncherClass.SetCustomShell($Cashier_SID, &quot;c:\program files\internet explorer\iexplore.exe www.microsoft.com&quot;, ($null), ($null), $restart_shell)
# Set Explorer as the shell for administrators.
# Set Explorer as the shell for administrators.
$ShellLauncherClass.SetCustomShell($Admins_SID, &quot;explorer.exe&quot;)
# View all the custom shells defined.
# View all the custom shells defined.
&quot;`nCurrent settings for custom shells:&quot;
Get-WmiObject -namespace $NAMESPACE -computer $COMPUTER -class WESL_UserSetting | Select Sid, Shell, DefaultAction
# Enable Shell Launcher
# Enable Shell Launcher
$ShellLauncherClass.SetEnabled($TRUE)
&quot;`nEnabled is set to &quot; + $DefaultShellObject.IsEnabled()
# Remove the new custom shells.
# Remove the new custom shells.
$ShellLauncherClass.RemoveCustomShell($Admins_SID)
$ShellLauncherClass.RemoveCustomShell($Cashier_SID)
</code></pre></td>
</tr>
</tbody>
</table>
```
## Related topics

View File

@ -5,7 +5,7 @@ ms.assetid: 34F7FA2B-B848-454B-AC00-ECA49D87B678
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Settings reference: Windows Store for Business

View File

@ -26,11 +26,7 @@ You can use Lockdown.xml to configure lockdown settings.
The following table lists the settings pages and page groups. Use the page name in the Settings section of Lockdown.xml. The Settings section contains an allow list of pages in the Settings app.
<table>
<colgroup>
<col width="33%" />
<col width="33%" />
<col width="33%" />
</colgroup>
<thead>
<tr class="header">
<th align="left">Main menu</th>

View File

@ -5,7 +5,7 @@ ms.assetid: 63B56B8B-2A40-44B5-B100-DC50C43D20A9
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Sign code integrity policy with Device Guard signing

View File

@ -5,7 +5,7 @@ ms.assetid: 87C6FA60-3AB9-4152-A85C-6A1588A20C7B
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Sign up and get started

View File

@ -5,7 +5,7 @@ ms.assetid: 296AAC02-5C79-4999-B221-4F5F8CEA1F12
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Sign up for Windows Store for Business

View File

@ -5,7 +5,7 @@ ms.assetid: 7AA60D3D-2A69-45E7-AAB0-B8AFC29C2E97
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Configure access to Windows Store

View File

@ -5,7 +5,7 @@ ms.assetid: 243755A3-9B20-4032-9A77-2207320A242A
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Troubleshoot Windows Store for Business

View File

@ -5,7 +5,7 @@ ms.assetid: CEFFF451-D7D2-4A35-AF28-4A72B9582585
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Update Windows Store for Business account settings

View File

@ -6,7 +6,7 @@ keywords: ["telemetry", "BYOD", "MDM"]
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: AMeeus
---
# Windows 10 Mobile and mobile device management

View File

@ -5,7 +5,7 @@ ms.assetid: 527E611E-4D47-44F0-9422-DCC2D1ACBAB8
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Windows Store for Business

View File

@ -5,7 +5,7 @@ ms.assetid: 95EB7085-335A-447B-84BA-39C26AEB5AC7
ms.prod: W10
ms.mktglfcycl: manage
ms.sitesec: library
author: jdeckerMS
author: TrudyHa
---
# Working with line-of-business apps