diff --git a/devices/surface-hub/accessibility-surface-hub.md b/devices/surface-hub/accessibility-surface-hub.md index 11b73eecdf..4c4b6a6425 100644 --- a/devices/surface-hub/accessibility-surface-hub.md +++ b/devices/surface-hub/accessibility-surface-hub.md @@ -2,7 +2,11 @@ title: Accessibility (Surface Hub) description: Accessibility settings for the Microsoft Surface Hub can be changed by using the Settings app. You'll find them under Ease of Access. Your Surface Hub has the same accessibility options as Windows 10. ms.assetid: 1D44723B-1162-4DF6-99A2-8A3F24443442 -keywords: ["Accessibility settings", "Settings app", "Ease of Access"] +keywords: Accessibility settings, Settings app, Ease of Access +ms.prod: w10 +ms.mktglfcycl: manage +ms.pagetype: surfacehub +ms.sitesec: library author: TrudyHa --- diff --git a/devices/surface-hub/admin-group-management-for-surface-hub.md b/devices/surface-hub/admin-group-management-for-surface-hub.md index 170f3d1be5..daab251d41 100644 --- a/devices/surface-hub/admin-group-management-for-surface-hub.md +++ b/devices/surface-hub/admin-group-management-for-surface-hub.md @@ -2,7 +2,11 @@ title: Admin group management (Surface Hub) description: Every Microsoft Surface Hub can be configured individually by opening the Settings app on the device. ms.assetid: FA67209E-B355-4333-B903-482C4A3BDCCE -keywords: ["admin group management", "Settings app", "configure Surface Hub"] +keywords: admin group management, Settings app, configure Surface Hub +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub, security author: TrudyHa --- @@ -31,11 +35,11 @@ Note that the local admin account information is not backed by any directory ser You can set a security group from your domain as local administrators on the Surface Hub after you domain join the device to AD. You will need to provide credentials that are capable of joining the domain of your choice. After you domain join successfully, you will be asked to pick an existing security group to be set as the local admins. Anyone who is a member of that security group can enter their credentials and unlock Settings. -**Note**  Surface Hubs domain join for the single purpose of using a security group as local admins. Group policies are not applied after the device is domain joined. +>**Note**  Surface Hubs domain join for the single purpose of using a security group as local admins. Group policies are not applied after the device is domain joined.   -**Note**  If your Surface Hub loses trust with the domain (for example, if you remove the Surface Hub from the domain after it is domain joined), you won't be able to authenticate into the device and open up Settings. If you decide to remove the trust relationship of the Surface Hub with your domain, reset the device first. +>**Note**  If your Surface Hub loses trust with the domain (for example, if you remove the Surface Hub from the domain after it is domain joined), you won't be able to authenticate into the device and open up Settings. If you decide to remove the trust relationship of the Surface Hub with your domain, reset the device first.   @@ -43,7 +47,7 @@ You can set a security group from your domain as local administrators on the Sur You can set up IT pros from your Azure AD organization as local administrators on the Surface Hub after you join the device. The people that are provisioned as local admins on your device depend on what Azure AD subscription you have. You will need to provide credentials that are capable of joining the Azure AD organization of your choice. After you successfully join Azure AD, the appropriate people will be set as local admins on the device. Any user who was set up as a local admin as a result of this process can enter their credentials and unlock the Settings app. -**Note**  If your Azure AD organization is configured with mobile device management (MDM) enrollment, Surface Hubs will be enrolled into MDM as a result of joining Azure AD. Surface Hubs that have joined Azure AD are subject to receiving MDM policies, and can be managed using the MDM solution that your organization uses. +>**Note**  If your Azure AD organization is configured with mobile device management (MDM) enrollment, Surface Hubs will be enrolled into MDM as a result of joining Azure AD. Surface Hubs that have joined Azure AD are subject to receiving MDM policies, and can be managed using the MDM solution that your organization uses.   diff --git a/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md b/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md index e1bce22bd9..a388fc0cca 100644 --- a/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md +++ b/devices/surface-hub/appendix-a-powershell-scripts-for-surface-hub.md @@ -2,7 +2,11 @@ title: Appendix PowerShell (Surface Hub) description: PowerShell scripts to help set up and manage your Microsoft Surface Hub . ms.assetid: 3EF48F63-8E4C-4D74-ACD5-461F1C653784 -keywords: ["PowerShell", "set up Surface Hub", "manage Surface Hub"] +keywords: PowerShell, set up Surface Hub, manage Surface Hub +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -38,7 +42,7 @@ What do you need in order to run the scripts? - Remote PowerShell access to your organization's domain or tenant, Exchange servers, and Skype for Business servers. - Admin credentials for your organization's domain or tenant, Exchange servers, and Skype for Business servers. -**Note**  Whether you’re creating a new account or modifying an already-existing account, the validation script will verify that your device account is configured correctly. You should always run the validation script before adding a device account to Surface Hub. +>**Note**  Whether you’re creating a new account or modifying an already-existing account, the validation script will verify that your device account is configured correctly. You should always run the validation script before adding a device account to Surface Hub.   @@ -1669,7 +1673,7 @@ Set-CalendarProcessing $ strRoomUpn -AutomateProcessing AutoAccept For a device account to accept external meeting requests (a meeting request from an account not in the same tenant/domain), the device account must be set to allow processing of external meeting requests. Once set, the device account will automatically accept or decline meeting requests from external accounts as well as local accounts. -**Note**  If the **AutomateProcessing** attribute is not set to **AutoAccept**, then setting this will have no effect. +>**Note**  If the **AutomateProcessing** attribute is not set to **AutoAccept**, then setting this will have no effect.   diff --git a/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md b/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md index 6a123919fd..8712782546 100644 --- a/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md +++ b/devices/surface-hub/apply-activesync-policies-for-surface-hub-device-accounts.md @@ -2,7 +2,11 @@ title: Applying ActiveSync policies to device accounts (Surface Hub) description: The Microsoft Surface Hub's device account uses ActiveSync to sync mail and calendar. This allows people to join and start scheduled meetings from the Surface Hub, and allows them to email any whiteboards they have made during their meeting. ms.assetid: FAABBA74-3088-4275-B58E-EC1070F4D110 -keywords: ["Surface Hub", "ActiveSync policies"] +keywords: Surface Hub, ActiveSync policies +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/change-surface-hub-device-account.md b/devices/surface-hub/change-surface-hub-device-account.md index 44ad0b01d5..0760c66e33 100644 --- a/devices/surface-hub/change-surface-hub-device-account.md +++ b/devices/surface-hub/change-surface-hub-device-account.md @@ -2,7 +2,11 @@ title: Change the Microsoft Surface Hub device account description: You can change the device account in Settings to either add an account if one was not already provisioned, or to change any properties of an account that was already provisioned. ms.assetid: AFC43043-3319-44BC-9310-29B1F375E672 -keywords: ["change device account", "change properties", "Surface Hub"] +keywords: change device account, change properties, Surface Hub +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/connect-and-display-with-surface-hub.md b/devices/surface-hub/connect-and-display-with-surface-hub.md index cc608f499b..35d14c4df5 100644 --- a/devices/surface-hub/connect-and-display-with-surface-hub.md +++ b/devices/surface-hub/connect-and-display-with-surface-hub.md @@ -1,8 +1,11 @@ --- title: Connect other devices and display with Surface Hub description: You can connect other device to your Surface Hub to display content. This topic describes guest mode and replacement PC modes that is available through a wired connection. -Robots: noindex, nofollow ms.assetid: 8BB80FA3-D364-4A90-B72B-65F0F0FC1F0D +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- 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 084758aa68..a39e64d4cc 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 @@ -2,7 +2,11 @@ title: Create a device account using UI (Surface Hub) description: If you prefer to use a graphical user interface, you can create a device account for your Microsoft Surface Hub with either the Office 365 UI or the Exchange Admin Center. ms.assetid: D11BCDC4-DABA-4B9A-9ECB-58E02CC8218C -keywords: ["create device account", "Office 365 UI", "Exchange Admin center", "Office 365 admin center", "Skype for Business", "mobile device mailbox policy"] +keywords: create device account, Office 365 UI, Exchange Admin center, Office 365 admin center, Skype for Business, mobile device mailbox policy +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -264,7 +268,7 @@ You can use the Exchange Admin Center to create a device account: ### Create a mobile device mailbox policy from the Exchange Admin Center -**Note**  If you want to create and assign a policy to the account you created, and are using Exchange 2010, look up the corresponding information regarding policy creation and policy assignment when using the EMC (Exchange management console). +>**Note**  If you want to create and assign a policy to the account you created, and are using Exchange 2010, look up the corresponding information regarding policy creation and policy assignment when using the EMC (Exchange management console).   diff --git a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md index ae3b772bd4..d63259487e 100644 --- a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md +++ b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md @@ -2,7 +2,11 @@ title: Create and test a device account (Surface Hub) description: This topic introduces how to create and test the device account that Microsoft Surface Hub uses to communicate with Microsoft Exchange and Skype. ms.assetid: C8605B5F-2178-4C3A-B4E0-CE32C70ECF67 -keywords: ["create and test device account", "device account", "Surface Hub and Microsoft Exchange", "Surface Hub and Skype"] +keywords: create and test device account, device account, Surface Hub and Microsoft Exchange, Surface Hub and Skype +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -19,7 +23,7 @@ A "device account" is an account that the Microsoft Surface Hub uses to: People can book this account by scheduling a meeting with it. The Surface Hub will be able to join that meeting and provide various features to the meeting attendees. -**Important**  Without a device account, none of these features will work. +>**Important**  Without a device account, none of these features will work.   diff --git a/devices/surface-hub/device-reset-suface-hub.md b/devices/surface-hub/device-reset-suface-hub.md index 449deca360..e4f36616da 100644 --- a/devices/surface-hub/device-reset-suface-hub.md +++ b/devices/surface-hub/device-reset-suface-hub.md @@ -2,7 +2,11 @@ title: Device reset (Surface Hub) description: You may wish to reset your Microsoft Surface Hub. ms.assetid: 44E82EEE-1905-464B-A758-C2A1463909FF -keywords: ["reset Surface Hub"] +keywords: reset Surface Hub +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md b/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md index a9a913e3bd..f2264e2d63 100644 --- a/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md +++ b/devices/surface-hub/exchange-properties-for-surface-hub-device-accounts.md @@ -2,7 +2,11 @@ title: Microsoft Exchange properties (Surface Hub) description: Some Microsoft Exchange properties of the device account must be set to particular values to have the best meeting experience on Microsoft Surface Hub. ms.assetid: 3E84393B-C425-45BF-95A6-D6502BA1BF29 -keywords: ["Microsoft Exchange properties", "device account", "Surface Hub", "Windows PowerShell cmdlet"] +keywords: Microsoft Exchange properties, device account, Surface Hub, Windows PowerShell cmdlet +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/first-run-program-surface-hub.md b/devices/surface-hub/first-run-program-surface-hub.md index 4a45985296..da4eafbf85 100644 --- a/devices/surface-hub/first-run-program-surface-hub.md +++ b/devices/surface-hub/first-run-program-surface-hub.md @@ -2,7 +2,11 @@ title: First-run program (Surface Hub) description: The term \ 0034;first run \ 0034; refers to the series of steps you'll go through the first time you power up your Microsoft Surface Hub, and means the same thing as \ 0034;out-of-box experience \ 0034; (OOBE). This section will walk you through the process. ms.assetid: 07C9E84C-1245-4511-B3B3-75939AD57C49 -keywords: ["first run", "Surface Hub", "out-of-box experience", "OOBE"] +keywords: first run, Surface Hub, out-of-box experience, OOBE +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -29,7 +33,7 @@ The normal procedure goes through six steps: Each of these sections also contains information about paths you might take when something is different. For example, most Surface Hubs will use a wired network connection, but some of them will be set up with wireless instead. Details are described where appropriate. -**Note**  You should have the separate keyboard that came with your Surface Hub set up and ready before beginning. See the Surface Hub Setup Guide for details. +>**Note**  You should have the separate keyboard that came with your Surface Hub set up and ready before beginning. See the Surface Hub Setup Guide for details.   @@ -38,7 +42,7 @@ Each of these sections also contains information about paths you might take when This is the first screen you'll see when you power up the Surface Hub for the first time. It's where you input localization information for your device. -**Note**  This is also where you begin the optional process of deploying a provisioning package. See [Create provisioning packages](provisioning-packages-for-certificates-surface-hub.md) if that's what you're doing. +>**Note**  This is also where you begin the optional process of deploying a provisioning package. See [Create provisioning packages](provisioning-packages-for-certificates-surface-hub.md) if that's what you're doing.   @@ -55,7 +59,7 @@ If the default values shown are correct, then you can click **Next** to go on. O ### What happens? -**Note**  Once the settings on this page are entered, you can't come back to this screen unless you reset the device (see [Device reset](device-reset-suface-hub.md)). Make sure that the settings are properly configured before proceeding. +>**Note**  Once the settings on this page are entered, you can't come back to this screen unless you reset the device (see [Device reset](device-reset-suface-hub.md)). Make sure that the settings are properly configured before proceeding.   @@ -136,7 +140,7 @@ When you click **Next**, the device will attempt to connect to the proxy server. You can skip connecting to a network by selecting **Skip this step**. You'll be taken to the [Set up for you page](#set-up-for-you). -**Note**  If you skip this, the device will not have a network connection, and nothing that requires a network connection will work on your Surface Hub, including things like email and calendar synchronization. You can connect to a wireless network later using Settings (see [Wireless network managment](wireless-network-management-for-surface-hub.md)). +>**Note**  If you skip this, the device will not have a network connection, and nothing that requires a network connection will work on your Surface Hub, including things like email and calendar synchronization. You can connect to a wireless network later using Settings (see [Wireless network managment](wireless-network-management-for-surface-hub.md)).   @@ -162,7 +166,7 @@ The settings shown on the page have already been made, and can't be changed unti On this page, the Surface Hub will ask for credentials for the device account that you previously configured. (See [Create and test a device account](create-and-test-a-device-account-surface-hub.md).) The Surface Hub will attempt to discover various properties of the account, and may ask for more information on another page if it does not succeed. -**Note**  This section does not cover specific errors that can happen during first run. See [Troubleshoot Surface Hub](troubleshoot-surface-hub.md) for more information on errors. +>**Note**  This section does not cover specific errors that can happen during first run. See [Troubleshoot Surface Hub](troubleshoot-surface-hub.md) for more information on errors.   @@ -299,7 +303,7 @@ On this page, you will choose from several options for how you want to set up ad Because every Surface Hub can be used by any number of authenticated employees, settings are locked down so that they can't change from session to session. Only admins can configure the settings on the device, and on this page, you’ll choose which type of admins have that privilege. -**Note**  The purpose of this page is primarily to determine who can configure the device from the device’s UI; that is, who can actually visit a device, log in, open up the Settings app, and make changes to the Settings. +>**Note**  The purpose of this page is primarily to determine who can configure the device from the device’s UI; that is, who can actually visit a device, log in, open up the Settings app, and make changes to the Settings.   @@ -331,7 +335,7 @@ This is what happens when you choose an option. Note that a local admin must have physical access to the Surface Hub to log in. -**Note**  After you finish this process, you won't be able to change the device's admin option unless you reset the device. +>**Note**  After you finish this process, you won't be able to change the device's admin option unless you reset the device.   @@ -389,7 +393,7 @@ Using the provided domain, account credentials from the [Use Active Directory Do If the join is successful, you'll see the **Enter a security group** page. When you click the **Select** button on this page, the device will search for the specified security group on your domain. If found, the group will be verified. Click **Finish** to complete the first run process. -**Note**  If you domain join the Surface Hub, you can't unjoin the device without resetting it. +>**Note**  If you domain join the Surface Hub, you can't unjoin the device without resetting it.   @@ -414,7 +418,7 @@ This page will attempt to create a new admin account using the credentials that ## Update the Surface Hub -**Important**  Before you do the updates, make sure you read [Save your BitLocker key](save-bitlocker-key-surface-hub.md) in order to make sure you have a backup of the key. +>**Important**  Before you do the updates, make sure you read [Save your BitLocker key](save-bitlocker-key-surface-hub.md) in order to make sure you have a backup of the key.   diff --git a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md index 4fa0401135..482dce9fa8 100644 --- a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md +++ b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md @@ -2,7 +2,11 @@ title: Hybrid deployment (Surface Hub) description: A hybrid deployment requires special processing in order to set up a device account for your Microsoft Surface Hub. ms.assetid: 7BFBB7BE-F587-422E-9CE4-C9DDF829E4F1 -keywords: ["hybrid deployment", "device account for Surface Hub", "Exchange hosted on-prem", "Exchange hosted online"] +keywords: hybrid deployment, device account for Surface Hub, Exchange hosted on-prem, Exchange hosted online +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -21,7 +25,7 @@ Use this procedure if you use Exchange on-prem. - Type the password for this account. You'll need to retype it for verification. Make sure the **Password never expires** checkbox is the only option selected. - **Important**
Selecting **Password never expires** is a requirement for Skype for Business on the Surface Hub. Your domain rules may prohibit passwords that don't expire. If so, you'll need to create an exception for each Surface Hub device account. + >**Important** Selecting **Password never expires** is a requirement for Skype for Business on the Surface Hub. Your domain rules may prohibit passwords that don't expire. If so, you'll need to create an exception for each Surface Hub device account. ![image showing password dialog box](images/hybriddeployment-02a.png) @@ -147,7 +151,7 @@ Use this procedure if you use Exchange on-prem. - Click **Save**. - **Note**
You can also use the Windows Azure Active Directory Module for Windows Powershell to run the cmdlets needed to assign one of these licenses, but that's not covered here. + >**Note** You can also use the Windows Azure Active Directory Module for Windows Powershell to run the cmdlets needed to assign one of these licenses, but that's not covered here. For validation, you should be able to use any Skype for Business client (PC, Android, etc) to log in to this account. @@ -223,7 +227,7 @@ Use this procedure if you use Exchange online. - Type the password for this account. You'll need to retype it for verification. Make sure the **Password never expires** checkbox is the only option selected. - **Important**
Selecting **Password never expires** is a requirement for Skype for Business on the Surface Hub. Your domain rules may prohibit passwords that don't expire. If so, you'll need to create an exception for each Surface Hub device account. + >**Important** Selecting **Password never expires** is a requirement for Skype for Business on the Surface Hub. Your domain rules may prohibit passwords that don't expire. If so, you'll need to create an exception for each Surface Hub device account. ![image showing password dialog box](images/hybriddeployment-02a.png) @@ -306,6 +310,6 @@ Use this procedure if you use Exchange online. - Click **Save**. - **Note**
You can also use the Windows Azure Active Directory Module for Windows PowerShell to run the cmdlets needed to assign one of these licenses, but that's not covered here. + >**Note** You can also use the Windows Azure Active Directory Module for Windows PowerShell to run the cmdlets needed to assign one of these licenses, but that's not covered here. For validation, you should be able to use any Skype for Business client (PC, Android, etc) to log in to this account. \ No newline at end of file diff --git a/devices/surface-hub/i-am-done-finishing-your-surface-hub-meeting.md b/devices/surface-hub/i-am-done-finishing-your-surface-hub-meeting.md index 137667385b..db6e9ddd5f 100644 --- a/devices/surface-hub/i-am-done-finishing-your-surface-hub-meeting.md +++ b/devices/surface-hub/i-am-done-finishing-your-surface-hub-meeting.md @@ -2,6 +2,10 @@ title: I am done - ending a Surface Hub meeting description: To end a Surface Hub meeting, tap I am Done. Surface Hub cleans up the application state, operating system state, and the user interface so that Surface Hub is ready for the next meeting. keywords: I am Done, end Surface Hub meeting, finish Surface Hub meeting, clean up Surface Hub meeting +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/index.md b/devices/surface-hub/index.md index f60a86c42a..f526e77791 100644 --- a/devices/surface-hub/index.md +++ b/devices/surface-hub/index.md @@ -2,6 +2,10 @@ title: Microsoft Surface Hub description: Documents related to the Microsoft Surface Hub. ms.assetid: 69C99E91-1441-4318-BCAF-FE8207420555 +ms.prod: w10 +ms.mktglfcycl: explore +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/install-apps-on-surface-hub.md b/devices/surface-hub/install-apps-on-surface-hub.md index fb6bd9e507..2e6754e6cc 100644 --- a/devices/surface-hub/install-apps-on-surface-hub.md +++ b/devices/surface-hub/install-apps-on-surface-hub.md @@ -2,7 +2,11 @@ title: Install apps on your Microsoft Surface Hub description: Admins can install apps can from either the Windows Store or the Windows Store for Business. ms.assetid: 3885CB45-D496-4424-8533-C9E3D0EDFD94 -keywords: ["install apps", "Windows Store", "Windows Store for Business"] +keywords: [install apps, Windows Store, Windows Store for Business +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: surfacehub, store author: TrudyHa --- diff --git a/devices/surface-hub/intro-to-surface-hub.md b/devices/surface-hub/intro-to-surface-hub.md index dcfea76b5b..584dc26a5e 100644 --- a/devices/surface-hub/intro-to-surface-hub.md +++ b/devices/surface-hub/intro-to-surface-hub.md @@ -2,7 +2,11 @@ title: Intro to Microsoft Surface Hub description: Microsoft Surface Hub is an all-in-one productivity device that is intended for brainstorming, collaboration, and presentations. ms.assetid: 5DAD4489-81CF-47ED-9567-A798B90C7E76 -keywords: ["Surface Hub", "productivity", "collaboration", "presentations", "setup"] +keywords: Surface Hub, productivity, collaboration, presentations, setup +ms.prod: w10 +ms.mktglfcycl: explore +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/manage-settings-with-local-admin-account-surface-hub.md b/devices/surface-hub/manage-settings-with-local-admin-account-surface-hub.md index 17628909b6..59a5eb9898 100644 --- a/devices/surface-hub/manage-settings-with-local-admin-account-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-local-admin-account-surface-hub.md @@ -2,7 +2,11 @@ title: Manage settings with a local admin account (Surface Hub) description: A local admin account will be set up on every Microsoft Surface Hub as part of the first run program. The only way to change the local admin options that you chose at that time is to reset the device. ms.assetid: B4B3668B-985D-427E-8495-E30ABEECA679 -keywords: ["local admin account", "Surface Hub", "change local admin options"] +keywords: local admin account, Surface Hub, change local admin options +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -83,7 +87,7 @@ To create a local admin, choose to use a local admin during first run. This will After you domain join the device, you can set up a security group from your domain as local administrators on the Surface Hub. You will need to provide credentials that are capable of joining the domain of your choice. After you domain join successfully, you will be asked to pick an existing security group to be set as the local admins. When the Setting app is opened, any user who is a member of that security group can enter their credentials and unlock Settings. -**Note**  Surface Hubs domain join for the sole purpose of using a security group as local admins. Group policies are not applied after the device is domain joined. +>**Note**  Surface Hubs domain join for the sole purpose of using a security group as local admins. Group policies are not applied after the device is domain joined.   @@ -96,7 +100,7 @@ Otherwise, if you don’t want to use the device account to join Azure AD, you c - The org account of an admin who will manage the device, or - A separate account that is part of your organization and used only for joining Surface Hubs. -**Note**  If your Azure AD organization is also configured with MDM enrollment, Surface Hubs will also be enrolled into MDM as a result of joining Azure AD. Surface Hubs that have joined Azure AD are subject to receiving MDM policies, and can be widely managed using an MDM solution, which opts these devices into remote management. You may want to choose an account to join Azure AD that benefits how you manage devices—you find more info about this in the [Enroll a Surface Hub into MDM](manage-settings-with-mdm-for-surface-hub.md#enroll-into-mdm) section. +>**Note**  If your Azure AD organization is also configured with MDM enrollment, Surface Hubs will also be enrolled into MDM as a result of joining Azure AD. Surface Hubs that have joined Azure AD are subject to receiving MDM policies, and can be widely managed using an MDM solution, which opts these devices into remote management. You may want to choose an account to join Azure AD that benefits how you manage devices—you find more info about this in the [Enroll a Surface Hub into MDM](manage-settings-with-mdm-for-surface-hub.md#enroll-into-mdm) section.   diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index b5d58ebb5f..061bfada43 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -2,7 +2,11 @@ title: Manage settings with an MDM provider (Surface Hub) description: Microsoft Surface Hub provides an enterprise management solution to help IT administrators manage policies and business applications on these devices using a mobile device management (MDM) solution. ms.assetid: 18EB8464-6E22-479D-B0C3-21C4ADD168FE -keywords: ["mobile device managemen", "MDM", "manage policies"] +keywords: mobile device management, MDM, manage policies +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub, mobility author: TrudyHa --- diff --git a/devices/surface-hub/manage-surface-hub.md b/devices/surface-hub/manage-surface-hub.md index 213492014b..7baf06e0be 100644 --- a/devices/surface-hub/manage-surface-hub.md +++ b/devices/surface-hub/manage-surface-hub.md @@ -2,7 +2,11 @@ title: Manage Microsoft Surface Hub description: How to manage your Surface Hub after finishing the first-run program. ms.assetid: FDB6182C-1211-4A92-A930-6C106BCD5DC1 -keywords: ["manage Surface Hub"] +keywords: manage Surface Hub +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -25,7 +29,7 @@ For remotely-managed devices, the device must be enrolled into an MDM solution, Be aware that the two management methods are not mutually exclusive—every device will have the capability to be locally managed, and devices can be remotely managed if you choose. -**Note**  If a device is remotely managed, then any changes to local settings that are also remotely managed will only persist until the next time your Surface Hub syncs with your MDM solution. Once a sync occurs, the settings and policies defined on your MDM solution will be pushed to the device, overwriting the local changes. +>**Note**  If a device is remotely managed, then any changes to local settings that are also remotely managed will only persist until the next time your Surface Hub syncs with your MDM solution. Once a sync occurs, the settings and policies defined on your MDM solution will be pushed to the device, overwriting the local changes.   diff --git a/devices/surface-hub/manage-windows-updates-for-surface-hub.md b/devices/surface-hub/manage-windows-updates-for-surface-hub.md index d97e75cffd..fdf19039e5 100644 --- a/devices/surface-hub/manage-windows-updates-for-surface-hub.md +++ b/devices/surface-hub/manage-windows-updates-for-surface-hub.md @@ -2,7 +2,11 @@ title: Windows updates (Surface Hub) description: You can manage Windows updates on your Microsoft Surface Hub by setting the maintenance window, deferring updates, or using Windows Server Update Services (WSUS). ms.assetid: A737BD50-2D36-4DE5-A604-55053D549045 -keywords: ["manage Windows updates", "Surface Hub", "Windows Server Update Services", "WSUS"] +keywords: manage Windows updates, Surface Hub, Windows Server Update Services, WSUS +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -20,7 +24,7 @@ A default maintenance window is set for all new Surface Hubs: Most Windows updates are downloaded and installed automatically by Surface Hub. You can change the maintenance window to limit when the device can be automatically rebooted after a Windows update installation. For those updates that require a reboot of the device, the update installation will be postponed until the maintenance window begins. If a meeting is scheduled to start during the maintenance window, or if the Surface Hub sensors detect that the device is being used, the pending installation will be postponed to the next maintenance window. -**Note**  : If an update installation has been pending for 28 days, on the 28th day the update will be forcibly installed. The device will ignore meetings or sensor status and reboot during the maintenance window. +>**Note**: If an update installation has been pending for 28 days, on the 28th day the update will be forcibly installed. The device will ignore meetings or sensor status and reboot during the maintenance window.   diff --git a/devices/surface-hub/monitor-surface-hub.md b/devices/surface-hub/monitor-surface-hub.md index d27435da83..2055b8369d 100644 --- a/devices/surface-hub/monitor-surface-hub.md +++ b/devices/surface-hub/monitor-surface-hub.md @@ -2,7 +2,11 @@ title: Monitor your Microsoft Surface Hub description: Monitoring for Microsoft Surface Hub devices is enabled through Microsoft Operations Management Suite (OMS). ms.assetid: 1D2ED317-DFD9-423D-B525-B16C2B9D6942 -keywords: ["monitor Surface Hub", "Microsoft Operations Management Suite", "OMS"] +keywords: monitor Surface Hub, Microsoft Operations Management Suite, OMS +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- 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 1c2f707abd..03fc4981b1 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 @@ -2,7 +2,11 @@ title: On-premises deployment (Surface Hub) description: This topic explains how you add a device account for your Microsoft Surface Hub when you have a single-forest, on-premises deployment. ms.assetid: 80E12195-A65B-42D1-8B84-ECC3FCBAAFC6 -keywords: ["single forest deployment", "on prem deployment", "device account", "Surface Hub"] +keywords: single forest deployment, on prem deployment, device account, Surface Hub +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/online-deployment-surface-hub-device-accounts.md b/devices/surface-hub/online-deployment-surface-hub-device-accounts.md index 1afd55621a..15024b02d2 100644 --- a/devices/surface-hub/online-deployment-surface-hub-device-accounts.md +++ b/devices/surface-hub/online-deployment-surface-hub-device-accounts.md @@ -2,7 +2,11 @@ title: Online deployment with Office 365 (Surface Hub) description: This topic has instructions for adding a device account for your Microsoft Surface Hub when you have a pure, online deployment. ms.assetid: D325CA68-A03F-43DF-8520-EACF7C3EDEC1 -keywords: ["device account for Surface Hub", "online deployment"] +keywords: device account for Surface Hub, online deployment +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -134,8 +138,7 @@ If you have a pure, online (O365) deployment, then you can [use the provided Pow - In the **Assign licenses** section, you need to select Skype for Business (Plan 2) or Skype for Business (Plan 3), depending on your licensing and what you've decided in terms of needing Enterprise Voice. You'll have to use a Plan 3 license if you want to use Enterprise Voice on your Surface Hub. - Click **Save** and you're done. -**Note**
-It's also possible to use the Windows Azure Active Directory Module for Windows PowerShell to run the cmdlets needed to assign one of these licenses, but that's not covered here. +>**Note**: It's also possible to use the Windows Azure Active Directory Module for Windows PowerShell to run the cmdlets needed to assign one of these licenses, but that's not covered here. For validation, you should be able to use any Skype for Business client (PC, Android, etc) to log in to this account. diff --git a/devices/surface-hub/password-management-for-surface-hub-device-accounts.md b/devices/surface-hub/password-management-for-surface-hub-device-accounts.md index 0f413f86d6..58fc3a9004 100644 --- a/devices/surface-hub/password-management-for-surface-hub-device-accounts.md +++ b/devices/surface-hub/password-management-for-surface-hub-device-accounts.md @@ -2,7 +2,11 @@ title: Password management (Surface Hub) description: Every Microsoft Surface Hub device account requires a password to authenticate and enable features on the device. ms.assetid: 0FBFB546-05F0-430E-905E-87111046E4B8 -keywords: ["password", "password management", "password rotation", "device account"] +keywords: password, password management, password rotation, device account +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub, security author: TrudyHa --- diff --git a/devices/surface-hub/physically-install-your-surface-hub-device.md b/devices/surface-hub/physically-install-your-surface-hub-device.md index e576286f28..2a95ec05e4 100644 --- a/devices/surface-hub/physically-install-your-surface-hub-device.md +++ b/devices/surface-hub/physically-install-your-surface-hub-device.md @@ -2,7 +2,11 @@ title: Physically install Microsoft Surface Hub description: The Microsoft Surface Hub Readiness Guide will help make sure that your site is ready for the installation. ms.assetid: C764DBFB-429B-4B29-B4E8-D7F0073BC554 -keywords: ["Surface Hub", "readiness guide", "installation location", "mounting options"] +keywords: Surface Hub, readiness guide, installation location, mounting options +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub, readiness author: TrudyHa --- diff --git a/devices/surface-hub/prepare-your-environment-for-surface-hub.md b/devices/surface-hub/prepare-your-environment-for-surface-hub.md index bca63b0847..8656c33064 100644 --- a/devices/surface-hub/prepare-your-environment-for-surface-hub.md +++ b/devices/surface-hub/prepare-your-environment-for-surface-hub.md @@ -2,7 +2,11 @@ title: Prepare your environment for Microsoft Surface Hub description: This section contains an overview of the steps required to prepare your environment so that you can use all of the features of Microsoft Surface Hub. ms.assetid: 336A206C-5893-413E-A270-61BFF3DF7DA9 -keywords: ["prepare environment", "features of Surface Hub", "create and test device account", "check network availability"] +keywords: prepare environment, features of Surface Hub, create and test device account, check network availability +ms.prod: w10 +ms.mktglfcycl: plan +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md b/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md index 8a4eb488f1..f3ecf5f2d4 100644 --- a/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md +++ b/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md @@ -2,7 +2,11 @@ title: Create provisioning packages (Surface Hub) description: For Windows 10, settings that use the registry or a content services platform (CSP) can be configured using provisioning packages. You can also add certificates during first run using provisioning. ms.assetid: 8AA25BD4-8A8F-4B95-9268-504A49BA5345 -keywords: ["add certificate", "provisioning package"] +keywords: add certificate, provisioning package +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- @@ -34,7 +38,7 @@ Currently, you can use provisioning packages to install certificates and to inst You may use provisioning packages to install certificates that will allow the device to authenticate to Microsoft Exchange or Skype for Business, or to sideload apps that don't come from the Windows Store (for example, your own in-house apps). -**Note**  Provisioning can only install certificates to the device (local machine) store, and not to the user store. If your organization requires that certificates must be installed to the user store, you must use Mobile Device Management (MDM) to deploy these certificates. See your MDM solution documentation for details. +>**Note**  Provisioning can only install certificates to the device (local machine) store, and not to the user store. If your organization requires that certificates must be installed to the user store, you must use Mobile Device Management (MDM) to deploy these certificates. See your MDM solution documentation for details.   @@ -54,7 +58,7 @@ In order to create and deploy provisioning packages, all of the following are re ### Install the Windows Imaging and Configuration Designer 1. The Windows Imaging and Configuration Designer (ICD) is installed as part of the Windows 10 ADK. The installer for the ADK can be downloaded from the [Microsoft Download Center](http://go.microsoft.com/fwlink/?LinkId=718147). - **Note**  The ADK must be installed on a separate PC, not on the Surface Hub. + >**Note**  The ADK must be installed on a separate PC, not on the Surface Hub.   diff --git a/devices/surface-hub/save-bitlocker-key-surface-hub.md b/devices/surface-hub/save-bitlocker-key-surface-hub.md index 6c08da3b77..869f0a540b 100644 --- a/devices/surface-hub/save-bitlocker-key-surface-hub.md +++ b/devices/surface-hub/save-bitlocker-key-surface-hub.md @@ -2,7 +2,11 @@ title: Save your BitLocker key (Surface Hub) description: Every Microsoft Surface Hub is automatically set up with BitLocker drive encryption software. Microsoft strongly recommends that you make sure you back up your BitLocker recovery keys. ms.assetid: E11E4AB6-B13E-4ACA-BCE1-4EDC9987E4F2 -keywords: ["Surface Hub", "BitLocker", "Bitlocker recovery keys"] +keywords: Surface Hub, BitLocker, Bitlocker recovery keys +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub, security author: TrudyHa --- diff --git a/devices/surface-hub/set-up-your-surface-hub.md b/devices/surface-hub/set-up-your-surface-hub.md index 976bfd183c..1323fc0f77 100644 --- a/devices/surface-hub/set-up-your-surface-hub.md +++ b/devices/surface-hub/set-up-your-surface-hub.md @@ -2,7 +2,11 @@ title: Set up Microsoft Surface Hub description: Set up instructions for Surface Hub include a setup worksheet, and a walkthrough of the first-run program. ms.assetid: 4D1722BC-704D-4471-BBBE-D0500B006221 -keywords: ["set up instructions", "Surface Hub", "setup worksheet", "first-run program"] +keywords: set up instructions, Surface Hub, setup worksheet, first-run program +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/setup-worksheet-surface-hub.md b/devices/surface-hub/setup-worksheet-surface-hub.md index 4dd579c142..9f23b06daa 100644 --- a/devices/surface-hub/setup-worksheet-surface-hub.md +++ b/devices/surface-hub/setup-worksheet-surface-hub.md @@ -2,7 +2,11 @@ title: Setup worksheet (Surface Hub) description: When you've finished pre-setup and are ready to start first-time setup for your Microsoft Surface Hub, make sure you have all the information listed in this section. ms.assetid: AC6F925B-BADE-48F5-8D53-8B6FFF6EE3EB -keywords: ["Setup worksheet", "pre-setup", "first-time setup"] +keywords: Setup worksheet, pre-setup, first-time setup +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/surface-hub-administrators-guide.md b/devices/surface-hub/surface-hub-administrators-guide.md index a965c14182..8a1a636282 100644 --- a/devices/surface-hub/surface-hub-administrators-guide.md +++ b/devices/surface-hub/surface-hub-administrators-guide.md @@ -2,7 +2,11 @@ title: Microsoft Surface Hub administrator's guide description: This guide covers the installation and administration of devices running Surface Hub, and is intended for use by anyone responsible for these tasks, including IT administrators and developers. ms.assetid: e618aab7-3a94-4159-954e-d455ef7b8839 -keywords: ["Surface Hub", "installation", "administration", "administrator's guide"] +keywords: Surface Hub, installation, administration, administrator's guide +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/troubleshoot-surface-hub.md b/devices/surface-hub/troubleshoot-surface-hub.md index 1a55de269c..5f586fe00d 100644 --- a/devices/surface-hub/troubleshoot-surface-hub.md +++ b/devices/surface-hub/troubleshoot-surface-hub.md @@ -2,7 +2,11 @@ title: Troubleshoot Microsoft Surface Hub description: Troubleshoot common problems, including setup issues, Exchange ActiveSync errors. ms.assetid: CF58F74D-8077-48C3-981E-FCFDCA34B34A -keywords: ["Troubleshoot common problems", "setup issues", "Exchange ActiveSync errors"] +keywords: Troubleshoot common problems, setup issues, Exchange ActiveSync errors +ms.prod: w10 +ms.mktglfcycl: support +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/use-room-control-system-with-surface-hub.md b/devices/surface-hub/use-room-control-system-with-surface-hub.md index 447edd18aa..590099c5ec 100644 --- a/devices/surface-hub/use-room-control-system-with-surface-hub.md +++ b/devices/surface-hub/use-room-control-system-with-surface-hub.md @@ -2,7 +2,11 @@ title: Using a room control system (Surface Hub) description: Room control systems can be used with your Microsoft Surface Hub. ms.assetid: DC365002-6B35-45C5-A2B8-3E1EB0CB8B50 -keywords: ["room control system", "Surface Hub"] +keywords: room control system, Surface Hub +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub author: TrudyHa --- diff --git a/devices/surface-hub/wireless-network-management-for-surface-hub.md b/devices/surface-hub/wireless-network-management-for-surface-hub.md index 467c9cf42c..c68b67eb32 100644 --- a/devices/surface-hub/wireless-network-management-for-surface-hub.md +++ b/devices/surface-hub/wireless-network-management-for-surface-hub.md @@ -2,7 +2,11 @@ title: Wireless network management (Surface Hub) description: Microsoft Surface Hub offers two options for network connectivity to your corporate network and Internet wireless, and wired. While both provide network access, we recommend you use a wired connection. ms.assetid: D2CFB90B-FBAA-4532-B658-9AA33CAEA31D -keywords: ["network connectivity", "wired connection"] +keywords: network connectivity, wired connection +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: surfacehub, networking author: TrudyHa --- @@ -11,7 +15,7 @@ author: TrudyHa Microsoft Surface Hub offers two options for network connectivity to your corporate network and Internet: wireless, and wired. While both provide network access, we recommend you use a wired connection. -## Modifying, adding or reviewing a network connection +## Modifying, adding, or reviewing a network connection If a wired network connection is not available, the Surface Hub can use a wireless network for internet access. A properly connected and configured Wi-Fi access point must be available and within range of the Surface Hub. diff --git a/education/index.md b/education/index.md deleted file mode 100644 index 0bd9ced4cc..0000000000 --- a/education/index.md +++ /dev/null @@ -1 +0,0 @@ -#OP Testing file diff --git a/education/windows/TOC.md b/education/windows/TOC.md index 9e07262fa7..fa7c285458 100644 --- a/education/windows/TOC.md +++ b/education/windows/TOC.md @@ -2,6 +2,9 @@ ## [Change history for Windows 10 for Education](change-history-edu.md) ## [Use the Set up School PCs app (Preview)](use-set-up-school-pcs-app.md) ## [Technical reference for the Set up School PCs app (Preview)](set-up-school-pcs-technical.md) +## [Get Minecraft Education Edition](get-minecraft-for-education.md) +### [For teachers: get Minecraft Education Edition](teacher-get-minecraft.md) +### [For IT administrators: get Minecraft Education Edition](school-get-minecraft.md) ## [Take tests in Windows 10 (Preview)](take-tests-in-windows-10.md) ### [Set up Take a Test on a single PC (Preview)](take-a-test-single-pc.md) ### [Set up Take a Test on multiple PCs (Preview)](take-a-test-multiple-pcs.md) diff --git a/education/windows/change-history-edu.md b/education/windows/change-history-edu.md index 49e7b6303a..bb06ebd59a 100644 --- a/education/windows/change-history-edu.md +++ b/education/windows/change-history-edu.md @@ -1,9 +1,10 @@ --- title: Change history for Windows 10 for Education (Windows 10) description: New and changed topics in Windows 10 for Education -ms.prod: W10 +ms.prod: w10 ms.mktglfcycl: deploy ms.sitesec: library +ms.pagetype: edu author: jdeckerMS --- diff --git a/education/windows/chromebook-migration-guide.md b/education/windows/chromebook-migration-guide.md index e56979fdef..428efd3e77 100644 --- a/education/windows/chromebook-migration-guide.md +++ b/education/windows/chromebook-migration-guide.md @@ -2,10 +2,11 @@ title: Chromebook migration guide (Windows 10) description: In this guide you will learn how to migrate a Google Chromebook-based learning environment to a Windows 10-based learning environment. ms.assetid: 7A1FA48A-C44A-4F59-B895-86D4D77F8BEA -keywords: ["migrate", "automate", "device"] -ms.prod: W10 +keywords: migrate, automate, device +ms.prod: w10 ms.mktglfcycl: plan ms.sitesec: library +ms.pagetype: edu, devices author: craigash --- diff --git a/education/windows/deploy-windows-10-in-a-school.md b/education/windows/deploy-windows-10-in-a-school.md index 2c9039447a..53a866f3b8 100644 --- a/education/windows/deploy-windows-10-in-a-school.md +++ b/education/windows/deploy-windows-10-in-a-school.md @@ -4,7 +4,7 @@ description: Learn how to integrate your school environment with Microsoft Offic keywords: configure, tools, device, school ms.prod: w10 ms.mktglfcycl: plan -ms.pgtyp: edu +ms.pagetype: edu ms.sitesec: library author: craigash --- diff --git a/education/windows/get-minecraft-for-education.md b/education/windows/get-minecraft-for-education.md new file mode 100644 index 0000000000..2fedf96bda --- /dev/null +++ b/education/windows/get-minecraft-for-education.md @@ -0,0 +1,42 @@ +--- +title: Get Minecraft Education Edition +description: Learn how to get and distribute Minecraft Education Edition. +keywords: school +ms.prod: W10 +ms.mktglfcycl: plan +ms.sitesec: library +author: jdeckerMS +--- + +# Get Minecraft Education Edition + +**Applies to:** + +- Windows 10 + + +[Minecraft: Education Edition](http://education.minecraft.net/) is built for learning. Watch this video to learn more about Minecraft. + + + +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) + +![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/images/mc-assign-to-others-admin.png b/education/windows/images/mc-assign-to-others-admin.png new file mode 100644 index 0000000000..907f21d514 Binary files /dev/null and b/education/windows/images/mc-assign-to-others-admin.png differ diff --git a/education/windows/images/mc-assign-to-others-teacher.png b/education/windows/images/mc-assign-to-others-teacher.png new file mode 100644 index 0000000000..2656e9c784 Binary files /dev/null and b/education/windows/images/mc-assign-to-others-teacher.png differ diff --git a/education/windows/images/mc-check-for-updates.png b/education/windows/images/mc-check-for-updates.png new file mode 100644 index 0000000000..a9a0fbae5f Binary files /dev/null and b/education/windows/images/mc-check-for-updates.png differ diff --git a/education/windows/images/mc-dnld-others-admin.png b/education/windows/images/mc-dnld-others-admin.png new file mode 100644 index 0000000000..5e253c20d1 Binary files /dev/null and b/education/windows/images/mc-dnld-others-admin.png differ diff --git a/education/windows/images/mc-dnld-others-teacher.png b/education/windows/images/mc-dnld-others-teacher.png new file mode 100644 index 0000000000..24fa7ae20d Binary files /dev/null and b/education/windows/images/mc-dnld-others-teacher.png differ diff --git a/education/windows/images/mc-install-for-me-admin.png b/education/windows/images/mc-install-for-me-admin.png new file mode 100644 index 0000000000..f9194a6188 Binary files /dev/null and b/education/windows/images/mc-install-for-me-admin.png differ diff --git a/education/windows/images/mc-install-for-me-teacher.png b/education/windows/images/mc-install-for-me-teacher.png new file mode 100644 index 0000000000..7bc90ad129 Binary files /dev/null and b/education/windows/images/mc-install-for-me-teacher.png differ diff --git a/education/windows/images/minecraft-admin-permissions.png b/education/windows/images/minecraft-admin-permissions.png new file mode 100644 index 0000000000..3051c3dd84 Binary files /dev/null and b/education/windows/images/minecraft-admin-permissions.png differ diff --git a/education/windows/images/minecraft-assign-roles-2.png b/education/windows/images/minecraft-assign-roles-2.png new file mode 100644 index 0000000000..3ab1d6e072 Binary files /dev/null and b/education/windows/images/minecraft-assign-roles-2.png differ diff --git a/education/windows/images/minecraft-assign-roles.png b/education/windows/images/minecraft-assign-roles.png new file mode 100644 index 0000000000..5dc396155c Binary files /dev/null and b/education/windows/images/minecraft-assign-roles.png differ diff --git a/education/windows/images/minecraft-assign-to-others.png b/education/windows/images/minecraft-assign-to-others.png new file mode 100644 index 0000000000..4e8fba6126 Binary files /dev/null and b/education/windows/images/minecraft-assign-to-others.png differ diff --git a/education/windows/images/minecraft-assign-to-people-name.png b/education/windows/images/minecraft-assign-to-people-name.png new file mode 100644 index 0000000000..e39891698b Binary files /dev/null and b/education/windows/images/minecraft-assign-to-people-name.png differ diff --git a/education/windows/images/minecraft-assign-to-people.png b/education/windows/images/minecraft-assign-to-people.png new file mode 100644 index 0000000000..0f0e3dcdff Binary files /dev/null and b/education/windows/images/minecraft-assign-to-people.png differ diff --git a/education/windows/images/minecraft-get-the-app.png b/education/windows/images/minecraft-get-the-app.png new file mode 100644 index 0000000000..f30ab8ac68 Binary files /dev/null and b/education/windows/images/minecraft-get-the-app.png differ diff --git a/education/windows/images/minecraft-in-windows-store-app.png b/education/windows/images/minecraft-in-windows-store-app.png new file mode 100644 index 0000000000..e25f2b4df3 Binary files /dev/null and b/education/windows/images/minecraft-in-windows-store-app.png differ diff --git a/education/windows/images/minecraft-my-library.png b/education/windows/images/minecraft-my-library.png new file mode 100644 index 0000000000..1be1660adb Binary files /dev/null and b/education/windows/images/minecraft-my-library.png differ diff --git a/education/windows/images/minecraft-private-store.png b/education/windows/images/minecraft-private-store.png new file mode 100644 index 0000000000..0194d4b955 Binary files /dev/null and b/education/windows/images/minecraft-private-store.png differ diff --git a/education/windows/images/minecraft-student-install-email.png b/education/windows/images/minecraft-student-install-email.png new file mode 100644 index 0000000000..aa562a0f01 Binary files /dev/null and b/education/windows/images/minecraft-student-install-email.png differ diff --git a/education/windows/index.md b/education/windows/index.md index 55697f65f9..97c9414064 100644 --- a/education/windows/index.md +++ b/education/windows/index.md @@ -1,9 +1,10 @@ --- title: Windows 10 for Education (Windows 10) description: Learn about using Windows 10 in schools. -ms.prod: W10 +ms.prod: w10 ms.mktglfcycl: deploy ms.sitesec: library +ms.pagetype: edu author: jdeckerMS --- diff --git a/education/windows/school-get-minecraft.md b/education/windows/school-get-minecraft.md new file mode 100644 index 0000000000..5c18b9e201 --- /dev/null +++ b/education/windows/school-get-minecraft.md @@ -0,0 +1,206 @@ +--- +title: For IT administrators get Minecraft Education Edition +description: Learn how IT admins can get and distribute Minecraft in their schools. +keywords: ["school"] +ms.prod: W10 +ms.mktglfcycl: plan +ms.sitesec: library +author: jdeckerMS +--- + +# 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. + +> **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. + +## Add Minecraft to your Windows Store for Business + +1. Go to [http://education.minecraft.net/](http://education.minecraft.net/) and select **Get the app**. + + ![Click Get the app](images/it-get-app.png) + +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. + + ![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: + +- You can install the app on your PC. +- You can assign the app to others. +- You can download the app to distribute. + +![App distribution options](images/mc-install-for-me-admin.png) + +### Install for me +You can install the app on your PC. This gives you a chance to test the app and know how you might help others in your organization use the app. + +1. Sign in to Windows Store for Business. +2. Click **Manage**, and then click **Install for me**. + + ![Minecraft Education Edition product page](images/mc-install-for-me-admin.png) + +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 + +**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**. + + ![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**. + + 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. + + ![Assign to people showing student name](images/minecraft-assign-to-people-name.png) + +**To finish Minecraft install (for students)** + +Students will receive an email with a link that will install the app on their PC. + +![Email with Get the app link](images/minecraft-student-install-email.png) + +1. Click **Get the app** to start the app install in Windows Store app. +2. In Windows Store app, click **Install**. + + ![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**. + +![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. + +![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: +- 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. + +**Requirements** +- Administrative permissions are required on the PC. If you don't have the correct permissions, you won't be able to install the app. +- Windows 10 (at least version 1511) is required for PCs running Minecraft: Education Edition. + +**Check for updates**
+Minecraft: Education Edition will not install if there are updates pending for other apps on the PC. Before installing Minecraft, check to see if there are pending updates for Windows Store apps. + +**To check for app updates** +1. Start Windows Store app on the PC (click **Start**, and type **Store**). +2. Click the account button, and then click **Downloads and updates**. + + ![Windows Store app showing access to My Library](images/minecraft-private-store.png) + +3. Click **Check for updates**, and install all available updates. + + ![Windows Store app showing access to My Library](images/mc-check-for-updates.png) + +4. Restart the computer before installing Minecraft: Education Edition. + +**To download for others**
+You'll download a .zip file, extract the files, and then use one of the files to install Minecraft: Education Edition on each PC. + +1. **Download Minecraft Education Edition.zip**. From the **Minecraft: Education Edition** page, click **Download for others** tab, and then click **Download**. + + ![Windows Store app showing access to My Library](images/mc-dnld-others-admin.png) + +2. **Extract files**. Find the .zip file that you downloaded and extract the files. This is usually your **Downloads** folder, unless you chose to save the .zip file to a different location. Right-click the file and choose **Extract all**. +3. **Save to USB drive**. After you've extracted the files, save the Minecraft: Education Edition folder to a USB drive, or to a network location that you can access from each PC. +4. **Install app**. Use the USB drive to copy the Minecraft folder to each Windows 10 PC where you want to install Minecraft: Education Edition. Open Minecraft: Education Edition folder, right-click **InstallMinecraftEducationEdition.bat** and click **Run as administrator**. +5. **Quick check**. The install program checks the PC to make sure it can run Minecraft: Education Edition. If your PC passes this test, the app will automatically install. +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 + +### 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. + +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. + +To prevent educators from automatically signing up for Windows Store for Business +1. In Windows Store for Business, click **Settings**, and then click **Permissions**. + + ![Permission page for Windows Store for Business](images/minecraft-admin-permissions.png) + +2. Click **Allow educators in my organization to sign up for the Windows Store for Business.** + +### Roles and permissions +Minecraft: Education Edition adds a new role for teachers: **Basic Purchaser**. When a teacher has been granted this role, they can: +- View the Minecraft product description page +- Acquire and manage the app +- Info on Support page (including links to documentation and access to support through customer service) + +![assign roles to manage Minecraft permissions](images/minecraft-perms.png) + +**To assign Basic Purchaser role** + +1. Sign in to Store for Business + + **Note**
+ You need to be a Global Administrator, or have the Store for Business Admin role to access the Permissions page. + +2. Click **Settings**, and then choose **Permissions**. + + ![Permission page for Windows Store for Business](images/minecraft-admin-permissions.png) + +3. Click **Add people**, type a name, select the correct person, choose the role you want to assign, and click **Save**. + + ![Permission page for Windows Store for Business](images/minecraft-assign-roles.png) + + Windows Store for Business updates the list of people and permissions. + + ![Permission page for Windows Store for Business](images/minecraft-assign-roles-2.png) + +## Private store + +When you create you Windows Store for Business account, you'll have a set of apps included for free in your private store. Apps in your private store are available for all people in your organization to install and use. + +These apps will automatically be in your private store: +- Word mobile +- Excel mobile +- PowerPoint mobile +- OneNote +- Sway +- Fresh Paint +- Minecraft: Education Edition + +As an admin, you can remove any of these apps from the private store if you'd prefer to control how apps are distributed. + +## Learn more + +[Roles and permissions in Windows Store for Business](https://technet.microsoft.com/itpro/windows/manage/roles-and-permissions-windows-store-for-business) + +[Troubleshoot Windows Store for Business](https://technet.microsoft.com/itpro/windows/manage/troubleshoot-windows-store-for-business) + +## Related topics + +[Get Minecraft Education Edition](get-minecraft-for-education.md) + +[For teachers get Minecraft Education Edition](teacher-get-minecraft.md) diff --git a/education/windows/set-up-school-pcs-technical.md b/education/windows/set-up-school-pcs-technical.md index 515f82d2d3..3223550a4b 100644 --- a/education/windows/set-up-school-pcs-technical.md +++ b/education/windows/set-up-school-pcs-technical.md @@ -1,10 +1,11 @@ --- title: Set up School PCs app technical reference description: Describes the changes that the Set up School PCs app makes to a PC. -keywords: ["shared cart", "shared PC", "school"] -ms.prod: W10 +keywords: shared cart, shared PC, school +ms.prod: w10 ms.mktglfcycl: plan ms.sitesec: library +ms.pagetype: edu author: jdeckerMS --- diff --git a/education/windows/take-a-test-app-technical.md b/education/windows/take-a-test-app-technical.md index 149c29d066..d10f638e00 100644 --- a/education/windows/take-a-test-app-technical.md +++ b/education/windows/take-a-test-app-technical.md @@ -1,10 +1,11 @@ --- title: Take a Test app technical reference description: The policies and settings applied by the Take a Test app. -keywords: ["shared cart", "shared PC", "school"] -ms.prod: W10 +keywords: shared cart, shared PC, school +ms.prod: w10 ms.mktglfcycl: plan ms.sitesec: library +ms.pagetype: edu author: jdeckerMS --- diff --git a/education/windows/take-a-test-multiple-pcs.md b/education/windows/take-a-test-multiple-pcs.md index 64dde75a76..8c90e26274 100644 --- a/education/windows/take-a-test-multiple-pcs.md +++ b/education/windows/take-a-test-multiple-pcs.md @@ -2,9 +2,10 @@ title: Set up Take a Test on multiple PCs description: Learn how to set up and use the Take a Test app on multiple PCs. keywords: ["shared cart", "shared PC", "school"] -ms.prod: W10 +ms.prod: w10 ms.mktglfcycl: plan ms.sitesec: library +ms.pagetype: edu author: jdeckerMS --- diff --git a/education/windows/take-a-test-single-pc.md b/education/windows/take-a-test-single-pc.md index e1c6bb189c..b8bb602a2d 100644 --- a/education/windows/take-a-test-single-pc.md +++ b/education/windows/take-a-test-single-pc.md @@ -1,10 +1,11 @@ --- title: Set up Take a Test on a single PC description: Learn how to set up and use the Take a Test app on a single PC. -keywords: ["shared cart", "shared PC", "school"] -ms.prod: W10 +keywords: shared cart, shared PC, school +ms.prod: w10 ms.mktglfcycl: plan ms.sitesec: library +ms.pagetype: edu author: jdeckerMS --- diff --git a/education/windows/take-tests-in-windows-10.md b/education/windows/take-tests-in-windows-10.md index 7d15a79d72..bfac8bcc33 100644 --- a/education/windows/take-tests-in-windows-10.md +++ b/education/windows/take-tests-in-windows-10.md @@ -1,10 +1,11 @@ --- title: Take tests in Windows 10 description: Learn how to set up and use the Take a Test app. -keywords: ["shared cart", "shared PC", "school"] -ms.prod: W10 +keywords: shared cart, shared PC, school +ms.prod: w10 ms.mktglfcycl: plan ms.sitesec: library +ms.pagetype: edu author: jdeckerMS --- @@ -27,7 +28,7 @@ Many schools use online testing for formative and summative assessments. It's cr - Cortana is turned off. -**Take a Test** is included in Windows 10 Education. To add **Take a Test** to other editions of Windows 10, see [Add the Take a Test app to Windows 10](#add-the-take-a-test-app-to-windows-10) +**Take a Test** is included in version 1607 of Windows 10 Pro, Pro Education, Education and Enterprise. ## How you use Take a Test @@ -40,25 +41,7 @@ Many schools use online testing for formative and summative assessments. It's cr [Learn how to set up Take a Test on multiple PCs](take-a-test-multiple-pcs.md) -## Add the Take a Test app to Windows 10 -You can add the Take a Test app to Windows 10 Pro and Enterprise. - -### Add Take a Test on a single PC - -Use **Settings** to get **Take a Test** from Windows Update. - -1. Open **Settings**. -2. Go to **System** > **Apps & features** > **Manage optional features** > **Add a feature**. -3. Select **Take a Test**. - -### Deploy Take a Test to multiple PCs using DISM - -You can deploy the Take a Test package through Deployment Image Servicing and Management (DISM.exe). - -1. Get the Take a Test package from the [Microsoft update catalog](http://catalog.update.microsoft.com/). -2. Upload the package to a network share or to your Windows Server Update Services (WSUS) server. -3. Create and deploy a DISM script to add the package to offline or online images. For more information on how to add or enable features through DISM, see [DISM Operating System Package (.cab or .msu) Servicing Command-Line Options](https://msdn.microsoft.com/windows/hardware/commercialize/manufacture/desktop/dism-operating-system-package-servicing-command-line-options). ## Related topics diff --git a/education/windows/teacher-get-minecraft.md b/education/windows/teacher-get-minecraft.md new file mode 100644 index 0000000000..d5e4592eb6 --- /dev/null +++ b/education/windows/teacher-get-minecraft.md @@ -0,0 +1,147 @@ +--- +title: For teachers get Minecraft Education Edition +description: Learn how teachers can get and distribute Minecraft. +keywords: ["school"] +ms.prod: W10 +ms.mktglfcycl: plan +ms.sitesec: library +author: jdeckerMS +--- + +# For teachers: get Minecraft Education Edition + +**Applies to:** + +- Windows 10 + +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**. + + ![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. + + ![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: + +- You can install the app on your PC. +- 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. + +1. Sign in to Windows Store for Business. +2. Click **Manage**, and then click **Install for me**. + + ![Minecraft Education Edition product page](images/mc-install-for-me-teacher.png) + +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. + +**To assign to others** +1. Sign in to Windows Store for Business. +2. Click **Manage**. + + ![Minecraft Education Edition product page](images/mc-assign-to-others-teacher.png) + +3. Click **Assign to people**. + + ![Assign to people](images/minecraft-assign-to-people.png) + +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, contact your IT admin to add a work or school account for the student. + + ![Assign to people showing student name](images/minecraft-assign-to-people-name.png) + +**To finish Minecraft install (for students)** + +Students will receive an email with a link that will install the app on their PC. + +![Email with Get the app link](images/minecraft-student-install-email.png) + +1. Click **Get the app** to start the app install in Windows Store app. +2. In Windows Store app, click **Install**. + + ![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**. + + ![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. + + ![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: +- 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. + +**Requirements** +- Administrative permissions are required on the PC. If you don't have the correct permissions, you won't be able to install the app. +- Windows 10 (at least version 1511) is required for PCs running Minecraft: Education Edition. + +**Check for updates**
+Minecraft: Education Edition will not install if there are updates pending for other apps on the PC. Before installing Minecraft, check to see if there are pending updates for Windows Store apps. + +**To check for app updates** +1. Start Windows Store app on the PC (click **Start**, and type **Store**). +2. Click the account button, and then click **Downloads and updates**. + + ![Windows Store app showing access to My Library](images/minecraft-private-store.png) + +3. Click **Check for updates**, and install all available updates. + + ![Windows Store app showing access to My Library](images/mc-check-for-updates.png) + +4. Restart the computer before installing Minecraft: Education Edition. + +**To download for others**
+You'll download a .zip file, extract the files, and then use one of the files to install Minecraft: Education Edition on each PC. + +1. **Download Minecraft Education Edition.zip**. From the **Minecraft: Education Edition** page, click **Download for others** tab, and then click **Download**. + + ![Windows Store app showing access to My Library](images/mc-dnld-others-teacher.png) + + +2. **Extract files**. Find the .zip file that you downloaded and extract the files. This is usually your **Downloads** folder, unless you chose to save the .zip file to a different location. Right-click the file and choose **Extract all**. +3. **Save to USB drive**. After you've extracted the files, save the Minecraft: Education Edition folder to a USB drive, or to a network location that you can access from each PC. +4. **Install app**. Use the USB drive to copy the Minecraft folder to each Windows 10 PC where you want to install Minecraft: Education Edition. Open Minecraft: Education Edition folder, right-click **InstallMinecraftEducationEdition.bat** and click **Run as administrator**. +5. **Quick check**. The install program checks the PC to make sure it can run Minecraft: Education Edition. If your PC passes this test, the app will automatically install. +6. **Restart**. Once installation is complete, restart each PC. Minecraft: Education Edition app is now ready for any student to use. + +**Note**:
+If Minecraft: Education Edition does not install, you may need to update other Windows Store apps on your computer before you can install Minecraft: Education Edition. To do this, open the Windows Store for Business and select the Account button in the top right corner of your screen (next to Search.) Select Check for updates and install all available updates. Now Minecraft should install. + +## Related topics + +[Get Minecraft Education Edition](get-minecraft-for-education.md) + +[For IT admins: get Minecraft Education Edition](school-get-minecraft.md) + + diff --git a/education/windows/use-set-up-school-pcs-app.md b/education/windows/use-set-up-school-pcs-app.md index 1e5af39910..97f0a04fcb 100644 --- a/education/windows/use-set-up-school-pcs-app.md +++ b/education/windows/use-set-up-school-pcs-app.md @@ -1,10 +1,11 @@ --- title: Use Set up School PCs app description: Learn how the Set up School PCs app works and how to use it. -keywords: ["shared cart", "shared PC", "school"] -ms.prod: W10 +keywords: shared cart, shared PC, school +ms.prod: w10 ms.mktglfcycl: plan ms.sitesec: library +ms.pagetype: edu author: jdeckerMS --- diff --git a/mdop/uev-v2/prepare-a-ue-v-2x-deployment-new-uevv2.md b/mdop/uev-v2/prepare-a-ue-v-2x-deployment-new-uevv2.md index d2f8d804fb..81b493e1d2 100644 --- a/mdop/uev-v2/prepare-a-ue-v-2x-deployment-new-uevv2.md +++ b/mdop/uev-v2/prepare-a-ue-v-2x-deployment-new-uevv2.md @@ -695,6 +695,7 @@ Also… - The UE-V Windows PowerShell feature of the UE-V Agent requires .NET Framework 4 or higher and Windows PowerShell 3.0 or higher to be enabled. Download Windows PowerShell 3.0 [here](http://go.microsoft.com/fwlink/?LinkId=309609). - Install .NET Framework 4 or .NET Framework 4.5 on computers that run the Windows 7 or the Windows Server 2008 R2 operating system. The Windows 8, Windows 8.1, and Windows Server 2012 operating systems come with .NET Framework 4.5 installed. The Windows 10 operating system comes with .NET Framework 4.6 installed. +- The “Delete Roaming Cache” policy for Mandatory profiles is not supported with UE-V and should not be used.   diff --git a/windows/deploy/TOC.md b/windows/deploy/TOC.md index cc0388e935..ff58491fd1 100644 --- a/windows/deploy/TOC.md +++ b/windows/deploy/TOC.md @@ -134,4 +134,4 @@ ###### [Recognized Environment Variables](usmt-recognized-environment-variables.md) ###### [XML Elements Library](usmt-xml-elements-library.md) ##### [Offline Migration Reference](offline-migration-reference.md) -## [Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md) +## [Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md) \ No newline at end of file diff --git a/windows/deploy/change-history-for-deploy-windows-10.md b/windows/deploy/change-history-for-deploy-windows-10.md index ef6b329f37..ce380b474a 100644 --- a/windows/deploy/change-history-for-deploy-windows-10.md +++ b/windows/deploy/change-history-for-deploy-windows-10.md @@ -15,6 +15,7 @@ This topic lists new and updated topics in the [Deploy Windows 10](index.md) doc | New or changed topic | Description | |----------------------|-------------| | [Configure a PXE server to load Windows PE](configure-a-pxe-server-to-load-windows-pe.md) | New | +| [User State Migration Tool Technical Reference](usmt-technical-reference.md) | Updated | ## May 2016 | New or changed topic | Description | diff --git a/windows/deploy/configure-a-pxe-server-to-load-windows-pe.md b/windows/deploy/configure-a-pxe-server-to-load-windows-pe.md index a304a10c23..463da5964f 100644 --- a/windows/deploy/configure-a-pxe-server-to-load-windows-pe.md +++ b/windows/deploy/configure-a-pxe-server-to-load-windows-pe.md @@ -21,7 +21,7 @@ This walkthrough describes how to configure a PXE server to load Windows PE by ## Prerequisites -- A deployment computer: A computer with the [Windows Assessment and Deployment Kit](https://www.microsoft.com/en-us/download/details.aspx?id=39982) (Windows ADK) installed. +- A deployment computer: A computer with the [Windows Assessment and Deployment Kit](http://go.microsoft.com/fwlink/p/?LinkId=526740) (Windows ADK) installed. - A DHCP server: A DHCP server or DHCP proxy configured to respond to PXE client requests is required. - A PXE server: A server running the TFTP service that can host Windows PE boot files that the client will download. - A file server: A server hosting a network file share. @@ -49,17 +49,17 @@ All four of the roles specified above can be hosted on the same computer or each The script creates the destination directory structure and copies all the necessary files for that architecture. In the previous example, the following directories are created: ``` - C:\winpe\_amd64 - C:\winpe\_amd64\fwfiles - C:\winpe\_amd64\media - C:\winpe\_amd64\mount + C:\winpe_amd64 + C:\winpe_amd64\fwfiles + C:\winpe_amd64\media + C:\winpe_amd64\mount ``` 4. Mount the base Windows PE image (winpe.wim) to the \mount directory using the DISM tool. Mounting an image file unpacks the file contents into a folder so that you can make changes directly or by using tools such as DISM. See the following example. ``` Dism /mount-image /imagefile:c:\winpe_amd64\media\sources\boot.wim /index:1 /mountdir:C:\winpe_amd64\mount ``` -5. Map a network share to the root TFTP directory on the PXE/TFTP server and create a \Boot folder. Consult your TFTP server documentation to determine the root TFTP server directory, then enable sharing for this directory, and verify it can be accessed on the network. In the following example, the PXE server name is PXE-1 and the TFTP root directory is shared using a network path of \\PXE-1\TFTPRoot: +5. Map a network share to the root TFTP directory on the PXE/TFTP server and create a \Boot folder. Consult your TFTP server documentation to determine the root TFTP server directory, then enable sharing for this directory, and verify it can be accessed on the network. In the following example, the PXE server name is PXE-1 and the TFTP root directory is shared using a network path of **\\\PXE-1\TFTPRoot**: ``` net use y: \\PXE-1\TFTPRoot diff --git a/windows/deploy/index.md b/windows/deploy/index.md index 4e09532aaf..c6b8e27ed1 100644 --- a/windows/deploy/index.md +++ b/windows/deploy/index.md @@ -15,6 +15,7 @@ Learn about deploying Windows 10 for IT professionals. |Topic |Description | |------|------------| +|[Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md) |This topic lists new and updated topics in the Deploy Windows 10 documentation for [Windows 10 and Windows 10 Mobile](../index.md). | |[Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) |To successfully deploy the Windows 10 operating system in your organization, it is important to understand the different ways that it can be deployed, especially now that there are new scenarios to consider. Choosing among these scenarios, and understanding the key capabilities and limitations of each, is a key task. | |[Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md) |This guide will walk you through the process of deploying Windows 10 in an enterprise environment using the Microsoft Deployment Toolkit (MDT), and MDT 2013 Update 2 specifically. | |[Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-10-with-system-center-2012-r2-configuration-manager.md) |If you have Microsoft System Center 2012 R2 Configuration Manager in your environment, you will most likely want to use it to deploy Windows 10. This topic will show you how to set up Configuration Manager for operating system deployment and how to integrate Configuration Manager with the Microsoft Deployment Toolkit (MDT) or, more specifically, MDT 2013 Update 2. | @@ -28,7 +29,7 @@ Learn about deploying Windows 10 for IT professionals. |[Sideload apps in Windows 10](sideload-apps-in-windows-10.md) |Sideload line-of-business apps in Windows 10. | |[Volume Activation [client]](volume-activation-windows-10.md) |This guide is designed to help organizations that are planning to use volume activation to deploy and activate Windows 10, including organizations that have used volume activation for earlier versions of Windows. | |[Windows 10 deployment tools reference](windows-10-deployment-tools-reference.md) |Learn about the tools available to deploy Windows 10. | -|[Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md) |This topic lists new and updated topics in the Deploy Windows 10 documentation for [Windows 10 and Windows 10 Mobile](../index.md). | + ## Related topics - [Windows 10 and Windows 10 Mobile](../index.md) diff --git a/windows/deploy/usmt-technical-reference.md b/windows/deploy/usmt-technical-reference.md index 5bdf666976..17380ccbb3 100644 --- a/windows/deploy/usmt-technical-reference.md +++ b/windows/deploy/usmt-technical-reference.md @@ -13,6 +13,8 @@ The User State Migration Tool (USMT) 10.0 is included with the Windows Assessme Download the Windows ADK [from this website](http://go.microsoft.com/fwlink/p/?LinkID=526803). +**Note**: USMT version 10.1.10586 supports migration of user settings for installations of Microsoft Office 2003, 2007, 2010, and 2013. + USMT 10.0 includes three command-line tools: - ScanState.exe diff --git a/windows/keep-secure/change-history-for-keep-windows-10-secure.md b/windows/keep-secure/change-history-for-keep-windows-10-secure.md index dba679a5fa..86130bfcda 100644 --- a/windows/keep-secure/change-history-for-keep-windows-10-secure.md +++ b/windows/keep-secure/change-history-for-keep-windows-10-secure.md @@ -16,6 +16,7 @@ This topic lists new and updated topics in the [Keep Windows 10 secure](index.md |New or changed topic | Description | |----------------------|-------------| +|[Create an enterprise data protection (EDP) policy using Microsoft Intune](create-edp-policy-using-intune.md) |Added an update about needing to reconfigure your enterprise data protection app rules after delivery of the June service update. | | [Windows Firewall with Advanced Security](windows-firewall-with-advanced-security.md) (multiple topics) | New | | [Advanced security audit policy settings](advanced-security-audit-policy-settings.md) (mutiple topics) | New security monitoring reference topics | | [Windows security baselines](windows-security-baselines.md) | New | diff --git a/windows/keep-secure/create-edp-policy-using-intune.md b/windows/keep-secure/create-edp-policy-using-intune.md index c5d390ea1c..194bdc40b7 100644 --- a/windows/keep-secure/create-edp-policy-using-intune.md +++ b/windows/keep-secure/create-edp-policy-using-intune.md @@ -19,6 +19,9 @@ author: eross-msft Microsoft Intune helps you create and deploy your enterprise data protection (EDP) policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. +## Important note about the June service update +We've received some great feedback from you, our Windows 10 Insider Preview customers, about our enterprise data protection experiences and processes. Because of that feedback, we're delighted to deliver an enhanced apps policy experience with the June service update. This means that when you open an existing enterprise data protection policy after we release the June service update in your test environment, your existing Windows 10 enterprise data protection app rules (formerly in the **Protected Apps** area) will be removed.

To prepare for this change, we recommend that you make an immediate backup of your current app rules as they are today, so you can use them to help reconfigure your app rules with the enhanced experience. When you open an existing enterprise data protection policy after we release the June service update, you'll get a dialog box telling you about this change. Click the **OK** button to close the box and to begin reconfiguring your app rules.

![Microsoft Intune: Reconfigure app rules list dialog box](images/edp-intune-app-reconfig-warning.png)

Note that if you exit the **Policy** page before you've saved your new policy, your existing deployments won't be affected. However, if you save the policy without reconfiguring your apps, an updated policy will be deployed to your employees with an empty app rules list. + ## Add an EDP policy After you’ve installed and set up Intune for your organization, you must create an EDP-specific policy. @@ -38,9 +41,9 @@ During the policy-creation process in Intune, you can choose the apps you want t The steps to add your apps are based on the type of app it is; either a Universal Windows Platform (UWP) app, or a signed Desktop app, also known as a Classic Windows application. -**Important**
EDP-aware apps are expected to prevent enterprise data from going to unprotected network locations and to avoid encrypting personal data. On the other hand, EDP-unaware apps might not respect the corporate network boundary and will encrypt all files they create or modify, meaning that they could encrypt personal data and cause data loss during the revocation process. Care must be taken to get a support statement from the software provider that their app is safe with EDP before adding it to your **Protected App** list. -

-**Note**
If you want to use **File hash** or **Path** rules, instead of Publisher rules, you must follow the steps in the [Add multiple apps to your enterprise data protection (EDP) Protected Apps list](add-apps-to-protected-list-using-custom-uri.md) topic. +>**Important**
EDP-aware apps are expected to prevent enterprise data from going to unprotected network locations and to avoid encrypting personal data. On the other hand, EDP-unaware apps might not respect the corporate network boundary and will encrypt all files they create or modify, meaning that they could encrypt personal data and cause data loss during the revocation process. Care must be taken to get a support statement from the software provider that their app is safe with EDP before adding it to your **Protected App** list.

+ +>**Note**
If you want to use **File hash** or **Path** rules, instead of Publisher rules, you must follow the steps in the [Add multiple apps to your enterprise data protection (EDP) Protected Apps list](add-apps-to-protected-list-using-custom-uri.md) topic. **To add a UWP app** @@ -50,8 +53,9 @@ The steps to add your apps are based on the type of app it is; either a Universa **To find the Publisher and Product name values for Microsoft Store apps without installing them** - 1. Go to the [Windows Store for Business](http://go.microsoft.com/fwlink/p/?LinkID=722910) website, and find your app. For example, Microsoft OneNote.

- **Note**
If your app is already installed on desktop devices, you can use the AppLocker local security policy MMC snap-in to gather the info for adding the app to the **Protected App** list. For info about how to do this, see the [Add multiple apps to your enterprise data protection (EDP) Protected Apps list](add-apps-to-protected-list-using-custom-uri.md) topic. + 1. Go to the [Windows Store for Business](http://go.microsoft.com/fwlink/p/?LinkID=722910) website, and find your app. For example, Microsoft OneNote. + + >**Note**
If your app is already installed on desktop devices, you can use the AppLocker local security policy MMC snap-in to gather the info for adding the app to the **Protected App** list. For info about how to do this, see the [Add multiple apps to your enterprise data protection (EDP) Protected Apps list](add-apps-to-protected-list-using-custom-uri.md) topic. 2. Copy the ID value from the app URL. For example, Microsoft OneNote's ID URL is https://www.microsoft.com/store/apps/onenote/9wzdncrfhvjl, and you'd copy the ID value, `9wzdncrfhvjl`. @@ -78,7 +82,8 @@ The steps to add your apps are based on the type of app it is; either a Universa **To find the Publisher and Product name values for apps installed on Windows 10 Mobile phones** 1. If you need to add mobile apps that aren't distributed through the Store for Business, you must use the **Windows Device Portal** feature. -

**Note**
Your PC and phone must be on the same wireless network. + + >**Note**
Your PC and phone must be on the same wireless network. 2. On the Windows Phone, go to **Settings**, choose **Update & security**, and then choose **For developers**. @@ -93,7 +98,8 @@ The steps to add your apps are based on the type of app it is; either a Universa 7. Start the app for which you're looking for the publisher and product name values 8. Copy the `publisherCertificateName` value and paste it into the **Publisher Name** box and the `packageIdentityName` value into the **Product Name** box of Intune. -

**Important**
The JSON file might also return a `windowsPhoneLegacyId` value for both the **Publisher Name** and **Product Name** boxes. This means that you have an app that’s using a XAP package and that you must set the **Product Name** as `windowsPhoneLegacyId`, and set the **Publisher Name** as “CN=” followed by the `windowsPhoneLegacyId`. + + >**Important**
The JSON file might also return a `windowsPhoneLegacyId` value for both the **Publisher Name** and **Product Name** boxes. This means that you have an app that’s using a XAP package and that you must set the **Product Name** as `windowsPhoneLegacyId`, and set the **Publisher Name** as “CN=” followed by the `windowsPhoneLegacyId`.

For example:
``` json { @@ -239,11 +245,11 @@ If you have multiple domains, you must separate them with the "|" character. For ![Microsoft Intune: Add the primary internet domain for your enterprise identity](images/intune-primary-domain.png) ## Choose where apps can access enterprise data -After you've added a protection level to your apps, you'll need to decide where those apps can access enterprise data on your network. There are 6 options, including your network domain, cloud domain, proxy server, internal proxy server, IPv4 range, and IPv6 range.

-**Important**
-- Every EDP policy should include policy that defines your enterprise network locations. +After you've added a protection level to your apps, you'll need to decide where those apps can access enterprise data on your network. There are 6 options, including your network domain, cloud domain, proxy server, internal proxy server, IPv4 range, and IPv6 range. -- Classless Inter-Domain Routing (CIDR) notation isn’t supported for EDP configurations. +>**Important**
+- Every EDP policy should include policy that defines your enterprise network locations.

+- Classless Inter-Domain Routing (CIDR) notation isn’t supported for EDP configurations. **To specify where your protected apps can find and send enterprise data on the network** diff --git a/windows/keep-secure/event-4688.md b/windows/keep-secure/event-4688.md index fa4b2d568d..b152e305fb 100644 --- a/windows/keep-secure/event-4688.md +++ b/windows/keep-secure/event-4688.md @@ -175,7 +175,7 @@ This event generates every time a new process starts. - **Process Command Line** \[Version 1, 2\] \[Type = UnicodeString\]**:** contains the name of executable and arguments which were passed to it. You must enable “Administrative Templates\\System\\Audit Process Creation\\Include command line in process creation events” group policy to include command line in process creation events: - Group policy illustration + Group policy illustration By default **Process Command Line** field is empty. diff --git a/windows/keep-secure/event-4713.md b/windows/keep-secure/event-4713.md index 47ebf3fbb5..f87013f4a6 100644 --- a/windows/keep-secure/event-4713.md +++ b/windows/keep-secure/event-4713.md @@ -101,7 +101,7 @@ This event is generated only on domain controllers. This event shows changes in “Kerberos policy”. Here is location of Kerberos policies in Group Policy management console: -Group policy editor illustration +Group policy editor illustration ## Security Monitoring Recommendations diff --git a/windows/keep-secure/images/edp-intune-app-reconfig-warning.png b/windows/keep-secure/images/edp-intune-app-reconfig-warning.png new file mode 100644 index 0000000000..af36a7cc4e Binary files /dev/null and b/windows/keep-secure/images/edp-intune-app-reconfig-warning.png differ diff --git a/windows/manage/acquire-apps-windows-store-for-business.md b/windows/manage/acquire-apps-windows-store-for-business.md index 47dc081e5c..5f68e8e296 100644 --- a/windows/manage/acquire-apps-windows-store-for-business.md +++ b/windows/manage/acquire-apps-windows-store-for-business.md @@ -4,6 +4,8 @@ description: As an admin, you can acquire apps from the Windows Store for Busine ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store +author: TrudyHa --- # Acquire apps in Windows Store for Business diff --git a/windows/manage/add-unsigned-app-to-code-integrity-policy.md b/windows/manage/add-unsigned-app-to-code-integrity-policy.md index 8ccdfd7c62..d453da171a 100644 --- a/windows/manage/add-unsigned-app-to-code-integrity-policy.md +++ b/windows/manage/add-unsigned-app-to-code-integrity-policy.md @@ -5,6 +5,7 @@ ms.assetid: 580E18B1-2FFD-4EE4-8CC5-6F375BE224EA ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store, security author: TrudyHa --- diff --git a/windows/manage/app-inventory-managemement-windows-store-for-business.md b/windows/manage/app-inventory-managemement-windows-store-for-business.md index 16923a2b15..d58572c900 100644 --- a/windows/manage/app-inventory-managemement-windows-store-for-business.md +++ b/windows/manage/app-inventory-managemement-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: 44211937-801B-4B85-8810-9CA055CDB1B2 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/application-development-for-windows-as-a-service.md b/windows/manage/application-development-for-windows-as-a-service.md index 5b8fc04a92..dedc91d3cd 100644 --- a/windows/manage/application-development-for-windows-as-a-service.md +++ b/windows/manage/application-development-for-windows-as-a-service.md @@ -5,7 +5,7 @@ ms.assetid: 28E0D103-B0EE-4B14-8680-6F30BD373ACF ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library -ms.pagetype: security +ms.pagetype: security, servicing author: greg-lindsay --- diff --git a/windows/manage/apps-in-windows-store-for-business.md b/windows/manage/apps-in-windows-store-for-business.md index bd94b6ad6f..dec7d4ca5f 100644 --- a/windows/manage/apps-in-windows-store-for-business.md +++ b/windows/manage/apps-in-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: CC5641DA-3CEA-4950-AD81-1AF1AE876926 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/assign-apps-to-employees.md b/windows/manage/assign-apps-to-employees.md index e3be271bfd..adf354a31f 100644 --- a/windows/manage/assign-apps-to-employees.md +++ b/windows/manage/assign-apps-to-employees.md @@ -5,6 +5,7 @@ ms.assetid: A0DF4EC2-BE33-41E1-8832-DBB0EBECA31A ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/configure-mdm-provider-windows-store-for-business.md b/windows/manage/configure-mdm-provider-windows-store-for-business.md index d187a3674a..e621a59e02 100644 --- a/windows/manage/configure-mdm-provider-windows-store-for-business.md +++ b/windows/manage/configure-mdm-provider-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: B3A45C8C-A96C-4254-9659-A9B364784673 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/configure-windows-telemetry-in-your-organization.md b/windows/manage/configure-windows-telemetry-in-your-organization.md index 0c28495bbb..1d4f6b116f 100644 --- a/windows/manage/configure-windows-telemetry-in-your-organization.md +++ b/windows/manage/configure-windows-telemetry-in-your-organization.md @@ -2,6 +2,11 @@ description: Use this article to make informed decisions about how you can configure telemetry in your organization. title: Configure Windows telemetry in your organization (Windows 10) keywords: privacy +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: security +author: brianlic-msft --- # Configure Windows telemetry in your organization diff --git a/windows/manage/device-guard-signing-portal.md b/windows/manage/device-guard-signing-portal.md index c511f4b081..cff094be8b 100644 --- a/windows/manage/device-guard-signing-portal.md +++ b/windows/manage/device-guard-signing-portal.md @@ -5,6 +5,7 @@ ms.assetid: 8D9CD2B9-5FC6-4C3D-AA96-F135AFEEBB78 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store, security author: TrudyHa --- diff --git a/windows/manage/distribute-apps-from-your-private-store.md b/windows/manage/distribute-apps-from-your-private-store.md index 07e519edc4..c81973c29f 100644 --- a/windows/manage/distribute-apps-from-your-private-store.md +++ b/windows/manage/distribute-apps-from-your-private-store.md @@ -5,6 +5,7 @@ ms.assetid: C4644035-845C-4C84-87F0-D87EA8F5BA19 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/distribute-apps-to-your-employees-windows-store-for-business.md b/windows/manage/distribute-apps-to-your-employees-windows-store-for-business.md index 1c58d0489a..ffdae6061d 100644 --- a/windows/manage/distribute-apps-to-your-employees-windows-store-for-business.md +++ b/windows/manage/distribute-apps-to-your-employees-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: E591497C-6DFA-49C1-8329-4670F2164E9E ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/distribute-apps-with-management-tool.md b/windows/manage/distribute-apps-with-management-tool.md index 65abfa89d6..5677c4fd85 100644 --- a/windows/manage/distribute-apps-with-management-tool.md +++ b/windows/manage/distribute-apps-with-management-tool.md @@ -5,6 +5,7 @@ ms.assetid: 006F5FB1-E688-4769-BD9A-CFA6F5829016 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/distribute-offline-apps.md b/windows/manage/distribute-offline-apps.md index 82c3720714..f6493b53b4 100644 --- a/windows/manage/distribute-offline-apps.md +++ b/windows/manage/distribute-offline-apps.md @@ -5,6 +5,7 @@ ms.assetid: 6B9F6876-AA66-4EE4-A448-1371511AC95E ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/find-and-acquire-apps-overview.md b/windows/manage/find-and-acquire-apps-overview.md index 28a4e36fef..4b4aab57ea 100644 --- a/windows/manage/find-and-acquire-apps-overview.md +++ b/windows/manage/find-and-acquire-apps-overview.md @@ -5,6 +5,7 @@ ms.assetid: 274A5003-5F15-4635-BB8B-953953FD209A ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/group-policies-for-enterprise-and-education-editions.md b/windows/manage/group-policies-for-enterprise-and-education-editions.md index 8a39c49e60..9904809076 100644 --- a/windows/manage/group-policies-for-enterprise-and-education-editions.md +++ b/windows/manage/group-policies-for-enterprise-and-education-editions.md @@ -4,6 +4,7 @@ description: Use this topic to learn about Group Policy objects that apply only ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +author: brianlic-msft --- # Group Policies that apply only to Windows 10 Enterprise and Education Editions diff --git a/windows/manage/introduction-to-windows-10-servicing.md b/windows/manage/introduction-to-windows-10-servicing.md index 4a7499aac7..0325ebfeac 100644 --- a/windows/manage/introduction-to-windows-10-servicing.md +++ b/windows/manage/introduction-to-windows-10-servicing.md @@ -6,7 +6,7 @@ keywords: update, LTSB, lifecycle, Windows update, upgrade ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library -ms.pagetype: security +ms.pagetype: security, servicing author: greg-lindsay --- @@ -18,6 +18,8 @@ author: greg-lindsay This article describes the new servicing options available in Windows 10 and IoT Core and how they enable enterprises to keep their devices current with the latest feature upgrades. It also covers related topics, such as how enterprises can make better use of Windows Update, and what the new servicing options mean for support lifecycles. +For Windows 10 current version numbers by servicing option see: [Windows 10 release information](https://technet.microsoft.com/en-us/windows/mt679505.aspx). + **Note**   Several of the figures in this article show multiple feature upgrades of Windows being released by Microsoft over time. Be aware that these figures were created with dates that were chosen for illustrative clarity, not for release roadmap accuracy, and should not be used for planning purposes.   diff --git a/windows/manage/join-windows-10-mobile-to-azure-active-directory.md b/windows/manage/join-windows-10-mobile-to-azure-active-directory.md index 876c02620c..3a8047bf80 100644 --- a/windows/manage/join-windows-10-mobile-to-azure-active-directory.md +++ b/windows/manage/join-windows-10-mobile-to-azure-active-directory.md @@ -3,8 +3,9 @@ title: Join Windows 10 Mobile to Azure Active Directory (Windows 10) description: Devices running Windows 10 Mobile can join Azure Active Directory (Azure AD) when the device is configured during the out-of-box experience (OOBE). ms.assetid: 955DD9EC-3519-4752-827E-79CEB1EC8D6B ms.prod: w10 -ms.mktglfcycl: deploy +ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: mobile author: jdeckerMS --- diff --git a/windows/manage/lock-down-windows-10-to-specific-apps.md b/windows/manage/lock-down-windows-10-to-specific-apps.md index 800fe35493..232ab26d13 100644 --- a/windows/manage/lock-down-windows-10-to-specific-apps.md +++ b/windows/manage/lock-down-windows-10-to-specific-apps.md @@ -6,6 +6,7 @@ keywords: ["lockdown", "app restrictions", "applocker"] ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: edu, security author: jdeckerMS --- diff --git a/windows/manage/lock-down-windows-10.md b/windows/manage/lock-down-windows-10.md index 4c11f7b7ce..320d69d80d 100644 --- a/windows/manage/lock-down-windows-10.md +++ b/windows/manage/lock-down-windows-10.md @@ -6,6 +6,7 @@ keywords: lockdown ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: security, mobile author: jdeckerMS --- diff --git a/windows/manage/lockdown-xml.md b/windows/manage/lockdown-xml.md index 3baacaad11..7655d1f5e4 100644 --- a/windows/manage/lockdown-xml.md +++ b/windows/manage/lockdown-xml.md @@ -5,6 +5,7 @@ ms.assetid: 22C8F654-2EC3-4E6D-8666-1EA9FCF90F5F ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: security, mobile author: jdeckerMS --- diff --git a/windows/manage/manage-access-to-private-store.md b/windows/manage/manage-access-to-private-store.md index c6bca23dc2..47ddaea3ef 100644 --- a/windows/manage/manage-access-to-private-store.md +++ b/windows/manage/manage-access-to-private-store.md @@ -2,6 +2,10 @@ 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 +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/manage-apps-windows-store-for-business-overview.md b/windows/manage/manage-apps-windows-store-for-business-overview.md index faaed20b58..6856a7683d 100644 --- a/windows/manage/manage-apps-windows-store-for-business-overview.md +++ b/windows/manage/manage-apps-windows-store-for-business-overview.md @@ -5,6 +5,7 @@ ms.assetid: 2F65D4C3-B02C-41CC-92F0-5D9937228202 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md index b1a2217df3..f3194a4699 100644 --- a/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md +++ b/windows/manage/manage-connections-from-windows-operating-system-components-to-microsoft-services.md @@ -6,6 +6,7 @@ keywords: privacy, manage connections to Microsoft ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +author: brianlic-msft --- # Manage connections from Windows operating system components to Microsoft services diff --git a/windows/manage/manage-corporate-devices.md b/windows/manage/manage-corporate-devices.md index 87b3a7684b..901a3beb11 100644 --- a/windows/manage/manage-corporate-devices.md +++ b/windows/manage/manage-corporate-devices.md @@ -6,6 +6,7 @@ keywords: ["MDM", "device management"] ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: devices author: jdeckerMS --- diff --git a/windows/manage/manage-cortana-in-enterprise.md b/windows/manage/manage-cortana-in-enterprise.md index f011f4fcae..b44e4c4920 100644 --- a/windows/manage/manage-cortana-in-enterprise.md +++ b/windows/manage/manage-cortana-in-enterprise.md @@ -2,6 +2,9 @@ title: Cortana integration in your business or enterprise (Windows 10) description: The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments. ms.assetid: db7b05da-186f-4628-806a-f8b134e2af2c +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library author: eross-msft --- diff --git a/windows/manage/manage-orders-windows-store-for-business.md b/windows/manage/manage-orders-windows-store-for-business.md index bfebed0a7e..03d95f9433 100644 --- a/windows/manage/manage-orders-windows-store-for-business.md +++ b/windows/manage/manage-orders-windows-store-for-business.md @@ -4,6 +4,8 @@ description: You can view your order history with Windows Store for Business. ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store +author: TrudyHa --- # Manage app orders in Windows Store for Business diff --git a/windows/manage/manage-private-store-settings.md b/windows/manage/manage-private-store-settings.md index dd0d959555..1eb1190a30 100644 --- a/windows/manage/manage-private-store-settings.md +++ b/windows/manage/manage-private-store-settings.md @@ -5,6 +5,7 @@ ms.assetid: 2D501538-0C6E-4408-948A-2BF5B05F7A0C ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/manage-settings-windows-store-for-business.md b/windows/manage/manage-settings-windows-store-for-business.md index 5736a2df33..04bd40016e 100644 --- a/windows/manage/manage-settings-windows-store-for-business.md +++ b/windows/manage/manage-settings-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: E3283D77-4DB2-40A9-9479-DDBC33D5A895 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/manage-users-and-groups-windows-store-for-business.md b/windows/manage/manage-users-and-groups-windows-store-for-business.md index a057ed9e67..42fb25bfa2 100644 --- a/windows/manage/manage-users-and-groups-windows-store-for-business.md +++ b/windows/manage/manage-users-and-groups-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: 5E7FA071-CABD-4ACA-8AAE-F549EFCE922F ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/prerequisites-windows-store-for-business.md b/windows/manage/prerequisites-windows-store-for-business.md index 706b1a93a1..85f411ba17 100644 --- a/windows/manage/prerequisites-windows-store-for-business.md +++ b/windows/manage/prerequisites-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: CEBC6870-FFDD-48AD-8650-8B0DC6B2651D ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/product-ids-in-windows-10-mobile.md b/windows/manage/product-ids-in-windows-10-mobile.md index 0e9a15a716..f1e1f9a3e3 100644 --- a/windows/manage/product-ids-in-windows-10-mobile.md +++ b/windows/manage/product-ids-in-windows-10-mobile.md @@ -6,6 +6,7 @@ keywords: ["lockdown"] ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: mobile author: jdeckerMS --- diff --git a/windows/manage/reset-a-windows-10-mobile-device.md b/windows/manage/reset-a-windows-10-mobile-device.md index 15d8ead349..f9b0a026b4 100644 --- a/windows/manage/reset-a-windows-10-mobile-device.md +++ b/windows/manage/reset-a-windows-10-mobile-device.md @@ -5,6 +5,7 @@ ms.assetid: B42A71F4-DFEE-4D6E-A904-7942D1AAB73F ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: mobile author: jdeckerMS --- diff --git a/windows/manage/roles-and-permissions-windows-store-for-business.md b/windows/manage/roles-and-permissions-windows-store-for-business.md index 6906e95ed6..4fbfcc521e 100644 --- a/windows/manage/roles-and-permissions-windows-store-for-business.md +++ b/windows/manage/roles-and-permissions-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: CB6281E1-37B1-4B8B-991D-BC5ED361F1EE ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md b/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md index 6b5f7c60df..ad17d4f627 100644 --- a/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md +++ b/windows/manage/set-up-a-kiosk-for-windows-10-for-mobile-edition.md @@ -6,6 +6,7 @@ keywords: ["kiosk", "lockdown", "assigned access"] ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: mobile author: jdeckerMS --- diff --git a/windows/manage/settings-reference-windows-store-for-business.md b/windows/manage/settings-reference-windows-store-for-business.md index 7cf2f724c9..283e512bd4 100644 --- a/windows/manage/settings-reference-windows-store-for-business.md +++ b/windows/manage/settings-reference-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: 34F7FA2B-B848-454B-AC00-ECA49D87B678 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/settings-that-can-be-locked-down.md b/windows/manage/settings-that-can-be-locked-down.md index 325b33fcb7..a58bf463c0 100644 --- a/windows/manage/settings-that-can-be-locked-down.md +++ b/windows/manage/settings-that-can-be-locked-down.md @@ -6,6 +6,7 @@ keywords: ["lockdown"] ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: mobile author: jdeckerMS --- diff --git a/windows/manage/sign-code-integrity-policy-with-device-guard-signing.md b/windows/manage/sign-code-integrity-policy-with-device-guard-signing.md index 4fc6b81da0..71deb2dedb 100644 --- a/windows/manage/sign-code-integrity-policy-with-device-guard-signing.md +++ b/windows/manage/sign-code-integrity-policy-with-device-guard-signing.md @@ -5,6 +5,7 @@ ms.assetid: 63B56B8B-2A40-44B5-B100-DC50C43D20A9 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store, security author: TrudyHa --- diff --git a/windows/manage/sign-up-windows-store-for-business-overview.md b/windows/manage/sign-up-windows-store-for-business-overview.md index 5aeff64c06..93c2e85ad1 100644 --- a/windows/manage/sign-up-windows-store-for-business-overview.md +++ b/windows/manage/sign-up-windows-store-for-business-overview.md @@ -5,6 +5,7 @@ ms.assetid: 87C6FA60-3AB9-4152-A85C-6A1588A20C7B ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/sign-up-windows-store-for-business.md b/windows/manage/sign-up-windows-store-for-business.md index cd31dc1d15..89ca4e135b 100644 --- a/windows/manage/sign-up-windows-store-for-business.md +++ b/windows/manage/sign-up-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: 296AAC02-5C79-4999-B221-4F5F8CEA1F12 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/troubleshoot-windows-store-for-business.md b/windows/manage/troubleshoot-windows-store-for-business.md index f39d0bcdbf..e2653436b7 100644 --- a/windows/manage/troubleshoot-windows-store-for-business.md +++ b/windows/manage/troubleshoot-windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: 243755A3-9B20-4032-9A77-2207320A242A ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- @@ -31,24 +32,28 @@ The private store for your organization is a page in the Windows Store app that 1. Click the people icon in Windows Store app, and click **Sign in**. - ![](images/wsfb-wsappsignin.png) + ![Sign in to Store app with a different account](images/wsfb-wsappsignin.png) 2. Click **Add account**, and then click **Work or school account**. - ![](images/wsfb-wsappaddacct.png) + ![Choose an account to use](images/wsfb-wsappaddacct.png) 3. Type the email account and password, and click **Sign in**. - ![](images/wsfb-wsappworkacct.png) + ![Sign in for work or school account](images/wsfb-wsappworkacct.png) 4. You should see the private store for your organization. In our example, the page is named **Contoso publishing**. - ![](images/wsfb-wsappprivatestore.png) + ![Private store with name highlighted](images/wsfb-wsappprivatestore.png) Click the private store to see apps in your private store. - ![](images/wsfb-privatestoreapps.png) + ![Private store for Contoso publishing](images/wsfb-privatestoreapps.png) +## Still having trouble? + +If you are still having trouble using WSfB or installing the app, you can get more help on our [Support page](http://go.microsoft.com/fwlink/?LinkID=799757). +     diff --git a/windows/manage/update-windows-store-for-business-account-settings.md b/windows/manage/update-windows-store-for-business-account-settings.md index 613556110e..2870bbda8a 100644 --- a/windows/manage/update-windows-store-for-business-account-settings.md +++ b/windows/manage/update-windows-store-for-business-account-settings.md @@ -4,6 +4,7 @@ description: The Account information page in Windows Store for Business shows in ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/windows-10-mobile-and-mdm.md b/windows/manage/windows-10-mobile-and-mdm.md index 6e48f9f183..3053aedc09 100644 --- a/windows/manage/windows-10-mobile-and-mdm.md +++ b/windows/manage/windows-10-mobile-and-mdm.md @@ -6,7 +6,7 @@ keywords: telemetry, BYOD, MDM ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library -ms.pagetype: mobile; devices +ms.pagetype: mobile, devices, security author: AMeeus --- @@ -373,6 +373,7 @@ Windows 10 Mobile devices use state-of-the-art technology that includes popular >**Note:**  Some of these hardware restrictions provide connectivity and assist in data protection. Enterprise data protection is currently being tested in select customer evaluation programs.   Table 7. Windows 10 Mobile hardware restrictions + | Setting | Description | |--------------------------------------------|-------------------------------------------------------------------------------------------------------------------------------| | Allow NFC | Whether the NFC radio is enabled | @@ -1058,7 +1059,7 @@ Table 20. Windows 10 Mobile Enterprise update management settings Nonsecurity upgrades deferred -Whether nonsecurity upgrades are deferred (You can defer upgrades up to 8 months.) +Whether nonsecurity upgrades are deferred (You can defer upgrades up to 4 weeks.) Pause update deferrals diff --git a/windows/manage/windows-store-for-business.md b/windows/manage/windows-store-for-business.md index b30c16566a..d3a4044273 100644 --- a/windows/manage/windows-store-for-business.md +++ b/windows/manage/windows-store-for-business.md @@ -5,6 +5,7 @@ ms.assetid: 527E611E-4D47-44F0-9422-DCC2D1ACBAB8 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa --- diff --git a/windows/manage/working-with-line-of-business-apps.md b/windows/manage/working-with-line-of-business-apps.md index e3bfdb63b7..f780a06748 100644 --- a/windows/manage/working-with-line-of-business-apps.md +++ b/windows/manage/working-with-line-of-business-apps.md @@ -5,6 +5,7 @@ ms.assetid: 95EB7085-335A-447B-84BA-39C26AEB5AC7 ms.prod: w10 ms.mktglfcycl: manage ms.sitesec: library +ms.pagetype: store author: TrudyHa ---