mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-05-13 22:07:22 +00:00
Merge pull request #473 from MicrosoftDocs/FromPrivateRepo
From private repo
This commit is contained in:
Alma Jenks
GitHub
commit
5802dbddfa
BIN
education/windows/images/mc-ee-video-icon.png
Normal file
BIN
education/windows/images/mc-ee-video-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 194 KiB |
BIN
education/windows/images/mcee-icon.png
Normal file
BIN
education/windows/images/mcee-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 55 KiB |
@ -10,7 +10,7 @@ author: trudyha
|
||||
searchScope:
|
||||
- Store
|
||||
ms.author: trudyha
|
||||
ms.date: 10/13/2017
|
||||
ms.date: 1/5/2018
|
||||
---
|
||||
|
||||
# For IT administrators - get Minecraft: Education Edition
|
||||
@ -152,7 +152,7 @@ You can install the app on your PC. This gives you a chance to test the app and
|
||||
1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
|
||||
2. Click **Manage**, and then click **Install**.
|
||||
|
||||
|
||||
<!--  -->
|
||||
|
||||
3. Click **Install**.
|
||||
|
||||
|
||||
@ -9,7 +9,7 @@ ms.pagetype: edu
|
||||
ms.localizationpriority: high
|
||||
author: CelesteDG
|
||||
ms.author: celested
|
||||
ms.date: 12/12/2017
|
||||
ms.date: 02/02/2018
|
||||
---
|
||||
|
||||
# Technical reference for the Set up School PCs app
|
||||
|
||||
@ -10,8 +10,7 @@ author: trudyha
|
||||
searchScope:
|
||||
- Store
|
||||
ms.author: trudyha
|
||||
ms.date: 10/13/2017
|
||||
---
|
||||
ms.date: 1/5/2018
|
||||
|
||||
# For teachers - get Minecraft: Education Edition
|
||||
|
||||
@ -41,9 +40,9 @@ Learn how teachers can get and distribute Minecraft: Education Edition.
|
||||
|
||||
6. **Minecraft: Education Edition** opens in the Microsoft Store for Education. Select **Get the app**. This places **Minecraft: Education Edition** in your Microsoft Store inventory.
|
||||
|
||||
|
||||
<!--  -->
|
||||
|
||||
If you need additional licenses for **Minecraft: Education Edition**, see [Purchase additional licenses](https://technet.microsoft.com/edu/windows/education-scenarios-store-for-business#purchase-additional-licenses).
|
||||
If you need additional licenses for **Minecraft: Education Edition**, see [Purchase additional licenses](https://docs.microsoft.com/education/windows/education-scenarios-store-for-business#purchase-additional-licenses).
|
||||
|
||||
## Distribute Minecraft
|
||||
|
||||
@ -53,7 +52,7 @@ After Minecraft: Education Edition is added to your Microsoft Store for Educatio
|
||||
- You can assign the app to others.
|
||||
- You can download the app to distribute.
|
||||
|
||||
|
||||
<!--  -->
|
||||
|
||||
### Install for me
|
||||
You can install the app on your PC. This gives you a chance to work with the app before using it with your students.
|
||||
@ -61,7 +60,7 @@ You can install the app on your PC. This gives you a chance to work with the app
|
||||
1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
|
||||
2. Click **Manage**, and then click **Install**.
|
||||
|
||||
|
||||
<!--  -->
|
||||
|
||||
3. Click **Install**.
|
||||
|
||||
@ -72,7 +71,7 @@ Enter email addresses for your students, and each student will get an email with
|
||||
1. Sign in to [Microsoft Store for Education](https://educationstore.microsoft.com).
|
||||
2. Click **Manage**.
|
||||
|
||||
|
||||
<!--  -->
|
||||
|
||||
3. Click **Invite people**.
|
||||
|
||||
|
||||
@ -56,9 +56,9 @@ There are a couple of things we need to know when you pay for apps. You can add
|
||||
6. If you don’t have a payment method saved in **Billing - Payment methods**, we will prompt you for one.
|
||||
7. Add your credit card or debit card info, and click **Next**. Your card info is saved as a payment option on **Billing - Payment methods**.
|
||||
|
||||
You’ll also need to have your business address saved on ****Billing - Account profile***. The address is used to generate tax rates. For more information on taxes for apps, see [organization tax information](https://docs.microsoft.com/microsoft-store/update-microsoft-store-for-business-account-settings#organization-tax-information).
|
||||
You’ll also need to have your business address saved on **Billing - Account profile**. The address is used to generate tax rates. For more information on taxes for apps, see [organization tax information](https://docs.microsoft.com/microsoft-store/update-microsoft-store-for-business-account-settings#organization-tax-information).
|
||||
|
||||
Microsoft Store adds the app to your inventory. From **Inventory** or **Apps & software**, you can:
|
||||
Microsoft Store adds the app to your inventory. From **Products & services**, you can:
|
||||
- Distribute the app: add to private store, or assign licenses
|
||||
- View app licenses: review current licenses, reclaim and reassign licenses
|
||||
- View app details: review the app details page and purchase more licenses
|
||||
|
||||
@ -7,7 +7,7 @@ ms.sitesec: library
|
||||
ms.pagetype: store
|
||||
author: TrudyHa
|
||||
ms.author: TrudyHa
|
||||
ms.date: 1/4/2018
|
||||
ms.date: 1/29/2018
|
||||
ms.localizationpriority: high
|
||||
---
|
||||
|
||||
@ -20,7 +20,7 @@ Windows AutoPilot Deployment Program simplifies device set up for IT Admins. For
|
||||
|
||||
Watch this video to learn more about Windows AutoPilot in Micrsoft Store for Business. </br>
|
||||
|
||||
<iframe width="560" height="315" src="https://www.youtube.com/embed/IpLIZU_j7Z0" frameborder="0" allowfullscreen></iframe>
|
||||
[!video https://www.microsoft.com/en-us/videoplayer/embed/3b30f2c2-a3e2-4778-aa92-f65dbc3ecf54?autoplay=false]
|
||||
|
||||
## What is Windows AutoPilot Deployment Program?
|
||||
In Microsoft Store for Business, you can manage devices for your organization and apply an *AutoPilot deployment profile* to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows based on the AutoPilot deployment profile you applied to the device.
|
||||
|
||||
@ -26,6 +26,8 @@
|
||||
### [Manage access to private store](/microsoft-store/manage-access-to-private-store?toc=/microsoft-store/education/toc.json)
|
||||
### [Manage private store settings](/microsoft-store/manage-private-store-settings?toc=/microsoft-store/education/toc.json)
|
||||
### [Configure MDM provider](/microsoft-store/configure-mdm-provider-microsoft-store-for-business?toc=/microsoft-store/education/toc.json)
|
||||
### [Manage Windows device deployment with Windows AutoPilot Deployment](/microsoft-store/add-profile-to-devices?toc=/microsoft-store/education/toc.json)
|
||||
### [Microsoft Store for Business and Education PowerShell module - preview](/microsoft-store/microsoft-store-for-business-education-powershell-module?toc=/microsoft-store/education/toc.json)
|
||||
## [Device Guard signing portal](/microsoft-store/device-guard-signing-portal?toc=/microsoft-store/education/toc.json)
|
||||
### [Add unsigned app to code integrity policy](/microsoft-store/add-unsigned-app-to-code-integrity-policy?toc=/microsoft-store/education/toc.json)
|
||||
### [Sign code integrity policy with Device Guard signing](/microsoft-store/sign-code-integrity-policy-with-device-guard-signing?toc=/microsoft-store/education/toc.json)
|
||||
|
||||
BIN
store-for-business/images/mc-ee-video-icon.png
Normal file
BIN
store-for-business/images/mc-ee-video-icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 194 KiB |
@ -1389,6 +1389,27 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware
|
||||
|
||||
## Change history in MDM documentation
|
||||
|
||||
### February 2018
|
||||
|
||||
<table class="mx-tdBreakAll">
|
||||
<colgroup>
|
||||
<col width="25%" />
|
||||
<col width="75%" />
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr class="header">
|
||||
<th>New or updated topic</th>
|
||||
<th>Description</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr class="odd">
|
||||
<td style="vertical-align:top">[VPNv2 ProfileXML XSD](vpnv2-profile-xsd.md)</td>
|
||||
<td style="vertical-align:top"><p>Updated the XSD and Plug-in profile example for VPNv2 CSP.</p>
|
||||
</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
### January 2018
|
||||
|
||||
<table class="mx-tdBreakAll">
|
||||
|
||||
@ -6,13 +6,13 @@ ms.topic: article
|
||||
ms.prod: w10
|
||||
ms.technology: windows
|
||||
author: nickbrower
|
||||
ms.date: 11/01/2017
|
||||
ms.date: 01/26/2018
|
||||
---
|
||||
|
||||
# Office CSP
|
||||
|
||||
|
||||
The Office configuration service provider (CSP) enables a Microsoft Office client to be installed on a device via the Office Deployment Tool. For more information, see [Configuration options for the Office Deployment Tool](https://technet.microsoft.com/en-us/library/jj219426.aspx).
|
||||
The Office configuration service provider (CSP) enables a Microsoft Office client to be installed on a device via the Office Deployment Tool (ODT). For more information, see [Configuration options for the Office Deployment Tool](https://technet.microsoft.com/en-us/library/jj219426.aspx).
|
||||
This CSP was added in Windows 10, version 1703.
|
||||
|
||||
For additional information, see [Office DDF](office-ddf.md).
|
||||
@ -144,31 +144,54 @@ To get the current status of Office 365 on the device.
|
||||
<tr>
|
||||
<td>997</td>
|
||||
<td>Installation in progress</td>
|
||||
<td>Windows Information Protection</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>13 (ERROR_INVALID_DATA)</td>
|
||||
<td>Cannot verify signature of the downloaded ODT</td>
|
||||
<td>13</td>
|
||||
<td>ERROR_INVALID_DATA
|
||||
<p>Cannot verify signature of the downloaded Office Deployment Tool (ODT)<p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>1460 (ERROR_TIMEOUT)</td>
|
||||
<td>Failed to download ODT </td>
|
||||
<td>1460</td>
|
||||
<td>ERROR_TIMEOUT
|
||||
<p>Failed to download ODT</p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>1603 (ERROR_INSTALL_FAILURE)</td>
|
||||
<td>Failed any pre-req check.
|
||||
<td>1602 </td>
|
||||
<td>ERROR_INSTALL_USEREXIT
|
||||
<p>User cancelled the installation </p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>1603</td>
|
||||
<td>ERROR_INSTALL_FAILURE
|
||||
<p>Failed any pre-req check.</p>
|
||||
<ul>
|
||||
<li>SxS (Tried to install when 2016 MSI is installed)</li>
|
||||
<li>Bit mismatch</li>
|
||||
<li>Bit mismatch between the currently installed Office and the Office that was attempting to be installed (such as when you try to install a 32-bit version while 64-bit version is currently installed.)</li>
|
||||
</ul>
|
||||
</td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>17000</td>
|
||||
<td>ERROR_PROCESSPOOL_INITIALIZATION
|
||||
<p>Failed to start C2RClient </p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>17001</td>
|
||||
<td>ERROR_QUEUE_SCENARIO
|
||||
<p>Failed to queue installation scenario in C2RClient</p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>17002</td>
|
||||
<td>Failed to complete the process. Possible reasons:<ul>
|
||||
<td>ERROR_COMPLETING_SCENARIO
|
||||
<p>Failed to complete the process. Possible reasons:</p>
|
||||
<ul>
|
||||
<li>Installation cancelled by user</li>
|
||||
<li>Installation cancelled by another installation</li>
|
||||
<li>Out of disk space during installation </li>
|
||||
@ -177,13 +200,60 @@ To get the current status of Office 365 on the device.
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>17004</td>
|
||||
<td>Unknown SKU</td>
|
||||
<td>17003</td>
|
||||
<td>ERROR_ANOTHER_RUNNING_SCENARIO
|
||||
<p>Another scenario is running</p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>0x8000ffff (E_UNEXPECTED)</td>
|
||||
<td>Tried to uninstall when there is no C2R Office on the machine.</td>
|
||||
<td>17004</td>
|
||||
<td>ERROR_COMPLETING_SCENARIO_NEED_CLEAN_UP
|
||||
<p>Possible reasons:</p>
|
||||
<ul>
|
||||
<li>Unknown SKUs</li>
|
||||
<li>Content does't exist on CDN
|
||||
<ul><li>such as trying to install an unsupported LAP, like zh-sg</li>
|
||||
<li>CDN issue that content is not available</li></ul>
|
||||
</li>
|
||||
<li>Signature check issue, such as failed the signature check for Office content</li>
|
||||
<li>User cancelled
|
||||
</ul>
|
||||
</td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>17005</td>
|
||||
<td>ERROR_SCENARIO_CANCELLED_AS_PLANNED</td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>17006</td>
|
||||
<td>ERROR_SCENARIO_CANCELLED
|
||||
<p>Blocked update by running apps</p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>17007</td>
|
||||
<td>ERROR_REMOVE_INSTALLATION_NEEDED
|
||||
<p>The client is requesting client clean up in a "Remove Installation" scenario</p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>17100</td>
|
||||
<td>ERROR_HANDLING_COMMAND_LINE
|
||||
<p>C2RClient command line error </p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>0x80004005</td>
|
||||
<td>E_FAIL
|
||||
<p>ODT cannot be used to install Volume license</p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>0x8000ffff </td>
|
||||
<td>E_UNEXPECTED
|
||||
<p>Tried to uninstall when there is no C2R Office on the machine.</p></td>
|
||||
<td>Failure</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -7,7 +7,7 @@ ms.topic: article
|
||||
ms.prod: w10
|
||||
ms.technology: windows
|
||||
author: nickbrower
|
||||
ms.date: 06/26/2017
|
||||
ms.date: 02/05/2018
|
||||
---
|
||||
|
||||
# ProfileXML XSD
|
||||
@ -31,6 +31,8 @@ Here's the XSD for the ProfileXML node in VPNv2 CSP for Windows 10 and some pro
|
||||
<xs:element name="DnsSuffix" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="TrustedNetworkDetection" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="LockDown" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="DeviceTunnel" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="RegisterDNS" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="ByPassForLocal" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="Proxy" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
@ -46,6 +48,20 @@ Here's the XSD for the ProfileXML node in VPNv2 CSP for Windows 10 and some pro
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
<xs:element name="APNBinding" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
<xs:element name="ProviderId" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="AccessPointName" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="UserName" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="Password" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="IsCompressionEnabled" type="xs:boolean" minOccurs="0" maxOccurs="1"/>
|
||||
<xs:element name="AuthenticationType" type="xs:string" minOccurs="0" maxOccurs="1"/>
|
||||
</xs:sequence>
|
||||
</xs:complexType>
|
||||
</xs:element>
|
||||
|
||||
<xs:element name="DeviceCompliance" minOccurs="0" maxOccurs="1">
|
||||
<xs:complexType>
|
||||
<xs:sequence>
|
||||
@ -388,6 +404,8 @@ Here's the XSD for the ProfileXML node in VPNv2 CSP for Windows 10 and some pro
|
||||
<!--<EdpModeId>corp.contoso.com</EdpModeId>-->
|
||||
<RememberCredentials>true</RememberCredentials>
|
||||
<AlwaysOn>false</AlwaysOn>
|
||||
<DeviceTunnel>false</DeviceTunnel>
|
||||
<RegisterDNS>false</RegisterDNS>
|
||||
<DnsSuffix>corp.contoso.com</DnsSuffix>
|
||||
<TrustedNetworkDetection>contoso.com,test.corp.contoso.com</TrustedNetworkDetection>
|
||||
<Proxy>
|
||||
@ -396,6 +414,14 @@ Here's the XSD for the ProfileXML node in VPNv2 CSP for Windows 10 and some pro
|
||||
</Manual>
|
||||
<AutoConfigUrl>Helloworld.Com</AutoConfigUrl>
|
||||
</Proxy>
|
||||
<APNBinding>
|
||||
<ProviderId></ProviderId>
|
||||
<AccessPointName></AccessPointName>
|
||||
<UserName></UserName>
|
||||
<Password></Password>
|
||||
<IsCompressionEnabled></IsCompressionEnabled>
|
||||
<AuthenticationType></AuthenticationType>
|
||||
</APNBinding>
|
||||
</VPNProfile>
|
||||
```
|
||||
|
||||
|
||||
@ -16,7 +16,7 @@ ms.date: 01/29/2018
|
||||
|
||||
**Applies to**
|
||||
|
||||
- Windows 10
|
||||
- Windows 10 Enterprise edition
|
||||
- Windows Server 2016
|
||||
|
||||
If you're looking for content on what each diagnostic data level means and how to configure it in your organization, see [Configure Windows diagnostic data in your organization](configure-windows-diagnostic-data-in-your-organization.md).
|
||||
@ -39,7 +39,7 @@ It is recommended that you restart a device after making configuration changes t
|
||||
|
||||
We are always striving to improve our documentation and welcome your feedback. You can provide feedback by contacting telmhelp@microsoft.com.
|
||||
|
||||
## What's new in Windows 10, version 1709
|
||||
## What's new in Windows 10, version 1709 Enterprise edition
|
||||
|
||||
Here's a list of changes that were made to this article for Windows 10, version 1709:
|
||||
|
||||
@ -47,7 +47,7 @@ Here's a list of changes that were made to this article for Windows 10, version
|
||||
- Added the Storage Health section.
|
||||
- Added discussion of apps for websites in the Microsoft Store section.
|
||||
|
||||
## What's new in Windows 10, version 1703
|
||||
## What's new in Windows 10, version 1703 Enterprise edition
|
||||
|
||||
Here's a list of changes that were made to this article for Windows 10, version 1703:
|
||||
|
||||
@ -81,7 +81,7 @@ The following sections list the components that make network connections to Micr
|
||||
|
||||
If you're running Windows 10, they will be included in the next update for the Long Term Servicing Branch.
|
||||
|
||||
### Settings for Windows 10 Enterprise
|
||||
### Settings for Windows 10 Enterprise edition
|
||||
|
||||
See the following table for a summary of the management settings for Windows 10 Enterprise, version 1709 and Windows 10 Enterprise, version 1703.
|
||||
|
||||
@ -1445,7 +1445,7 @@ To change the level of diagnostic and usage data sent when you **Send your devic
|
||||
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Software\\Policies\\Microsoft\\Windows\\DataCollection\\AllowTelemetry**, with a value of 0-3, as appropriate for your deployment (see below for the values for each level).
|
||||
|
||||
> [!NOTE]
|
||||
> If the **Security** option is configured by using Group Policy or the Registry, the value will not be reflected in the UI. The **Security** option is only availble in Windows 10 Enterprise edition.
|
||||
> If the **Security** option is configured by using Group Policy or the Registry, the value will not be reflected in the UI. The **Security** option is only available in Windows 10 Enterprise edition.
|
||||
|
||||
-or-
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user