From baf9334f876a431b226f2d3a4c33bcbcd1b9edef Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Wed, 5 Oct 2016 11:42:01 -0700 Subject: [PATCH 01/10] updates from tech review --- .../windows/get-minecraft-for-education.md | 10 +++--- education/windows/school-get-minecraft.md | 32 ++++++++++--------- education/windows/teacher-get-minecraft.md | 20 ++++++------ 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index 2fedf96bda..d501c53df0 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -21,22 +21,22 @@ author: jdeckerMS Teachers and IT administrators can now get early access to **Minecraft Education Edition** and add it their Microsoft Store for Business for distribution. -![education.minecraft.net](images/minecraft.png) + ## Prerequisites - **Minecraft Education Edition** requires Windows 10. - Early access to **Minecraft Education Edition** is offered to education tenants that are managed by Azure Active Directory (Azure AD). - If your school doesn't have an Azure AD tenant, the [IT administrator can set one up](school-get-minecraft.md) as part of the process of getting **Minecraft Education Edition**. - * Office 365, which includes online versions of Office apps plus 1 TB online storage and [Microsoft Classroom](https://classroom.microsoft.com/), is free for teachers and students. [Sign up your school for Office 365 Education.](https://products.office.com/en-us/academic/office-365-education-plan) - * If your school has an Office 365 Education subscription, it includes a free Azure AD subscription. [Register your free Azure AD subscription.](https://msdn.microsoft.com/en-us/library/windows/hardware/mt703369%28v=vs.85%29.aspx) + * Office 365, which includes online versions of Office apps plus 1 TB online storage and [Microsoft Classroom](https://classroom.microsoft.com/), is free for teachers and students. [Sign up your school for Office 365 Education.](https://products.office.com/academic/office-365-education-plan) + * If your school has an Office 365 Education subscription, it includes a free Azure AD subscription. [Register your free Azure AD subscription.](https://msdn.microsoft.com/library/windows/hardware/mt703369%28v=vs.85%29.aspx) -![teacher](images/teacher.png) + [Learn how teachers can get and distribute **Minecraft Education Edition**](teacher-get-minecraft.md) -![IT administrator](images/school.png) + [Learn how IT administrators can get and distribute **Minecraft Education Edition**](school-get-minecraft.md), and how to manage permissions for Minecraft. diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md index e1d8f75c0d..da7e2d7c94 100644 --- a/education/windows/school-get-minecraft.md +++ b/education/windows/school-get-minecraft.md @@ -8,45 +8,47 @@ ms.sitesec: library author: jdeckerMS --- -# For IT administrators: get Minecraft Education Edition +# For IT administrators: get Minecraft: Education Edition **Applies to:** - Windows 10 -When you sign up for early access to [Minecraft Education Edition](http://education.minecraft.net), Minecraft will be added to the inventory in your Windows Store for Business, a private version of Windows Store associated with your Azure Active Directory (Azure AD) tenant. Your Store for Business is only displayed to members of your organization. +When you sign up for early access to [Minecraft: Education Edition](http://education.minecraft.net), Minecraft will be added to the inventory in your Windows Store for Business, a private version of Windows Store associated with your Azure Active Directory (Azure AD) tenant. Your Store for Business is only displayed to members of your organization. -> **Note**: If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 subscription when you request Minecraft Education Edition. +> **Note**: If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 subscription when you request Minecraft: Education Edition. For more information on ## Add Minecraft to your Windows Store for Business You can start with the Minecraft: Education Edition trial to get individual copies of the app. For more information, see [Minecraft: Education Edition - individual copies](#individual-copies). -If you’ve been approved and are part of the Enrollment for Education Solutions program, you can purchase a volume license for Minecraft: Education Edition. For more information, see [Minecraft: Education Edition - volume license](#volume-license) +If you’ve been approved and are part of the Enrollment for Education Solutions program, you can purchase a volume license for Minecraft: Education Edition. For more information, see [Minecraft: Education Edition - volume license](#volume-license). -### Minecraft: Education Edition - individual copies +Minecraft: Education Edition licenses can be purchased directly through the Windows Store for Business, or through the Enrollment for Education Solutions (EES) volume licensing program. For more information, [add redirect to screenshot]. -1. Go to [http://education.minecraft.net/](http://education.minecraft.net/) and select **Get the app**. +### Minecraft: Education Edition - direct purchase - ![Click Get the app](images/it-get-app.png) +1. Go to [http://education.minecraft.net/](http://education.minecraft.net/) and select **GET STARTED**. + + 2. Enter your email address. - ![Enter school email address](images/enter-email.png) + - If your email address isn't associated to an Azure AD or Office 365 tenant, you'll be asked to fill in a form. The information will be used to create an Office 365 subscription for your school. 3. Select **Get the app**. This will take you to the Windows Store for Business to download the app. You will also receive an email with instructions and a link to the Store. - ![You can get the app now](images/get-the-app.png) + 4. Sign in to Windows Store for Business with your email address. 5. Read and accept the Windows Store for Business Service Agreement, and then select **Next**. -6. **Minecraft Education Edition** opens in the Windows Store for Business. Select **Get the app**. This places **Minecraft: Education Edition** in your Store inventory. +6. **Minecraft: Education Edition** opens in the Windows Store for Business. Select **Get the app**. This places **Minecraft: Education Edition** in your Store inventory. - ![Get Minecraft app in Store](images/minecraft-get-the-app.png) + Now that the app is in your Store for Business inventory, you can choose how to distribute Minecraft. For more information on distribution options, see [Distribute Minecraft](#distribute-minecraft). @@ -60,7 +62,7 @@ Qualified education institutions can purchase Minecraft: Education Edition volum ## Distribute Minecraft -After Minecraft Education Edition is added to your Windows Store for Business, you have three options: +After Minecraft: Education Edition is added to your Windows Store for Business, you have three options: - You can install the app on your PC. - You can assign the app to others. @@ -161,7 +163,7 @@ You'll download a .zip file, extract the files, and then use one of the files to 6. **Restart**. Once installation is complete, restart each PC. Minecraft: Education Edition app is now ready for any student to use. -## Manage Minecraft Education Edition +## Manage Minecraft: Education Edition ### Access to Windows Store for Business By default, when a teacher with a work or school account in your edu tenant acquires Minecraft: Education Edition, they are automatically signed up for Window Store for Business, and the **Basic Purchaser** role is assigned to them. **Basic Purchaser** role allows teachers to acquire Minecraft: Education Edition and to distribute it to students. @@ -230,6 +232,6 @@ If you’ve purchased a volume license, be sure to let other basic purchasers in ## Related topics -[Get Minecraft Education Edition](get-minecraft-for-education.md) +[Get Minecraft: Education Edition](get-minecraft-for-education.md) -[For teachers get Minecraft Education Edition](teacher-get-minecraft.md) +[For teachers get Minecraft: Education Edition](teacher-get-minecraft.md) diff --git a/education/windows/teacher-get-minecraft.md b/education/windows/teacher-get-minecraft.md index 7c7eda6f8e..ee487613c0 100644 --- a/education/windows/teacher-get-minecraft.md +++ b/education/windows/teacher-get-minecraft.md @@ -8,7 +8,7 @@ ms.sitesec: library author: jdeckerMS --- -# For teachers: get Minecraft Education Edition +# For teachers: get Minecraft: Education Edition **Applies to:** @@ -18,29 +18,29 @@ Learn how teachers can get and distribute Minecraft: Education Edition. ## Add Minecraft to your Windows Store for Business -1. Go to [http://education.minecraft.net/](http://education.minecraft.net/) and select **Get the app**. +1. Go to [http://education.minecraft.net/](http://education.minecraft.net/) and select **GET STARTED**. - ![Click Get the app](images/teacher-get-app.png) + 2. Enter your email address. - ![Enter school email address](images/enter-email.png) + 3. Select **Get the app**. This will take you to the Windows Store for Business to download the app. You will also receive an email with instructions and a link to the Store. - ![You can get the app now](images/get-the-app.png) + 4. Sign in to Windows Store for Business with your email address. 5. Read and accept the Windows Store for Business Service Agreement, and then select **Next**. -6. **Minecraft Education Edition** opens in the Windows Store for Business. Select **Get the app**. This places **Minecraft Education Edition** in your Store inventory. +6. **Minecraft: Education Edition** opens in the Windows Store for Business. Select **Get the app**. This places **Minecraft: Education Edition** in your Windows Store for Business inventory. ![Get Minecraft app in Store](images/minecraft-get-the-app.png) ## Distribute Minecraft -After Minecraft Education Edition is added to your Windows Store for Business, you have three options: +After Minecraft: Education Edition is added to your Windows Store for Business inventory, you have three options: - You can install the app on your PC. - You can assign the app to others. @@ -97,7 +97,7 @@ Students will receive an email with a link that will install the app on their PC ![My Library for example student](images/minecraft-my-library.png) ### Download for others -Download for others allows teachers or IT admins to download a packages that they can install on student PCs. This will install Minecraft: Education Edition on the PC, and allows anyone with a Windows account to use the app on that PC. This option is best for younger students, and for shared computers. Choose this option when: +Download for others allows teachers or IT admins to download a packages that they can install on student PCs. This will install Minecraft: Education Edition on the PC, and allows anyone with a Windows account to use the app on that PC. This option is best for students, and for shared computers. Choose this option when: - You have administrative permissions to install apps on the PC. - You want to install this app on each of your student's Windows 10 (at least version 1511) PCs. - Your students share Windows 10 computers, but sign in with their own Windows account. @@ -152,8 +152,8 @@ If you are still having trouble installing the app, you can get more help on our ## Related topics -[Get Minecraft Education Edition](get-minecraft-for-education.md) +[Get Minecraft: Education Edition](get-minecraft-for-education.md) -[For IT admins: get Minecraft Education Edition](school-get-minecraft.md) +[For IT admins: get Minecraft: Education Edition](school-get-minecraft.md) From 3d4202e4928148c71bad27a4bec66f911bb09c08 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Wed, 5 Oct 2016 14:22:04 -0700 Subject: [PATCH 02/10] updates --- education/windows/school-get-minecraft.md | 44 +++++++++++------------ 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md index da7e2d7c94..5c1f03a24d 100644 --- a/education/windows/school-get-minecraft.md +++ b/education/windows/school-get-minecraft.md @@ -16,15 +16,13 @@ author: jdeckerMS When you sign up for early access to [Minecraft: Education Edition](http://education.minecraft.net), Minecraft will be added to the inventory in your Windows Store for Business, a private version of Windows Store associated with your Azure Active Directory (Azure AD) tenant. Your Store for Business is only displayed to members of your organization. -> **Note**: If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 subscription when you request Minecraft: Education Edition. For more information on +> **Note**: If you don't have an Azure AD or Office 365 tenant, you can set up a free Office 365 Education subscription when you request Minecraft: Education Edition. For more information see [Office 365 Education plans and pricing](https://products.office.com/academic/compare-office-365-education-plans). ## Add Minecraft to your Windows Store for Business -You can start with the Minecraft: Education Edition trial to get individual copies of the app. For more information, see [Minecraft: Education Edition - individual copies](#individual-copies). +You can start with the Minecraft: Education Edition trial to get individual copies of the app. For more information, see [Minecraft: Education Edition - direct purchase](#individual-copies). -If you’ve been approved and are part of the Enrollment for Education Solutions program, you can purchase a volume license for Minecraft: Education Edition. For more information, see [Minecraft: Education Edition - volume license](#volume-license). - -Minecraft: Education Edition licenses can be purchased directly through the Windows Store for Business, or through the Enrollment for Education Solutions (EES) volume licensing program. For more information, [add redirect to screenshot]. +If you’ve been approved and are part of the Enrollment for Education Solutions volume license program, you can purchase a volume licenses for Minecraft: Education Edition. For more information, see [Minecraft: Education Edition - volume license](#volume-license). ### Minecraft: Education Edition - direct purchase @@ -32,11 +30,11 @@ Minecraft: Education Edition licenses can be purchased directly through the Wind -2. Enter your email address. +2. Enter your email address, and select Educator, Administrator, or Student. - - If your email address isn't associated to an Azure AD or Office 365 tenant, you'll be asked to fill in a form. The information will be used to create an Office 365 subscription for your school. + - If your email address isn't associated to an Azure AD or Office 365 Education tenant, you'll be asked to create one. 3. Select **Get the app**. This will take you to the Windows Store for Business to download the app. You will also receive an email with instructions and a link to the Store. @@ -52,17 +50,17 @@ Minecraft: Education Edition licenses can be purchased directly through the Wind Now that the app is in your Store for Business inventory, you can choose how to distribute Minecraft. For more information on distribution options, see [Distribute Minecraft](#distribute-minecraft). -### Minecraft: Education Edition - volume license +### Minecraft: Education Edition - volume licensing -Qualified education institutions can purchase Minecraft: Education Edition volume licenses through their Microsoft channel partner. Schools need to be part of the Enrollment for Education Solutions program. Educational institutions should work with their channel partner to determine which Minecraft: Education Edition licensing offer is best for their institution. The process looks like this: +Qualified education institutions can purchase Minecraft: Education Edition licenses through their Microsoft channel partner. Schools need to be part of the Enrollment for Education Solutions (EES) volume licensing program. Educational institutions should work with their channel partner to determine which Minecraft: Education Edition licensing offer is best for their institution. The process looks like this: -- Your channel partner will submit and process your volume license order, your licenses will be shown on [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx), and the copies will be available in [Windows Store for Business](https://www.microsoft.com/business-store) inventory. +- Your channel partner will submit and process your volume license order, your licenses will be shown on [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx), and the licenses will be available in your [Windows Store for Business](https://www.microsoft.com/business-store) inventory. - You’ll receive an email with a link to Windows Store for Business. - Sign in to [Windows Store for Business](https://www.microsoft.com/business-store) to distribute and manage the Minecraft: Education Edition licenses. For more information on distribution options, see [Distribute Minecraft](#distribute-minecraft) ## Distribute Minecraft -After Minecraft: Education Edition is added to your Windows Store for Business, you have three options: +After Minecraft: Education Edition is added to your Windows Store for Business inventory, you have three options: - You can install the app on your PC. - You can assign the app to others. @@ -70,11 +68,11 @@ After Minecraft: Education Edition is added to your Windows Store for Business, Admins can also add Minecraft: Education Edition to the private store. This allows people in your organization to install the app from the private store. For more information, see [Distribute apps using your private store](https://technet.microsoft.com/itpro/windows/manage/distribute-apps-from-your-private-store). -Here's the page you'll see for individual copies of **Minecraft: Education Edition**. +Here's the page you'll see for Minecraft: Education Edition licenses purchased directly through the Windows Store for Business. ![App distribution options - individual copies](images/mc-install-for-me-admin.png) -Here's the page you'll see for volume licensed copies of of **Minecraft: Education Edition**. +Here's the page you'll see for Minecraft: Education Edition licenses purchased through volume licensing. ![App distribution options - individual copies](images/wsfb-minecraft-vl.png) @@ -89,17 +87,17 @@ You can install the app on your PC. This gives you a chance to test the app and 3. Click **Install**. ### Assign to others -Enter email addresses for your students, and each student will get an email with a link to install the app. This option is best for older, more tech-savvy students who will always use the same PC at school. You can assign the app to individuals, groups, or add it to your private store, where students and teachers in your organization can +Enter email addresses for your students, and each student will get an email with a link to install the app. This option is best for older, more tech-savvy students who will always use the same PC at school. You can assign the app to individuals, groups, or add it to your private store, where students and teachers in your organization can download the app. **To assign to others** 1. Sign in to Windows Store for Business. 2. Click **Manage**. ![Minecraft Education Edition product page](images/minecraft-assign-to-others.png) -4. Click **Assign to people**. +3. Click **Assign to people**. ![Assign to people](images/minecraft-assign-to-people.png) -5. Type the name, or email address of the student you want to assign the app to, and then click **Assign**. +4. Type the name, or email address of the student you want to assign the app to, and then click **Assign**. You can only assign the app to students with work or school accounts. If you don't find the student, you might need to add a work or school account for the student. @@ -116,16 +114,16 @@ Enter email addresses for your students, and each student will get an email with ![Windows Store app with Minecraft page](images/minecraft-in-windows-store-app.png) - After installing the app, students can find Minecraft: Education Edition in Windows Store app under **My Library**. + After installing the app, students can find Minecraft: Education Edition in Windows Store app under **My Library**. Windows Store app is preinstalled with Windows 10. ![Windows Store app showing access to My Library](images/minecraft-private-store.png) - When students click **My Libarary** they'll find apps assigned to them. + When students click **My Library** they'll find apps assigned to them. ![My Library for example student](images/minecraft-my-library.png) ### Download for others -Download for others allows teachers or IT admins to download a packages that they can install on student PCs. This will install Minecraft: Education Edition on the PC, and allows anyone with a Windows account to use the app on that PC. This option is best for younger students, and for shared computers. Choose this option when: +Download for others allows teachers or IT admins to download an app that they can install on PCs. This will install Minecraft: Education Edition on the PC, and allows anyone with a Windows account to use the app on that PC. This option is best for students, and for shared computers. Choose this option when: - You have administrative permissions to install apps on the PC. - You want to install this app on each of your student's Windows 10 (at least version 1511) PCs. - Your students share Windows 10 computers, but sign in with their own Windows account. @@ -166,9 +164,9 @@ You'll download a .zip file, extract the files, and then use one of the files to ## Manage Minecraft: Education Edition ### Access to Windows Store for Business -By default, when a teacher with a work or school account in your edu tenant acquires Minecraft: Education Edition, they are automatically signed up for Window Store for Business, and the **Basic Purchaser** role is assigned to them. **Basic Purchaser** role allows teachers to acquire Minecraft: Education Edition and to distribute it to students. +By default, when a teacher with a work or school account acquires Minecraft: Education Edition, they are automatically signed up for Window Store for Business, and the **Basic Purchaser** role is assigned to them. **Basic Purchaser** role allows teachers to acquire Minecraft: Education Edition and to distribute it to students. -However, tenant admins can control whether or not teachers automatically sign up for Windows Store for Business, and get the **Basic Purachaser** role. You can configure this with the **Allow educators in my organization to sign up for the Windows Store for Business.** You'll find this on the **Permissions** page. +However, tenant admins can control whether or not teachers automatically sign up for Windows Store for Business, and get the **Basic Purchaser** role. You can configure this with the **Allow educators in my organization to sign up for the Windows Store for Business.** You'll find this on the **Permissions** page. To prevent educators from automatically signing up for Windows Store for Business 1. In Windows Store for Business, click **Settings**, and then click **Permissions**. @@ -219,10 +217,10 @@ These apps will automatically be in your private store: As an admin, you can remove any of these apps from the private store if you'd prefer to control how apps are distributed. -## Need more copies of Minecraft: Education Edition? + ## Learn more From 4ea9a3739d5c1fc103c6ced4b9e4639067a1292a Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Wed, 5 Oct 2016 14:31:36 -0700 Subject: [PATCH 03/10] updates --- education/windows/get-minecraft-for-education.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index d501c53df0..c6a18d1ad8 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -19,24 +19,24 @@ author: jdeckerMS -Teachers and IT administrators can now get early access to **Minecraft Education Edition** and add it their Microsoft Store for Business for distribution. +Teachers and IT administrators can now get early access to **Minecraft Education :Edition** and add it their Microsoft Store for Business for distribution. ## Prerequisites -- **Minecraft Education Edition** requires Windows 10. -- Early access to **Minecraft Education Edition** is offered to education tenants that are managed by Azure Active Directory (Azure AD). - - If your school doesn't have an Azure AD tenant, the [IT administrator can set one up](school-get-minecraft.md) as part of the process of getting **Minecraft Education Edition**. +- **Minecraft: Education Edition** requires Windows 10. +- Early access to **Minecraft: Education Edition** is offered to education tenants that are managed by Azure Active Directory (Azure AD). + - If your school doesn't have an Azure AD tenant, the [IT administrator can set one up](school-get-minecraft.md) as part of the process of getting **Minecraft: Education Edition**. * Office 365, which includes online versions of Office apps plus 1 TB online storage and [Microsoft Classroom](https://classroom.microsoft.com/), is free for teachers and students. [Sign up your school for Office 365 Education.](https://products.office.com/academic/office-365-education-plan) * If your school has an Office 365 Education subscription, it includes a free Azure AD subscription. [Register your free Azure AD subscription.](https://msdn.microsoft.com/library/windows/hardware/mt703369%28v=vs.85%29.aspx) -[Learn how teachers can get and distribute **Minecraft Education Edition**](teacher-get-minecraft.md) +[Learn how teachers can get and distribute **Minecraft: Education Edition**](teacher-get-minecraft.md) -[Learn how IT administrators can get and distribute **Minecraft Education Edition**](school-get-minecraft.md), and how to manage permissions for Minecraft. +[Learn how IT administrators can get and distribute **Minecraft: Education Edition**](school-get-minecraft.md), and how to manage permissions for Minecraft. From 1c69b3fc3653948805e07f028d62d897e385c56b Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Wed, 5 Oct 2016 14:40:39 -0700 Subject: [PATCH 04/10] fixing list formatting --- education/windows/school-get-minecraft.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md index 5c1f03a24d..3efe123ac0 100644 --- a/education/windows/school-get-minecraft.md +++ b/education/windows/school-get-minecraft.md @@ -30,12 +30,10 @@ If you’ve been approved and are part of the Enrollment for Education Solutions -2. Enter your email address, and select Educator, Administrator, or Student. +2. Enter your email address, and select Educator, Administrator, or Student.
If your email address isn't associated to an Azure AD or Office 365 Education tenant, you'll be asked to create one. - - If your email address isn't associated to an Azure AD or Office 365 Education tenant, you'll be asked to create one. - 3. Select **Get the app**. This will take you to the Windows Store for Business to download the app. You will also receive an email with instructions and a link to the Store. From d55931405633ab9129aef069ac2079601e9d0ebd Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Tue, 11 Oct 2016 13:07:08 -0700 Subject: [PATCH 05/10] added 0xc1800118 --- windows/deploy/resolve-windows-10-upgrade-errors.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/windows/deploy/resolve-windows-10-upgrade-errors.md b/windows/deploy/resolve-windows-10-upgrade-errors.md index 8ce1abe2e0..95b2e9a819 100644 --- a/windows/deploy/resolve-windows-10-upgrade-errors.md +++ b/windows/deploy/resolve-windows-10-upgrade-errors.md @@ -736,6 +736,12 @@ This error has more than one possible cause. Attempt [quick fixes](#quick-fixes) Mitigation + +0xC1800118 +WSUS has downloaded content that it cannot use. +See [Steps to resolve error 0xC1800118](https://blogs.technet.microsoft.com/wsus/2016/09/21/resolving-error-0xc1800118/) for information. + + 0xC1900200 Setup.exe has detected that the machine does not meet the minimum system requirements. From 0f894f18d283e81aa1513a03d26d63ad5cc4dc3c Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Tue, 11 Oct 2016 13:15:56 -0700 Subject: [PATCH 06/10] tweak --- windows/deploy/resolve-windows-10-upgrade-errors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/resolve-windows-10-upgrade-errors.md b/windows/deploy/resolve-windows-10-upgrade-errors.md index 95b2e9a819..515ff82ee2 100644 --- a/windows/deploy/resolve-windows-10-upgrade-errors.md +++ b/windows/deploy/resolve-windows-10-upgrade-errors.md @@ -738,7 +738,7 @@ This error has more than one possible cause. Attempt [quick fixes](#quick-fixes) 0xC1800118 -WSUS has downloaded content that it cannot use. +WSUS has downloaded content that it cannot use due to a missing decryption key. See [Steps to resolve error 0xC1800118](https://blogs.technet.microsoft.com/wsus/2016/09/21/resolving-error-0xc1800118/) for information. From 1c2298ae6b159e6f3d753eb22d9b0e68155af6ad Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 11 Oct 2016 13:34:39 -0700 Subject: [PATCH 07/10] corrections from doc conversion --- .../surface-hub/create-a-device-account-using-office-365.md | 6 +++--- .../on-premises-deployment-surface-hub-device-accounts.md | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devices/surface-hub/create-a-device-account-using-office-365.md b/devices/surface-hub/create-a-device-account-using-office-365.md index a24d50ff5c..914b6136e6 100644 --- a/devices/surface-hub/create-a-device-account-using-office-365.md +++ b/devices/surface-hub/create-a-device-account-using-office-365.md @@ -133,7 +133,7 @@ In order to run cmdlets used by these PowerShell scripts, the following must be 5. Finally, to connect to Exchange Online Services, run: ``` syntax - $exchangeSession = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri"https://outlook.office365.com/powershell-liveid/" -Credential $cred -Authentication "Basic" –AllowRedirection + $exchangeSession = New-PSSession -ConfigurationName Microsoft.Exchange -ConnectionUri "https://outlook.office365.com/powershell-liveid/" -Credential $cred -Authentication "Basic" –AllowRedirection ``` ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-21.png) @@ -202,7 +202,7 @@ Now that you're connected to the online services, you can finish setting up the ``` syntax Set-CalendarProcessing -Identity $acctUpn -AutomateProcessing AutoAccept -AddOrganizerToSubject $false –AllowConflicts $false –DeleteComments $false -DeleteSubject $false -RemovePrivateProperty $false - Set-CalendarProcessing -Identity $acctUpn -AddAdditionalResponse $true -AdditionalResponse "This is a room!" + Set-CalendarProcessing -Identity $acctUpn -AddAdditionalResponse $true -AdditionalResponse "This is a Surface Hub room!" ``` ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-26.png) @@ -350,7 +350,7 @@ Now that you're connected to the online services, you can finish setting up the ``` syntax Set-CalendarProcessing -Identity $acctUpn -AutomateProcessing AutoAccept -AddOrganizerToSubject $false –AllowConflicts $false –DeleteComments $false -DeleteSubject $false -RemovePrivateProperty $false - Set-CalendarProcessing -Identity $acctUpn -AddAdditionalResponse $true -AdditionalResponse "This is a room!" + Set-CalendarProcessing -Identity $acctUpn -AddAdditionalResponse $true -AdditionalResponse "This is a Surface Hub room!" ``` 5. Now we have to set some properties in AD. To do that, you need the alias of the account (this is the part of the UPN that becomes before the “@”). diff --git a/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md b/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md index e948c327bb..a2103eec0b 100644 --- a/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md +++ b/devices/surface-hub/on-premises-deployment-surface-hub-device-accounts.md @@ -71,7 +71,7 @@ If you have a single-forest on-premises deployment with Microsoft Exchange 2013 ```PowerShell Set-CalendarProcessing -Identity $acctUpn -AutomateProcessing AutoAccept -AddOrganizerToSubject $false –AllowConflicts $false –DeleteComments $false -DeleteSubject $false -RemovePrivateProperty $false - Set-CalendarProcessing -Identity $acctUpn -AddAdditionalResponse $true -AdditionalResponse "This is a room!" + Set-CalendarProcessing -Identity $acctUpn -AddAdditionalResponse $true -AdditionalResponse "This is a Surface Hub room!" ``` 5. If you decide to have the password not expire, you can set that with PowerShell cmdlets too. See [Password management](password-management-for-surface-hub-device-accounts.md) for more information. From 9bc90084dbc62611efe20697d3520fbeb2aac7d1 Mon Sep 17 00:00:00 2001 From: jdeckerMS Date: Tue, 11 Oct 2016 13:37:48 -0700 Subject: [PATCH 08/10] remove outdated policy from table --- .../manage/windows-10-start-layout-options-and-policies.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/windows/manage/windows-10-start-layout-options-and-policies.md b/windows/manage/windows-10-start-layout-options-and-policies.md index 93ebd58d4e..53a6cf10b4 100644 --- a/windows/manage/windows-10-start-layout-options-and-policies.md +++ b/windows/manage/windows-10-start-layout-options-and-policies.md @@ -80,11 +80,6 @@ The following table lists the different parts of Start and any applicable policy Group Policy: Remove and prevent access to the Shut Down, Restart, Sleep, and Hibernate commands None - -All apps -Group Policy: Remove All Programs list from the Start menu -None - Start layout

MDM: Start layout

From 45c7b97474a393c167671fc0ac8c6ae07a0c28e9 Mon Sep 17 00:00:00 2001 From: Greg Lindsay Date: Tue, 11 Oct 2016 14:42:44 -0700 Subject: [PATCH 09/10] typo --- windows/deploy/resolve-windows-10-upgrade-errors.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deploy/resolve-windows-10-upgrade-errors.md b/windows/deploy/resolve-windows-10-upgrade-errors.md index 95b2e9a819..116daa7867 100644 --- a/windows/deploy/resolve-windows-10-upgrade-errors.md +++ b/windows/deploy/resolve-windows-10-upgrade-errors.md @@ -771,7 +771,7 @@ This error has more than one possible cause. Attempt [quick fixes](#quick-fixes) 0x80246007 The update was not downloaded successfully. -Attempt other methods of upgrading the operatign system.
+Attempt other methods of upgrading the operating system.
Download and run the media creation tool. See [Download windows 10](https://www.microsoft.com/en-us/software-download/windows10).
Attempt to upgrade using .ISO or USB.
**Note**: Windows 10 Enterprise isn’t available in the media creation tool. For more information, go to the [Volume Licensing Service Center](https://www.microsoft.com/licensing/servicecenter/default.aspx). From ca829f44ffcda04683f601095eef6e6a003aef48 Mon Sep 17 00:00:00 2001 From: Trudy Hakala Date: Tue, 11 Oct 2016 15:17:06 -0700 Subject: [PATCH 10/10] updates from tech review --- education/windows/get-minecraft-for-education.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md index c6a18d1ad8..e0880b7a0e 100644 --- a/education/windows/get-minecraft-for-education.md +++ b/education/windows/get-minecraft-for-education.md @@ -19,16 +19,16 @@ author: jdeckerMS -Teachers and IT administrators can now get early access to **Minecraft Education :Edition** and add it their Microsoft Store for Business for distribution. +Teachers and IT administrators can now get early access to **Minecraft: Education Edition** and add it their Microsoft Store for Business for distribution. ## Prerequisites - + - **Minecraft: Education Edition** requires Windows 10. - Early access to **Minecraft: Education Edition** is offered to education tenants that are managed by Azure Active Directory (Azure AD). - If your school doesn't have an Azure AD tenant, the [IT administrator can set one up](school-get-minecraft.md) as part of the process of getting **Minecraft: Education Edition**. - * Office 365, which includes online versions of Office apps plus 1 TB online storage and [Microsoft Classroom](https://classroom.microsoft.com/), is free for teachers and students. [Sign up your school for Office 365 Education.](https://products.office.com/academic/office-365-education-plan) + * Office 365 Education, which includes online versions of Office apps plus 1 TB online storage and [Microsoft Classroom](https://classroom.microsoft.com/), is free for teachers and students. [Sign up your school for Office 365 Education.](https://products.office.com/academic/office-365-education-plan) * If your school has an Office 365 Education subscription, it includes a free Azure AD subscription. [Register your free Azure AD subscription.](https://msdn.microsoft.com/library/windows/hardware/mt703369%28v=vs.85%29.aspx)