diff --git a/education/windows/images/mc-ee-video-icon.png b/education/windows/images/mc-ee-video-icon.png new file mode 100644 index 0000000000..61c8a0f681 Binary files /dev/null and b/education/windows/images/mc-ee-video-icon.png differ diff --git a/education/windows/images/mcee-icon.png b/education/windows/images/mcee-icon.png new file mode 100644 index 0000000000..32ed1cf134 Binary files /dev/null and b/education/windows/images/mcee-icon.png differ diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md index 0e3dfcd0ba..f0c3df0aea 100644 --- a/education/windows/school-get-minecraft.md +++ b/education/windows/school-get-minecraft.md @@ -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**. - ![Minecraft Education Edition product page](images/mc-install-for-me-teacher.png) + 3. Click **Install**. diff --git a/education/windows/set-up-school-pcs-technical.md b/education/windows/set-up-school-pcs-technical.md index 3999707536..59d779962f 100644 --- a/education/windows/set-up-school-pcs-technical.md +++ b/education/windows/set-up-school-pcs-technical.md @@ -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 diff --git a/education/windows/teacher-get-minecraft.md b/education/windows/teacher-get-minecraft.md index 7cf6b0d940..14bbe54561 100644 --- a/education/windows/teacher-get-minecraft.md +++ b/education/windows/teacher-get-minecraft.md @@ -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. - ![Get Minecraft app in Store](images/minecraft-get-the-app.png) + -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. -![App distribution options](images/mc-install-for-me-teacher.png) + ### 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**. - ![Minecraft Education Edition product page](images/mc-install-for-me-teacher.png) + 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**. - ![Minecraft Education Edition product page](images/mc-install-for-me-teacher.png) + 3. Click **Invite people**. diff --git a/store-for-business/acquire-apps-microsoft-store-for-business.md b/store-for-business/acquire-apps-microsoft-store-for-business.md index 181fb19436..3c59ec92f0 100644 --- a/store-for-business/acquire-apps-microsoft-store-for-business.md +++ b/store-for-business/acquire-apps-microsoft-store-for-business.md @@ -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 diff --git a/store-for-business/add-profile-to-devices.md b/store-for-business/add-profile-to-devices.md index cee7f01a25..d63ff3800d 100644 --- a/store-for-business/add-profile-to-devices.md +++ b/store-for-business/add-profile-to-devices.md @@ -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.
- +[!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. diff --git a/store-for-business/education/TOC.md b/store-for-business/education/TOC.md index 63f52ca1ce..f5ff057e17 100644 --- a/store-for-business/education/TOC.md +++ b/store-for-business/education/TOC.md @@ -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) diff --git a/store-for-business/images/mc-ee-video-icon.png b/store-for-business/images/mc-ee-video-icon.png new file mode 100644 index 0000000000..61c8a0f681 Binary files /dev/null and b/store-for-business/images/mc-ee-video-icon.png differ diff --git a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md index 8c40978809..8fdf97effb 100644 --- a/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md +++ b/windows/client-management/mdm/new-in-windows-mdm-enrollment-management.md @@ -1389,6 +1389,27 @@ The DM agent for [push-button reset](https://msdn.microsoft.com/windows/hardware ## Change history in MDM documentation +### February 2018 + + ++++ + + + + + + + + + + + +
New or updated topicDescription
[VPNv2 ProfileXML XSD](vpnv2-profile-xsd.md)

Updated the XSD and Plug-in profile example for VPNv2 CSP.

+
+ ### January 2018 diff --git a/windows/client-management/mdm/office-csp.md b/windows/client-management/mdm/office-csp.md index b3eec1da15..f031f91a4b 100644 --- a/windows/client-management/mdm/office-csp.md +++ b/windows/client-management/mdm/office-csp.md @@ -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. - + - - + + - - + + - - + + + + + + + + + + + + + + + + - - - + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/windows/client-management/mdm/vpnv2-profile-xsd.md b/windows/client-management/mdm/vpnv2-profile-xsd.md index 4934ae68ec..7f839bb83d 100644 --- a/windows/client-management/mdm/vpnv2-profile-xsd.md +++ b/windows/client-management/mdm/vpnv2-profile-xsd.md @@ -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 + + @@ -46,6 +48,20 @@ Here's the XSD for the ProfileXML node in VPNv2 CSP for Windows 10 and some pro + + + + + + + + + + + + + + @@ -388,6 +404,8 @@ Here's the XSD for the ProfileXML node in VPNv2 CSP for Windows 10 and some pro true false + false + false corp.contoso.com contoso.com,test.corp.contoso.com @@ -396,6 +414,14 @@ Here's the XSD for the ProfileXML node in VPNv2 CSP for Windows 10 and some pro Helloworld.Com + + + + + + + + ``` diff --git a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md index 649b0054e6..cb60ffc382 100644 --- a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md +++ b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md @@ -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-
997 Installation in progressWindows Information Protection
13 (ERROR_INVALID_DATA)Cannot verify signature of the downloaded ODT13ERROR_INVALID_DATA +

Cannot verify signature of the downloaded Office Deployment Tool (ODT)

 Failure
1460 (ERROR_TIMEOUT)Failed to download ODT 1460ERROR_TIMEOUT +

Failed to download ODT

 Failure
1603 (ERROR_INSTALL_FAILURE)Failed any pre-req check. +1602 ERROR_INSTALL_USEREXIT +

User cancelled the installation

Failure
1603ERROR_INSTALL_FAILURE +

Failed any pre-req check.

  • SxS (Tried to install when 2016 MSI is installed)
    • -
  • Bit mismatch
    • +
  • 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.)
 Failure
17000ERROR_PROCESSPOOL_INITIALIZATION +

Failed to start C2RClient

Failure
17001ERROR_QUEUE_SCENARIO +

Failed to queue installation scenario in C2RClient

Failure
17002Failed to complete the process. Possible reasons:
    +
ERROR_COMPLETING_SCENARIO +

Failed to complete the process. Possible reasons:

+
  • Installation cancelled by user
  • Installation cancelled by another installation
  • Out of disk space during installation
    • @@ -177,13 +200,60 @@ To get the current status of Office 365 on the device.
Failure
17004Unknown SKU17003ERROR_ANOTHER_RUNNING_SCENARIO +

Another scenario is running

 Failure
0x8000ffff (E_UNEXPECTED)Tried to uninstall when there is no C2R Office on the machine.17004ERROR_COMPLETING_SCENARIO_NEED_CLEAN_UP +

Possible reasons:

+
    +
  • Unknown SKUs
    • +
  • Content does't exist on CDN +
    • such as trying to install an unsupported LAP, like zh-sg
      • +
    • CDN issue that content is not available
    +
    • +
  • Signature check issue, such as failed the signature check for Office content
    • +
  • User cancelled +
+		Failure
17005ERROR_SCENARIO_CANCELLED_AS_PLANNEDFailure
17006ERROR_SCENARIO_CANCELLED +

Blocked update by running apps

Failure
17007ERROR_REMOVE_INSTALLATION_NEEDED +

The client is requesting client clean up in a "Remove Installation" scenario

Failure
17100ERROR_HANDLING_COMMAND_LINE +

C2RClient command line error

Failure
0x80004005E_FAIL +

ODT cannot be used to install Volume license

Failure
0x8000ffff E_UNEXPECTED +

Tried to uninstall when there is no C2R Office on the machine.

 Failure