+
##  Deploy
-
-
[Get started: Deploy and manage a full cloud IT solution for your business](cloud-mode-business-setup.md)
Find out how easy it is to deploy and manage a full cloud IT solution for your small to midsize business using Microsoft cloud services and tools.
-
-
-
+
## Related topics
diff --git a/store-for-business/TOC.md b/store-for-business/TOC.md
index 81657682cf..ba2c1b8c8a 100644
--- a/store-for-business/TOC.md
+++ b/store-for-business/TOC.md
@@ -1,30 +1,30 @@
-# [Windows Store for Business](index.md)
+# [Microsoft Store for Business](index.md)
## [Sign up and get started](sign-up-windows-store-for-business-overview.md)
-###[Windows Store for Business overview](windows-store-for-business-overview.md)
-### [Prerequisites for Windows Store for Business](prerequisites-windows-store-for-business.md)
-### [Sign up for Windows Store for Business](sign-up-windows-store-for-business.md)
-### [Roles and permissions in the Windows Store for Business](roles-and-permissions-windows-store-for-business.md)
-### [Settings reference: Windows Store for Business](settings-reference-windows-store-for-business.md)
+###[Microsoft Store for Business and Microsoft Store for Education overview](windows-store-for-business-overview.md)
+### [Prerequisites for Microsoft Store for Business and Education](prerequisites-windows-store-for-business.md)
+### [Sign up for Microsoft Store for Business or Microsoft Store for Education](sign-up-windows-store-for-business.md)
+### [Roles and permissions in the Microsoft Store for Business and Education](roles-and-permissions-windows-store-for-business.md)
+### [Settings reference: Microsoft Store for Business and Education](settings-reference-windows-store-for-business.md)
## [Find and acquire apps](find-and-acquire-apps-overview.md)
-### [Apps in the Windows Store for Business](apps-in-windows-store-for-business.md)
-### [Acquire apps in the Windows Store for Business](acquire-apps-windows-store-for-business.md)
+### [Apps in the Microsoft Store for Business and Education](apps-in-windows-store-for-business.md)
+### [Acquire apps in the Microsoft Store for Business and Education](acquire-apps-windows-store-for-business.md)
### [Working with line-of-business apps](working-with-line-of-business-apps.md)
-## [Distribute apps to your employees from the Windows Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md)
+## [Distribute apps to your employees from the Microsoft Store for Business and Education](distribute-apps-to-your-employees-windows-store-for-business.md)
### [Distribute apps using your private store](distribute-apps-from-your-private-store.md)
### [Assign apps to employees](assign-apps-to-employees.md)
### [Distribute apps with a management tool](distribute-apps-with-management-tool.md)
### [Distribute offline apps](distribute-offline-apps.md)
## [Manage apps](manage-apps-windows-store-for-business-overview.md)
-### [App inventory managemement for Windows Store for Business](app-inventory-management-windows-store-for-business.md)
-### [Manage app orders in Windows Store for Business](manage-orders-windows-store-for-business.md)
+### [App inventory managemement for Microsoft Store for Business and Education](app-inventory-management-windows-store-for-business.md)
+### [Manage app orders in Microsoft Store for Business and Education](manage-orders-windows-store-for-business.md)
### [Manage access to private store](manage-access-to-private-store.md)
### [Manage private store settings](manage-private-store-settings.md)
### [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md)
## [Device Guard signing portal](device-guard-signing-portal.md)
### [Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md)
### [Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md)
-## [Manage settings in the Windows Store for Business](manage-settings-windows-store-for-business.md)
-### [Update Windows Store for Business account settings](update-windows-store-for-business-account-settings.md)
-### [Manage user accounts in Windows Store for Business](manage-users-and-groups-windows-store-for-business.md)
-## [Troubleshoot Windows Store for Business](troubleshoot-windows-store-for-business.md)
+## [Manage settings in the Microsoft Store for Business and Education](manage-settings-windows-store-for-business.md)
+### [Update Microsoft Store for Business and Microsoft Store for Education account settings](update-windows-store-for-business-account-settings.md)
+### [Manage user accounts in Microsoft Store for Business and Education](manage-users-and-groups-windows-store-for-business.md)
+## [Troubleshoot Microsoft Store for Business](troubleshoot-windows-store-for-business.md)
diff --git a/store-for-business/acquire-apps-windows-store-for-business.md b/store-for-business/acquire-apps-windows-store-for-business.md
index 156d071c04..77563b064c 100644
--- a/store-for-business/acquire-apps-windows-store-for-business.md
+++ b/store-for-business/acquire-apps-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Acquire apps in Windows Store for Business (Windows 10)
-description: As an admin, you can acquire apps from the Windows Store for Business for your employees. Some apps are free, and some have a price. For info on app types that are supported, see Apps in the Windows Store for Business.
+title: Acquire apps in Microsoft Store for Business (Windows 10)
+description: As an admin, you can acquire apps from the Microsoft Store for Business for your employees. Some apps are free, and some have a price. For info on app types that are supported, see Apps in the Microsoft Store for Business.
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
@@ -9,16 +9,16 @@ author: TrudyHa
localizationpriority: high
---
-# Acquire apps in Windows Store for Business
-As an admin, you can acquire apps from the Windows Store for Business for your employees. Some apps are free, and some have a price. For info on app types that are supported, see [Apps in the Windows Store for Business](apps-in-windows-store-for-business.md).
+# Acquire apps in Microsoft Store for Business and Education
+As an admin, you can acquire apps from the Microsoft Store for Business and Education for your employees. Some apps are free, and some have a price. For info on app types that are supported, see [Apps in the Microsoft Store for Business](apps-in-windows-store-for-business.md).
## App licensing model
-The Business store supports two options to license apps: online and offline. **Online** licensing is the default licensing model and is similar to the Windows Store. Online licensed apps require users and devices to connect to the Store for Business service to acquire an app and its license. **Offline** licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center. Admins control whether or not offline apps are available in Store for Business with an offline app visibility setting. For more information, see [offline license visibility](https://technet.microsoft.com/itpro/windows/manage/update-windows-store-for-business-account-settings#offline-licensing).
+The Microsoft Store supports two options to license apps: online and offline. **Online** licensing is the default licensing model. Online licensed apps require users and devices to connect to the Microsoft Store services to acquire an app and its license. **Offline** licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center. Admins control whether or not offline apps are available in Microsoft Store with an offline app visibility setting. For more information, see [offline license visibility](https://technet.microsoft.com/itpro/windows/manage/update-windows-store-for-business-account-settings#offline-licensing).
-For more information on the Store for Business licensing model, see [licensing model](https://technet.microsoft.com/itpro/windows/manage/apps-in-windows-store-for-business#licensing-model).
+For more information on the Microsoft Store licensing model, see [licensing model](https://technet.microsoft.com/itpro/windows/manage/apps-in-windows-store-for-business#licensing-model).
## Payment options
-Some apps are free, and some have a price. Apps can be purchased in the Windows Store for Business using your credit card. You can enter your credit card information on **Account Information**, or when you purchase an app. Currently, we accept these credit cards:
+Some apps are free, and some have a price. Apps can be purchased in the Microsoft Store using your credit card. You can enter your credit card information on **Account Information**, or when you purchase an app. Currently, we accept these credit cards:
- VISA
- MasterCard
- Discover
@@ -26,11 +26,10 @@ Some apps are free, and some have a price. Apps can be purchased in the Windows
- Japan Commercial Bureau (JCB)
## Organization info
-There are a couple of things we need to know when you pay for apps. You can add this info to the **Account information** page before you buy apps. If you haven’t provided it, we’ll ask when you make a purchase. Either way works. Here’s the info you’ll need to provide:
+There are a couple of things we need to know when you pay for apps. You can add this info to the **Account information** or **Payments & billing** page before you buy apps. If you haven’t provided it, we’ll ask when you make a purchase. Either way works. Here’s the info you’ll need to provide:
- Legal business address
- Payment option (credit card)
-You can add payment info on **Account information**. If you don’t have one saved with your account, you’ll be prompted to provide one when you buy an app.
## Acquire apps
**To acquire an app**
@@ -38,17 +37,17 @@ You can add payment info on **Account information**. If you don’t have one sav
2. Click Shop, or use Search to find an app.
3. Click the app you want to purchase.
4. On the product description page, choose your license type - either online or offline.
-5. Free apps will be added to Inventory. For apps with a price, you can set the quantity you want to buy. Type the quantity and click **Next**.
-6. If you don’t have a payment method saved in Account settings, Store for Business will prompt you for one.
-7. Add your credit card or debit card info, and click **Next**. Your card info is saved as a payment option on **Account information**.
+5. Free apps will be added to **Inventory** or **Apps & software**. For apps with a price, you can set the quantity you want to buy. Type the quantity and click **Next**.
+6. If you don’t have a payment method saved in **Account Information** or **Payments & billing**, we will prompt you for one.
+7. Add your credit card or debit card info, and click **Next**. Your card info is saved as a payment option on **Account information** or **Payments & billing**.
-You’ll also need to have your business address saved on **Account information**. The address is used to generate tax rates. For more information on taxes for apps, see [organization tax information](https://technet.microsoft.com/itpro/windows/manage/update-windows-store-for-business-account-settings#organization-tax-information).
+You’ll also need to have your business address saved on **Account information** or **Payments & billing**. The address is used to generate tax rates. For more information on taxes for apps, see [organization tax information](https://technet.microsoft.com/itpro/windows/manage/update-windows-store-for-business-account-settings#organization-tax-information).
-Store for Business adds the app to your inventory. From **Inventory**, you can:
+Microsoft Store adds the app to your inventory. From **Inventory**or **Apps & software**, you can:
- Distribute the app: add to private store, or assign licenses
- View app licenses: review current licenses, reclaim and reassign licenses
- View app details: review the app details page and purchase more licenses
-For info on distributing apps, see [Distribute apps to your employees from the Windows Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md).
+For info on distributing apps, see [Distribute apps to your employees from the Microsoft Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md).
For info on offline-licensed apps, see [Distribute offline apps](distribute-offline-apps.md).
diff --git a/store-for-business/add-unsigned-app-to-code-integrity-policy.md b/store-for-business/add-unsigned-app-to-code-integrity-policy.md
index a0c9e5ac70..491172a16d 100644
--- a/store-for-business/add-unsigned-app-to-code-integrity-policy.md
+++ b/store-for-business/add-unsigned-app-to-code-integrity-policy.md
@@ -21,35 +21,27 @@ localizationpriority: high
When you want to add an unsigned app to a code integrity policy, you need to start with a code integrity policy created from a reference device. Then, create the catalog files for your unsigned app, sign the catalog files, and then merge the default policy that includes your signing certificate with existing code integrity policies.
## In this section
-
-
-- [Create a code integrity policy based on a reference device](#create-ci-policy)
-- [Create catalog files for your unsigned app](#create-catalog-files)
-- [Catalog signing with Device Guard signing portal](#catalog-signing-device-guard-portal)
+- [Create a code integrity policy based on a reference device](#create-ci-policy)
+- [Create catalog files for your unsigned app](#create-catalog-files)
+- [Catalog signing with Device Guard signing portal](#catalog-signing-device-guard-portal)
##
Create a code integrity policy based on a reference device
-
-
To add an unsigned app to a code integrity policy, your code integrity policy must be created from golden image machine. For more information, see [Create a Device Guard code integrity policy based on a reference device](https://technet.microsoft.com/library/mt243445.aspx).
##
Create catalog files for your unsigned app
-
-
Creating catalog files starts the process for adding an unsigned app to a code integrity policy.
Before you get started, be sure to review these best practices and requirements:
**Requirements**
-- You'll use Package Inspector during this process.
-
-- Only perform this process with a code integrity policy running in audit mode. You should not perform this process on a system running an enforced Device Guard policy.
+- You'll use Package Inspector during this process.
+- Only perform this process with a code integrity policy running in audit mode. You should not perform this process on a system running an enforced Device Guard policy.
**Best practices**
-- **Naming convention** -- Using a naming convention makes it easier to find deployed catalog files. We'll use \*-Contoso.cat as the naming convention in this topic. For more information, see the section Inventorying catalog files by using Configuration Manager in the [Device Guard deployment guide](https://technet.microsoft.com/library/mt463091.aspx).
-
-- **Where to deploy code integrity policy** -- The [code integrity policy that you created](#create-ci-policy) should be deployed to the system on which you are running Package Inspector. This will ensure that the code integrity policy binaries are trusted.
+- **Naming convention** -- Using a naming convention makes it easier to find deployed catalog files. We'll use \*-Contoso.cat as the naming convention in this topic. For more information, see the section Inventorying catalog files by using Configuration Manager in the [Device Guard deployment guide](https://technet.microsoft.com/library/mt463091.aspx).
+- **Where to deploy code integrity policy** -- The [code integrity policy that you created](#create-ci-policy) should be deployed to the system on which you are running Package Inspector. This will ensure that the code integrity policy binaries are trusted.
Copy the commands for each step into an elevated Windows PowerShell session. You'll use Package Inspector to find and trust all binaries in the app.
@@ -85,34 +77,25 @@ After you're done, the files are saved to your desktop. You still need to sign t
##
Catalog signing with Device Guard signing portal
-
To sign catalog files with the Device Guard signing portal, you need to be signed up with the Windows Store for Business. For more information, see [Sign up for the Windows Store for Business](sign-up-windows-store-for-business.md).
Catalog signing is a vital step to adding your unsigned apps to your code integrity policy.
**To sign a catalog file with Device Guard signing portal**
-1. Sign in to the Store for Business
-
-2. Click **Settings**, and then choose **Device Guard signing**.
-
-3. Click **Upload** to upload your unsigned catalog files. These are the catalog files you created earlier in [Create catalog files for your unsigned app](#create-catalog-files).
-
-4. After the files are uploaded, click **Sign** to sign the catalog files.
-
-5. Click Download to download each item:
-
- - signed catalog file
-
- - default policy
-
- - root certificate for your organization
-
+1. Sign in to the [Store for Business](http://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com).
+2. Click **Settings**, click **Store settings**, and then click **Device Guard**.
+3. Click **Upload** to upload your unsigned catalog files. These are the catalog files you created earlier in [Create catalog files for your unsigned app](#create-catalog-files).
+4. After the files are uploaded, click **Sign** to sign the catalog files.
+5. Click Download to download each item:
+ - signed catalog file
+ - default policy
+ - root certificate for your organization
+
When you use the Device Guard signing portal to sign a catalog file, the signing certificate is added to the default policy. When you download the signed catalog file, you should also download the default policy and merge this code integrity policy with your existing code integrity policies to protect machines running the catalog file. You need to do this step to trust and run your catalog files. For more information, see the Merging code integrity policies in the [Device Guard deployment guide](https://technet.microsoft.com/library/mt463091.aspx).
-6. Open the root certificate that you downloaded, and follow the steps in **Certificate Import wizard** to install the certificate in your machine's certificate store.
-
-7. Deploy signed catalogs to your managed devices. For more information, see Deploy catalog files with Group Policy, or Deploy catalog files with System Center Configuration Manager in the [Device Guard deployment guide](https://technet.microsoft.com/library/mt463091.aspx).
+6. Open the root certificate that you downloaded, and follow the steps in **Certificate Import wizard** to install the certificate in your machine's certificate store.
+7. Deploy signed catalogs to your managed devices. For more information, see Deploy catalog files with Group Policy, or Deploy catalog files with System Center Configuration Manager in the [Device Guard deployment guide](https://technet.microsoft.com/library/mt463091.aspx).
diff --git a/store-for-business/app-inventory-management-windows-store-for-business.md b/store-for-business/app-inventory-management-windows-store-for-business.md
index e228b7bbba..71dceb3427 100644
--- a/store-for-business/app-inventory-management-windows-store-for-business.md
+++ b/store-for-business/app-inventory-management-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: App inventory management for Windows Store for Business (Windows 10)
-description: You can manage all apps that you've acquired on your Inventory page.
+title: App inventory management for Microsoft Store for Business and Microsoft Store for Education (Windows 10)
+description: You can manage all apps that you've acquired on your Apps & Software page.
ms.assetid: 44211937-801B-4B85-8810-9CA055CDB1B2
ms.prod: w10
ms.mktglfcycl: manage
@@ -9,29 +9,26 @@ ms.pagetype: store
author: TrudyHa
---
-# App inventory management for Windows Store for Business
-
+# App inventory management for Microsoft Store for Business and Education
**Applies to**
- Windows 10
- Windows 10 Mobile
-You can manage all apps that you've acquired on your **Inventory** page.
-
-The **Inventory** page in Windows Store for Business shows all apps in your inventory. This includes all apps that you've acquired from Store for Business, and the line-of-business (LOB) apps that you've accepted into your inventory. After LOB apps are submitted to your organization, you'll see a notification on your **Inventory** page. On the **New line-of-business apps** page, you can accept, or reject the LOB apps. For more information on LOB apps, see [Working with line-of-business apps](working-with-line-of-business-apps.md). The inventory page includes apps acquired by all people in your organization with the Store for Business Admin role.
+You can manage all apps that you've acquired on your **Apps & software** page. This page shows all of the content you've acquired, including apps that from Microsoft Store, and line-of-business (LOB) apps that you've accepted into your inventory. After LOB apps are submitted to your organization, you'll see a notification on your **Apps & software** page. On the **New LOB apps** tab, you can accept, or reject the LOB apps. For more information on LOB apps, see [Working with line-of-business apps](working-with-line-of-business-apps.md). The inventory page includes apps acquired by all people in your organization with the Store for Business Admin role.
All of these apps are treated the same once they are in your inventory and you can perform app lifecycle tasks for them: distribute apps, add apps to private store, review license details, and reclaim app licenses.
-
+
-Store for Business shows this info for each app in your inventory:
-
-- Name
-- Access to actions for the app
-- Last modified
-- Available licenses
-- Private store status
+Microsoft Store for Business and Education shows this info for each app in your inventory:
+- Name
+- Last modified
+- Private store status
+- Available licenses
+- Supported devices
+- Access to actions for the app
The last modified date tracks changes about the app as an item in your inventory. The last modified date changes when one of the following happens:
- First purchase (the date you acquire the app from Windows Store for Business)
@@ -40,100 +37,52 @@ The last modified date tracks changes about the app as an item in your inventory
- Reclaim license
- Refund order (applies to purchased apps, not free apps)
-The last modified date does not correspond to when an app was last updated in the Store. It tracks activity for that app, as an item in your inventory.
+The last modified date does not correspond to when an app was last updated in Microsoft Store. It tracks activity for that app, as an item in your inventory.
-### Find apps in your inventory
+## Find apps in your inventory
There are a couple of ways to find specific apps, or groups of apps in your inventory.
-**Search** - Use the Search box to search for an app.
-
-**Refine** - Use **Refine** to scope your list of apps by one or more of these app attributes:
-
-- **License** - Online or offline licenses. For more info, see [Apps in Windows Store for Business](apps-in-windows-store-for-business.md#licensing-model).
-
-- **Platforms** - Lists the devices that apps in your inventory were originally written to support. This list is cumulative for all apps in your inventory.
-
-- **Source** - **Store**, for apps acquired from Store for Business, or LOB, for line-of-business apps.
-
-- **Private store** - **In private store**, or **Not in private store**, depending on whether or not you've added the app to your private store.
-
-### Manage apps in your inventory
+**Search** - Use the Search box to search for an app.
+**Refine results** - Use **Refine results** to scope your list of apps by one or more of these app attributes:
+- **License type** - Online or offline licenses. For more info, see [Apps in Windows Store for Business](apps-in-windows-store-for-business.md#licensing-model).
+- **Supported devices** - Lists the devices that apps in your inventory were originally written to support. This list is cumulative for all apps in your inventory.
+- **Source** - **Store**, for apps acquired from Store for Business, or LOB, for line-of-business apps.
+- **Product type** - Product categories, such as app, or game.
+- **Private store** - Whether or not the app is in the private store, or status if the app is being added or removed from private store.
+## Manage apps in your inventory
Each app in the Store for Business has an online, or an offline license. For more information on Store for Business licensing model, see [Apps in the Windows Store for Business](apps-in-windows-store-for-business.md#licensing-model). There are different actions you can take depending on the app license type. They're summarized in this table.
-
-
-
-
-
-
-
-
-
-
-
-Assign to employees |
-X |
- |
-
-
-Add to private store |
-X |
- |
-
-
-Remove from private store |
-X |
- |
-
-
-View license details |
-X |
- |
-
-
-View product details |
-X |
-X |
-
-
-Download for offline use |
- |
-X |
-
-
-
-
-
+| Action | Online-licensed app | Offline-licensed app |
+| ------ | ------------------- | -------------------- |
+| Assign to employees | X | |
+| Add to private store | X | |
+| Remove from private store | X | |
+| View license details | X | |
+| View product details | X | X |
+| Download for offline use | | X |
The actions in the table are how you distribute apps, and manage app licenses. We'll cover those in the next sections. Working with offline-licensed apps has different steps. For more information on distributing offline-licensed apps, see [Distribute offline apps](distribute-offline-apps.md).
-### Distribute apps
+## Distribute apps
For online-licensed apps, there are a couple of ways to distribute apps from your inventory:
+- Assign apps to people in your organization.
+- Add apps to your private store, and let people in your organization install the app.
-- Assign apps to people in your organization.
-
-- Add apps to your private store, and let people in your organization install the app.
-
-If you use a management tool that supports Store for Business, you can distribute apps with your management tool. Once it is configured to work with Store for Business, your managment tool will have access to all apps in your inventory. For more information, see [Distribute apps with a management tool](distribute-apps-with-management-tool.md).
+If you use a management tool that supports Microsoft Store, you can distribute apps with your management tool. Once it is configured to work with Store for Business, your managment tool will have access to all apps in your inventory. For more information, see [Distribute apps with a management tool](distribute-apps-with-management-tool.md).
Once an app is in your private store, people in your org can install the app on their devices. For more information, see [Distribute apps using your private store](distribute-apps-from-your-private-store.md).
-**To make an app in inventory available in your private store**
+**To make an app in Apps & software available in your private store**
-1. Sign in to the [Store for Business](http://businessstore.microsoft.com).
-2. Click **Manage**, and then choose **Inventory**.
-3. Click **Refine**, and then choose **Online**. Store for Business will update the list of apps on the **Inventory** page.
-4. From an app in **Inventory**, click the ellipses under **Action**, and then choose **Add to private store**.
-
-The value under Private store for the app will change to pending. It will take approximately twelve hours before the app is available in the private store.
+1. Sign in to the [Store for Business](https://businessstore.microsoft.com) or [Micrososft Store for Education](https://businessstore.microsoft.com).
+2. Click **Manage**, and then choose **Apps & software**.
+3. Use **Refine results** to search for online-licensed apps under **License type**.
+4. From the list of online-licensed apps, click the ellipses for the app you want, and then choose **Add to private store**.
+The value under **Private store** for the app will change to pending. It will take approximately twelve hours before the app is available in the private store.
Employees can claim apps that admins added to the private store by doing the following.
**To claim an app from the private store**
@@ -148,94 +97,72 @@ If you decide that you don't want an app available for employees to install on t
**To remove an app from the private store**
-1. Sign in to the [Store for Business](http://businessstore.microsoft.com).
-2. Click **Manage**, and then choose **Inventory**.
-3. Find an app, click the ellipses under **Action**, and then choose **Remove from private store**, and then click **Remove**.
+1. Sign in to the [Microsoft Store for Business](http://businessstore.microsoft.com) or [Micrososft Store for Education](https://businessstore.microsoft.com).
+2. Click **Manage**, and then choose **Apps & software**.
+3. Find an app, click the ellipses under **Action**, choose **Remove from private store**, and then click **Remove**.
The app will still be in your inventory, but your employees will not have access to the app from your private store.
**To assign an app to an employee**
-1. Sign in to the [Store for Business](http://businessstore.microsoft.com).
+1. Sign in to the [Microsoft Store for Business](http://businessstore.microsoft.com) or [Micrososft Store for Education](https://businessstore.microsoft.com).
2. Click **Manage**, and then choose **Inventory**.
3. Find an app, click the ellipses under **Action**, and then choose **Assign to people**.
4. Type the email address for the employee that you're assigning the app to, and click **Confirm**.
Employees will receive an email with a link that will install the app on their device. Click the link to start the Windows Store app, and then click **Install**. Also, in the Windows Store app, they can find the app under **My Library**.
-### Manage app licenses
+## Manage app licenses
For each app in your inventory, you can view and manage license details. This give you another way to assign apps to people in your organization. It also allows you to reclaim app licenses after they've been assigned to people, or claimed by people in your organization.
**To view license details**
-1. Sign in to [Store for Business](https://go.microsoft.com/fwlink/p/?LinkId=691845)
+1. Sign in to [Microsoft Store for Business](https://go.microsoft.com/fwlink/p/?LinkId=691845) or [Micrososft Store for Education](https://businessstore.microsoft.com).
+2. Click **Manage**, and then choose **Apps & software**.
+3. Click an app you want to manage.
+4. On the app page, you'll see the names of people in your organization who have installed the app and are using one of the licenses. From here, you can:
-2. Click **Manage**, and then choose **Inventory**.
+ - Assign the app to other people in your organization.
+ - Reclaim app licenses.
+ - View app details.
+ - Add the app to your private store, if it is not in the private store.
-3. Click the ellipses for an app, and then choose **View license details**.
+You can assign the app to more people in your organization, or reclaim licenses.
- 
+**To assign an app to more people**
- You'll see the names of people in your organization who have installed the app and are using one of the licenses.
+- On the app page, click **Assign users**, type the email address for the person that you're assigning the app to, and click **Assign**.
- 
+Micrososft Store updates the list of assigned licenses.
- On **Assigned licenses**, you can do several things:
+**To reclaim licenses**
- - Assign the app to other people in your organization.
+- On the app page, choose the person you want to reclaim the license from, click the ellipses, and then click **Reclaim licenses**.
- - Reclaim app licenses.
+Microsoft Store updates the list of assigned licenses.
- - View app details.
-
- - Add the app to your private store, if it is not in the private store.
-
- You can assign the app to more people in your organization, or reclaim licenses.
-
- **To assign an app to more people**
-
- - Click **Assign to people**, type the email address for the employee that you're assigning the app to, and click **Assign**.
-
- 
-
- Store for Business updates the list of assigned licenses.
-
- **To reclaim licenses**
-
- - Choose the person you want to reclaim the license from, click **Reclaim licenses**, and then click **Reclaim licenses**.
-
- 
-
- Store for Business updates the list of assigned licenses.
-
-### Purchase additional licenses
+## Purchase additional licenses
You can purchase additional licenses for apps in your Inventory.
**To purchase additional app licenses**
-1. Sign in to [Store for Business](https://go.microsoft.com/fwlink/p/?LinkId=691845)
-2. Click **Manage**, and then choose **Inventory**.
-3. From **Inventory**, click an app.
-4. On the app page, click **View app details**.
-5. From this page, click **Buy more** for additional licenses, or click **Manage** to work with your current licenses.
+1. Sign in to [Store for Business](https://go.microsoft.com/fwlink/p/?LinkId=691845) or [Micrososft Store for Education](https://businessstore.microsoft.com)
+2. Click **Manage**, and then choose **Apps & software**.
+3. From **Apps & software**, click an app.
+4. On the app page, click **Buy more** for additional licenses, or click **Assign users** to manage your current licenses.
You'll have a summary of current license availability.
-###
Download offline-licensed app
-
+##
Download offline-licensed app
Offline licensing is a new feature in Windows 10 and allows apps to be deployed to devices that are not connected to the Internet. This means organizations can deploy apps when users or devices do not have connectivity to the Store.
You can download offline-licensed apps from your inventory. You'll need to download these items:
+- App metadata
+- App package
+- App license
+- App framework
-- App metadata
-
-- App package
-
-- App license
-
-- App framework
-
-For more information about online and offline licenses, see [Apps in the Windows Store for Business](apps-in-windows-store-for-business.md#licensing-model).
+For more information about online and offline licenses, see [Apps in the Microsoft Store for Business](apps-in-windows-store-for-business.md#licensing-model).
For more information about downloading offline-licensed apps, see [Download offline apps](distribute-offline-apps.md).
\ No newline at end of file
diff --git a/store-for-business/apps-in-windows-store-for-business.md b/store-for-business/apps-in-windows-store-for-business.md
index 5dcc21f0b4..da6eb860b6 100644
--- a/store-for-business/apps-in-windows-store-for-business.md
+++ b/store-for-business/apps-in-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Apps in Windows Store for Business (Windows 10)
-description: Windows Store for Business has thousands of apps from many different categories.
+title: Apps in Microsoft Store for Business and Education (Windows 10)
+description: Microsoft Store for Business has thousands of apps from many different categories.
ms.assetid: CC5641DA-3CEA-4950-AD81-1AF1AE876926
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,7 +10,7 @@ author: TrudyHa
localizationpriority: high
---
-# Apps in Windows Store for Business
+# Apps in Microsoft Store for Business and Education
**Applies to**
@@ -18,83 +18,57 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Windows Store for Business has thousands of apps from many different categories.
+Microsoft Store for Business and Education has thousands of apps from many different categories.
-##
+These app types are supported in Microsoft Store for Business and Education:
-
-These app types are supported in Store for Business:
-
-- Universal Windows apps for Windows 10
-
-- Universal Windows apps, by device: phone, Surface Hub, IoT, HoloLens
+- Universal Windows apps for Windows 10
+- Universal Windows apps, by device: phone, Surface Hub, IoT, HoloLens
Apps in your inventory will have at least one of these supported platforms listed for the app:
-- Windows 10 desktops
+- Windows 10 desktops
+- Windows 10 phones
+- Windows 10 xbox
+- Windows 10 IOT devices
+- Windows 10 servers
+- Windows 10 \*all devices\*
+- Windows 10 Surface Hub
+- Windows 10 HoloLens
-- Windows 10 phones
-
-- Windows 10 xbox
-
-- Windows 10 IOT devices
-
-- Windows 10 servers
-
-- Windows 10 \*all devices\*
-
-- Windows 10 Surface Hub
-
-- Windows 10 HoloLens
-
-Apps that you acquire from the Store for Business only work on Windows 10-based devices. Even though an app might list Windows 8 as its supported platform, that tells you what platform the app was originally written for. Apps developed for Windows 8, or Windows phone 8 will work on Windows 10.
+Apps that you acquire from the Microsoft Store only work on Windows 10-based devices. Even though an app might list Windows 8 as its supported platform, that tells you what platform the app was originally written for. Apps developed for Windows 8, or Windows Phone 8 will work on Windows 10.
Some apps are free, and some apps charge a price. Currently, you can pay for apps with a credit card. We'll be adding more payment options over time.
-Some apps which are available to consumers in the Windows Store might not be available to organizations in the Windows Store for Business. App developers can opt-out their apps, and they also need to meet eligibility requirements for Windows Store for Business. For more information, read this info on [Organizational licensing options](https://msdn.microsoft.com/windows/uwp/publish/organizational-licensing).
+Some apps which are available to consumers in the Windows Store might not be available to organizations in the Microsoft Store for Business and Education. App developers can opt-out their apps, and they also need to meet eligibility requirements for Microsoft Store for Business and Education. For more information, see [Organizational licensing options](https://msdn.microsoft.com/windows/uwp/publish/organizational-licensing).
-**Note**
-We are still setting up the catalog of apps for Windows Store for Business. If you are searching for an app and it isn’t available, please check again in a couple of days.
+Line-of-business (LOB) apps are also supported using the Micrososft Store. Admins can invite IT devs and ISVs to be LOB publishers. Apps developed by your LOB publishers that are submitted to Microsoft Store are only available to your organization. Once an administrator accepts an app submitted by one of their LOB publishers, the app can be distributed just like any other app. For more information, see [Working with Line-of-Business apps](working-with-line-of-business-apps.md).
-Line-of-business (LOB) apps are also supported using the Store for Business. Admins can invite IT devs and ISVs to be LOB publishers. Apps developed by your LOB publishers that are submitted to the Store are only available to your organization. Once an administrator accepts an app submitted by one of their LOB publishers, the app can be distributed just like any other app from Store for Business. For more information, see Working with Line-of-Business apps.
+## In-app purchases
-##
In-app purchases
-
-
-Some apps offer you the option to make in-app purchases. In-app purchases are not currently supported for apps that are acquired through Store for Business and distributed to employees.
+Some apps offer you the option to make in-app purchases. In-app purchases are not currently supported for apps that are acquired through Micrososft Store and distributed to employees.
If an employee makes an in-app purchase, they'll make it with their personal Microsoft account and pay for it with a personal payment method. The employee will own the item purchased, and it cannot be transferred to your organization’s inventory.
##
Licensing model: online and offline licenses
+Microsoft Store supports two options to license apps: online and offline.
-Store for Business supports two options to license apps: online and offline.
-
-**Online** licensing is the default licensing model and is similar to the Windows Store. Online licensed apps require users and devices to connect to the Store for Business service to acquire an app and its license. Licensing management is enforced based on the user’s Azure AD identity and maintained by the store as well as the management tool. By default app updates are handled by Windows Update.
+### Online licensing
+Online licensing is the default licensing model and is similar to the Windows Store. Online licensed apps require customers and devices to connect to the Microsoft Store service to acquire an app and its license. License management is enforced based on the user’s Azure AD identity and maintained by Microsoft Store as well as the management tool. By default app updates are handled by Windows Update.
Distribution options for online-licensed apps include the ability to:
-- Assign an app to employees.
+- Assign an app to employees.
+- Add an app to your private store, allowing employees to download the app.
+- Distribute through a management tool.
-- Add an app to your private store, allowing employees to download the app.
-
-- Distribute through a management tool.
-
-**Offline** licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center. Only apps that are opted in to offline licensing will show that they are available for offline licensing in Store for Business. This model means organizations can deploy apps when users or devices do not have connectivity to the Store. Admins control whether or not offline apps are available in Store for Business with an offline app visibility setting. For more information, see [offline license visibility](https://technet.microsoft.com/itpro/windows/manage/update-windows-store-for-business-account-settings#offline-licensing).
+### Offline licensing
+Offline licensing is a new licensing option for Windows 10. With offline licenses, organizations can cache apps and their licenses to deploy within their network. ISVs or devs can opt-in their apps for offline licensing when they submit them to the developer center. Only apps that are opted in to offline licensing will show that they are available for offline licensing in Microsoft Store. This model means organizations can deploy apps when users or devices do not have connectivity to Microsost Store. Admins control whether or not offline apps are available in Microsost Store with an offline app visibility setting. For more information, see [offline license visibility](https://technet.microsoft.com/itpro/windows/manage/update-windows-store-for-business-account-settings#offline-licensing).
You have the following distribution options for offline-licensed apps:
-- Include the app in a provisioning package, and then use it as part of imaging a device.
-
-- Distribute the app through a management tool.
-
-For more information, see [Distribute apps to your employees from the Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md).
-
-
-
-
-
-
-
-
+- Include the app in a provisioning package, and then use it as part of imaging a device.
+- Distribute the app through a management tool.
+For more information, see [Distribute apps to your employees from the Microsoft Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md).
\ No newline at end of file
diff --git a/store-for-business/assign-apps-to-employees.md b/store-for-business/assign-apps-to-employees.md
index a329393689..cffba1a162 100644
--- a/store-for-business/assign-apps-to-employees.md
+++ b/store-for-business/assign-apps-to-employees.md
@@ -1,6 +1,6 @@
---
title: Assign apps to employees (Windows 10)
-description: Administrators can assign online-licensed apps to employees in their organization.
+description: Administrators can assign online-licensed apps to employees and students in their organization.
ms.assetid: A0DF4EC2-BE33-41E1-8832-DBB0EBECA31A
ms.prod: w10
ms.mktglfcycl: manage
@@ -18,17 +18,16 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Administrators can assign online-licensed apps to employees in their organization.
+Adminis, Purchasers, and Basic Purchasers can assign online-licensed apps to employees in their organization.
**To assign an app to an employee**
-
-1. Sign in to Windows Store for Business.
-
-2. Click **Manage**, and then choose **Inventory**.
-
+
+1. Sign in to [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, and then choose **Apps & software**.
3. Find an app, click the ellipses under **Action**, and then choose **Assign to people**.
-
-4. Type the email address for the employee that you're assigning the app to, and click **Confirm**.
+-OR-
+ Click the app, and then click **Assign User**.
+4. Type the email address for the person you're assigning the app to, and click **Assign**.
Employees will receive an email with a link that will install the app on their device. Click the link to start the Windows Store app, and then click **Install**. Also, in the Windows Store app, they can find the app under **My Library**.
diff --git a/store-for-business/configure-mdm-provider-windows-store-for-business.md b/store-for-business/configure-mdm-provider-windows-store-for-business.md
index 8d22548f35..c11269d2f5 100644
--- a/store-for-business/configure-mdm-provider-windows-store-for-business.md
+++ b/store-for-business/configure-mdm-provider-windows-store-for-business.md
@@ -12,47 +12,30 @@ localizationpriority: high
# Configure an MDM provider
-
**Applies to**
-
- Windows 10
- Windows 10 Mobile
-For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Windows Store for Business inventory to manage apps with offline licenses. Store for Business management tool services work with your third-party management tool to manage content.
+For companies or organizations using mobile device management (MDM) tools,those tools can synchronize with Windows Store for Business inventory to manage apps with offline licenses. Store for Business management tool services work with your third-party management tool to manage content.
Your management tool needs to be installed and configured with Azure AD, in the same directory that you are using for Store for Business. Once that's done, you can configure it to work with Store for Business
**To configure a management tool in Azure AD**
1. Sign in to the Azure Portal as an Administrator.
-
2. Click **Active Directory**, and then choose your directory.
-
3. Click **Applications**, find the application, and add it to your directory.
-After your management tool is added to your Azure AD directory, you can configure it to work with Store for Business. You can configure multiple management tools - just repeat the following procedure.
+After your management tool is added to your Azure AD directory, you can configure it to work with Microsoft Store. You can configure multiple management tools - just repeat the following procedure.
**To configure a management tool in Store for Business**
-1. Log in to Store for Business.
-
-2. Click **Settings**, and then choose **Management tool**.
-
- You'll see a list of available MDM tools.
-
- 
-
-3. Choose the MDM tool you want to synchronize with Store for Business, and then click **Activate.**
-
-Your MDM tool is ready to use with Store for Business. Consult docs for your management tool to learn how to distribute apps from your synchronized inventory.
-
-See [Manage apps you purchased from Windows Store for Business with Microsoft InTune](https://technet.microsoft.com/library/mt676514.aspx) to learn how to configure synchroniztion and deploy apps.
-
-
-
-
-
-
-
+1. Sign in to the [Store for Business](http://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com)
+2. Click **Manage**, click **Store settings**, and then click **Management tools**.
+3. From the list of MDM tools, select the one you want to synchronize with Microsoft Store, and then click **Activate.**
+Your MDM tool is ready to use with Microsoft Store. To learn how to configure synchroniztion and deploy apps, see these topics:
+- [Manage apps you purchased from Windows Store for Business with Microsoft Intune](https://technet.microsoft.com/library/mt676514.aspx)
+- [Manage apps from Windows Store for Business with System Center Configuration Manager](https://docs.microsoft.com/sccm/apps/deploy-use/manage-apps-from-the-windows-store-for-business)
+For third-party MDM providers or management servers, check your product documentation.
\ No newline at end of file
diff --git a/store-for-business/device-guard-signing-portal.md b/store-for-business/device-guard-signing-portal.md
index e9dabd0581..de51622611 100644
--- a/store-for-business/device-guard-signing-portal.md
+++ b/store-for-business/device-guard-signing-portal.md
@@ -1,6 +1,6 @@
---
title: Device Guard signing (Windows 10)
-description: Device Guard signing is a Device Guard feature that is available in the Windows Store for Business.
+description: Device Guard signing is a Device Guard feature that is available in the Microsoft Store for Business and Microsoft Store for Education.
ms.assetid: 8D9CD2B9-5FC6-4C3D-AA96-F135AFEEBB78
ms.prod: w10
ms.mktglfcycl: manage
@@ -18,41 +18,18 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Device Guard signing is a Device Guard feature that is available in the Windows Store for Business. It gives admins a single place to sign catalog files and code integrity policies. After admins have created catalog files for unsigned apps and signed the catalog files, they can add the signers to a code integrity policy. You can merge the code integrity policy with your existing policy to include your custom signing certificate. This allows you to trust the catalog files.
+Device Guard signing is a Device Guard feature that is available in Microsoft Store for Business and Education. It gives admins a single place to sign catalog files and code integrity policies. After admins have created catalog files for unsigned apps and signed the catalog files,they can add the signers to a code integrity policy. You can merge the code integrity policy with your existing policy to include your custom signing certificate. This allows you to trust the catalog files.
Device Guard is a feature set that consists of both hardware and software system integrity hardening features. These features use new virtualization-based security options and the trust-nothing mobile device operating system model. A key feature in this model is called configurable code integrity, which allows your organization to choose exactly which software or trusted software publishers are allowed to run code on your client machines. Also, Device Guard offers organizations a way to sign existing line-of-business (LOB) applications so that they can trust their own code, without the requirement that the application be repackaged. Also, this same method of signing allows organizations to trust individual third-party applications. For more information, see [Device Guard deployment guide](https://technet.microsoft.com/library/mt463091.aspx).
## In this section
-
-
-
-
-
-
-
-
-
-
-
-[Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md) |
-When you want to add an unsigned app to a code integrity policy, you need to start with a code integrity policy created from a reference device. Then, create the catalog files for your unsigned app, sign the catalog files, and then merge the default policy that includes your signing certificate with existing code integrity policies. |
-
-
-[Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md) |
-Signing code integrity policies prevents policies from being tampered with after they're deployed. You can sign code integrity policies with the Device Guard signing portal. |
-
-
-
-
-
+| Topic | Description |
+| ----- | ----------- |
+| [Add unsigned app to code integrity policy](add-unsigned-app-to-code-integrity-policy.md) | When you want to add an unsigned app to a code integrity policy, you need to start with a code integrity policy created from a reference device. Then, create the catalog files for your unsigned app, sign the catalog files, and then merge the default policy that includes your signing certificate with existing code integrity policies. |
+| [Sign code integrity policy with Device Guard signing](sign-code-integrity-policy-with-device-guard-signing.md) | Signing code integrity policies prevents policies from being tampered with after they're deployed. You can sign code integrity policies with the Device Guard signing portal. |
## File and size limits
-
-
When you're uploading files for Device Guard signing, there are a few limits for files and file size:
| Description | Limit |
@@ -61,11 +38,7 @@ When you're uploading files for Device Guard signing, there are a few limits for
| Maximum size for multiple files (uploaded in a group) | 4 MB |
| Maximum number of files per upload | 15 files |
-
-
-## File types
-
-
+ ## File types
Catalog and policy files have required files types.
| File | Required file type |
@@ -73,23 +46,8 @@ Catalog and policy files have required files types.
| catalog files | .cat |
| policy files | .bin |
-
-
-## Store for Business roles and permissions
-
-
+ ## Store for Business roles and permissions
Signing code integrity policies and access to Device Guard portal requires the Device Guard signer role.
## Device Guard signing certificates
-
-
-All certificates generated by the Device Guard signing service are unique per customer and are independent of the Microsoft production code signing certificate authorities. All Certification Authority (CA) keys are stored within the cryptographic boundary of Federal Information Processing Standards (FIPS) publication 140-2 compliant hardware security modules. After initial generation, root certificate keys and top level CA keys are removed from the online signing service, encrypted, and stored offline.
-
-
-
-
-
-
-
-
-
+All certificates generated by the Device Guard signing service are unique per customer and are independent of the Microsoft production code signing certificate authorities. All Certification Authority (CA) keys are stored within the cryptographic boundary of Federal Information Processing Standards (FIPS) publication 140-2 compliant hardware security modules. After initial generation, root certificate keys and top level CA keys are removed from the online signing service, encrypted, and stored offline.
\ No newline at end of file
diff --git a/store-for-business/distribute-apps-from-your-private-store.md b/store-for-business/distribute-apps-from-your-private-store.md
index 8c53c8e10d..608cfdca5f 100644
--- a/store-for-business/distribute-apps-from-your-private-store.md
+++ b/store-for-business/distribute-apps-from-your-private-store.md
@@ -1,6 +1,6 @@
---
title: Distribute apps using your private store (Windows 10)
-description: The private store is a feature in Windows Store for Business that organizations receive during the sign up process.
+description: The private store is a feature in Microsoft Store for Business and Microsoft Store for Education that organizations receive during the signup process.
ms.assetid: C4644035-845C-4C84-87F0-D87EA8F5BA19
ms.prod: w10
ms.mktglfcycl: manage
@@ -18,33 +18,31 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-The private store is a feature in Windows Store for Business that organizations receive during the sign up process. When admins add apps to the private store, all employees in the organization can view and download the apps. Your private store is available as a tab in the Windows Store, and is usually named for your company or organization. Only apps with online licenses can be added to the private store.
+The private store is a feature in Microsoft Store for Business and Education that organizations receive during the signup process. When admins add apps to the private store, all employees in the organization can view and download the apps. Your private store is available as a tab in the Windows Store, and is usually named for your company or organization. Only apps with online licenses can be added to the private store.
You can make an app available in your private store when you acquire the app, or you can do it later from your inventory. Once the app is in your private store, employees can claim and install the app.
**To acquire an app and make it available in your private store**
-1. Sign in to the [Store for Business](https://businessstore.microsoft.com).
+1. Sign in to [Micrososft Store for Business](https://businessstore.microsoft.com) or [Micrososft Store for Education](https://educationstore.microsoft.com).
2. Click an app, choose the license type, and then click **Get the app** to acquire the app for your organization.
- 
+
-Windows Store for Business add the app to your **Inventory**. Click **Manage**, **Inventory** for app distribution options.
+Microsoft Store adds the app to **Apps & software**. Click **Manage**, **Apps & software** for app distribution options.
-**To make an app in Inventory available in your private store**
+**To make an app in Apps & software available in your private store**
-1. Sign in to the [Store for Business](https://businessstore.microsoft.com).
+1. Sign in to the [Store for Business](https://businessstore.microsoft.com) or [Micrososft Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, and then choose **Apps & software**.
-2. Click **Manage**, and then choose **Inventory**.
+
- 
+3. Use **Refine results** to search for online-licensed apps under **License type**.
+4. From the list of online-licensed apps, click the ellipses for the app you want, and then choose **Add to private store**.
-3. Click **Refine**, and then choose **Online**. Store for Business will update the list of apps on the **Inventory** page.
-
-4. From an app in **Inventory**, click the ellipses under **Action**, and then choose **Add to private store**.
-
- 
+
The value under **Private store** for the app will change to pending. It will take approximately twelve hours before the app is available in the private store.
@@ -52,18 +50,13 @@ Employees can claim apps that admins added to the private store by doing the fol
**To claim an app from the private store**
-1. Sign in to your computer with your Azure Active Directory (AD) credentials, and start the Windows Store app.
-
-2. Click the **private store** tab.
-
-3. Click the app you want to install, and then click **Install**.
+1. Sign in to your computer with your Azure Active Directory (AD) credentials, and start the Windows Store app.
+2. Click the **private store** tab.
+3. Click the app you want to install, and then click **Install**.
## Related topics
-
-
-[Manage access to private store](manage-access-to-private-store.md)
-
-[Configure access to Windows Store](/windows/configuration/stop-employees-from-using-the-windows-store)
+- [Manage access to private store](manage-access-to-private-store.md)
+- [Configure access to Windows Store](/windows/configuration/stop-employees-from-using-the-windows-store)
diff --git a/store-for-business/distribute-apps-to-your-employees-windows-store-for-business.md b/store-for-business/distribute-apps-to-your-employees-windows-store-for-business.md
index 8863d87a80..b72519ba89 100644
--- a/store-for-business/distribute-apps-to-your-employees-windows-store-for-business.md
+++ b/store-for-business/distribute-apps-to-your-employees-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Distribute apps to your employees from the Windows Store for Business (Windows 10)
-description: Distribute apps to your employees from Windows Store for Business. You can assign apps to employees, or let employees install them from your private store.
+title: Distribute apps to your employees from the Microsoft Store for Business and Education (Windows 10)
+description: Distribute apps to your employees from Microsoft Store for Business or Microsoft Store for Education. You can assign apps to employees,or let employees install them from your private store.
ms.assetid: E591497C-6DFA-49C1-8329-4670F2164E9E
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,7 +10,7 @@ author: TrudyHa
localizationpriority: high
---
-# Distribute apps to your employees from the Windows Store for Business
+# Distribute apps to your employees from Microsoft Store for Business and Education
**Applies to**
@@ -18,49 +18,14 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Distribute apps to your employees from Windows Store for Business. You can assign apps to employees, or let employees install them from your private store.
+Distribute apps to your employees from Microsoft Store for Business and Microsoft Store for Education. You can assign apps to employees, or let employees install them from your private store.
## In this section
-
-
-
-
-
-
-
-
-
-
-
-[Distribute apps using your private store](distribute-apps-from-your-private-store.md) |
-The private store is a feature in Store for Business that organizations receive during the sign up process. When admins add apps to the private store, all employees in the organization can view and download the apps. Your private store is available as a tab in the Windows Store, and is usually named for your company or organization. Only apps with online licenses can be added to the private store. |
-
-
-[Assign apps to employees](assign-apps-to-employees.md) |
-Administrators can assign online-licensed apps to employees in their organization. |
-
-
-[Distribute apps with a management tool](distribute-apps-with-management-tool.md) |
-You can configure a mobile device management (MDM) tool to synchronize your Store for Business inventory. Store for Business management tool services work with MDM tools to manage content. |
-
-
-[Distribute offline apps](distribute-offline-apps.md) |
-Offline licensing is a new licensing option for Windows 10. With offline licenses, organizations can download apps and their licenses to deploy within their network, or on devices that are not connected to the Internet. ISVs or devs can opt-in their apps for offline licensing when they submit them to the Windows Dev Center. Only apps that are opted in to offline licensing will show that they are available for offline licensing in the Store for Business. This model means organizations can deploy apps when users or devices do not have connectivity to the Store. |
-
-
-
-
-
-
-
-
-
-
-
-
-
+| Topic | Description |
+| ----- | ----------- |
+| [Distribute apps using your private store](distribute-apps-from-your-private-store.md) | The private store is a feature in Microsoft Store that organizations and schools receive during the signup process. When admins add apps to the private store, all people in the organization can view and download the apps. Only apps with online licenses can be added to the private store. |
+| [Assign apps to employees](assign-apps-to-employees.md) | Adminis can assign online-licensed apps to people in their organization. |
+| [Distribute apps with a management tool](distribute-apps-with-management-tool.md) | Admins can configure a mobile device management (MDM) tool to synchronize your Microsoft Store inventory. Microsoft Store management tool services work with MDM tools to manage content. |
+| [Distribute offline apps](distribute-offline-apps.md) | Offline licensing is a new licensing option for Windows 10. With offline licenses, organizations can download apps and their licenses to deploy within their network, or on devices that are not connected to the Internet. This allows organizations to deploy apps to devices without connectivity to the Store. |
diff --git a/store-for-business/distribute-apps-with-management-tool.md b/store-for-business/distribute-apps-with-management-tool.md
index f030d0d1ce..391e5173f4 100644
--- a/store-for-business/distribute-apps-with-management-tool.md
+++ b/store-for-business/distribute-apps-with-management-tool.md
@@ -1,6 +1,6 @@
---
title: Distribute apps with a management tool (Windows 10)
-description: You can configure a mobile device management (MDM) tool to synchronize your Store for Business inventory. Store for Business management tool services work with MDM tools to manage content.
+description: You can configure a mobile device management (MDM) tool to synchronize your Microsoft Store for Business or Microsoft Store for Education inventory. Microsoft Store management tool services work with MDM tools to manage content.
ms.assetid: 006F5FB1-E688-4769-BD9A-CFA6F5829016
ms.prod: w10
ms.mktglfcycl: manage
@@ -18,13 +18,13 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-You can configure a mobile device management (MDM) tool to synchronize your Store for Business inventory. Store for Business management tool services work with MDM tools to manage content.
+You can configure a mobile device management (MDM) tool to synchronize your Microsoft Store for Business or Microsoft Store for Education inventory. Microsoft Store management tool services work with MDM tools to manage content.
-Your MDM tool needs to be installed and configured in Azure AD, in the same Azure AD directory used with Windows Store for Business.
+Your MDM tool needs to be installed and configured in Azure AD, in the same Azure AD directory used with Microsoft Store.
-In Azure AD management portal, find the MDM application, and then add it to your directory. Once the MDM has been configured in Azure AD, you can authorize the tool to work with the Store for Business. This allows the MDM tool to call Store for Business management tool services. For more information, see [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) and [Manage apps you purchased from the Windows Store for Business with Microsoft Intune](https://docs.microsoft.com/intune/deploy-use/manage-apps-you-purchased-from-the-windows-store-for-business-with-microsoft-intune).
+In Azure AD management portal, find the MDM application, and then add it to your directory. Once the MDM has been configured in Azure AD, you can authorize the tool to work with the Microsoft Store for Business or Microsoft Store for Education. This allows the MDM tool to call Microsoft Store management tool services. For more information, see [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) and [Manage apps you purchased from the Windows Store for Business with Microsoft Intune](https://docs.microsoft.com/intune/deploy-use/manage-apps-you-purchased-from-the-windows-store-for-business-with-microsoft-intune).
-Store for Business services provide:
+Microsoft Store services provide:
- Services for third-party MDM tools.
@@ -38,14 +38,13 @@ MDM tool requirements:
- Must be an Azure Active Directory (AD) application to authenticate against the Store for Business services.
-- Must be configured in Azure AD, and Store for Business.
+- Must be configured in Azure AD, and Microsoft Store.
-- Azure AD identity is required to authorize Store for Business services.
+- Azure AD identity is required to authorize Microsoft Store services.
## Distribute offline-licensed apps
-
-If your vendor doesn’t support the ability to synchronize applications from the management tool services or cannot connect to the management tool services, your vendor may support the ability to deploy offline licensed applications by downloading the application and license from the store and then deploying the app through your MDM. For more information on online and offline licensing with Store for Business, see [Apps in the Windows Store for Business.](apps-in-windows-store-for-business.md#licensing-model)
+If your vendor doesn’t support the ability to synchronize applications from the management tool services, or can't connect to the management tool services, your vendor may support the ability to deploy offline licensed applications by downloading the application and license from the store and then deploying the app through your MDM. For more information on online and offline licensing with Store for Business, see [Apps in the Windows Store for Business.](apps-in-windows-store-for-business.md#licensing-model)
This diagram shows how you can use a management tool to distribute offline-licensed app to employees in your organization. Once synchronized from Store for Business, management tools can use the Windows Management framework to distribute applications to devices.
@@ -53,17 +52,14 @@ This diagram shows how you can use a management tool to distribute offline-licen
## Distribute online-licensed apps
+This diagram shows how you can use a management tool to distribute an online-licensed app to employees in your organization. Once synchronized from Microsoft Store, management tools use the Windows Management framework to distribute applications to devices. For online-licensed applications, the management tool calls back to Microsoft Store management services to assign an application prior to issuing the policy to install the application.
-This diagram shows how you can use a management tool to distribute an online-licensed app to employees in your organization. Once synchronized from Store for Business, management tools use the Windows Management framework to distribute applications to devices. For Online licensed applications, the management tool calls back in to Store for Business management services to assign an application prior to issuing the policy to install the application.
-
-
+
## Related topics
-
[Configure MDM Provider](configure-mdm-provider-windows-store-for-business.md)
-
-[Manage apps you purchased from the Windows Store for Business with Microsoft InTune](https://technet.microsoft.com/library/mt676514.aspx)
+[Manage apps you purchased from the Microsoft Store for Business and Education with Microsoft InTune](https://technet.microsoft.com/library/mt676514.aspx)
diff --git a/store-for-business/distribute-offline-apps.md b/store-for-business/distribute-offline-apps.md
index b0a6b60bc0..2e540c478f 100644
--- a/store-for-business/distribute-offline-apps.md
+++ b/store-for-business/distribute-offline-apps.md
@@ -18,22 +18,21 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Offline licensing is a new licensing option for Windows 10 Store for Business. With offline licenses, organizations can download apps and their licenses to deploy within their network, or on devices that are not connected to the Internet. ISVs or devs can opt-in their apps for offline licensing when they submit them to the Windows Dev Center. Only apps that are opted in to offline licensing will show that they are available for offline licensing in the Windows Store for Business. This model means organizations can deploy apps when users or devices do not have connectivity to the Store.
+Offline licensing is a new licensing option for Windows 10 with Microsoft Store for Business and Microsoft Store for Education. With offline licenses, organizations can download apps and their licenses to deploy within their network, or on devices that are not connected to the Internet. ISVs or devs can opt-in their apps for offline licensing when they submit them to the Windows Dev Center. Only apps that are opted in to offline licensing will show that they are available for offline licensing in the Microsoft Store for Business and Microsoft Store for Education. This model allows organizations to deploy apps when users or devices do not have connectivity to the Store.
## Why offline-licensed apps?
+Offline-licensed apps offer an alternative to online apps, and provide additional deployment options. Some reasons to use offline-licensed apps:
-Offline-licensed apps offer an alternative to online apps, and provide additional deployment options. Some reasons to use offline-licensed apps include:
-
-- **You don't have access to Windows Store services** - If your employees don't have access to the internet and Windows Store services, downloading offline-licensed apps and deploying them with imaging is an alternative to online-licensed apps.
+- **You don't have access to Windows Store services** - If your employees don't have access to the internet and Microsoft Store services, downloading offline-licensed apps and deploying them with imaging is an alternative to online-licensed apps.
- **You use imaging to manage devices in your organization** - Offline-licensed apps can be added to images and deployed with Deployment Image Servicing and Management (DISM), or Windows Imaging and Configuration Designer (ICD).
-- **Your employees do not have Azure Active Directory (AD) accounts** - Azure AD accounts are required for employees that install apps assigned to them from Store for Business or that claim apps from a private store.
+- **Your employees do not have Azure Active Directory (AD) accounts** - Azure AD accounts are required for employees that install apps assigned to them from Microsoft Store or that claim apps from a private store.
## Distribution options for offline-licensed apps
-You can't distribute offline-licensed apps directly from the Store for Business. Once you download the items for the offline-licensed app, you have options for distributing the apps:
+You can't distribute offline-licensed apps directly from the Microsoft Store. Once you download the items for the offline-licensed app, you have options for distributing the apps:
- **Deployment Image Servicing and Management**. DISM is a command-line tool that is used to mount and service Microsoft Windows images before deployment. You can also use DISM to install, uninstall, configure, and update Windows features, packages, drivers, and international settings in a .wim file or VHD using the DISM servicing commands. DISM commands are used on offline images. For more information, see [Deployment Image Servicing and Management](https://msdn.microsoft.com/windows/hardware/commercialize/manufacture/desktop/dism---deployment-image-servicing-and-management-technical-reference-for-windows).
@@ -60,12 +59,9 @@ There are several items to download or create for offline-licensed apps. The app
**To download an offline-licensed app**
-1. Sign in to the [Store for Business](http://businessstore.microsoft.com/).
-
-2. Click **Manage**, and then choose **Inventory**.
-
-3. Click **Refine**, and then choose **Offline**.
-
+1. Sign in to the [Microsoft Store for Business](http://businessstore.microsoft.com/) or [Microsoft Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, and then choose **Apps & software**.
+3. Refine results by **License type** to show apps with offline licenses.
4. Find the app you want to download, click the ellipses under **Actions**, and then choose **Download for offline use**.
- **To download app metadata**: Choose the language for the app metadata, and then click **Download**. Save the downloaded app metadata. This is optional.
- **To download app package**: Click to expand the package details information, choose the Platform and Architecture combination that you need for your organization, and then click **Download**. Save the downloaded app package. This is required.
diff --git a/store-for-business/education/TOC.md b/store-for-business/education/TOC.md
new file mode 100644
index 0000000000..2e4ef3a73c
--- /dev/null
+++ b/store-for-business/education/TOC.md
@@ -0,0 +1,35 @@
+# [Microsoft Store for Education](/microsoft-store/index?toc=/microsoft-store/education/toc.json)
+
+## [Sign up and get started](/microsoft-store/sign-up-windows-store-for-business-overview?toc=/microsoft-store/education/toc.json)
+###[Microsoft Store for Business and Education overview](/microsoft-store/windows-store-for-business-overview?toc=/microsoft-store/education/toc.json)
+### [Prerequisites for Microsoft Store for Business and Education](/microsoft-store/prerequisites-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Sign up for Microsoft Store for Business or Microsoft Store for Education](/microsoft-store/sign-up-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Roles and permissions in the Microsoft Store for Business and Education](/microsoft-store/roles-and-permissions-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Settings reference: Microsoft Store for Business and Education](/microsoft-store/settings-reference-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+## [Working with Microsoft Store for Education](/education/windows/education-scenarios-store-for-business?toc=/microsoft-store/education/toc.json)
+## [Find and acquire apps](/microsoft-store/find-and-acquire-apps-overview?toc=/microsoft-store/education/toc.json)
+### [Apps in the Microsoft Store for Business and Education](/microsoft-store/apps-in-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Acquire apps in the Microsoft Store for Business and Education](/microsoft-store/acquire-apps-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Working with line-of-business apps](/microsoft-store/working-with-line-of-business-apps?toc=/microsoft-store/education/toc.json)
+## [Get Minecraft: Education Edition](/education/windows/get-minecraft-for-education?toc=/microsoft-store/education/toc.json)
+### [For teachers: get Minecraft Education Edition](/education/windows/teacher-get-minecraft?toc=/microsoft-store/education/toc.json)
+### [For IT administrators: get Minecraft Education Edition](/education/windows/school-get-minecraft?toc=/microsoft-store/education/toc.json)
+## [Distribute apps to your employees from the Microsoft Store for Business and Education](/microsoft-store/distribute-apps-to-your-employees-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Distribute apps using your private store](/microsoft-store/distribute-apps-from-your-private-store?toc=/microsoft-store/education/toc.json)
+### [Assign apps to employees](/microsoft-store/assign-apps-to-employees?toc=/microsoft-store/education/toc.json)
+### [Distribute apps with a management tool](/microsoft-store/distribute-apps-with-management-tool?toc=/microsoft-store/education/toc.json)
+### [Distribute offline apps](/microsoft-store/distribute-offline-apps?toc=/microsoft-store/education/toc.json)
+## [Manage apps](/microsoft-store/manage-apps-windows-store-for-business-overview?toc=/microsoft-store/education/toc.json)
+### [App inventory managemement for Microsoft Store for Business](/microsoft-store/app-inventory-management-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Manage app orders in Microsoft Store for Business and Education](/microsoft-store/manage-orders-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Manage access to private store](/microsoft-store/manage-access-to-private-store?toc=/microsoft-store/education/toc.json)
+### [Manage private store settings](/microsoft-store/manage-private-store-settings?toc=/microsoft-store/education/toc.json)
+### [Configure MDM provider](/microsoft-store/configure-mdm-provider-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+## [Device Guard signing portal](/microsoft-store/device-guard-signing-portal?toc=/microsoft-store/education/toc.json)
+### [Add unsigned app to code integrity policy](/microsoft-store/add-unsigned-app-to-code-integrity-policy?toc=/microsoft-store/education/toc.json)
+### [Sign code integrity policy with Device Guard signing](/microsoft-store/sign-code-integrity-policy-with-device-guard-signing?toc=/microsoft-store/education/toc.json)
+## [Manage settings in the Microsoft Store for Business and Education](/microsoft-store/manage-settings-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+### [Update Microsoft Store for Business and Microsoft Store for Education account settings](/microsoft-store/update-windows-store-for-business-account-settings?toc=/microsoft-store/education/toc.json)
+### [Manage user accounts in Microsoft Store for Business and Education](/microsoft-store/manage-users-and-groups-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+## [Troubleshoot Microsoft Store for Business](/microsoft-store/troubleshoot-windows-store-for-business?toc=/microsoft-store/education/toc.json)
+
diff --git a/store-for-business/find-and-acquire-apps-overview.md b/store-for-business/find-and-acquire-apps-overview.md
index 30ca08ff48..fd460d3479 100644
--- a/store-for-business/find-and-acquire-apps-overview.md
+++ b/store-for-business/find-and-acquire-apps-overview.md
@@ -1,6 +1,6 @@
---
title: Find and acquire apps (Windows 10)
-description: Use the Windows Store for Business to find apps for your organization. You can also work with developers to create line-of-business apps that are only available to your organization.
+description: Use the Microsoft Store for Business and Education to find apps for your organization. You can also work with developers to create line-of-business apps that are only available to your organization.
ms.assetid: 274A5003-5F15-4635-BB8B-953953FD209A
ms.prod: w10
ms.mktglfcycl: manage
@@ -18,45 +18,13 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Use the Windows Store for Business to find apps for your organization. You can also work with developers to create line-of-business apps that are only available to your organization.
+Use the Microsoft Store for Business and Education to find apps for your organization. You can also work with developers to create line-of-business apps that are only available to your organization.
## In this section
-
-
-
-
-
-
-
-
-
-
-
-[Apps in the Windows Store for Business](apps-in-windows-store-for-business.md) |
-Store for Business has thousands of apps from many different categories. |
-
-
-[Acquire apps in the Windows Store for Business](acquire-apps-windows-store-for-business.md) |
-You can acquire apps from the Windows Store for Business for your employees. |
-
-
-[Working with line-of-business apps](working-with-line-of-business-apps.md) |
-Your company can make line-of-business (LOB) applications available through Store for Business. These apps are custom to your company – they might be internal business apps, or apps specific to your business or industry. |
-
-
-
-
-
-
-
-
-
-
-
-
-
+| Topic | Description |
+| ----- | ----------- |
+| [Apps in the Microsoft Store for Business and Education](apps-in-windows-store-for-business.md) | Store for Business and Education has thousands of apps from many different categories. |
+| [Acquire apps in the Microsoft Store for Business and Education](acquire-apps-windows-store-for-business.md) | You can acquire apps from the Microsoft Store for Business and Education for your employees. |
+| [Working with line-of-business apps](working-with-line-of-business-apps.md) | Your company can make line-of-business (LOB) applications available through Microsoft Store for Business and Education. These apps are custom to your company – they might be internal business apps, or apps specific to your business or industry. |
diff --git a/store-for-business/index.md b/store-for-business/index.md
index 7db0654659..f8fca9deb1 100644
--- a/store-for-business/index.md
+++ b/store-for-business/index.md
@@ -1,6 +1,6 @@
---
-title: Windows Store for Business (Windows 10)
-description: Welcome to the Windows Store for Business You can use the Store for Business, to find, acquire, distribute, and manage apps for your organization.
+title: Microsoft Store for Business and Education (Windows 10)
+description: Welcome to the Microsoft Store for Business and Education. You can use Microsoft Store, to find, acquire, distribute, and manage apps for your organization or school.
ms.assetid: 527E611E-4D47-44F0-9422-DCC2D1ACBAB8
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,7 +10,7 @@ author: TrudyHa
localizationpriority: high
---
-# Windows Store for Business
+# Microsoft Store for Business and Education
**Applies to**
@@ -18,51 +18,15 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Welcome to the Windows Store for Business! You can use the Store for Business, to find, acquire, distribute, and manage apps for your organization.
+Welcome to the Microsoft Store for Business and Education! You can use Microsoft Store to find, acquire, distribute, and manage apps for your organization or school.
## In this section
-
-
-
-
-
-
-
-
-
-
-
-[Sign up and get started](sign-up-windows-store-for-business-overview.md) |
-IT admins can sign up for the Store for Business, and get started working with apps. |
-
-
-[Find and acquire apps](find-and-acquire-apps-overview.md) |
-Use the Store for Business to find apps for your organization. You can also work with developers to create line-of-business apps that are only available to your organization. |
-
-
-[Distribute apps to your employees from the Windows Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md) |
-Distribute apps to your employees from Store for Business. You can assign apps to employees, or let employees install them from your private store. |
-
-
-[Manage apps](manage-apps-windows-store-for-business-overview.md) |
-Manage settings and access to apps in Store for Business. |
-
-
-[Device Guard signing portal](device-guard-signing-portal.md) |
-Device Guard signing is a Device Guard feature that is available in the Store for Business. It gives admins a single place to sign catalog files and code integrity policies. After admins have created catalog files for unsigned apps and signed the catalog files, they can add the signers to a code integrity policy. You can merge the code integrity policy with your existing policy to include your custom signing certificate. This allows you to trust the catalog files. |
-
-
-[Manage settings in the Windows Store for Business](manage-settings-windows-store-for-business.md) |
-You can add users and groups, as well as update some of the settings associated with the Azure Active Directory (AD) tenant |
-
-
-[Troubleshoot Windows Store for Business](troubleshoot-windows-store-for-business.md) |
-Troubleshooting topics for Store for Business. |
-
-
-
-
+| Topic | Description |
+| ----- | ----------- |
+| [Sign up and get started](sign-up-windows-store-for-business-overview.md) | IT admins can sign up for the Microsoft Store for Business and Education, and get started working with apps. |
+| [Find and acquire apps](find-and-acquire-apps-overview.md) | Use the Microsoft Store for Business and Education to find apps for your organization. You can also work with developers to create line-of-business apps that are only available to your organization. |
+| [Manage apps](manage-apps-windows-store-for-business-overview.md) | Manage settings and access to apps in Microsoft Store for Business and Education. |
+| [Device Guard signing portal](device-guard-signing-portal.md) | Device Guard signing is a Device Guard feature that is available in the Microsoft Store for Business and Education. It gives admins a single place to sign catalog files and code integrity policies. After admins have created catalog files for unsigned apps and signed the catalog files, they can add the signers to a code integrity policy. You can merge the code integrity policy with your existing policy to include your custom signing certificate. This allows you to trust the catalog files. |
+| [Manage settings in the Microsoft Store for Business and Education](manage-settings-windows-store-for-business.md) | You can add users and groups, as well as update some of the settings associated with the Azure Active Directory (AD) tenant |
+| [Troubleshoot Microsoft Store for Business and Education](troubleshoot-windows-store-for-business.md) | Troubleshooting topics for Microsoft Store for Business and Education. |
\ No newline at end of file
diff --git a/store-for-business/manage-access-to-private-store.md b/store-for-business/manage-access-to-private-store.md
index 248ea4396f..36e3b78d0b 100644
--- a/store-for-business/manage-access-to-private-store.md
+++ b/store-for-business/manage-access-to-private-store.md
@@ -1,6 +1,6 @@
---
title: Manage access to private store (Windows 10)
-description: You can manage access to your private store in Windows Store for Business.
+description: You can manage access to your private store in Microsoft Store for Business and Microsoft Store for Education.
ms.assetid: 4E00109C-2782-474D-98C0-02A05BE613A5
ms.prod: w10
ms.mktglfcycl: manage
@@ -17,13 +17,13 @@ author: TrudyHa
- Windows 10
- Windows 10 Mobile
-You can manage access to your private store in Windows Store for Business.
+You can manage access to your private store in Microsoft Store for Business and Microsoft Store for Education.
-Organizations might want control the set of apps that are available to their employees, and not show the full set of applications that are in the Windows Store. Using the private store with the Store for Business, an administrator can curate the set of apps that are available to their employees.
+You can control the set of apps that are available to your employees and students, and not show the full set of applications that are in the Windows Store. Using the private store with the Micrososft Store for Business and Eduction, admins can curate the set of apps that are available.
The private store is a feature in Store for Business that organizations receive during the sign up process. When admins add apps to the private store, all employees in the organization can view and download the apps. Your private store is available as a tab in the Windows Store, and is usually named for your company or organization. Only apps with online licenses can be added to the private store. Your private store looks something like this:
-
+
Organizations can use either an MDM policy, or Group Policy to show only their private store in Windows Store.
@@ -41,7 +41,7 @@ For more information on configuring an MDM provider, see [Configure an MDM provi
## Show private store only using Group Policy
-If you're using Windows Store for Business and you want employees to only see apps you're managing in your private store, you can use Group Policy to show only the private store. Windows Store app will still be available, but employees can't view or purchase apps. Employees can view and install apps that the admin has added to your organization's private store.
+If you're using Microsoft Store and you want employees to only see apps you're managing in your private store, you can use Group Policy to show only the private store. Windows Store app will still be available, but employees can't view or purchase apps. Employees can view and install apps that the admin has added to your organization's private store.
**Only display the private store within the Windows Store app** group policy is supported on the following Windows 10 editions:
- Enterprise
@@ -63,9 +63,7 @@ You can also prevent employees from using the Windows Store. For more informatio
## Related topics
-
[Distribute apps using your private store](distribute-apps-from-your-private-store.md)
-
[Configure access to Windows Store](/windows/configuration/stop-employees-from-using-the-windows-store)
diff --git a/store-for-business/manage-apps-windows-store-for-business-overview.md b/store-for-business/manage-apps-windows-store-for-business-overview.md
index f4248b9b04..6757e4eecd 100644
--- a/store-for-business/manage-apps-windows-store-for-business-overview.md
+++ b/store-for-business/manage-apps-windows-store-for-business-overview.md
@@ -1,6 +1,6 @@
---
-title: Manage apps in Windows Store for Business (Windows 10)
-description: Manage settings and access to apps in Windows Store for Business.
+title: Manage apps in Microsoft Store for Business (Windows 10)
+description: Manage settings and access to apps in Microsoft Store for Business.
ms.assetid: 2F65D4C3-B02C-41CC-92F0-5D9937228202
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,57 +10,20 @@ author: TrudyHa
localizationpriority: high
---
-# Manage apps in Windows Store for Business
-
+# Manage apps in Microsoft Store for Business and Education
**Applies to**
- Windows 10
- Windows 10 Mobile
-Manage settings and access to apps in Windows Store for Business.
+Manage settings and access to apps in Microsoft Store for Business and Microsoft Store for Education.
## In this section
-
-
-
-
-
-
-
-
-
-
-
-[Manage access to private store](manage-access-to-private-store.md) |
-You can manage access to your private store in Store for Business. |
-
-
-[App inventory managemement for Windows Store for Business](app-inventory-management-windows-store-for-business.md) |
-You can manage all apps that you've acquired on your Inventory page. |
-
-
-[Manage private store settings](manage-private-store-settings.md) |
-The private store is a feature in the Store for Business that organizations receive during the sign up process. When admins add apps to the private store, all employees in the organization can view and download the apps. Only online-licensed apps can be distributed from your private store. |
-
-
-[Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) |
-For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Store for Business inventory to manage apps with offline licenses. Store for Business management tool services work with your third-party management tool to manage content. |
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+| Topic | Description |
+| ----- | ----------- |
+| [Manage access to private store](manage-access-to-private-store.md) | You can manage access to your private store in Store for Business. |
+| [App inventory managemement for Microsoft Store for Business and Education](app-inventory-management-windows-store-for-business.md) | You can manage all apps that you've acquired on your **Apps & software** page. |
+| [Manage private store settings](manage-private-store-settings.md) | The private store is a feature in Microsoft Store for Business and Education that organizations receive during the sign up process. When admins add apps to the private store, all employees in the organization can view and download the apps. Only online-licensed apps can be distributed from your private store. |
+| [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md) | For companies or organizations using mobile device management (MDM) tools, those tools can synchronize with Microsoft Store for Business inventory to manage apps with offline licenses. Microsoft Store management tool services work with your third-party management tool to manage content. |
\ No newline at end of file
diff --git a/store-for-business/manage-orders-windows-store-for-business.md b/store-for-business/manage-orders-windows-store-for-business.md
index 9ca7ce1322..ee1a065e82 100644
--- a/store-for-business/manage-orders-windows-store-for-business.md
+++ b/store-for-business/manage-orders-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Manage app orders in Windows Store for Business (Windows 10)
-description: You can view your order history with Windows Store for Business.
+title: Manage app orders in Microsoft Store for Business or Microsoft Store for Education (Windows 10)
+description: You can view your order history with Micrsoft Store for Business or Micrsoft Store for Education.
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
@@ -9,9 +9,9 @@ author: TrudyHa
localizationpriority: high
---
-# Manage app orders in Windows Store for Business
+# Manage app orders in Microsoft Store for Business and Education
-After you've acquired apps, you can review order information and invoices on **Order history**. On this page, you can buy more license for an app, view invoices, and request refunds.
+After you've acquired apps, you can review order information and invoices on **Order history**. On this page, you can view invoices, and request refunds.
**Order history** lists orders in chronological order and shows:
- Date ordered
@@ -31,18 +31,6 @@ Click to expand an order, and the following info is available:
Invoices for orders are available approximatley 24 hours after your purchase. The link opens a .pdf that you can save for your records.
-## Buy more licenses
-
-You can purchase more copies of apps that are in your order history.
-
-**To buy more licenses**
-
-1. Sign in to the [Store for Business](http://businessstore.microsoft.com).
-2. Click **Manage**, and then choose **Order history**.
-3. Click an order, and then click **Buy more**.
-
-You can buy more copies of the app from the product page.
-
## Refund an order
Refunds work a little differently for free apps, and apps that have a price. In both cases, you must reclaim licenses before requesting a refund.
@@ -61,13 +49,12 @@ Refunds work a little differently for free apps, and apps that have a price. In
**To refund an order**
Reclaim licenses, and then request a refund. If you haven't assigned licenses, start on step 5.
-1. Sign in to the [Store for Business](http://businessstore.microsoft.com).
-2. Click **Manage**, and then choose **Inventory**.
-3. Find the app you want to refund, click the ellipses under **Action**, and then choose **View license details**.
-4. Select the number of licenses you need to reclaim, and then click **Reclaim licenses**.
-5. Click **Manage**, and then choose **Order history**.
-6. Click the order you want to refund, and click **Refund order**.
+1. Sign in to the [Store for Business](http://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, and then choose **Apps & software**.
+3. Find the app you want to refund, click the ellipses under **Actions**, and then choose **View license details**.
+4. Select the the people who you want to reclaim license from, click the ellipses under **Actions**, and then choose **Reclaim licenses**.
+5. Click **Order history**, click the order you want to refund, and click **Refund order**.
-For free apps, the app will be removed from your inventory.
+For free apps, the app will be removed from your inventory in **Apps & software**.
For apps with a price, your payment option will be refunded with the cost of the app, and the app will be removed from your inventory.
diff --git a/store-for-business/manage-private-store-settings.md b/store-for-business/manage-private-store-settings.md
index e070bd57ea..5f93dc0e99 100644
--- a/store-for-business/manage-private-store-settings.md
+++ b/store-for-business/manage-private-store-settings.md
@@ -1,6 +1,6 @@
---
title: Manage private store settings (Windows 10)
-description: The private store is a feature in the Windows Store for Business that organizations receive during the sign up process.
+description: The private store is a feature in the Microsoft Store for Business and Microsoft Store for Education that organizations receive during the sign up process.
ms.assetid: 2D501538-0C6E-4408-948A-2BF5B05F7A0C
ms.prod: w10
ms.mktglfcycl: manage
@@ -12,32 +12,25 @@ localizationpriority: high
# Manage private store settings
-
**Applies to**
- Windows 10
- Windows 10 Mobile
-The private store is a feature in the Windows Store for Business that organizations receive during the sign up process. When admins add apps to the private store, all employees in the organization can view and download the apps. Only online-licensed apps can be distributed from your private store.
+The private store is a feature in the Microsoft Store for Business and Education that organizations receive during the sign up process. When admins add apps to the private store, all people in the organization can view and download the apps. Only online-licensed apps can be distributed from your private store.
-The name of your private store is shown on a tab in the Windows Store app.
+The name of your private store is shown on a tab in the Windows Store app, or on [Microsoft Store for Business](https://businessstore.microsoft.com), or [Microsoft Store for Education](https://educationstore.microsoft.com).
-You can change the name of your private store in Store for Business.
+You can change the name of your private store in Microsoft Store.
+## Change private store name
**To change the name of your private store**
-1. Sign in to Store for Business.
-
-2. Click **Settings**, and then choose **Private store**.
-
- You'll see your private store name.
-
- 
-
-3. Click **Change**.
-
+1. Sign in to the [Store for Business](http://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com)
+2. Click **Manage**, click **Permissions**.
+3. On the **Private store ** tab, click **Change**.
4. Type a new display name for your private store, and click **Save**.
diff --git a/store-for-business/manage-settings-windows-store-for-business.md b/store-for-business/manage-settings-windows-store-for-business.md
index 704d4d4401..e7c764ce7d 100644
--- a/store-for-business/manage-settings-windows-store-for-business.md
+++ b/store-for-business/manage-settings-windows-store-for-business.md
@@ -1,5 +1,5 @@
---
-title: Manage settings for the Windows Store for Business (Windows 10)
+title: Manage settings for the Microsoft Store for Business and Microsoft Store for Education (Windows 10)
description: You can add users and groups, as well as update some of the settings associated with the Azure Active Directory (AD) tenant.
ms.assetid: E3283D77-4DB2-40A9-9479-DDBC33D5A895
ms.prod: w10
@@ -10,7 +10,7 @@ author: TrudyHa
localizationpriority: high
---
-# Manage settings for the Windows Store for Business
+# Manage settings for the Microsoft Store for Business and Education
**Applies to**
@@ -22,37 +22,9 @@ You can add users and groups, as well as update some of the settings associated
## In this section
-
-
-
-
-
-
-
-
-
-
-
-[Update Windows Store for Business account settings](update-windows-store-for-business-account-settings.md) |
-The Account information page in Windows Store for Business shows information about your organization that you can update, including: organization information, payment options, and offline licensing settings. |
-
-
-[Manage user accounts in Windows Store for Business](manage-users-and-groups-windows-store-for-business.md) |
-Store for Business manages permissions with a set of roles. Currently, you can [assign these roles to individuals in your organization](roles-and-permissions-windows-store-for-business.md), but not to groups. |
-
-
-
-
-
-
-
-
-
-
-
-
+| Topic | Description |
+| ----- | ----------- |
+| [Update Microsoft Store for Business and Education account settings](update-windows-store-for-business-account-settings.md) | The **Account information** page in Microsoft Store for Business shows information about your organization that you can update, including: organization information, payment options, and offline licensing settings. |
+| [Manage user accounts in Microsoft Store for Business and Education](manage-users-and-groups-windows-store-for-business.md) | Store for Business manages permissions with a set of roles. Currently, you can [assign these roles to individuals in your organization](roles-and-permissions-windows-store-for-business.md), but not to groups. |
diff --git a/store-for-business/manage-users-and-groups-windows-store-for-business.md b/store-for-business/manage-users-and-groups-windows-store-for-business.md
index 23783a767d..83baed4cea 100644
--- a/store-for-business/manage-users-and-groups-windows-store-for-business.md
+++ b/store-for-business/manage-users-and-groups-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Manage user accounts in Windows Store for Business (Windows 10)
-description: Windows Store for Business manages permissions with a set of roles. Currently, you can assign these roles to individuals in your organization, but not to groups.
+title: Manage user accounts in Microsoft Store for Business and Microsoft Store for Education (Windows 10)
+description: Microsoft Store for Business and Microsoft Store for Education manages permissions with a set of roles. Currently, you can assign these roles to individuals in your organization, but not to groups.
ms.assetid: 5E7FA071-CABD-4ACA-8AAE-F549EFCE922F
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,7 +10,7 @@ author: TrudyHa
localizationpriority: high
---
-# Manage user accounts in Windows Store for Business
+# Manage user accounts in Microsoft Store for Business and Education
**Applies to**
@@ -18,35 +18,27 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Windows Store for Business manages permissions with a set of roles. Currently, you can [assign these roles to individuals in your organization](roles-and-permissions-windows-store-for-business.md), but not to groups.
+Microsoft Store for Business and Education manages permissions with a set of roles. Currently, you can [assign these roles to individuals in your organization](roles-and-permissions-windows-store-for-business.md), but not to groups.
## Why Azure AD accounts?
-
-
For organizations planning to use the private store feature with Store for Business, we recommend that you also configure cloud domain join. This provides a seamless integration between the identity your admin and employees will use to sign in to Windows and the Store for Business.
Azure AD is an Azure service that provides identity and access management capabilities using the cloud. It is primarily designed to provide this service for cloud- or web-based applications that need to access your local Active Directory information. Azure AD identity and access management includes:
-- Single sign-on to any cloud and on-premises web app.
-
-- Works with multiple platforms and devices.
-
-- Integrate with on-premises Active Directory.
+- Single sign-on to any cloud and on-premises web app.
+- Works with multiple platforms and devices.
+- Integrate with on-premises Active Directory.
For more information on Azure AD, see [About Office 365 and Azure Active Directory](https://go.microsoft.com/fwlink/p/?LinkId=708612), and [Intro to Azure: identity and access](https://go.microsoft.com/fwlink/p/?LinkId=708611).
## Add user accounts to your Azure AD directory
-
-
If you created a new Azure AD directory when you signed up for Store for Business, you'll have a directory set up with one user account - the global administrator. That global administrator can add user accounts to your Azure AD directory. However, adding user accounts to your Azure AD directory will not give those employees access to Store for Business. You'll need to assign Store for Business roles to your employees. For more information, see [Roles and permissions in the Store for Business.](roles-and-permissions-windows-store-for-business.md)
You can use the [Office 365 admin dashboard](https://go.microsoft.com/fwlink/p/?LinkId=708616) or [Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=691086) to add user accounts to your Azure AD directory. If you'll be using Azure management portal, you'll need an active subscription to [Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=708617).
For more information, see:
-
-- [Add user accounts using Office 365 admin dashboard](https://go.microsoft.com/fwlink/p/?LinkId=708618)
-
-- [Add user accounts using Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=708619)
+- [Add user accounts using Office 365 admin dashboard](https://go.microsoft.com/fwlink/p/?LinkId=708618)
+- [Add user accounts using Azure management portal](https://go.microsoft.com/fwlink/p/?LinkId=708619)
diff --git a/store-for-business/prerequisites-windows-store-for-business.md b/store-for-business/prerequisites-windows-store-for-business.md
index 0ca1be50d5..2bd8d40451 100644
--- a/store-for-business/prerequisites-windows-store-for-business.md
+++ b/store-for-business/prerequisites-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Prerequisites for Windows Store for Business (Windows 10)
-description: There are a few prerequisites for using Windows Store for Business.
+title: Prerequisites for Microsoft Store for Business and Education (Windows 10)
+description: There are a few prerequisites for using Microsoft Store for Business or Microsoft Store for Education.
ms.assetid: CEBC6870-FFDD-48AD-8650-8B0DC6B2651D
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,43 +10,42 @@ author: TrudyHa
localizationpriority: high
---
-# Prerequisites for Windows Store for Business
-
+# Prerequisites for Microsoft Store for Business and Education
**Applies to**
- Windows 10
- Windows 10 Mobile
-There are a few prerequisites for using Windows Store for Business.
+There are a few prerequisites for using Microsoft Store for Business or Microsoft Store for Education.
## Prerequisites
-You'll need this software to work with Store for Business.
+You'll need this software to work with Microsoft Store for Business or Education.
### Required
-- IT Pros that are administering Store for Business need a browser compatible with Store for Business running on a PC or mobile device. Supported browsers include: Internet Explorer 10 or later, Microsoft Edge, or current versions of Chrome or Firefox.
-- Employees using apps from Store for Business need at least Windows 10, version 1511 running on a PC or mobile device.
+- IT Pros that are administering Microsoft Store for Business and Education need a browser compatible with Microsoft Store for Business and Education running on a PC or mobile device. Supported browsers include: Internet Explorer 10 or later, Microsoft Edge, or current versions of Chrome or Firefox. Javascript needs to be supported and enabled.
+- Employees using apps from Micrsoft Store for Business and Education need at least Windows 10, version 1511 running on a PC or mobile device.
-Microsoft Azure Active Directory (AD) accounts for your employees:
-- IT Pros need Azure AD accounts to sign up for Store for Business, and then to sign in, get apps, distribute apps, and manage app licenses.
-- Employees need Azure AD accounts when they access Store for Business content from Windows-based devices.
+Microsoft Azure Active Directory (AD) or Office 365 accounts for your employees:
+- IT Pros need Azure AD or Office 365 accounts to sign up for Microsoft Store for Business and Education, and then to sign in, get apps, distribute apps, and manage app licenses.
+- Employees need Azure AD accounts when they access Microsoft Store for Business or Education content from Windows-based devices.
- If you use a management tool to distribute and manage online-licensed apps, all employees will need an Azure AD account.
For more information on Azure AD, see [About Office 365 and Azure Active Directory](https://go.microsoft.com/fwlink/p/?LinkId=708612), and [Intro to Azure: identity and access](https://go.microsoft.com/fwlink/p/?LinkId=708611).
### Optional
-While not required, you can use a management tool to distribute and manage apps. Using a management tool allows you to distribute content, scope app availability, and control when app updates are installed. This might make sense for larger organizations that already use a management tool. If you're considering using management tools, check with the management tool vendor to see if they support Store for Business. The management tool will need to:
+While not required, you can use a management tool to distribute and manage apps. Using a management tool allows you to distribute content, scope app availability, and control when app updates are installed. This might make sense for larger organizations that already use a management tool. If you're considering using management tools, check with the management tool vendor to see if they support Microsoft Store for Business and Education. The management tool will need to:
- Integrate with the Windows 10 management framework and Azure AD.
-- Sync with the Store for Business inventory to distribute apps.
+- Sync with the Microsoft Store for Business and Education inventory to distribute apps.
### Proxy configuration
-If your organization restricts computers on your network from connecting to the Internet, there is a set of URLs that need to be available for devices to use Store for Business. Some of the Store for Business features use Windows Store app and Windows Store services. Devices using Store for Business – either to acquire, install, or update apps – will need access to these URLs. If you use a proxy server to block traffic, your configuration needs to allow these URLs:
+If your organization restricts computers on your network from connecting to the Internet, there is a set of URLs that need to be available for devices to use Microsoft Store. Some of the Microsoft Store features use Windows Store app and Microsoft Store services. Devices using Microsoft Store – either to acquire, install, or update apps – will need access to these URLs. If you use a proxy sever to block traffic, your configuration needs to allow these URLs:
- login.live.com
- login.windows.net
diff --git a/store-for-business/roles-and-permissions-windows-store-for-business.md b/store-for-business/roles-and-permissions-windows-store-for-business.md
index 8985c21e1c..fc3fbae54c 100644
--- a/store-for-business/roles-and-permissions-windows-store-for-business.md
+++ b/store-for-business/roles-and-permissions-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Roles and permissions in Windows Store for Business (Windows 10)
-description: The first person to sign in to Windows Store for Business must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees.
+title: Roles and permissions in Microsoft Store for Business and Education (Windows 10)
+description: The first person to sign in to Microsoft Store for Business or Microsoft Store for Education must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees.
ms.assetid: CB6281E1-37B1-4B8B-991D-BC5ED361F1EE
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,7 +10,7 @@ author: TrudyHa
localizationpriority: high
---
-# Roles and permissions in Windows Store for Business
+# Roles and permissions in Microsoft Store for Business and Education
**Applies to**
@@ -18,36 +18,36 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-The first person to sign in to Windows Store for Business must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees.
+The first person to sign in to Microsoft Store for Business or Microsoft Store for Education must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees.
-Store for Business has a set of roles that help admins and employees manage access to apps and tasks for the Store for Business. Employees with these roles will need to use their Azure AD account to access the Store for Business. Global Administrators and global user accounts that are used with other Microsoft services, such as Azure, or Office 365 can sign in to Store for Business. Global user accounts have some permissions in the Store for Business. Store for Business has a set of roles that help IT admins and employees manage access to apps and tasks for the Store for Business.
+Microsoft Store for Business and Education has a set of roles that help admins and employees manage access to apps and tasks for Microsoft Store. Employees with these roles will need to use their Azure AD account to access the Store. Global Administrators and global user accounts that are used with other Microsoft services, such as Azure, or Office 365 can sign in to Microsoft Store. Global user accounts have some permissions in Microsoft Store, and Microsoft Store has a set of roles that help IT admins and employees manage access to apps and tasks for Microsoft Store.
-### Global user account permissions in Store for Business
+## Global user account permissions in Microsoft Store
-This table lists the global user accounts and the permissions they have in the Store for Business.
+This table lists the global user accounts and the permissions they have in Microsoft Store.
| | Global Administrator | Billing Administrator |
| ------------------------------ | --------------------- | --------------------- |
-| Sign up for Store for Business | X | |
+| Sign up for Microsoft Store for Business and Education | X | |
| Modify company profile settings | X | |
| Acquire apps | X | X |
| Distribute apps | X | X |
-- **Global Administrator** - IT Pros with this account have full access to Store for Business. They can do everything allowed in the Store for Business Admin role, plus they can sign up for the Store for Business.
+- **Global Administrator** - IT Pros with this account have full access to Microsoft Store. They can do everything allowed in the Microsoft Store Admin role, plus they can sign up for the Microsoft Store.
-- **Billing Administrator** - IT Pros with this account have the same permissions as the Store for Business Purchaser role.
+- **Billing Administrator** - IT Pros with this account have the same permissions as Microsoft Store Purchaser role.
-### Store for Business roles and permissions
+## Microsoft Store roles and permissions
-Store for Business has a set of roles that help IT admins and employees manage access to apps and tasks for the Store for Business. Employees with these roles will need to use their Azure AD account to access the Store for Business.
+Microsoft Store has a set of roles that help IT admins and employees manage access to apps and tasks for Microsoft Store. Employees with these roles will need to use their Azure AD account to access Microsoft Store.
This table lists the roles and their permissions.
| | Admin | Purchaser | Device Guard signer |
| ------------------------------ | ------ | -------- | ------------------- |
| Assign roles | X | | |
-| Manage Store for Business settings | X | | |
+| Manage Microsoft Store for business and education settings | X | | |
| Acquire apps | X | X | |
| Distribute apps | X | X | |
| Sign policies and catalogs | X | | |
@@ -56,50 +56,40 @@ This table lists the roles and their permissions.
These permissions allow people to:
-- **Manage Store for Business settings** - Manage Store for Business settings:
+- **Manage Microsoft Store settings**:
- Account information (view only)
-
- Device Guard signing
-
- LOB publishers
-
- Management tools
-
- Offline licensing
-
- Permissions
-
- Private store
-- **Acquire apps** - Acquire apps from Store for Business and add them to your inventory.
+- **Acquire apps** - Acquire apps from Microsoft Store and add them to your inventory.
-- **Distribute apps** - Distribute apps that are in your inventory. You can distribute from inventory, private store, or management tool.
+- **Distribute apps** - Distribute apps that are in your inventory. You can distribute from inventory, private store, or use a management tool.
**To assign roles to people**
-1. Sign in to Store for Business.
+1. Sign in to Microsoft Store for Business or Microsoft Store for Education.
>[!Note]
- >You need to be a Global Administrator, or have the Store for Business Admin role to access the **Permissions** page.
+ >You need to be a Global Administrator, or have the Microsoft Store Admin role to access the **Permissions** page.
To assign roles, you need to be a Global Administrator or a Store Administrator.
2. Click **Settings**, and then choose **Permissions**.
- 
+ OR
+
+ Click **Manage**, and then click **Permissions** on the left-hand menu.
+
+
3. Click **Add people**, type a name, choose the role you want to assign, and click **Save** .
- 
-
-4. If you are not finding the name you want, you might need to add people to your Azure AD directory. For more information, see [Manage user accounts in the Windows Store for Business.](manage-users-and-groups-windows-store-for-business.md)
-
-
-
-
-
-
-
+
+4. If you don't find the name you want, you might need to add people to your Azure AD directory. For more information, see [Manage user accounts in the Microsoft Store for Business and Education](manage-users-and-groups-windows-store-for-business.md).
diff --git a/store-for-business/settings-reference-windows-store-for-business.md b/store-for-business/settings-reference-windows-store-for-business.md
index 8b88eba8e5..08ce28a32e 100644
--- a/store-for-business/settings-reference-windows-store-for-business.md
+++ b/store-for-business/settings-reference-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Settings reference Windows Store for Business (Windows 10)
-description: The Windows Store for Business has a group of settings that admins use to manage the store.
+title: Settings reference Microsoft Store for Business and Education (Windows 10)
+description: The Microsoft Store for Business and Education has a group of settings that admins use to manage the store.
ms.assetid: 34F7FA2B-B848-454B-AC00-ECA49D87B678
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,7 +10,7 @@ author: TrudyHa
localizationpriority: high
---
-# Settings reference: Windows Store for Business
+# Settings reference: Microsoft Store for Business and Education
**Applies to**
@@ -18,17 +18,20 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-The Windows Store for Business has a group of settings that admins use to manage the store.
+The Microsoft Store for Business and Education has a group of settings that admins use to manage the store.
+
+| Setting | Description | Location under **Manage** |
+| ------- | ----------- | ------------------------------ |
+| Account information and payment options | Manage organization and payment option information. For more information, see [Manage settings for the Microsoft Store for Business and Education](manage-settings-windows-store-for-business.md).| **Payments & billing** |
+| Private store | Update the name for your private store. The new name will be displayed on a tab in the Store. For more information, see [Manage private store settings](manage-private-store-settings.md). | **Store settings** |
+| Offline licensing | Configure whether or not to make offline-licensed apps available in the Microsoft Store for Business and Education. For more information, see [Distribute offline apps](distribute-offline-apps.md). | **Store settings** (Private store tab) |
+| Management tools | Management tools that are synced with Azure AD are listed on this page. You can choose one to use for managing app updates and distribution. For more information, see [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md). | **Store settings** |
+| Device Guard signing | Use the Device Guard signing portal to add unsigned apps to a code integrity policy, or to sign code integrity policies. For more information, see [Device Guard signing portal](device-guard-signing-portal.md). | **Store settings** |
+| Permissions | Manage permissions for your employees. For more information, see [Roles and permissions in the Microsoft Store for Business and Education](roles-and-permissions-windows-store-for-business.md). | **Permissions** |
+| Line-of-business (LOB) publishers | Invite devs to become LOB publishers for your organization. Existing LOB publishers are listed on the page, and you can deactivate or invite them again. For more information, see [Work with line-of-business apps](working-with-line-of-business-apps.md). | **Permissions** |
+
+
-| | |
-|----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| Setting | Description |
-| Account information | Manage organization and payment option information. For more information, see [Manage settings for the Windows Store for Business](manage-settings-windows-store-for-business.md).
Configure whether or not to make offline-licensed apps available in the Store for Business. For more information, see [Distribute offline apps](distribute-offline-apps.md).|
-| Device Guard signing | Use the Device Guard signing portal to add unsigned apps to a code integrity policy, or to sign code integrity policies. For more information, see [Device Guard signing portal](device-guard-signing-portal.md). |
-| LOB publishers | Invite devs to become LOB publishers for your organization. Existing LOB publishers are listed on the page, and you can deactivate or invite them again. For more information, see [Work with line-of-business apps](working-with-line-of-business-apps.md). |
-| Management tools | Management tools that are synced with Azure AD are listed on this page. You can choose one to use for managing app updates and distribution. For more information, see [Configure MDM provider](configure-mdm-provider-windows-store-for-business.md). |
-| Permissions | Manage permissions for your employees. For more information, see [Roles and permissions in the Windows Store for Business](roles-and-permissions-windows-store-for-business.md). |
-| Private store | Update the name for your private store. The new name will be displayed on a tab in the Store. For more information, see [Manage private store settings](manage-private-store-settings.md). |
diff --git a/store-for-business/sign-code-integrity-policy-with-device-guard-signing.md b/store-for-business/sign-code-integrity-policy-with-device-guard-signing.md
index 96a6b5344b..75d490b304 100644
--- a/store-for-business/sign-code-integrity-policy-with-device-guard-signing.md
+++ b/store-for-business/sign-code-integrity-policy-with-device-guard-signing.md
@@ -12,7 +12,6 @@ localizationpriority: high
# Sign code integrity policy with Device Guard signing
-
**Applies to**
- Windows 10
@@ -21,35 +20,19 @@ localizationpriority: high
Signing code integrity policies prevents policies from being tampered with after they're deployed. You can sign code integrity policies with the Device Guard signing portal.
## Sign your code integrity policy
-
-
Before you get started, be sure to review these best practices:
**Best practices**
-- Test your code integrity policies on a group of devices before deploying them to a large group of devices.
-
-- Use rule options 9 and 10 during testing. For more information, see the section Code integrity policy rules in the [Device Guard deployment guide](https://technet.microsoft.com/library/mt463091.aspx).
+- Test your code integrity policies on a group of devices before deploying them to a large group of devices.
+- Use rule options 9 and 10 during testing. For more information, see the section Code integrity policy rules in the [Device Guard deployment guide](https://technet.microsoft.com/library/mt463091.aspx).
**To sign a code integrity policy**
-1. Sign in to the Windows Store for Business
-
-2. Click **Settings**, and then choose **Device Guard signing**.
-
+1. Sign in to the [Store for Business](http://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, click **Store settings**, and then click **Device Guard**.
3. Click **Upload** to upload your code integrity policy.
-
4. After the files are uploaded, click **Sign** to sign the code integrity policy.
-
5. Click **Download** to download the signed code integrity policy.
- When you sign a code integrity policy with the Device Guard signing portal, the signing certificate is added to the policy. This means you can't modify this policy. If you need to make changes, make them to an unsigned version of the policy, and then resign the policy.
-
-
-
-
-
-
-
-
-
+ When you sign a code integrity policy with the Device Guard signing portal, the signing certificate is added to the policy. This means you can't modify this policy. If you need to make changes, make them to an unsigned version of the policy, and then resign the policy.
\ No newline at end of file
diff --git a/store-for-business/sign-up-windows-store-for-business-overview.md b/store-for-business/sign-up-windows-store-for-business-overview.md
index 5a85ddec8a..b96261fb90 100644
--- a/store-for-business/sign-up-windows-store-for-business-overview.md
+++ b/store-for-business/sign-up-windows-store-for-business-overview.md
@@ -1,6 +1,6 @@
---
title: Sign up and get started (Windows 10)
-description: IT admins can sign up for the Windows Store for Business, and get started working with apps.
+description: IT admins can sign up for the Microsoft Store for Business or Microsoft Store for Education and get started working with apps.
ms.assetid: 87C6FA60-3AB9-4152-A85C-6A1588A20C7B
ms.prod: w10
ms.mktglfcycl: manage
@@ -12,58 +12,22 @@ localizationpriority: high
# Sign up and get started
-
**Applies to**
- Windows 10
- Windows 10 Mobile
-IT admins can sign up for the Windows Store for Business, and get started working with apps.
+IT admins can sign up for the Microsoft Store for Business and Education, and get started working with apps.
## In this section
-
-
-
-
-
-
-
-
-
-
-
-[Windows Store for Business overview](windows-store-for-business-overview.md) |
-Learn about Windows Store for Business. |
-
-
-[Prerequisites for Windows Store for Business](prerequisites-windows-store-for-business.md) |
-There are a few prerequisites for using Store for Business. |
-
-
-[Sign up for Windows Store for Business](sign-up-windows-store-for-business.md) |
-Before you sign up for Store for Business, at a minimum, you'll need an Azure Active Directory (AD) account for your organization, and you'll need to be the global administrator for your organization. If your organization is already using Azure AD, you can go ahead and sign up for Store for Business. If not, we'll help you create an Azure AD account and directory as part of the sign up process. |
-
-
-[Roles and permissions in the Windows Store for Business](roles-and-permissions-windows-store-for-business.md) |
-The first person to sign in to Store for Business must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees. |
-
-
-[Settings reference: Windows Store for Business](settings-reference-windows-store-for-business.md) |
-The Store for Business has a group of settings that admins use to manage the store. |
-
-
-
-
-
-
-
-
-
-
+| Topic | Description |
+| ----- | ----------- |
+| [Microsoft Store for Business and Education overview](windows-store-for-business-overview.md) | Learn about Microsoft Store for Business. |
+| [Prerequisites for Microsoft Store for Business and Education](prerequisites-windows-store-for-business.md) | There are a few prerequisites for using Microsoft Store for Business and Education. |
+| [Sign up for Microsoft Store for Business or Microsoft Store for Education](sign-up-windows-store-for-business.md) | Before you sign up for Store for Business and Education, at a minimum, you'll need an Azure Active Directory (AD) or Office 365 account for your organization, and you'll need to be the global administrator for your organization. If your organization is already using Azure AD, you can go ahead and sign up for Store for Business. If not, we'll help you create an Azure AD or Office 365 account and directory as part of the sign up process. |
+| [Roles and permissions in the Microsoft Store for Business and Education](roles-and-permissions-windows-store-for-business.md) | The first person to sign in to Microsoft Store for Business and Education must be a Global Admin of the Azure Active Directory (AD) tenant. Once the Global Admin has signed in, they can give permissions to others employees. |
+| [Settings reference: Microsoft Store for Business and Education](settings-reference-windows-store-for-business.md) | The Microsoft Store for Business and Education has a group of settings that admins use to manage the store. |
diff --git a/store-for-business/sign-up-windows-store-for-business.md b/store-for-business/sign-up-windows-store-for-business.md
index 69d44f17e8..adccdea373 100644
--- a/store-for-business/sign-up-windows-store-for-business.md
+++ b/store-for-business/sign-up-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Sign up for Windows Store for Business (Windows 10)
-description: Before you sign up for Windows Store for Business, at a minimum, you'll need an Azure Active Directory (AD) account for your organization, and you'll need to be the global administrator for your organization.
+title: Sign up for Microsoft Store for Business or Microsoft Store for Education (Windows 10)
+description: Before you sign up for Microsoft Store for Business or Microsoft Store for Education, at a minimum, you'll need an Azure Active Directory (AD) account for your organization, and you'll need to be the global administrator for your organization.
ms.assetid: 296AAC02-5C79-4999-B221-4F5F8CEA1F12
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,7 +10,7 @@ author: TrudyHa
localizationpriority: high
---
-# Sign up for Windows Store for Business
+# Sign up for Microsoft Store for Business or Microsoft Store for Education
**Applies to**
@@ -18,28 +18,28 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Before you sign up for Windows Store for Business, at a minimum, you'll need an Azure Active Directory (AD) account for your organization, and you'll need to be the global administrator for your organization. If your organization is already using Azure AD, you can go ahead and sign up for Store for Business. If not, we'll help you create an Azure AD account and directory as part of the sign up process.
+Before you sign up for Microsoft Store for Business or Microsoft Store for Education, you'll need an Azure Active Directory (AD) or Office 365 account for your organization, and you'll need to be the global administrator for your organization. If your organization is already using Azure AD, you can go ahead and sign up for Microsoft Store for Business or Microsoft Store for Education. If not, we'll help you create an Azure AD or Office 365 account and directory as part of the sign up process.
-## Sign up for Store for Business
+## Sign up for Microsoft Store
-Before signing up for the Store for Business, make sure you're the global administrator for your organization.
+Before signing up for Microsoft Store, make sure you're the global administrator for your organization.
-**To sign up for the Store for Business**
+**To sign up for Microsoft Store**
-1. Go to [https://www.microsoft.com/business-store](https://go.microsoft.com/fwlink/p/?LinkId=691845), and click **Sign up**.
+1. Go to [https://www.microsoft.com/business-store](https://www.microsoft.com/business-store), or [https://www.microsoft.com/education-store](https://www.microsoft.com/education-store) and click **Sign up**.
- - If you start the Store for Business sign up process, and don't have an Azure AD directory for your organization, we'll help you create one. For more info, see [Sign up for Azure AD accounts](#o365-welcome).
+ - If you start the Microsoft Store sign-up process, and don't have an Azure AD directory for your organization, we'll help you create one. For more info, see [Sign up for Azure AD accounts](#o365-welcome).
- If you already have an Azure AD directory, you'll [sign in to Store for Business](#sign-in), and then accept Store for Business terms.
- 
+ 
**To sign up for Azure AD accounts through Office 365 for Business**
- -
Signing up for Store for Business will create an Azure AD directory and global administrator account for you. There are just a few steps.
+ -
Signing up for Microsoft Store will create an Azure AD directory and global administrator account for you. There are just a few steps.
Step 1: About you.
@@ -69,27 +69,26 @@ Before signing up for the Store for Business, make sure you're the global admini
Be sure to save the portal sign-in page and your user ID info. Click **You're ready to go**.
- 
+ 
- At this point, you'll have an Azure AD directory created with one user account. That user account is the global administrator. You can use that account to sign in to Store for Business.
2.
Sign in with your Azure AD account.
- 
+ 
-3.
Read through and accept Store for Business terms.
+3.
Read through and accept Microsoft Store for Business and Education terms.
4. Welcome to the Store for Business. Click **Next** to continue.
- 
+ 
-### Next steps
+## Next steps
-After signing up for Store for Business, you can:
+After signing up for Microsoft Store for Business or Microsoft Store for Education, you can:
-- **Add users to your Azure AD directory**. If you created your Azure AD directory during Store for Business sign up, additional user accounts are required for employees to install apps you assign to them, or to browse the private store. For more information, see [Manage user accounts in Store for Business](manage-users-and-groups-windows-store-for-business.md).
-
-- **Assign roles to employees**. For more information, see [Roles and permissions in the Windows Store for Business](roles-and-permissions-windows-store-for-business.md).
+- **Add users to your Azure AD directory**. If you created your Azure AD directory during sign up, additional user accounts are required for employees to install apps you assign to them, or to browse the private store in Store app. For more information, see [Manage user accounts in Microsoft Store for Business and Education](manage-users-and-groups-windows-store-for-business.md).
+- **Assign roles to employees**. For more information, see [Roles and permissions in the Microsoft Store for Business and Education](roles-and-permissions-windows-store-for-business.md).
diff --git a/store-for-business/troubleshoot-windows-store-for-business.md b/store-for-business/troubleshoot-windows-store-for-business.md
index d0a9381cf9..5ea7623579 100644
--- a/store-for-business/troubleshoot-windows-store-for-business.md
+++ b/store-for-business/troubleshoot-windows-store-for-business.md
@@ -1,6 +1,6 @@
---
-title: Troubleshoot Windows Store for Business (Windows 10)
-description: Troubleshooting topics for Windows Store for Business.
+title: Troubleshoot Microsoft Store for Business (Windows 10)
+description: Troubleshooting topics for Microsoft Store for Business.
ms.assetid: 243755A3-9B20-4032-9A77-2207320A242A
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,24 +10,19 @@ author: TrudyHa
localizationpriority: high
---
-# Troubleshoot Windows Store for Business
-
+# Troubleshoot Microsoft Store for Business
**Applies to**
- Windows 10
- Windows 10 Mobile
-Troubleshooting topics for Windows Store for Business.
+Troubleshooting topics for Microsoft Store for Business.
## Can't find apps in private store
-
-
The private store for your organization is a page in the Windows Store app that contains apps that are private to your organization. After your organization acquires an app, your Store for Business admin can add it to your organization's private store. Your private store usually has a name that is close to the name of your organization or company. If you can't see your private store, there are a couple of things to check:
-
-- **No apps in the private store** - The private store page is only available in the Windows Store app if there are apps added to your private store. You won't see your private store page with no apps listed on it. If your Store for Business admin has added an app to the private store, and the private store page is still not available, they can check the private store status for the app on the **Inventory** page. If the status is **Add in progress**, wait and check back.
-
-- **Signed in with the wrong account** - If you have multiple accounts that you use in your organization, you might be signed in with the wrong account. Or, you might not be signed in. Use this procedure to sign in with your organization account.
+- **No apps in the private store** - The private store page is only available in the Windows Store app if there are apps added to your private store. You won't see your private store page with no apps listed on it. If your Store for Business admin has added an app to the private store, and the private store page is still not available, they can check the private store status for the app on the **Inventory** page. If the status is **Add in progress**, wait and check back.
+- **Signed in with the wrong account** - If you have multiple accounts that you use in your organization, you might be signed in with the wrong account. Or, you might not be signed in. Use this procedure to sign in with your organization account.
**To sign in with organization account in Windows Store app**
diff --git a/store-for-business/update-windows-store-for-business-account-settings.md b/store-for-business/update-windows-store-for-business-account-settings.md
index 43a9468143..56aaa46e30 100644
--- a/store-for-business/update-windows-store-for-business-account-settings.md
+++ b/store-for-business/update-windows-store-for-business-account-settings.md
@@ -1,6 +1,6 @@
---
-title: Update Windows Store for Business account settings (Windows 10)
-description: The Account information page in Windows Store for Business shows information about your organization that you can update, including country or region, organization name, default domain, and language preference.
+title: Update Microsoft Store for Business and Microsoft Store for Education account settings (Windows 10)
+description: The Account information page in Microsoft Store for Business and Microsoft Store for Education shows information about your organization that you can update, including country or region, organization name, default domain, and language preference.
ms.prod: w10
ms.mktglfcycl: manage
ms.sitesec: library
@@ -9,27 +9,30 @@ author: TrudyHa
localizationpriority: high
---
-# Update Windows Store for Business account settings
-
+# Update Microsoft Store for Business and Microsoft Store for Education account settings
**Applies to**
- Windows 10
- Windows 10 Mobile
-The **Account information** page in Windows Store for Business allows you to manage organization information, payment options, and offline licensing settings. The organization information and payment options are required before you can acquire apps that have a price.
+The **Payments & billing** page in Microsoft Store for Business allows you to manage organization information, billing information, and payment options. The organization information and payment options are required before you can acquire apps that have a price.
## Organization information
-We’ll need your business address, email contact, and tax-exemption certificates that apply to your country or locale.
+We need your business address, email contact, and tax-exemption certificates that apply to your country or locale.
-**Business address and email contact**
Before purchasing apps that have a fee, you need to add or update your organization's business address, and contact email address .
+### Business address and email contact
-We use the Business address to calculate sales tax. If your organization's address has already been entered for other commercial purchases through the Microsoft Store, or through other online purchases such as Office 365 or Azure subscriptions, then we’ll use the same address in the Windows Store for Business. If we don’t have an address,we’ll ask you to enter it during your first purchase.
+Before purchasing apps that have a fee, you need to add or update your organization's business address, and contact email address.
-We need an email address in case we need to contact you about your Store for Business account. This email account should reach the admin for your organization’s O365 or Azure AD tenant that is used with Store for Business.
+We use the Business address to calculate sales tax. If your organization's address has already been entered for other commercial purchases through the Microsoft Store, or through other online purchases such as Office 365 or Azure subscriptions, then we’ll use the same address in the Microsoft Store for Business and Microsoft Store for Education. If we don’t have an address, we’ll ask you to enter it during your first purchase.
-To update Organization information, click **Edit organization information**.
+We need an email address in case we need to contact you about your Microsoft Store for Business and Education account. This email account should reach the admin for your organization’s Office 365 or Azure AD tenant that is used with Microsoft Store.
+
+**To update Organization information**
+1. Sign in to the [Store for Business](http://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com)
+2. Click **Manage**, click **Payments & billing**, and then click **Edit**.
## Organization tax information
Taxes for Windows Store for Business purchases are determined by your business address. Businesses in these countries can provide their VAT number or local equivalent:
@@ -58,7 +61,7 @@ Taxes for Windows Store for Business purchases are determined by your business a
- Switzerland
- United Kingdom
-These countries can provide their VAT number or local equivalent in **Account information**. However, they can only acquire free apps.
+These countries can provide their VAT number or local equivalent in **Payments & billing**. However, they can only acquire free apps.
|Market| Tax identifier |
|------|----------------|
@@ -66,8 +69,7 @@ These countries can provide their VAT number or local equivalent in **Account in
| India | CST ID, VAT ID |
| Taiwan | Unified business number|
-
-**Tax-exempt status**
+### Tax-exempt status
If you qualify for tax-exempt status in your market, start a service request to establish tax exempt status for your organization.
@@ -85,7 +87,7 @@ You’ll need this documentation:
| International organizations that hold tax exaemption | Certification / letter confirmation from local tax authorities |
-**Calculating tax**
+### Calculating tax
Sales taxes are calculated against the unit price, and then aggregated.
@@ -98,34 +100,34 @@ For example:
## Payment options
You can purchase apps from the Windows Store for Business using your credit card. You can enter your credit card information on Account Information, or when you purchase an app. We currently accept these credit cards:
-1. VISA
-2. MasterCard
-3. Discover
-4. American Express
-5. Japan Commercial Bureau (JCB)
+1. VISA
+2. MasterCard
+3. Discover
+4. American Express
+5. Japan Commercial Bureau (JCB)
> [!NOTE]
> Not all cards available in all countries. When you add a payment option, Store for Business shows which cards are available in your region.
**To add a new payment option**
-1. Sign in to [Store for Business](http://businessstore.microsoft.com).
-2. Click **Manage**, and then click **Account information**.
-3. Under **My payment options**, tap or click **Show my payment options**, and then select the type of credit card that you want to add.
-4. Add information to any required fields, and then click **Next**.
+1. Sign in to the [Store for Business](http://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, and then click **Payments & billing**.
+3. Under **Payment options**, click **Show my payment options**, and then select the type of credit card that you want to add.
+4. Add information to any required fields, and then click **Next**.
Once you click Next, the information you provided will be validated with a test authorization transaction and, if validated, the payment option will be added to your list of available payment options. Otherwise, you will be prompted for additional information or notified if there are any problems.
> [!NOTE]
-> When adding credit or debit cards, you may be prompted to enter a CVV . The CVV is only used for verification purposes and is not stored in our systems after validation
+> When adding credit or debit cards, you may be prompted to enter a CVV. The CVV is only used for verification purposes and is not stored in our systems after validation.
**To update a payment option**
-1. Sign in to [Store for Business](http://businessstore.microsoft.com).
-2. Click **Manage**, and then click **Account information**.
-3. Under **My payment options** > **Credit Cards**, select the payment option that you want to update, and then click **Update**.
-4. Enter any updated information in the appropriate fields, and then click **Next**.
-Once you click **Next**, the information you provided will be validated with a test authorization transaction and, if validated, the payment option will be added to your list of available payment options. Otherwise, you will be prompted for additional information or notified if there are any problems.
+1. Sign in to the [Store for Business](http://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, and then click **Payments & billng**.
+3. Under **Payment options** > **Show my payment options**, select the payment option that you want to update, and then click **Update**.
+4. Enter any updated information in the appropriate fields, and then click **Next**.
+Once you click **Next**, the information you provided will be validated with a test authorization transaction and, if validated, the payment option will be added to your list of available payment options. Otherwise,you will be prompted for additional information or notified if there are any problems.
> [!NOTE]
> Certain actions, like updating or adding a payment option, require temporary “test authorization” transactions to validate the payment option. These may appear on your statement as $0.00 authorizations or as small pending transactions. These transactions are temporary and should not impact your account unless you make several changes in a short period of time, or have a low balance.
@@ -138,9 +140,9 @@ Admins can decide whether or not offline licenses are shown for apps in Windows
**To set offline license visibility**
-1. Sign in to [Store for Business](http://businessstore.microsoft.com).
-2. Click **Manage**, and then click **Account information**.
-3. Under **Offline licensing**, click **Show offline licensed apps to people shopping in the store** to show availability for both online and offline licenses.
+1. Sign in to the [Store for Business](http://businessstore.microsoft.com) or [Store for Education](https://educationstore.microsoft.com).
+2. Click **Manage**, and then click **Payments & billing**.
+3. Under **Offline licensing**, click **Show offline licensed apps to people shopping in the store** to show availability for both online and offline licenses.
You have the following distribution options for offline-licensed apps:
- Include the app in a provisioning package, and then use it as part of imaging a device.
diff --git a/store-for-business/windows-store-for-business-overview.md b/store-for-business/windows-store-for-business-overview.md
index fa37237c48..5640ea1f23 100644
--- a/store-for-business/windows-store-for-business-overview.md
+++ b/store-for-business/windows-store-for-business-overview.md
@@ -1,6 +1,6 @@
---
-title: Windows Store for Business overview (Windows 10)
-description: With the new Windows Store for Business, organizations can make volume purchases of Windows apps.
+title: Microsoft Store for Business and Microsoft Store for Education overview (Windows 10)
+description: With Microsoft Store for Business and Microsoft Store for Education, organizations and schools can make volume purchases of Windows apps.
ms.assetid: 9DA71F6B-654D-4121-9A40-D473CC654A1C
ms.prod: w10
ms.pagetype: store, mobile
@@ -10,40 +10,36 @@ author: TrudyHa
localizationpriority: high
---
-# Windows Store for Business overview
-
+# Microsoft Store for Business and Microsoft Store for Education overview
**Applies to**
- Windows 10
- Windows 10 Mobile
-With Windows Store for Business, organizations can make volume purchases of Windows apps. The Store for Business provides app purchases based on organizational identity, flexible distribution options, and the ability to reclaim or re-use licenses. Organizations can also use the Store for Business to create a private store for their employees that includes apps from the Store, as well private Line-of-Business (LOB) apps.
+Designed for organizations, Microsoft Store for Business and Microsoft Store for Education gives IT decision makers and administrators in businesses or schools a flexible way to find, acquire, manage, and distribute free and paid apps in select markets to Windows 10 devices in volume. IT administrators can manage Windows Store apps and private line-of-business apps in one inventory, plus assign and re-use licenses as needed. You can choose the best distribution method for your organization: directly assign apps to individuals and teams, publish apps to private pages in Windows Store, or connect with management solutions for more options.
## Features
+Organizations of any size can benefit from using the Microsoft Store:
+- **Scales to fit the size of your business** - For smaller businesses, with Azure AD accounts or Office 365 accounts and Windows 10 devices, you can quickly have an end-to-end process for acquiring and distributing content using the Store for Business. For larger businesses, all the capabilities of the Store for Business are available to you, or you can integrate the Store for Business with management tools, for greater control over access to apps and app updates. You can use existing work or school accounts.
+- **Bulk app acquisition** - Acquire apps in volume from the Store for Business.
+- **Centralized management** – Microsoft Store provides centralized management for inventory, billing, permissions, and order history. You can use Microsoft Store to view, manage and distribute items purchased from:
+ - **Microsoft Store for Business** – Apps and subscriptions
+ - **Microsoft Store for Education** – Apps and subscriptions
+ - **Office 365** – Subscriptions
+ - **Volume licensing** - Apps purchased with volume licensing
+- **Private store** - Curate a private store for your business that’s easily available from any Windows 10 device. Your private store is available from Windows Store app, or with a browser on the Web. People in your organization can download apps from the private store on Windows 10 devices.
+- **Flexible distribution options** - Flexible options for distributing content and apps to your employee devices:
+ - Distribute through Store for Business services. You can assign apps to individual employees, or make apps available to all employees in your private store.
+ - Use a management tool from Microsoft, or a 3rd-party tool for advanced distribution and management functions, or for managing images.
+ - Offline licensing model allows you to distribute apps without connecting to Store services, and for managing images.
+- **Line-of-business apps** - Privately add and distribute your internal line-of-business apps using any of the distribution options.
+- **App license management**: Admins can reclaim and reuse app licenses. Online and offline licenses allow you to customize how you decide to deploy apps.
+- **Up-to-date apps** - Microsoft Store manages the update process for apps with online licenses. Apps are automatically updated so you are always current with the most recent software updates and product features. Store for Business apps also uninstall cleanly, without leaving behind extra files, for times when you need to switch apps for specific employees.
+- **Office app launcher** Office apps while working with Store for Business.
+- **Find a partner** – Microsoft Store allows businesses to search and find a Microsoft Partner who can assist you with Microsoft solutions for your business.
-Organizations of any size can benefit from using the Store for Business:
-
-- **Scales to fit the size of your business** - For smaller businesses, with Azure AD accounts and Windows 10 devices, you can quickly have an end-to-end process for acquiring and distributing content using the Store for Business. For larger businesses, all the capabilities of the Store for Business are available to you, or you can integrate the Store for Business with management tools, for greater control over access to apps and app updates. You can use existing work or school accounts.
-
-- **Bulk app acquisition** - Acquire apps in volume from the Store for Business.
-
-- **Private store** - Curate a private store for your business that’s easily available from any Windows 10 device.
-
-- **Flexible distribution options** - Flexible options for distributing content and apps to your employee devices:
-
- - Distribute through Store for Business services. You can assign apps to individual employees, or make apps available to all employees in your private store.
-
- - Use a management tool from Microsoft, or a 3rd-party tool for advanced distribution and management functions, or for managing images.
-
- - Offline licensing model allows you to distribute apps without connecting to Store services, and for managing images.
-
-- **Line-of-business apps** - Privately add and distribute your internal line-of-business apps using any of the distribution options.
-
-- **App license management**: Admins can reclaim and reuse app licenses. Online and offline licenses allow you to customize how you decide to deploy apps.
-
-- **Up-to-date apps** - The Store for Business manages the update process for apps with online licenses. Apps are automatically updated so you are always current with the most recent software updates and product features. Store for Business apps also uninstall cleanly, without leaving behind extra files, for times when you need to switch apps for specific employees.
## Prerequisites
@@ -51,19 +47,17 @@ You'll need this software to work with the Store for Business.
### Required
-- IT Pros that are administering Store for Business need a browser compatible with Store for Business running on a PC or mobile device. Supported browsers include: Internet Explorer 10 or later, Microsoft Edge, or current versions of Chrome or Firefox.
+- Admins working with Microsoft Store for Business and Education need a browser compatible with Store for Business running on a PC or mobile device. Supported browsers include: Internet Explorer 10 or later, or current versions of Microsoft Edge, Chrome or Firefox. JavaScript must be supported and enabled.
-- Employees using apps from Store for Business need Windows 10, version 1511 running on a PC or mobile device.
+- Employees using apps from Store for Business need Windows 10, version 1511 running on a PC or mobile device.
Microsoft Azure Active Directory (AD) accounts for your employees:
-- Admins need Azure AD accounts to sign up for the Store for Business, and then to sign in, get apps, distribute apps, and manage app licenses.
-
-- Employees need Azure AD account when they access Store for Business content from Windows devices.
-
-- If you use a management tool to distribute and manage online-licensed apps, all employees will need an Azure AD account
-
-- For offline-licensed apps, Azure AD accounts are not required for employees.
+- Admins need Azure AD accounts to sign up for the Store for Business, and then to sign in, get apps, distribute apps, and manage app licenses.
+- Employees need Azure AD account when they access Store for Business content from Windows devices.
+- If you use a management tool to distribute and manage online-licensed apps, all employees will need an Azure AD account
+- For offline-licensed apps, Azure AD accounts are not required for employees.
+- Admins can add or remove user accounts in the Office 365 admin center, even if you don’t have an Office 365 subscrition. You can access the Office 365 admin portal directly from the Microsoft Store for Business and Eduction.
For more information on Azure AD, see [About Office 365 and Azure Active Directory](https://go.microsoft.com/fwlink/p/?LinkId=708612), and [Intro to Azure: identity and access](https://go.microsoft.com/fwlink/p/?LinkId=708611).
@@ -71,19 +65,19 @@ For more information on Azure AD, see [About Office 365 and Azure Active Directo
While not required, you can use a management tool to distribute and manage apps. Using a management tool allows you to distribute content, scope app availability, and control when app updates are installed. This might make sense for larger organizations that already use a management tool. A couple of things to note about management tools:
-- Need to integrate with Windows 10 management framework and Azure AD.
+- Need to integrate with Windows 10 management framework and Azure AD.
-- Need to sync with the Store for Business inventory to distribute apps.
+- Need to sync with the Store for Business inventory to distribute apps.
## How does the Store for Business work?
-### Sign up!
+## Sign up!
-The first step for getting your organization started with the Store for Business is signing up. To sign up for the Business store, you need an Azure AD account and you must be a Global Administrator for your organization.
+The first step for getting your organization started with the Store for Business is signing up. Sign up using an existing account (the same one you use for Office 365, Dynamics 365, Intune, Azure, etc.) or we’ll quickly create an account for you. You must be a Global Administrator for your organization.
For more information, see [Sign up for the Store for Business](sign-up-windows-store-for-business.md).
-### Set up
+## Set up
After your admin signs up for the Store for Business, they can assign roles to other employees in your company. The admin needs Azure AD User Admin permissions to assign WSFB roles. These are the roles and their permissions.
@@ -92,20 +86,23 @@ After your admin signs up for the Store for Business, they can assign roles to o
| Admin | X | X | X | |
| Purchaser | | X | X | |
| Device Guard signer | | | | X |
+| Basic purchaser | | X | X | |
+
+> [!NOTE]
+> Currently, the Basic purchaser role is only available for schools using Microsoft Store for Education. For more information, see
In some cases, admins will need to add Azure Active Directory (AD) accounts for their employees. For more information, see [Manage user accounts and groups](manage-users-and-groups-windows-store-for-business.md).
Also, if your organization plans to use a management tool, you’ll need to configure your management tool to sync with the Store for Business.
-### Get apps and content
+## Get apps and content
-Once signed in to the Store for Business, you can browse and search for all products in the Store for Business catalog. Some apps are free, and some apps charge a price. We're continuing to add more paid apps to the Store for Business. Check back if you don't see the app that you're looking for. Currently, you can pay for apps with a credit card. We'll be adding more payment options over time.
+Once signed in to the Microsoft Store, you can browse and search for all products in the Store for Business catalog. Some apps are free, and some apps charge a price. We're continuing to add more paid apps to the Store for Business. Check back if you don't see the app that you're looking for. Currently, you can pay for apps with a credit card, and some items can be paid for with an invoice. We'll be adding more payment options over time.
-**App types** -- These app types are supported in the Store for Business:
+**App types** -- These app types are supported in the Microsoft Store for Business:
-- Universal Windows Platform apps
-
-- Universal Windows apps, by device: Phone, Surface Hub, IOT devices, HoloLens
+- Universal Windows Platform apps
+- Universal Windows apps, by device: Phone, Surface Hub, IOT devices, HoloLens
Apps purchased from the Store for Business only work on Windows 10 devices.
@@ -117,55 +114,42 @@ The Business store supports two options to license apps: online and offline. **O
For more information, see [Apps in the Store for Business](apps-in-windows-store-for-business.md#licensing-model).
-### Distribute apps and content
+## Distribute apps and content
App distribution is handled through two channels, either through the Store for Business, or using a management tool. You can use either or both distribution methods in your organization.
**Using the Store for Business** – Distribution options for the Store for Business:
-- Email link – After purchasing an app, admins can send employees a link in an email message. Employees can click the link to install the app.
-
-- Curate private store for all employees – A private store can include content you’ve purchased from the Store, and your line-of-business apps that you’ve submitted to the Store for Business. Apps in your private store are available to all of your employees. They can browse the private store and install apps when needed.
-
-- To use the options above users must be signed in with an Azure AD account on a Windows 10 device.
+- Email link – After purchasing an app, admins can send employees a link in an email message. Employees can click the link to install the app.
+- Curate private store for all employees – A private store can include content you’ve purchased from the Store, and your line-of-business apps that you’ve submitted to the Store for Business. Apps in your private store are available to all of your employees. They can browse the private store and install apps when needed.
+- To use the options above users must be signed in with an Azure AD account on a Windows 10 device. Licenses are assigned as individuals install apps.
**Using a management tool** – For larger organizations that might want a greater level of control over how apps are distributed and managed, a management tools provides other distribution options:
-- Scoped content distribution – Ability to scope content distribution to specific groups of employees.
+- Scoped content distribution – Ability to scope content distribution to specific groups of employees.
+- Install apps for employees – Employees are not responsible for installing apps. Management tool installs apps for employees.
-- Install apps for employees – Employees are not responsible for installing apps. Management tool installs apps for employees.
-
-Management tools can synchronize content that has been acquired in the Store for Business. If an offline application has been purchased this will also include the app package, license and metadata for the app (like, icons, count, or localized product descriptions). Using the metadata, management tools can enable portals or apps as a destination for employees to acquire apps.
+Management tools can synchronize content that has been acquired in the Store for Business. If an offline application has been purchased this will also include the app package, license and metadata for the app (like, icons, count, or localized product descriptions). Using the metadata,management tools can enable portals or apps as a destination for employees to acquire apps.
For more information, see [Distribute apps to your employees from the Store for Business](distribute-apps-to-your-employees-windows-store-for-business.md).
-### Manage Store for Business settings and content
+## Manage Store for Business settings and content
Once you are signed up with the Business store and have purchased apps, Admins can manage Store for Business settings and inventory.
**Manage Store for Business settings**
-
-- Assign and change roles for employees or groups
-
-- Device Guard signing
-
-- Register a management server to deploy and install content
-
-- Manage relationships with LOB publishers
-
-- Manage offline licenses
-
-- Update the name of your private store
+- Assign and change roles for employees or groups
+- Device Guard signing
+- Register a management server to deploy and install content
+- Manage relationships with LOB publishers
+- Manage offline licenses
+- Update the name of your private store
**Manage inventory**
-
-- Assign app licenses to employees
-
-- Reclaim and reassign app licenses
-
-- Manage app updates for all apps, or customize updates for each app. Online apps will automatically update from the Store. Offline apps can be updated using a management server.
-
-- Download apps for offline installs
+- Assign app licenses to employees
+- Reclaim and reassign app licenses
+- Manage app updates for all apps, or customize updates for each app. Online apps will automatically update from the Store. Offline apps can be updated using a management server.
+- Download apps for offline installs
For more information, see [Manage settings in the Store for Business](manage-settings-windows-store-for-business.md) and [Manage apps](manage-apps-windows-store-for-business-overview.md).
@@ -334,22 +318,18 @@ Microsoft Store for Business services get names and email addresses of people in
- Managing app licenses
- Distributing apps to people (names appear in a list that admins can select from)
-Store for Business does not save names, or email addresses.
+Microsoft Store for Business and Education does not save names, or email addresses.
-Your use of Store for Business is also governed by the Store for Business Terms of Use.
+Your use of Microsoft Store for Business and Education is also governed by the [Microsoft Store for Business and Education Services Agreement](https://businessstore.microsoft.com/servicesagreement).
-Information sent to Store for Business is subject to the [Store for Business Privacy Statement](https://privacy.microsoft.com/privacystatement/).
+Information sent to Microsoft Store for Business and Education is subject to the [Microsoft Privacy Statement](https://privacy.microsoft.com/privacystatement/).
##
ISVs and the Store for Business
-
Developers in your organization, or ISVs can create content specific to your organization. In the Store for Business, we call these line-of-business (LOB) apps, and the devs that create them are LOB publishers. The process looks like this:
-
-- Admin invites devs to be LOB publishers for your organization. These devs can be internal devs, or external ISVs.
-
-- LOB publishers accept the invitation, develop apps, and submits the app to the Windows Dev Center. LOB publishers use Enterprise associations when submitting the app to make the app exclusive to your organization.
-
-- Admin adds the app to Store for Business inventory.
+- Admin invites devs to be LOB publishers for your organization. These devs can be internal devs, or external ISVs.
+- LOB publishers accept the invitation, develop apps, and submits the app to the Windows Dev Center. LOB publishers use Enterprise associations when submitting the app to make the app exclusive to your organization.
+- Admin adds the app to Store for Business inventory.
Once the app is in inventory, admins can choose how to distribute the app. ISVs creating apps through the dev center can make their apps available in the Store for Business. ISVs can opt-in their apps to make them available for offline licensing. Apps purchased in the Store for Business will work only on Windows 10.
diff --git a/store-for-business/working-with-line-of-business-apps.md b/store-for-business/working-with-line-of-business-apps.md
index e6fff0c3bc..f991c3a1e0 100644
--- a/store-for-business/working-with-line-of-business-apps.md
+++ b/store-for-business/working-with-line-of-business-apps.md
@@ -1,6 +1,6 @@
---
title: Working with line-of-business apps (Windows 10)
-description: Your company can make line-of-business (LOB) applications available through Windows Store for Business. These apps are custom to your company – they might be internal business apps, or apps specific to your business or industry.
+description: Your company or school can make line-of-business (LOB) applications available through Microsoft Store for Business or Microsoft Store for Education. These apps are custom to your organization – they might be internal business apps, or apps specific to your school, business, or industry.
ms.assetid: 95EB7085-335A-447B-84BA-39C26AEB5AC7
ms.prod: w10
ms.mktglfcycl: manage
@@ -17,16 +17,17 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Your company can make line-of-business (LOB) applications available through Windows Store for Business. These apps are custom to your company – they might be internal business apps, or apps specific to your business or industry.
+Your company or school can make line-of-business (LOB) applications available through Microsoft Store for Business or Microsoft Store for Education. These apps are custom to your school or organization – they might be internal apps, or apps specific to your school,business, or industry.
-Developers within your own company, or ISVs that you invite, can become LOB publishers and submit apps to the Windows Store for your company. Once a LOB publisher submits an app for your company, the app is only available to your company. LOB publishers submit apps through the Windows Dev Center using the same process as all apps that are in the Store, and then can be managed or deployed using the same process as any other app that has been acquired through the Store.
+Developers within your organization, or ISVs that you invite, can become LOB publishers and submit apps to Microsoft Store for your company or school. Once an LOB publisher submits an app for your company, the app is only available to your company. LOB publishers submit apps through the Windows Dev Center using the same process as all apps that are in the Store, and then can be managed or deployed using the same process as any other app that has been acquired through the Store.
-One advantage of making apps available through Store for Business is that the app has been signed by the Store, and uses the standard Store policies. For companies that can’t submit their application through the Windows Dev Center (for example, those needing additional capabilities or due to compliance purposes), [Sideloading](https://go.microsoft.com/fwlink/p/?LinkId=623433) is also supported in Windows 10.
+One advantage of making apps available through Microsoft Store is that the app has been signed by the Store, and uses the standard Store policies. For organizations that can’t submit their application through the Windows Dev Center (for example, those needing additional capabilities or due to compliance purposes), [Sideloading](https://go.microsoft.com/fwlink/p/?LinkId=623433) is also supported in Windows 10.
##
Adding LOB apps to your private store
+Admins and ISVs each own different parts of the process for getting LOB apps created, submitted, and deployed to your employees or students. Admins use the Store for Business portal; ISVs or devs use the Windows Dev center on MSDN.
-Your Store for Business admin and ISV each own different parts of the process for getting LOB apps created, submitted, and deployed to your employees. They’ll use the Store for Business portal, and the Windows Dev center on MSDN. Here’s what’s involved:
+Here’s what’s involved:
- The Store for Business admin invites a developer or ISV to become an LOB publisher for your company.
@@ -34,26 +35,27 @@ Your Store for Business admin and ISV each own different parts of the process fo
- The Store for Business admin accepts the app and can distribute the app to employees in your company.
-What you'll have to set up:
+You'll need to set up:
-- Your company needs to be signed up with Store for Business.
+- Your company needs to be signed up with Microsoft Store for Business or Microsoft Store for Education.
- LOB publishers need to have an active developer account. To learn more about account options, see [Ready to sign up](https://go.microsoft.com/fwlink/p/?LinkId=623432).
- LOB publishers need to have an app in the Store, or have an app ready to submit to the Store.
-###
Add an LOB publisher (Store for Business Admin)
+##
Add an LOB publisher (Admin)
-For developers within your own organization, or ISVs you're working with to create LOB apps, you'll need to invite them to become a LOB publisher.
+Admins need to invite developer or ISVs to become an LOB publisher.
**To invite a developer to become an LOB publisher**
1. Sign in to the [Windows Store for Business]( https://go.microsoft.com/fwlink/p/?LinkId=623531).
-2. Click **Settings**, and then choose **LOB publishers**.
-3. On the Line-of business publishers page, click **Add** to complete a form and send an email invitation to a developer.
-**Note** This needs to be the email address listed in contact info for the developer account.
-
-###
Submit apps (LOB publisher)
+2. Click **Manage**, click **Permissions**, and then choose **Line-of-business publishers**.
+3. On the Line-of business publishers page, click **Invite** to send an email invitation to a developer.
+ >[!Note]
+ > This needs to be the email address listed in contact info for the developer account.
+
+##
Submit apps (LOB publisher)
The developer receives an email invite to become an LOB publisher for your company. Once they accept the invite, they can log in to the Windows Dev Center to create an app submission for your company. The info here assumes that devs or ISVs have an active developer account.
@@ -80,17 +82,19 @@ After an app is published and available in the Store, ISVs publish an updated ve
5. Click **Save** to save your changes and start the app submission process.
For more information, see [Organizational licensing options]( https://go.microsoft.com/fwlink/p/?LinkId=708615) and [Distributing LOB apps to enterprises](https://go.microsoft.com/fwlink/p/?LinkId=627543).
-**Note** In order to get the LOB app, the organization must be located in a [supported market](https://technet.microsoft.com/itpro/windows/whats-new/windows-store-for-business-overview#supported-markets), and you must not have excluded that market when submitting your app.
+
+ >[!Note]
+ > In order to get the LOB app, the organization must be located in a [supported market](https://technet.microsoft.com/itpro/windows/whats-new/windows-store-for-business-overview#supported-markets), and you must not have excluded that market when submitting your app.
-###
Add app to inventory (admin)
+##
Add app to inventory (admin)
-After an ISV submits the LOB app for your company, the Store for Businessadmin needs to accept the app.
+After an ISV submits the LOB app for your company or school, someone with Microsoft Store for Business and Eduction admin permissions needs to accept the app.
**To add the LOB app to your inventory**
1. Sign in to the Store for Business.
-2. Click **Manage**, and then choose **New LOB apps**.
-3. Click the ellipses under **Action** for the app you want to add to your inventory, and then choose **add to inventory**.
+2. Click **Manage**, click **Apps & Software**, and then choose **New LOB apps**.
+3. Click the ellipses under **Action** for the app you want to add to your inventory, and then choose **Add to inventory**.
After you add the app to your inventory, you can choose how to distribute the app. For more information, see:
diff --git a/windows/access-protection/credential-guard/credential-guard-known-issues.md b/windows/access-protection/credential-guard/credential-guard-known-issues.md
index 5499b6cfdd..b9cacf0bc7 100644
--- a/windows/access-protection/credential-guard/credential-guard-known-issues.md
+++ b/windows/access-protection/credential-guard/credential-guard-known-issues.md
@@ -15,20 +15,56 @@ author: brianlic-msft
- Windows 10
- Windows Server 2016
-Credential Guard has certain requirements for applications. Credential Guard blocks specific authentication capabilities. Therefore applications that require such capabilities will not function when Credential Guard is enabled. For further information, see [Application requirements](https://docs.microsoft.com/en-us/windows/access-protection/credential-guard/credential-guard-requirements#application-requirements).
+Credential Guard has certain application requirements. Credential Guard blocks specific authentication capabilities. Therefore applications that require such capabilities will not function when Credential Guard is enabled. For further information, see [Application requirements](https://docs.microsoft.com/en-us/windows/access-protection/credential-guard/credential-guard-requirements#application-requirements).
The following known issues have been fixed by servicing releases made available in the Cumulative Security Updates for April 2017:
-• KB4015217: [Credential Guard generates double bad password count on Active Directory domain-joined Windows 10 machines](https://support.microsoft.com/en-us/help/4015217/windows-10-update-kb4015217)
+- KB4015217: [Credential Guard generates double bad password count on Active Directory domain-joined Windows 10 machines](https://support.microsoft.com/en-us/help/4015217/windows-10-update-kb4015217)
-This issue can potentially lead to unexpected account lockouts.
+ This issue can potentially lead to unexpected account lockouts.
See also Knowledge Base articles [KB4015219](https://support.microsoft.com/en-us/help/4015219/windows-10-update-kb4015219) and
-[KB4015221](https://support.microsoft.com/en-us/help/4015221/windows-10-update-kb4015221).
+[KB4015221](https://support.microsoft.com/en-us/help/4015221/windows-10-update-kb4015221)
-In addition, products that connect to Virtualization Based Security (VBS) protected processes can cause Credential Guard-enabled Windows 10 clients to exhibit high CPU utilization. For further information, see the following Knowledge Base articles:
+The following issue is under investigation. For available workarounds, see the following Knowledge Base article:
+- [Installing AppSense Environment Manager on Windows 10 machines causes LsaIso.exe to exhibit high CPU usage when Credential Guard is enabled](http://www.appsense.com/kb/160525073917945) *
-• KB88869: [Windows 10 machines exhibit high CPU usage with McAfee Application and Change Control (MACC) installed when Credential Guard is enabled](https://kc.mcafee.com/corporate/index?page=content&id=KB88869)
+ *Registration required to access this article.
-• [Installing AppSense Environment Manager on Windows 10 machines causes LsaIso.exe to exhibit high CPU usage when Credential Guard is enabled](http://www.appsense.com/kb/160525073917945) *
+- [Blue screen on Windows 10 computers running Device Guard and Credential Guard with Cisco Anyconnect 4.3.04027](https://quickview.cloudapps.cisco.com/quickview/bug/CSCvc66692)**
- *Registration required to access this article.
+ **Registration required to access this article.
+
+Products that connect to Virtualization Based Security (VBS) protected processes can cause Credential Guard-enabled Windows 10 clients to exhibit high CPU usage. For further information, see the following Knowledge Base articles:
+
+- KB88869: [Windows 10 machines exhibit high CPU usage with McAfee Application and Change Control (MACC) installed when Credential Guard is enabled](https://kc.mcafee.com/corporate/index?page=content&id=KB88869)
+
+
+- Windows 10 machines exhibit high CPU usage with Citrix applications installed when Credential Guard is enabled.
+
+ Microsoft is currently working with Citrix to investigate this issue.
+
+
+## Vendor support
+
+- [Citrix Support for Secure Boot](https://www.citrix.com/blogs/2016/12/08/windows-server-2016-hyper-v-secure-boot-support-now-available-in-xenapp-7-12/)
+
+Credential Guard is not supported by either these products, products versions, computer systems, or Windows 10 versions:
+
+- For Credential Guard on Windows 10 with McAfee Encryption products, see:
+[Support for Device Guard and Credential Guard on Windows 10 with McAfee encryption products](https://kc.mcafee.com/corporate/index?page=content&id=KB86009)
+
+- For Credential Guard on Windows 10 with Check Point Endpoint Security Client, see:
+[Check Point Endpoint Security Client support for Microsoft Windows 10 Credential Guard and Device Guard features](https://supportcenter.checkpoint.com/supportcenter/portal?eventSubmit_doGoviewsolutiondetails=&solutionid=sk113912)
+
+- For Credential Guard on Windows 10 with VMWare Workstation
+[Windows 10 host fails when running VMWare Workstation when Credential Guard is enabled](https://kb.vmware.com/selfservice/microsites/search.do?language=en_US&cmd=displayKC&externalId=2146361)
+
+- For Credential Guard on Windows 10 with specific versions of the Lenovo ThinkPad
+[ThinkPad support for Device Guard and Credential Guard in Microsoft Windows 10 – ThinkPad](https://support.lenovo.com/in/en/solutions/ht503039)
+
+- For Credential Guard on Windows 10 with Symantec Endpoint Protection
+[Windows 10 with Credential Guard and Symantec Endpoint Protection 12.1](https://www.symantec.com/connect/forums/windows-10-device-guard-credentials-guard-and-sep-121)
+
+ This is not a comprehensive list. Check whether your product vendor, product version, or computer system, supports Credential guard on systems that run Windows 10 or specific versions of Windows 10. Specific computer system models may be incompatible with Credential Guard.
+
+ Microsoft encourages third-party vendors to contribute to this page by providing relevant product support information and by adding links to their own product support statements.
\ No newline at end of file
diff --git a/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password.md b/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password.md
index 00ead3c640..1aa658b96a 100644
--- a/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password.md
+++ b/windows/access-protection/hello-for-business/hello-why-pin-is-better-than-password.md
@@ -48,7 +48,7 @@ The Windows Hello for Business PIN is subject to the same set of IT management p
## What if someone steals the laptop or phone?
-To compromise a Windows Hello credential that TPM protects, an attacker must have access to the physical device, and then must find a way to spoof the user’s biometrics or guess his or her PIN—and all of this must be done before TPM anti-hammer capabilities lock the device.
+To compromise a Windows Hello credential that TPM protects, an attacker must have access to the physical device, and then must find a way to spoof the user’s biometrics or guess his or her PIN—and all of this must be done before [TPM anti-hammering](/windows/device-security/tpm/tpm-fundamentals#anti-hammering) protection locks the device.
You can provide additional protection for laptops that don't have TPM by enablng BitLocker and setting a policy to limit failed sign-ins.
**Configure BitLocker without TPM**
diff --git a/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md b/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
index fc03f88ce9..498b42fa47 100644
--- a/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
+++ b/windows/access-protection/windows-firewall/windows-firewall-with-advanced-security-administration-with-windows-powershell.md
@@ -86,21 +86,27 @@ Set-NetFirewallProfile -DefaultInboundAction Block -DefaultOutboundAction Allow
### Disable Windows Firewall
-Disabling Windows Firewall with Advanced Security can cause the following problems:
+Microsoft recommends that you do not disable Windows Firewall because you lose other benefits provided by the service, such as the ability to use Internet Protocol security (IPsec) connection security rules, network protection from attacks that employ network fingerprinting, [Windows Service Hardening](http://go.microsoft.com/fwlink/?linkid=104976), and [boot time filters](https://blogs.technet.microsoft.com/networking/2009/03/24/stopping-the-windows-authenticating-firewall-service-and-the-boot-time-policy/).
+
+Disabling Windows Firewall with Advanced Security can also cause problems, including:
- Start menu can stop working
- Modern applications can fail to install or update
- Activation of Windows via phone fails
- Application or OS incompatibilities that depend on Windows Firewall
-Do not disable Windows Firewall with Advanced Security service by stopping the service.
-The proper method to disable the Windows Firewall is to disable the Windows Firewall Profiles and leave the service running.
-Use the following procedure to turn the firewall off, or disable the Group Policy setting **Computer Configuration|Administrative Templates|Network|Network Connections|Windows Firewall|Domain Prolfile|Windows Firewall:Protect all network connections**.
-For more information, see [Windows firewall with advanced security deployment guide](windows-firewall-with-advanced-security-deployment-guide.md).
-If you turn off the Windows Firewall with Advanced Security service, you lose other benefits provided by the service, such as the ability to use Internet Protocol security (IPsec) connection security rules, network protection from attacks that employ network fingerprinting, [Windows Service Hardening](http://go.microsoft.com/fwlink/?linkid=104976), and [boot time filters](https://blogs.technet.microsoft.com/networking/2009/03/24/stopping-the-windows-authenticating-firewall-service-and-the-boot-time-policy/).
+Microsoft recommends disabling Windows Firewall with Advanced Security only when installing a third-party firewall, and resetting Windows Firewall back to defaults when the third-party software is disabled or removed.
+
+If disabling Windows Firewall with Advanced Security is required, do not disable it by stopping the Windows Firewall service (in the **Services** snap-in, the display name is Windows Firewall and the service name is MpsSvc).
+Stopping the Windows Firewall service is not supported by Microsoft.
+
Non-Microsoft firewall software can programmatically disable only the parts of Windows Firewall with Advanced Security that need to be disabled for compatibility.
You should not disable the firewall yourself for this purpose.
-Stopping the service associated with Windows Firewall with Advanced Security is not supported by Microsoft.
+
+The proper method to disable the Windows Firewall is to disable the Windows Firewall Profiles and leave the service running.
+
+Use the following procedure to turn the firewall off, or disable the Group Policy setting **Computer Configuration|Administrative Templates|Network|Network Connections|Windows Firewall|Domain Prolfile|Windows Firewall:Protect all network connections**.
+For more information, see [Windows firewall with advanced security deployment guide](windows-firewall-with-advanced-security-deployment-guide.md).
The following example disables Windows Firewall with Advanced Security for all profiles.
diff --git a/windows/client-management/change-history-for-client-management.md b/windows/client-management/change-history-for-client-management.md
index e0349be98b..17d2570fda 100644
--- a/windows/client-management/change-history-for-client-management.md
+++ b/windows/client-management/change-history-for-client-management.md
@@ -14,7 +14,10 @@ author: jdeckerMS
This topic lists new and updated topics in the [Client management](index.md) documentation for Windows 10 and Windows 10 Mobile.
-
+## April 2017
+| New or changed topic | Description |
+|----------------------|-------------|
+| [New policies for Windows 10](new-policies-for-windows-10.md) | Added a list of new Group Policy settings for Windows 10, version 1703 |
## RELEASE: Windows 10, version 1703
diff --git a/windows/client-management/new-policies-for-windows-10.md b/windows/client-management/new-policies-for-windows-10.md
index ef46947ea9..29b5b23d90 100644
--- a/windows/client-management/new-policies-for-windows-10.md
+++ b/windows/client-management/new-policies-for-windows-10.md
@@ -20,32 +20,144 @@ localizationpriority: high
Windows 10 includes the following new policies for management, in addition to policies that were available for Windows 8.1 and Windows Phone 8.1. [Download the complete set of Administrative Template (.admx) files for Windows 10](https://go.microsoft.com/fwlink/p/?LinkID=625081).
-## New Group Policy settings in Windows 10
+## New Group Policy settings in Windows 10, version 1703
+
+The following Group Policy settings were added in Windows 10, version 1703:
+
+**Control Panel**
+
+- Control Panel\Add or Remove Programs\Specify default category for Add New Programs
+- Control Panel\Add or Remove Programs\Hide the "Add a program from CD-ROM or floppy disk" option
+- Control Panel\Personalization\Prevent changing lock screen and logon image
+
+**Network**
+
+- Network\Background Intelligent Transfer Service (BITS)\Limit the maximum network bandwidth for BITS background transfers
+- Network\Background Intelligent Transfer Service (BITS)\Allow BITS Peercaching
+- Network\Background Intelligent Transfer Service (BITS)\Limit the age of files in the BITS Peercache
+- Network\Background Intelligent Transfer Service (BITS)\Limit the BITS Peercache size
+- Network\DNS Client\Allow NetBT queries for fully qualified domain names
+- Network\Network Connections\Prohibit access to properties of components of a LAN connection
+- Network\Network Connections\Ability to Enable/Disable a LAN connection
+- Network\Offline Files\Turn on economical application of administratively assigned Offline Files
+- Network\Offline Files\Configure slow-link mode
+- Network\Offline Files\Enable Transparent Caching
+- Network\Microsoft Peer-to-Peer Networking Services\Peer Name Resolution Protocol\Site-Local Clouds\Set the Seed Server
+- Network\Microsoft Peer-to-Peer Networking Services\Disable password strength validation for Peer Grouping
+
+**System**
+
+- System\App-V\Streaming\Location Provider
+- System\App-V\Streaming\Certificate Filter For Client SSL
+- System\Credentials Delegation\Allow delegating default credentials with NTLM-only server authentication
+- System\Ctrl+Alt+Del Options\Remove Change Password
+- System\Ctrl+Alt+Del Options\Remove Lock Computer
+- System\Ctrl+Alt+Del Options\Remove Task Manager
+- System\Ctrl+Alt+Del Options\Remove Logoff
+- System\Device Installation\Do not send a Windows error report when a generic driver is installed on a device
+- System\Device Installation\Prevent Windows from sending an error report when a device driver requests additional software during installation
+- System\Locale Services\Disallow user override of locale settings
+- System\Logon\Do not process the legacy run list
+- System\Logon\Always use custom logon background
+- System\Logon\Do not display network selection UI
+- System\Logon\Block user from showing account details on sign-in
+- System\Logon\Turn off app notifications on the lock screen
+- System\User Profiles\Establish timeout value for dialog boxes
+- System\Enable Windows NTP Server\Windows Time Service\Enable Windows NTP Client
+
+**Windows Components**
+
+- Windows Components\ActiveX Installer Service\Approved Installation Sites for ActiveX Controls
+- Windows Components\ActiveX Installer Service\Establish ActiveX installation policy for sites in Trusted zones
+- Windows Components\Application Compatibility\Turn off Application Compatibility Engine
+- Windows Components\Application Compatibility\Turn off Program Compatibility Assistant
+- Windows Components\Application Compatibility\Turn off Program Compatibility Assistant
+- Windows Components\Application Compatibility\Turn off Steps Recorder
+- Windows Components\Attachment Manager\Notify antivirus programs when opening attachments
+- Windows Components\Biometrics\Allow the use of biometrics
+- Windows Components\NetMeeting\Disable Whiteboard
+- Windows Components\Data Collection and Preview Builds\Configure the Commercial ID
+- Windows Components\File Explorer\Display the menu bar in File Explorer
+- Windows Components\File History\Turn off File History
+- Windows Components\Internet Explorer\Internet Control Panel\Advanced Page\Play animations in web pages
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Trusted Sites Zone\Turn on Cross-Site Scripting Filter
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Internet Zone\Turn on Cross-Site Scripting Filter
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Internet Zone\Run ActiveX controls and plugins
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Internet Zone\Script ActiveX controls marked safe for scripting
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Intranet Zone\Run ActiveX controls and plugins
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Intranet Zone\Script ActiveX controls marked safe for scripting
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Intranet Zone\Run ActiveX controls and plugins
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Intranet Zone\Script ActiveX controls marked safe for scripting
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Local Machine Zone\Run ActiveX controls and plugins
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Local Machine Zone\Script ActiveX controls marked safe for scripting
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Local Machine Zone\Run ActiveX controls and plugins
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Local Machine Zone\Script ActiveX controls marked safe for scripting
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Restricted Sites Zone\Run ActiveX controls and plugins
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Restricted Sites Zone\Script ActiveX controls marked safe for scripting
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Restricted Sites Zone\Run ActiveX controls and plugins
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Restricted Sites Zone\Script ActiveX controls marked safe for scripting
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Trusted Sites Zone\Run ActiveX controls and plugins
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Trusted Sites Zone\Script ActiveX controls marked safe for scripting
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Trusted Sites Zone\Run ActiveX controls and plugins
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Trusted Sites Zone\Script ActiveX controls marked safe for scripting
+- Windows Components\Internet Explorer\Accelerators\Restrict Accelerators to those deployed through Group Policy
+- Windows Components\Internet Explorer\Compatibility View\Turn on Internet Explorer 7 Standards Mode
+- Windows Components\Location and Sensors\Windows Location Provider\Turn off Windows Location Provider
+- Windows Components\Microsoft Edge\Configure Autofill
+- Windows Components\Microsoft Edge\Allow Developer Tools
+- Windows Components\Microsoft Edge\Allow Developer Tools
+- Windows Components\Microsoft Edge\Configure Do Not Track
+- Windows Components\Microsoft Edge\Allow InPrivate browsing
+- Windows Components\Microsoft Edge\Configure Password Manager
+- Windows Components\Microsoft Edge\Configure Password Manager
+- Windows Components\Microsoft Edge\Configure Pop-up Blocker
+- Windows Components\Microsoft Edge\Configure Pop-up Blocker
+- Windows Components\Microsoft Edge\Allow search engine customization
+- Windows Components\Microsoft Edge\Allow search engine customization
+- Windows Components\Microsoft Edge\Configure search suggestions in Address bar
+- Windows Components\Microsoft Edge\Set default search engine
+- Windows Components\Microsoft Edge\Configure additional search engines
+- Windows Components\Microsoft Edge\Configure additional search engines
+- Windows Components\Microsoft Edge\Configure the Enterprise Mode Site List
+- Windows Components\Microsoft Edge\Configure the Enterprise Mode Site List
+- Windows Components\Microsoft Edge\Prevent using Localhost IP address for WebRTC
+- Windows Components\Microsoft Edge\Prevent using Localhost IP address for WebRTC
+- Windows Components\Microsoft Edge\Configure Start pages
+- Windows Components\Microsoft Edge\Configure Start pages
+- Windows Components\Microsoft Edge\Disable lockdown of Start pages
+- Windows Components\Microsoft Edge\Disable lockdown of Start pages
+- Windows Components\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for sites
+- Windows Components\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for sites
+- Windows Components\Microsoft Edge\Prevent bypassing Windows Defender SmartScreen prompts for files
+- Windows Components\Microsoft Management Console\Restricted/Permitted snap-ins\.Net Framework Configuration
+- Windows Components\Windows Installer\Prohibit use of Restart Manager
+- Windows Components\Desktop Gadgets\Restrict unpacking and installation of gadgets that are not digitally signed.
+- Windows Components\Desktop Gadgets\Turn Off user-installed desktop gadgets
+- Windows Components\Desktop Gadgets\Turn Off user-installed desktop gadgets
+- Windows Components\OneDrive\Prevent the usage of OneDrive for file storage
+- Windows Components\OneDrive\Prevent the usage of OneDrive for file storage on Windows 8.1
+- Windows Components\OneDrive\Prevent OneDrive files from syncing over metered connections
+- Windows Components\OneDrive\Save documents to OneDrive by default
+- Windows Components\Smart Card\Allow certificates with no extended key usage certificate attribute
+- Windows Components\Smart Card\Turn on certificate propagation from smart card
+- Windows Components\Tablet PC\Pen UX Behaviors\Prevent flicks
+- Windows Components\BitLocker Drive Encryption\Choose drive encryption method and cipher strength (Windows 8, Windows Server 2012, Windows 8.1, Windows Server 2012 R2, Windows 10 [Version 1507])
+- Windows Components\Windows Defender Antivirus\Real-time Protection\Turn on behavior monitoring
+- Windows Components\Windows Defender Antivirus\Signature Updates\Define file shares for downloading definition updates
+- Windows Components\Windows Defender Antivirus\Signature Updates\Turn on scan after signature update
+- Windows Components\File Explorer\Display confirmation dialog when deleting files
+- Windows Components\Internet Explorer\Internet Control Panel\Security Page\Locked-Down Restricted Sites Zone\Allow OpenSearch queries in File Explorer
+- Windows Components\Windows Update\Remove access to use all Windows Update features
+- Windows Components\Windows Update\Configure Automatic Updates
+- Windows Components\Windows Update\Specify intranet Microsoft update service location
+- Windows Components\Windows Update\Automatic Updates detection frequency
+- Windows Components\Windows Update\Allow non-administrators to receive update notifications
+- Windows Components\Windows Update\Allow Automatic Updates immediate installation
+- Windows Components\Windows Update\Turn on recommended updates via Automatic Updates
+- Windows Components\Shutdown Options\Turn off legacy remote shutdown interface
-There are some new policy settings in Group Policy for devices running Windows 10 , such as:
-
-- Microsoft Edge browser settings
-
-- Universal Windows app settings, such as:
-
- - Disable deployment of Windows Store apps to non-system volumes
-
- - Restrict users' application data to always stay on the system volume
-
- - Allow applications to share app data between users
-
-- [Start screen and Start menu layout](/windows/configuration/customize-windows-10-start-screens-by-using-group-policy)
-
-- Windows Tips
-
-- Consumer experiences, such as suggested apps in Start and app tiles from Microsoft dynamically inserted in the default Start menu
-
-- [Microsoft Passport](https://go.microsoft.com/fwlink/p/?LinkId=623294)
-
-- Windows Updates for Business
-
-For a spreadsheet of Group Policy settings included in Windows, see [Group Policy Settings Reference for Windows and Windows Server](https://go.microsoft.com/fwlink/p/?LinkId=613627).
+For a spreadsheet of Group Policy settings included in Windows 10 and Windows Server 2016, see [Group Policy Settings Reference for Windows and Windows Server](https://go.microsoft.com/fwlink/p/?LinkId=613627).
## New MDM policies
diff --git a/windows/configuration/TOC.md b/windows/configuration/TOC.md
index 0664c17101..4d7de0a870 100644
--- a/windows/configuration/TOC.md
+++ b/windows/configuration/TOC.md
@@ -21,7 +21,7 @@
### [Start layout XML for mobile editions of Windows 10 (reference)](mobile-devices/start-layout-xml-mobile.md)
## [Configure Start, taskbar, and lock screen](start-taskbar-lockscreen.md)
### [Configure Windows Spotlight on the lock screen](windows-spotlight.md)
-### [Manage Windows 10 and Windows Store tips, tricks, and suggestions](manage-tips-and-suggestions.md)
+### [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](manage-tips-and-suggestions.md)
### [Manage Windows 10 Start and taskbar layout](windows-10-start-layout-options-and-policies.md)
#### [Configure Windows 10 taskbar](configure-windows-10-taskbar.md)
#### [Customize and export Start layout](customize-and-export-start-layout.md)
@@ -46,7 +46,7 @@
### [Set up and test custom voice commands in Cortana for your organization](cortana-at-work/cortana-at-work-voice-commands.md)
### [Use Group Policy and mobile device management (MDM) settings to configure Cortana in your organization](cortana-at-work/cortana-at-work-policy-settings.md)
### [Send feedback about Cortana at work back to Microsoft](cortana-at-work/cortana-at-work-feedback.md)
-## [Configure access to Windows Store](stop-employees-from-using-the-windows-store.md)
+## [Configure access to Microsoft Store](stop-employees-from-using-the-windows-store.md)
## [Provisioning packages for Windows 10](provisioning-packages/provisioning-packages.md)
### [How provisioning works in Windows 10](provisioning-packages/provisioning-how-it-works.md)
### [Introduction to configuration service providers (CSPs)](provisioning-packages/how-it-pros-can-use-configuration-service-providers.md)
diff --git a/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md b/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md
index 0ae4581bb0..871ff7e560 100644
--- a/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md
+++ b/windows/configuration/basic-level-windows-diagnostic-events-and-fields.md
@@ -20,7 +20,7 @@ ms.author: brianlic
- Windows 10, version 1703
-The Basic level gathers a limited set of information that is critical for understanding the device and its configuration including: basic device information, quality-related information, app compatibility, and Windows Store. When the level is set to Basic, it also includes the Security level information.
+The Basic level gathers a limited set of information that is critical for understanding the device and its configuration including: basic device information, quality-related information, app compatibility, and Microsoft Store. When the level is set to Basic, it also includes the Security level information.
The Basic level helps to identify problems that can occur on a particular device hardware or software configuration. For example, it can help determine if crashes are more frequent on devices with a specific amount of memory or that are running a particular driver version. This helps Microsoft fix operating system or app problems.
@@ -1707,7 +1707,7 @@ The following fields are available:
- **WUDODownloadMode** Retrieves whether DO is turned on and how to acquire/distribute updates Delivery Optimization (DO) allows users to deploy previously downloaded WU updates to other devices on the same network.
- **OSWUAutoUpdateOptions** Retrieves the auto update settings on the device.
- **AppStoreAutoUpdate** Retrieves the Appstore settings for auto upgrade. (Enable/Disabled).
-- **AppStoreAutoUpdatePolicy** Retrieves the Windows Store App Auto Update group policy setting
+- **AppStoreAutoUpdatePolicy** Retrieves the Microsoft Store App Auto Update group policy setting
- **AppStoreAutoUpdateMDM** Retrieves the App Auto Update value for MDM: 0 - Disallowed. 1 - Allowed. 2 - Not configured. Default: [2] Not configured
- **DelayUpgrade** Retrieves the Windows upgrade flag for delaying upgrades.
- **UpdateServiceURLConfigured** Retrieves if the device is managed by Windows Server Update Services (WSUS).
@@ -2009,7 +2009,7 @@ The following fields are available:
- **objectInstanceId** ProgramId (a hash of Name, Version, Publisher, and Language of an application used to identify it).
- **PackageFullName** The package full name for a Store application.
- **InventoryVersion** The version of the inventory file generating the events.
-- **StoreAppType** A sub-classification for the type of Windows Store app, such as UWP or Win8StoreApp.
+- **StoreAppType** A sub-classification for the type of Microsoft Store app, such as UWP or Win8StoreApp.
### Microsoft.Windows.Inventory.Core.InventoryApplicationRemove
@@ -2594,7 +2594,7 @@ The following fields are available:
- **WUDeviceID** The unique identifier of a specific device, used to identify how many devices are encountering success or a particular issue.
- **CallerApplicationName** The name provided by the caller who initiated API calls into the software distribution client.
- **ProcessName** The process name of the caller who initiated API calls, in the event where CallerApplicationName was not provided.
-- **ServiceGuid** An ID which represents which service the software distribution client is checking for content (Windows Update, Windows Store, etc.).
+- **ServiceGuid** An ID which represents which service the software distribution client is checking for content (Windows Update, Microsoft Store, etc.).
- **StatusCode** Indicates the result of a CheckForUpdates event (success, cancellation, failure code HResult).
- **ExtendedStatusCode** Secondary error code for certain scenarios where StatusCode wasn't specific enough.
- **FlightRing** The ring (speed of getting builds) that a device is on if participating in flighting (pre-release builds).
@@ -2675,7 +2675,7 @@ The following fields are available:
- **BiosSKUNumber** The sku number of the device BIOS.
- **ClientVersion** The version number of the software distribution client.
- **WUDeviceID** UniqueDeviceID
-- **ServerId** Identifier for the service to which the software distribution client is connecting, such as Windows Update and Windows Store.
+- **ServerId** Identifier for the service to which the software distribution client is connecting, such as Windows Update and Microsoft Store.
- **EventType** Possible values are "Child", "Bundle", or "Driver".
- **UpdateId** Unique Update ID
- **BundleId** Identifier associated with the specific content bundle; should not be all zeros if the bundleID was found.
@@ -2707,7 +2707,7 @@ The following fields are available:
- **WUDeviceID** The unique identifier of a specific device, used to identify how many devices are encountering success or a particular issue.
- **CallerApplicationName** The name provided by the caller who initiated API calls into the software distribution client.
- **ProcessName** The process name of the caller who initiated API calls, in the event where CallerApplicationName was not provided.
-- **ServiceGuid** An ID which represents which service the software distribution client is installing content for (Windows Update, Windows Store, etc.).
+- **ServiceGuid** An ID which represents which service the software distribution client is installing content for (Windows Update, Microsoft Store, etc.).
- **StatusCode** Indicates the result of a Download event (success, cancellation, failure code HResult).
- **ExtendedStatusCode** Secondary error code for certain scenarios where StatusCode wasn't specific enough.
- **FlightRing** The ring (speed of getting builds) that a device is on if participating in flighting (pre-release builds).
@@ -2791,7 +2791,7 @@ The following fields are available:
- **WUDeviceID** The unique identifier of a specific device, used to identify how many devices are encountering success or a particular issue.
- **CallerApplicationName** The name provided by the caller who initiated API calls into the software distribution client.
- **ProcessName** The process name of the caller who initiated API calls, in the event where CallerApplicationName was not provided.
-- **ServiceGuid** An ID which represents which service the software distribution client is installing content for (Windows Update, Windows Store, etc.).
+- **ServiceGuid** An ID which represents which service the software distribution client is installing content for (Windows Update, Microsoft Store, etc.).
- **StatusCode** Indicates the result of an installation event (success, cancellation, failure code HResult).
- **ExtendedStatusCode** Secondary error code for certain scenarios where StatusCode wasn't specific enough.
- **FlightRing** The ring that a device is on if participating in the Windows Insider Program.
@@ -2859,7 +2859,7 @@ The following fields are available:
- **EventScenario** Indicates the purpose of sending this event - whether because the software distribution just started checking for content, or whether it was cancelled, succeeded, or failed
- **SusClientId** The unique device ID controlled by the software distribution client
- **WUAVersion** The version number of the software distribution client
-- **ServiceID** An ID which represents which service the software distribution client is connecting to (Windows Update, Windows Store, etc.)
+- **ServiceID** An ID which represents which service the software distribution client is connecting to (Windows Update, Microsoft Store, etc.)
- **UrlPath** Path to the SLS cab that was downloaded
- **HResult** Indicates the result code of the event (success, cancellation, failure code HResult)
- **IsBackground** Indicates whether the SLS discovery event took place in the foreground or background
@@ -2868,7 +2868,7 @@ The following fields are available:
### SoftwareUpdateClientTelemetry.UpdateDetected
-This event sends data about an AppX app that has been updated from the Windows Store, including what app needs an update and what version/architecture is required, in order to understand and address problems with apps getting required updates.
+This event sends data about an AppX app that has been updated from the Microsoft Store, including what app needs an update and what version/architecture is required, in order to understand and address problems with apps getting required updates.
The following fields are available:
@@ -2890,7 +2890,7 @@ The following fields are available:
- **BiosSKUNumber** The device's SKU as defined in system bios
- **ClientVersion** The version number of the software distribution client
- **ProcessName** The process name of the caller who initiated API calls, in the event where CallerApplicationName was not provided
-- **ServiceGuid** An ID which represents which service the software distribution client is connecting to (Windows Update, Windows Store, etc.)
+- **ServiceGuid** An ID which represents which service the software distribution client is connecting to (Windows Update, Microsoft Store, etc.)
- **StatusCode** Indicates the result code of the event (success, cancellation, failure code HResult)
- **ExtendedStatusCode** Secondary status code for certain scenarios where StatusCode wasn't specific enough
- **FlightRing** The ring (speed of getting builds) that a device is on if participating in flighting (pre-release builds).
@@ -2919,7 +2919,7 @@ This event identifies whether updates have been tampered with and protects again
The following fields are available:
- **EventScenario** The purpose of this event, such as scan started, scan succeeded, or scan failed.
-- **ServiceGuid** Identifies the service to which the software distribution client is connected, Example: Windows Update or Windows Store
+- **ServiceGuid** Identifies the service to which the software distribution client is connected, Example: Windows Update or Microsoft Store
- **MetadataIntegrityMode** The mode of the transport metadata integrity check. 0 = unknown; 1 = ignore; 2 = audit; 3 = enforce
- **StatusCode** The status code of the event.
- **ExtendedStatusCode** The secondary status code of the event.
@@ -3263,7 +3263,7 @@ The following fields are available:
- **DumpFileAttributes** Codes that identify the type of data contained in the dump file
-## Windows Store events
+## Microsoft Store events
### Microsoft.Windows.StoreAgent.Telemetry.AbortedInstallation
diff --git a/windows/configuration/change-history-for-configure-windows-10.md b/windows/configuration/change-history-for-configure-windows-10.md
index 8f8efe4a16..d4636fc9a9 100644
--- a/windows/configuration/change-history-for-configure-windows-10.md
+++ b/windows/configuration/change-history-for-configure-windows-10.md
@@ -14,6 +14,12 @@ author: jdeckerms
This topic lists new and updated topics in the [Configure Windows 10](index.md) documentation for Windows 10 and Windows 10 Mobile.
+## May 2017
+
+| New or changed topic | Description |
+| --- | --- |
+| [ Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Added MDM policies for privacy settings. |
+
## April 2017
| New or changed topic | Description |
diff --git a/windows/configuration/configure-windows-telemetry-in-your-organization.md b/windows/configuration/configure-windows-telemetry-in-your-organization.md
index 7edc786a66..3cc807c64a 100644
--- a/windows/configuration/configure-windows-telemetry-in-your-organization.md
+++ b/windows/configuration/configure-windows-telemetry-in-your-organization.md
@@ -156,7 +156,7 @@ The principle of least privileged access guides access to telemetry data. Micros
### Retention
-Microsoft believes in and practices information minimization. We strive to gather only the info we need, and store it for as long as it’s needed to provide a service or for analysis. Much of the info about how Windows and apps are functioning is deleted within 30 days. Other info may be retained longer, such as error reporting data or Windows Store purchase history.
+Microsoft believes in and practices information minimization. We strive to gather only the info we need, and store it for as long as it’s needed to provide a service or for analysis. Much of the info about how Windows and apps are functioning is deleted within 30 days. Other info may be retained longer, such as error reporting data or Microsoft Store purchase history.
## Telemetry levels
@@ -256,7 +256,7 @@ The data gathered at this level includes:
- **Driver data**. Includes specific driver usage that’s meant to help figure out whether apps and devices will function after upgrading to a new version of the operating system. This can help to determine blocking issues and then help Microsoft and our partners apply fixes and improvements.
-- **Windows Store**. Provides information about how the Windows Store performs, including app downloads, installations, and updates. It also includes Windows Store launches, page views, suspend and resumes, and obtaining licenses.
+- **Microsoft Store**. Provides information about how the Microsoft Store performs, including app downloads, installations, and updates. It also includes Microsoft Store launches, page views, suspend and resumes, and obtaining licenses.
### Enhanced level
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
index 8d7ff55a35..def19d5939 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
@@ -34,11 +34,11 @@ To enable voice commands in Cortana
2. **Install the VCD file on employees' devices**. You can use System Center Configuration Manager or Microsoft Intune to deploy and install the VCD file on your employees' devices, the same way you deploy and install any other package in your organization.
-## Test scenario: Use voice commands in a Windows Store app
+## Test scenario: Use voice commands in a Microsoft Store app
While these aren't line-of-business apps, we've worked to make sure to implement a VCD file, allowing you to test how the functionality works with Cortana in your organization.
-**To get a Windows Store app**
-1. Go to the Windows Store, scroll down to the **Collections** area, click **Show All**, and then click **Better with Cortana**.
+**To get a Microsoft Store app**
+1. Go to the Microsoft Store, scroll down to the **Collections** area, click **Show All**, and then click **Better with Cortana**.
2. Click **Uber**, and then click **Install**.
diff --git a/windows/configuration/index.md b/windows/configuration/index.md
index 2111ea6179..63a20cbd58 100644
--- a/windows/configuration/index.md
+++ b/windows/configuration/index.md
@@ -27,7 +27,7 @@ Enterprises often need to apply custom configurations to devices for their users
| [Configure Windows 10 Mobile devices](mobile-devices/configure-mobile.md) | These topics help you configure the features and apps and Start screen for a device running Windows 10 Mobile, as well as how to configure a kiosk device that runs a single app. |
| [Configure Start, taskbar, and lock screen](start-taskbar-lockscreen.md) | A standard, customized Start layout can be useful on devices that are common to multiple users and devices that are locked down for specialized purposes. Configuring the taskbar allows the organization to pin useful apps for their employees and to remove apps that are pinned by default. |
| [Cortana integration in your business or enterprise](cortana-at-work/cortana-at-work-overview.md) | 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. |
-| [Configure access to Windows Store](stop-employees-from-using-the-windows-store.md) | IT Pros can configure access to Windows Store for client computers in their organization. For some organizations, business policies require blocking access to Windows Store. |
+| [Configure access to Microsoft Store](stop-employees-from-using-the-windows-store.md) | IT Pros can configure access to Microsoft Store for client computers in their organization. For some organizations, business policies require blocking access to Microsoft Store. |
| [Provisioning packages for Windows 10](provisioning-packages/provisioning-packages.md) | Learn how to use the Windows Configuration Designer and provisioning packages to easily configure multiple devices. |
| [Lockdown features from Windows Embedded 8.1 Industry](lockdown-features-windows-10.md) | Many of the lockdown features available in Windows Embedded 8.1 Industry have been modified in some form for Windows 10. |
| [Change history for Configure Windows 10](change-history-for-configure-windows-10.md) | This topic lists new and updated topics in the Configure Windows 10 documentation for Windows 10 and Windows 10 Mobile. |
diff --git a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
index e81b1db45a..804d9de6f8 100644
--- a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
+++ b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md
@@ -89,22 +89,22 @@ See the following table for a summary of the management settings for Windows 10
| [17.1 General](#bkmk-general) |  |  |  |  | |
| [17.2 Location](#bkmk-priv-location) |  |  |  |  | |
| [17.3 Camera](#bkmk-priv-camera) |  |  |  |  | |
-| [17.4 Microphone](#bkmk-priv-microphone) |  |  | |  | |
-| [17.5 Notifications](#bkmk-priv-notifications) |  |  | |  | |
+| [17.4 Microphone](#bkmk-priv-microphone) |  |  |  |  | |
+| [17.5 Notifications](#bkmk-priv-notifications) |  |  | |  | |
| [17.6 Speech, inking, & typing](#bkmk-priv-speech) |  |  |  |  | |
-| [17.7 Account info](#bkmk-priv-accounts) |  |  | |  | |
-| [17.8 Contacts](#bkmk-priv-contacts) |  |  | |  | |
-| [17.9 Calendar](#bkmk-priv-calendar) |  |  | |  | |
-| [17.10 Call history](#bkmk-priv-callhistory) |  |  | |  | |
-| [17.11 Email](#bkmk-priv-email) |  |  | |  | |
-| [17.12 Messaging](#bkmk-priv-messaging) |  |  | |  | |
-| [17.13 Radios](#bkmk-priv-radios) |  |  | |  | |
-| [17.14 Other devices](#bkmk-priv-other-devices) |  |  | |  | |
+| [17.7 Account info](#bkmk-priv-accounts) |  |  |  |  | |
+| [17.8 Contacts](#bkmk-priv-contacts) |  |  |  |  | |
+| [17.9 Calendar](#bkmk-priv-calendar) |  |  |  |  | |
+| [17.10 Call history](#bkmk-priv-callhistory) |  |  |  |  | |
+| [17.11 Email](#bkmk-priv-email) |  |  |  |  | |
+| [17.12 Messaging](#bkmk-priv-messaging) |  |  |  |  | |
+| [17.13 Radios](#bkmk-priv-radios) |  |  |  |  | |
+| [17.14 Other devices](#bkmk-priv-other-devices) |  |  |  |  | |
| [17.15 Feedback & diagnostics](#bkmk-priv-feedback) |  |  |  |  | |
-| [17.16 Background apps](#bkmk-priv-background) |  | | | | |
-| [17.17 Motion](#bkmk-priv-motion) |  |  | |  | |
-| [17.18 Tasks](#bkmk-priv-tasks) |  |  | |  | |
-| [17.19 App Diagnostics](#bkmk-priv-diag) |  |  | |  | |
+| [17.16 Background apps](#bkmk-priv-background) |  |  |  | | |
+| [17.17 Motion](#bkmk-priv-motion) |  |  |  |  | |
+| [17.18 Tasks](#bkmk-priv-tasks) |  |  |  |  | |
+| [17.19 App Diagnostics](#bkmk-priv-diag) |  |  |  |  | |
| [18. Software Protection Platform](#bkmk-spp) | |  |  |  | |
| [19. Sync your settings](#bkmk-syncsettings) |  |  |  |  | |
| [20. Teredo](#bkmk-teredo) | |  | |  |  |
@@ -112,7 +112,7 @@ See the following table for a summary of the management settings for Windows 10
| [22. Windows Defender](#bkmk-defender) | |  |  |  | |
| [23. Windows Media Player](#bkmk-wmp) |  | | | |  |
| [24. Windows spotlight](#bkmk-spotlight) |  |  | |  | |
-| [25. Windows Store](#bkmk-windowsstore) | |  | |  | |
+| [25. Microsoft Store](#bkmk-windowsstore) | |  | |  | |
| [26. Windows Update Delivery Optimization](#bkmk-updates) |  |  |  |  | |
| [27. Windows Update](#bkmk-wu) |  |  |  | | |
@@ -139,7 +139,7 @@ See the following table for a summary of the management settings for Windows Ser
| [20. Teredo](#bkmk-teredo) | |  |  |  |
| [22. Windows Defender](#bkmk-defender) | |  |  | |
| [23. Windows Media Player](#bkmk-wmp) | | | |  |
-| [25. Windows Store](#bkmk-windowsstore) | |  |  | |
+| [25. Microsoft Store](#bkmk-windowsstore) | |  |  | |
| [27. Windows Update](#bkmk-wu) | |  |  | |
### Settings for Windows Server 2016 Server Core
@@ -204,6 +204,7 @@ For Windows 10, Windows Server 2016 with Desktop Experience, and Windows Server
3. On the **Network Retrieval** tab, select the **Define these policy settings** check box.
4. Clear the **Automatically update certificates in the Microsoft Root Certificate Program (recommended)** check box, and then click **OK**.
+
On Windows Server 2016 Nano Server:
- Create the registry path **HKEY\_LOCAL\_MACHINE\SOFTWARE\Policies\Microsoft\SystemCertificates\AuthRoot** and then add a REG\_DWORD registry setting, called **DisableRootAutoUpdate**, with a value of 1.
@@ -308,7 +309,7 @@ To turn off Find My Device:
- Turn off the feature in the UI
- -or
+ -or-
- Disable the Group Policy: **Computer Configuration** > **Administrative Template** > **Windows Components** > **Find My Device** > **Turn On/Off Find My Device**
@@ -422,7 +423,11 @@ You can also use registry entries to set these Group Policies.
| Turn off the flip ahead with page prediction feature | HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Internet Explorer\\FlipAhead!Enabled
REG_DWORD: 0|
| Turn off background synchronization for feeds and Web Slices | HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Internet Explorer\\Feeds!BackgroundSyncStatus
REG_DWORD:0 |
-To turn off the home page, enable the Group Policy: **User Configuration** > **Administrative Templates** > **Windows Components** > **Internet Explorer** > **Disable changing home page settings**
+To turn off the home page, enable the Group Policy: **User Configuration** > **Administrative Templates** > **Windows Components** > **Internet Explorer** > **Disable changing home page settings**, and set it to **about:blank**.
+
+To configure the First Run Wizard, enable the Group Policy: **User Configuration** > **Administrative Templates** > **Windows Components** > **Internet Explorer** > **Prevent running First Run wizard**, and set it to **Go directly to home page**.
+
+To configure the behavior for a new tab, enable the Group Policy: **User Configuration** > **Administrative Templates** > **Windows Components** > **Internet Explorer** > **Specify default behavior for a new tab**, and set it to **about:blank**.
###
8.1 ActiveX control blocking
@@ -479,11 +484,14 @@ To prevent communication to the Microsoft Account cloud authentication service.
- Apply the Group Policy: **Computer Configuration** > **Windows Settings** > **Security Settings** > **Local Policies** > **Security Options** > **Accounts: Block Microsoft Accounts** and set it to **Users can't add Microsoft accounts**.
-or-
+
- Create a REG\_DWORD registry setting called **HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Policies\\System!NoConnectedUser**, with a value of 3.
To disable the Microsoft Account Sign-In Assistant:
- Apply the Accounts/AllowMicrosoftAccountSignInAssistant MDM policy from the [Policy CSP](http://msdn.microsoft.com/library/windows/hardware/dn904962.aspx) where 0 is turned off and 1 is turned on.
+- Change the Start REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\System\\CurrentControlSet\\Services\\wlidsvc** to a value of **4**.
+
###
12. Microsoft Edge
@@ -521,7 +529,7 @@ Alternatively, you can configure the Microsoft Group Policies using the followin
| Policy | Registry path |
| - | - |
-| Configure Autofill | HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\MicrosoftEdge\\Main!Use FormSuggest
REG_SZ: **about:blank** |
+| Configure Autofill | HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\MicrosoftEdge\\Main!Use FormSuggest
REG_SZ: **no** |
| Configure Do Not Track | HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\MicrosoftEdge\\Main!DoNotTrack
REG_DWORD: 1 |
| Configure Password Manager | HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\MicrosoftEdge\\Main!FormSuggest Passwords
REG_SZ: **no** |
| Configure search suggestions in Address bar | HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\MicrosoftEdge\\SearchScopes!ShowSearchSuggestionsGlobal
REG_DWORD: 0|
@@ -816,7 +824,7 @@ To turn off **Let apps use my advertising ID for experiences across apps (turnin
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\AdvertisingInfo!DisabledByGroupPolicy**, with a value of 1 (one).
-To turn off **Turn on SmartScreen Filter to check web content (URLs) that Windows Store apps use**:
+To turn off **Turn on SmartScreen Filter to check web content (URLs) that Microsoft Store apps use**:
- Turn off the feature in the UI.
@@ -1004,7 +1012,15 @@ To turn off **Let apps use my microphone**:
- Set the **Select a setting** box to **Force Deny**.
- -or-
+ -or-
+
+- Apply the Privacy/LetAppsAccessMicrophone MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsaccessmicrophone), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
+ -or-
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Policies\\Microsoft\\Windows\\AppPrivacy!LetAppsAccessMicrophone**, with a value of 2 (two)
@@ -1026,6 +1042,14 @@ To turn off **Let apps access my notifications**:
- Set the **Select a setting** box to **Force Deny**.
+ -or-
+
+- Apply the Privacy/LetAppsAccessNotifications MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsaccessnotifications), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
-or-
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Policies\\Microsoft\\Windows\\AppPrivacy!LetAppsAccessNotifications**, with a value of 2 (two)
@@ -1088,6 +1112,14 @@ To turn off **Let apps access my name, picture, and other account info**:
-or-
+- Apply the Privacy/LetAppsAccessAccountInfo MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsaccessaccountinfo), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
+ -or-
+
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Microsoft\\Windows\\AppPrivacy!LetAppsAccessContacts**, with a value of 2 (two).
To turn off **Choose the apps that can access your account info**:
@@ -1108,6 +1140,14 @@ To turn off **Choose apps that can access contacts**:
- Set the **Select a setting** box to **Force Deny**.
+ -or-
+
+- Apply the Privacy/LetAppsAccessContacts MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsaccesscontacts), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
###
17.9 Calendar
In the **Calendar** area, you can choose which apps have access to an employee's calendar.
@@ -1124,6 +1164,14 @@ To turn off **Let apps access my calendar**:
-or-
+- Apply the Privacy/LetAppsAccessCalendar MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsaccesscalendar), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
+ -or-
+
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Microsoft\\Windows\\AppPrivacy!LetAppsAccessCalendar**, with a value of 2 (two).
To turn off **Choose apps that can access calendar**:
@@ -1144,7 +1192,15 @@ To turn off **Let apps access my call history**:
- Set the **Select a setting** box to **Force Deny**.
- -or-
+ -or-
+
+ - Apply the Privacy/LetAppsAccessCallHistory MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsaccesscallhistory), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
+ -or-
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Policies\\Microsoft\\Windows\\AppPrivacy!LetAppsAccessCallHistory**, with a value of 2 (two).
@@ -1162,7 +1218,15 @@ To turn off **Let apps access and send email**:
- Set the **Select a setting** box to **Force Deny**.
- -or-
+ -or-
+
+ - Apply the Privacy/LetAppsAccessEmail MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsaccessemail), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
+ -or-
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Policies\\Microsoft\\Windows\\AppPrivacy!LetAppsAccessEmail**, with a value of 2 (two).
@@ -1182,6 +1246,14 @@ To turn off **Let apps read or send messages (text or MMS)**:
-or-
+- Apply the Privacy/LetAppsAccess
17.17 Motion
In the **Motion** area, you can choose which apps have access to your motion data.
@@ -1350,6 +1447,14 @@ To turn off **Let Windows and your apps use your motion data and collect motion
-or-
+- Apply the Privacy/LetAppsAccessMotion MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsaccessmotion), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
+ -or-
+
- Create a REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\Policies\\Microsoft\\Windows\\AppPrivacy!LetAppsAccessMotion**, with a value of 2 (two).
### 17.18 Tasks
@@ -1366,6 +1471,14 @@ To turn this off:
- Set the **Select a setting** box to **Force Deny**.
+ -or-
+
+- Apply the Privacy/LetAppsAccessTasks MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsaccesstasks), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
### 17.19 App Diagnostics
In the **App diagnostics** area, you can choose which apps have access to your diagnostic information.
@@ -1378,6 +1491,15 @@ To turn this off:
- Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Windows Components** > **App Privacy** > **Let Windows apps access dignostic information about other apps**
+ -or-
+
+- Apply the Privacy/LetAppsGetDiagnosticInfo MDM policy from the [Policy CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/policy-configuration-service-provider#privacy-letappsgetdiagnosticinfo), where:
+
+ - **0**. User in control
+ - **1**. Force allow
+ - **2**. Force deny
+
+
### 18. Software Protection Platform
Enterprise customers can manage their Windows activation status with volume licensing using an on-premise Key Management Server. You can opt out of sending KMS client activation data to Microsoft automatically by doing one of the following:
@@ -1563,7 +1685,7 @@ If you're running Windows 10, version 1607 or later, you only need to enable the
-or-
- - Create a new REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\CloudContent!DisableWindowsSpotlightFeatures**, with a value of 1 (one).
+- Create a new REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\CloudContent!DisableWindowsSpotlightFeatures**, with a value of 1 (one).
If you're not running Windows 10, version 1607 or later, you can use the other options in this section.
@@ -1591,7 +1713,7 @@ If you're not running Windows 10, version 1607 or later, you can use the other o
> This will only take effect if the policy is applied before the first logon. If you cannot apply the **Force a specific default lock screen image** policy before the first logon to the device, you can apply this policy: **Computer Configuration** > **Administrative Templates** > **Control Panel** > **Personalization** > **Do not display the lock screen**. Alternatively, you can create a new REG\_SZ registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\Personalization!LockScreenImage**, with a value of **C:\\windows\\web\\screen\\lockscreen.jpg** and create a new REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\Personalization!LockScreenOverlaysDisabled**, with a value of 1 (one).
- - **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Cloud Content** > **Do not show Windows tips**.
+ - **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Cloud Content** > **Do not show Windows tips**.
-or-
@@ -1599,17 +1721,17 @@ If you're not running Windows 10, version 1607 or later, you can use the other o
- **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Cloud Content** > **Turn off Microsoft consumer experiences**.
- -or-
+ -or-
- - Create a new REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\CloudContent!DisableWindowsConsumerFeatures**, with a value of 1 (one).
+ - Create a new REG\_DWORD registry setting in **HKEY\_LOCAL\_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\CloudContent!DisableWindowsConsumerFeatures**, with a value of 1 (one).
For more info, see [Windows Spotlight on the lock screen](windows-spotlight.md).
-### 25. Windows Store
+### 25. Microsoft Store
-You can turn off the ability to launch apps from the Windows Store that were preinstalled or downloaded. This will also turn off automatic app updates, and the Windows Store will be disabled. On Windows Server 2016, this will block Windows Store calls from Universal Windows Apps.
+You can turn off the ability to launch apps from the Microsoft Store that were preinstalled or downloaded. This will also turn off automatic app updates, and the Microsoft Store will be disabled. On Windows Server 2016, this will block Microsoft Store calls from Universal Windows Apps.
-- Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Store** > **Disable all apps from Windows Store**.
+- Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Windows Components** > **Store** > **Disable all apps from Microsoft Store**.
-or-
@@ -1625,7 +1747,7 @@ Disable the Group Policy: **Computer Configuration** > **Administrative Template
### 26. Windows Update Delivery Optimization
-Windows Update Delivery Optimization lets you get Windows updates and Windows Store apps from sources in addition to Microsoft, which not only helps when you have a limited or unreliable Internet connection, but can also help you reduce the amount of bandwidth needed to keep all of your organization's PCs up-to-date. If you have Delivery Optimization turned on, PCs on your network may send and receive updates and apps to other PCs on your local network, if you choose, or to PCs on the Internet.
+Windows Update Delivery Optimization lets you get Windows updates and Microsoft Store apps from sources in addition to Microsoft, which not only helps when you have a limited or unreliable Internet connection, but can also help you reduce the amount of bandwidth needed to keep all of your organization's PCs up-to-date. If you have Delivery Optimization turned on, PCs on your network may send and receive updates and apps to other PCs on your local network, if you choose, or to PCs on the Internet.
By default, PCs running Windows 10 Enterprise and Windows 10 Education will only use Delivery Optimization to get and receive updates for PCs and apps on your local network.
diff --git a/windows/configuration/manage-tips-and-suggestions.md b/windows/configuration/manage-tips-and-suggestions.md
index 477a8bf5c9..de1c017907 100644
--- a/windows/configuration/manage-tips-and-suggestions.md
+++ b/windows/configuration/manage-tips-and-suggestions.md
@@ -1,5 +1,5 @@
---
-title: Manage Windows 10 and Windows Store tips, tricks, and suggestions (Windows 10)
+title: Manage Windows 10 and Microsoft Store tips, tricks, and suggestions (Windows 10)
description: Windows 10 provides organizations with various options to manage user experiences to provide a consistent and predictable experience for employees.
keywords: ["device management"]
ms.prod: w10
@@ -10,7 +10,7 @@ author: jdeckerms
localizationpriority: high
---
-# Manage Windows 10 and Windows Store tips, tricks, and suggestions
+# Manage Windows 10 and Microsoft Store tips, tricks, and suggestions
**Applies to**
@@ -18,11 +18,11 @@ localizationpriority: high
- Windows 10
-Since its inception, Windows 10 has included a number of user experience features that provide useful tips, tricks, and suggestions as you use Windows, as well as app suggestions from the Windows Store. These features are designed to help people get the most out of their Windows 10 experience by, for example, sharing new features, providing more details on the features they use, or sharing content available in the Windows Store. Examples of such user experiences include:
+Since its inception, Windows 10 has included a number of user experience features that provide useful tips, tricks, and suggestions as you use Windows, as well as app suggestions from the Microsoft Store. These features are designed to help people get the most out of their Windows 10 experience by, for example, sharing new features, providing more details on the features they use, or sharing content available in the Microsoft Store. Examples of such user experiences include:
* **Windows Spotlight on the lock screen**. Daily updated images on the lock screen that can include additional facts and tips in “hotspots” that are revealed on hover.
-* **Start menu app suggestions**. App suggestions in Start that recommend productivity tool or utilities from the Windows Store.
+* **Start menu app suggestions**. App suggestions in Start that recommend productivity tool or utilities from the Microsoft Store.
* **Additional apps on Start**. Additional apps pre-installed on the Start screen which can enhance the user’s experience.
@@ -31,11 +31,11 @@ Since its inception, Windows 10 has included a number of user experience feature
* **Microsoft account notifications**. For users who have a connected Microsoft account, toast notifications about their account like parental control notifications or subscription expiration.
>[!TIP]
-> On all Windows desktop editions, users can directly enable and disable Windows 10 tips, tricks, and suggestions and Windows Store suggestions. For example, users are able to select personal photos for the lock screen as opposed to the images provided by Microsoft, or turn off tips, tricks, or suggestions as they use Windows.
+> On all Windows desktop editions, users can directly enable and disable Windows 10 tips, tricks, and suggestions and Microsoft Store suggestions. For example, users are able to select personal photos for the lock screen as opposed to the images provided by Microsoft, or turn off tips, tricks, or suggestions as they use Windows.
Windows 10, version 1607 (also known as the Anniversary Update), provides organizations the ability to centrally manage the type of content provided by these features through Group Policy or mobile device management (MDM). The following table describes how administrators can manage suggestions and tips in Windows 10 commercial and education editions.
-## Options available to manage Windows 10 tips and tricks and Windows Store suggestions
+## Options available to manage Windows 10 tips and tricks and Microsoft Store suggestions
| Windows 10 edition | Disable |Show Microsoft apps only | Show Microsoft and popular third-party apps |
| --- | --- | --- | --- |
diff --git a/windows/configuration/mobile-devices/provisioning-configure-mobile.md b/windows/configuration/mobile-devices/provisioning-configure-mobile.md
index f3010c5a98..07adaea24d 100644
--- a/windows/configuration/mobile-devices/provisioning-configure-mobile.md
+++ b/windows/configuration/mobile-devices/provisioning-configure-mobile.md
@@ -16,7 +16,7 @@ Windows provisioning makes it easy for IT administrators to configure end-user d
A provisioning package (.ppkg) is a container for a collection of configuration settings. Using Windows Configuration Designer, you can create provisioning packages that let you quickly and efficiently configure a device without having to install a new image.
-Windows Configuration Designer can be installed from the [Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit). Windows Configuration Designer is also available as an app in the Windows Store. [Learn more about installing Windows Configuration Designer.](../provisioning-packages/provisioning-install-icd.md)
+Windows Configuration Designer can be installed from the [Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit). Windows Configuration Designer is also available as an app in the Microsoft Store. [Learn more about installing Windows Configuration Designer.](../provisioning-packages/provisioning-install-icd.md)
## Create a provisioning package using the wizard
diff --git a/windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers.md b/windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers.md
index 32ba360e8e..655266907f 100644
--- a/windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers.md
+++ b/windows/configuration/provisioning-packages/how-it-pros-can-use-configuration-service-providers.md
@@ -139,7 +139,7 @@ CSPs provide access to a number of settings useful to enterprises. This section
Some of the settings available in the Policy CSP include the following:
- **Accounts**, such as whether a non-Microsoft account can be added to the device
- - **Application management**, such as whether only Windows Store apps are allowed
+ - **Application management**, such as whether only Microsoft Store apps are allowed
- **Bluetooth**, such as the services allowed to use it
- **Browser**, such as restricting InPrivate browsing
- **Connectivity**, such as whether the device can be connected to a computer by USB
@@ -151,7 +151,7 @@ CSPs provide access to a number of settings useful to enterprises. This section
- **Start**, such as applying a standard Start layout
- **System**, such as allowing the user to reset the device
- **Text input**, such as allowing the device to send anonymized user text input data samples to Microsoft
- - **Update**, such as specifying whether the device could use Microsoft Update, Windows Server Update Services (WSUS), or Windows Store
+ - **Update**, such as specifying whether the device could use Microsoft Update, Windows Server Update Services (WSUS), or Microsoft Store
- **WiFi**, such as whether to enable Internet sharing
Here is a list of CSPs supported on Windows 10 Enterprise, Windows 10 Mobile Enterprise, or both:
diff --git a/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md b/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md
index 99f65f664b..de91fcd4cb 100644
--- a/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md
+++ b/windows/configuration/provisioning-packages/provision-pcs-with-apps-and-certificates.md
@@ -62,23 +62,23 @@ Use the Windows Imaging and Configuration Designer (ICD) tool included in the Wi
### Add a universal app to your package
-Universal apps that you can distribute in the provisioning package can be line-of-business (LOB) apps developed by your organization, Windows Store for Business apps that you acquire with [offline licensing](/microsoft-store/acquire-apps-windows-store-for-business), or third-party apps. This procedure will assume you are distributing apps from the Windows Store for Business. For other apps, obtain the necessary information (such as the package family name) from the app developer.
+Universal apps that you can distribute in the provisioning package can be line-of-business (LOB) apps developed by your organization, Microsoft Store for Business apps that you acquire with [offline licensing](/microsoft-store/acquire-apps-windows-store-for-business), or third-party apps. This procedure will assume you are distributing apps from the Microsoft Store for Business. For other apps, obtain the necessary information (such as the package family name) from the app developer.
1. In the **Available customizations** pane, go to **Runtime settings** > **UniversalAppInstall**.
-2. For **DeviceContextApp**, specify the **PackageFamilyName** for the app. In Windows Store for Business, the package family name is listed in the **Package details** section of the download page.
+2. For **DeviceContextApp**, specify the **PackageFamilyName** for the app. In Microsoft Store for Business, the package family name is listed in the **Package details** section of the download page.
3. For **ApplicationFile**, click **Browse** to find and select the target app (either an \*.appx or \*.appxbundle).
-4. For **DependencyAppxFiles**, click **Browse** to find and add any dependencies for the app. In Windows Store for Business, any dependencies for the app are listed in the **Required frameworks** section of the download page.
+4. For **DependencyAppxFiles**, click **Browse** to find and add any dependencies for the app. In Microsoft Store for Business, any dependencies for the app are listed in the **Required frameworks** section of the download page.
5. For **DeviceContextAppLicense**, enter the **LicenseProductID**.
- - In Windows Store for Business, generate the unencoded license for the app on the app's download page, and change the extension of the license file from **.xml** to **.ms-windows-store-license**.
+ - In Microsoft Store for Business, generate the unencoded license for the app on the app's download page, and change the extension of the license file from **.xml** to **.ms-windows-store-license**.
@@ -88,7 +88,7 @@ Universal apps that you can distribute in the provisioning package can be line-o
7. For **LicenseInstall**, click **Browse**, navigate to the license file that you renamed **.**ms-windows-store-license**, and select the license file.
-[Learn more about distributing offline apps from the Windows Store for Business.](/microsoft-store/distribute-offline-apps)
+[Learn more about distributing offline apps from the Microsoft Store for Business.](/microsoft-store/distribute-offline-apps)
> [!NOTE]
> Removing a provisioning package will not remove any apps installed by device context in that provisioning package.
diff --git a/windows/configuration/provisioning-packages/provision-pcs-with-apps.md b/windows/configuration/provisioning-packages/provision-pcs-with-apps.md
index ec2849ab0e..835fa8a371 100644
--- a/windows/configuration/provisioning-packages/provision-pcs-with-apps.md
+++ b/windows/configuration/provisioning-packages/provision-pcs-with-apps.md
@@ -23,7 +23,7 @@ When you add an app in a Windows Configuration Designer wizard, the appropriate
## Settings for UWP apps
-- **License Path**: Specify the license file if it is an app from the Windows Store. This is optional if you have a certificate for the app.
+- **License Path**: Specify the license file if it is an app from the Microsoft Store. This is optional if you have a certificate for the app.
- **Package family name**: Specify the package family name if you don’t specify a license. This field will be auto-populated after you specify a license.
@@ -70,23 +70,23 @@ When you add an app in a Windows Configuration Designer wizard, the appropriate
### Add a universal app to your package
-Universal apps that you can distribute in the provisioning package can be line-of-business (LOB) apps developed by your organization, Windows Store for Business apps that you acquire with [offline licensing](/microsoft-store/acquire-apps-windows-store-for-business), or third-party apps. This procedure will assume you are distributing apps from the Windows Store for Business. For other apps, obtain the necessary information (such as the package family name) from the app developer.
+Universal apps that you can distribute in the provisioning package can be line-of-business (LOB) apps developed by your organization, Microsoft Store for Business apps that you acquire with [offline licensing](/microsoft-store/acquire-apps-windows-store-for-business), or third-party apps. This procedure will assume you are distributing apps from the Microsoft Store for Business. For other apps, obtain the necessary information (such as the package family name) from the app developer.
1. In the **Available customizations** pane, go to **Runtime settings** > **UniversalAppInstall**.
-2. For **DeviceContextApp**, specify the **PackageFamilyName** for the app. In Windows Store for Business, the package family name is listed in the **Package details** section of the download page.
+2. For **DeviceContextApp**, specify the **PackageFamilyName** for the app. In Microsoft Store for Business, the package family name is listed in the **Package details** section of the download page.
3. For **ApplicationFile**, click **Browse** to find and select the target app (either an \*.appx or \*.appxbundle).
-4. For **DependencyAppxFiles**, click **Browse** to find and add any dependencies for the app. In Windows Store for Business, any dependencies for the app are listed in the **Required frameworks** section of the download page.
+4. For **DependencyAppxFiles**, click **Browse** to find and add any dependencies for the app. In Microsoft Store for Business, any dependencies for the app are listed in the **Required frameworks** section of the download page.
5. For **DeviceContextAppLicense**, enter the **LicenseProductID**.
- - In Windows Store for Business, generate the unencoded license for the app on the app's download page.
+ - In Microsoft Store for Business, generate the unencoded license for the app on the app's download page.
@@ -96,7 +96,7 @@ Universal apps that you can distribute in the provisioning package can be line-o
7. For **LicenseInstall**, click **Browse**, navigate to the license file that you renamed **.**ms-windows-store-license**, and select the license file.
-[Learn more about distributing offline apps from the Windows Store for Business.](/microsoft-store/distribute-offline-apps)
+[Learn more about distributing offline apps from the Microsoft Store for Business.](/microsoft-store/distribute-offline-apps)
> [!NOTE]
> Removing a provisioning package will not remove any apps installed by device context in that provisioning package.
diff --git a/windows/configuration/provisioning-packages/provisioning-how-it-works.md b/windows/configuration/provisioning-packages/provisioning-how-it-works.md
index 9f73314c1e..e5acff9568 100644
--- a/windows/configuration/provisioning-packages/provisioning-how-it-works.md
+++ b/windows/configuration/provisioning-packages/provisioning-how-it-works.md
@@ -16,7 +16,7 @@ localizationpriority: high
- Windows 10
- Windows 10 Mobile
-Provisioning packages in Windows 10 provide IT administrators with a simplified way to apply configuration settings to Windows 10 devices. Windows Configuration Designer is a tool that makes it easy to create a provisioning package. Windows Configuration Designer can be installed from the [Windows Assessment and Deployment Kit (ADK)](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) or through the Windows Store.
+Provisioning packages in Windows 10 provide IT administrators with a simplified way to apply configuration settings to Windows 10 devices. Windows Configuration Designer is a tool that makes it easy to create a provisioning package. Windows Configuration Designer can be installed from the [Windows Assessment and Deployment Kit (ADK)](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) or through the Microsoft Store.
## Provisioning packages
diff --git a/windows/configuration/provisioning-packages/provisioning-install-icd.md b/windows/configuration/provisioning-packages/provisioning-install-icd.md
index 146fa07f6d..ba730bf0b5 100644
--- a/windows/configuration/provisioning-packages/provisioning-install-icd.md
+++ b/windows/configuration/provisioning-packages/provisioning-install-icd.md
@@ -38,12 +38,12 @@ Windows Configuration Designer can create provisioning packages for Windows 10 d
## Install Windows Configuration Designer
-On devices running Windows 10, you can install [the Windows Configuration Designer app from the Windows Store](https://www.microsoft.com/store/apps/9nblggh4tx22). To run Windows Configuration Designer on other operating systems or in languages other than English, install it from the [Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit).
+On devices running Windows 10, you can install [the Windows Configuration Designer app from the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4tx22). To run Windows Configuration Designer on other operating systems or in languages other than English, install it from the [Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit).
>[!NOTE]
->If you install Windows Configuration Designer from both the ADK and Windows Store, the Store app will not open.
+>If you install Windows Configuration Designer from both the ADK and Microsoft Store, the Store app will not open.
>
->The Windows Configuration Designer App from Windows Store currently supports only English. For a localized version of the Windows Configuration Designer, install it from the Windows ADK.
+>The Windows Configuration Designer App from Microsoft Store currently supports only English. For a localized version of the Windows Configuration Designer, install it from the Windows ADK.
1. Go to [Download the Windows ADK](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) and select **Get Windows ADK** for the version of Windows 10 that you want to create provisioning packages for (version 1511, 1607, or 1703).
diff --git a/windows/configuration/provisioning-packages/provisioning-packages.md b/windows/configuration/provisioning-packages/provisioning-packages.md
index 77deef6f51..33edd4d4c4 100644
--- a/windows/configuration/provisioning-packages/provisioning-packages.md
+++ b/windows/configuration/provisioning-packages/provisioning-packages.md
@@ -23,7 +23,7 @@ A provisioning package (.ppkg) is a container for a collection of configuration
Provisioning packages are simple enough that with a short set of written instructions, a student or non-technical employee can use them to configure their device. This can result in a significant reduction in the time required to configure multiple devices in your organization.
-The [Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) includes the Windows Configuration Designer, a tool for configuring provisioning packages. Windows Configuration Designer is also available as an [app in the Windows Store](https://www.microsoft.com/store/apps/9nblggh4tx22).
+The [Windows Assessment and Deployment Kit (ADK) for Windows 10](https://developer.microsoft.com/windows/hardware/windows-assessment-deployment-kit) includes the Windows Configuration Designer, a tool for configuring provisioning packages. Windows Configuration Designer is also available as an [app in the Microsoft Store](https://www.microsoft.com/store/apps/9nblggh4tx22).
@@ -31,12 +31,12 @@ The [Windows Assessment and Deployment Kit (ADK) for Windows 10](https://develo
## New in Windows 10, version 1703
- The tool for creating provisioning packages is renamed Windows Configuration Designer, replacing the Windows Imaging and Configuration Designer (ICD) tool. The components for creating images have been removed from Windows Configuration Designer, which now provides access to runtime settings only.
-- Windows Configuration Designer can still be installed from the Windows ADK. You can also install it from the Windows Store.
+- Windows Configuration Designer can still be installed from the Windows ADK. You can also install it from the Microsoft Store.
- Windows Configuration Designer adds more wizards to make it easier to create provisioning packages for specific scenarios. See [What you can configure](#configuration-designer-wizards) for wizard descriptions.
- The wizard **Provision desktop devices** (previously called **Simple provisioning**) now enables joining Azure Active Directory (Azure AD) domains and also allows you to remove non-Microsoft software from Windows desktop devices during provisioning.
- When provisioning packages are applied to a device, a status screen indicates successful or failed provisioning.
- Windows 10 includes PowerShell cmdlets that simplify scripted provisioning. Using these cmdlets, you can add provisioning packages, remove provisioning packages and generate log files to investigate provisioning errors.
-- The **Provision school devices** wizard is removed from Windows Configuration Designer. Instead, use the [Setup School PCs app](https://www.microsoft.com/store/p/set-up-school-pcs/9nblggh4ls40) from the Windows Store.
+- The **Provision school devices** wizard is removed from Windows Configuration Designer. Instead, use the [Setup School PCs app](https://www.microsoft.com/store/p/set-up-school-pcs/9nblggh4ls40) from the Microsoft Store.
diff --git a/windows/configuration/set-up-a-kiosk-for-windows-10-for-desktop-editions.md b/windows/configuration/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
index 7ffa944628..e7a7a025ab 100644
--- a/windows/configuration/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
+++ b/windows/configuration/set-up-a-kiosk-for-windows-10-for-desktop-editions.md
@@ -59,7 +59,7 @@ When you use the **Provision kiosk devices** wizard in Windows Configuration Des
|  Enable account management if you want to configure settings on this page. **If enabled:**You can enroll the device in Active Directory, enroll in Azure Active Directory, or create a local administrator account on the deviceTo enroll the device in Active Directory, enter the credentials for a least-privileged user account to join the device to the domain.Before you use a Windows Configuration Designer wizard to configure bulk Azure AD enrollment, [set up Azure AD join in your organization](https://docs.microsoft.com/azure/active-directory/active-directory-azureadjoin-setup). The **maximum number of devices per user** setting in your Azure AD tenant determines how many times the bulk token that you get in the wizard can be used. To enroll the device in Azure AD, select that option and enter a friendly name for the bulk token you will get using the wizard. Set an expiration date for the token (maximum is 30 days from the date you get the token). Click **Get bulk token**. In the **Let's get you signed in** window, enter an account that has permissions to join a device to Azure AD, and then the password. Click **Accept** to give Windows Configuration Designer the necessary permissions.**Warning:** You must run Windows Configuration Designer on Windows 10 to configure Azure Active Directory enrollment using any of the wizards.To create a local administrator account, select that option and enter a user name and password. **Important:** If you create a local account in the provisioning package, you must change the password using the **Settings** app every 42 days. If the password is not changed during that period, the account might be locked out and unable to sign in. |  |
|  You can provision the kiosk app in the **Add applications** step. You can install multiple applications, both Classic Windows (Win32) apps and Universal Windows Platform (UWP) apps, in a provisioning package. The settings in this step vary according to the application that you select. For help with the settings, see [Provision PCs with apps](provisioning-packages/provision-pcs-with-apps.md)**Warning:** If you click the plus button to add an application, you must specify an application for the provisioning package to validate. If you click the plus button in error, select any executable file in **Installer Path**, and then a **Cancel** button becomes available, allowing you to complete the provisioning package without an application. |  |
|  To provision the device with a certificate for the kiosk app, click **Add a certificate**. Enter a name for the certificate, and then browse to and select the certificate to be used. |  |
-|  **Important:** You must use the Windows Configuration Designer app from Windows Store to select a Classic Windows application as the kiosk app in a provisioning package.You can create a local standard user account that will be used to run the kiosk app. If you toggle **No**, make sure that you have an existing user account to run the kiosk app.If you want to create an account, enter the user name and password, and then toggle **Yes** or **No** to automatically sign in the account when the device starts.In **Configure the kiosk mode app**, enter the name of the user account that will run the kiosk mode app. Select the type of app to run in kiosk mode, and then enter the path or filename (for a Classic Windows app) or the AUMID (for a Universal Windows app). For a Classic Windows app, you can use the filename if the path to the file is in the PATH environment variable, otherwise the full path is required. |  |
+|  **Important:** You must use the Windows Configuration Designer app from Microsoft Store to select a Classic Windows application as the kiosk app in a provisioning package.You can create a local standard user account that will be used to run the kiosk app. If you toggle **No**, make sure that you have an existing user account to run the kiosk app.If you want to create an account, enter the user name and password, and then toggle **Yes** or **No** to automatically sign in the account when the device starts.In **Configure the kiosk mode app**, enter the name of the user account that will run the kiosk mode app. Select the type of app to run in kiosk mode, and then enter the path or filename (for a Classic Windows app) or the AUMID (for a Universal Windows app). For a Classic Windows app, you can use the filename if the path to the file is in the PATH environment variable, otherwise the full path is required. |  |
|  On this step, select your options for tablet mode, the user experience on the Welcome and shutdown screens, and the timeout settings. |  |
| You can set a password to protect your provisioning package. You must enter this password when you apply the provisioning package to a device. |  |
diff --git a/windows/configuration/start-taskbar-lockscreen.md b/windows/configuration/start-taskbar-lockscreen.md
index 876de1e25e..cad0f022bc 100644
--- a/windows/configuration/start-taskbar-lockscreen.md
+++ b/windows/configuration/start-taskbar-lockscreen.md
@@ -18,7 +18,7 @@ author: jdeckerms
| Topic | Description |
| --- | --- |
| [Windows Spotlight on the lock screen](windows-spotlight.md) | Windows Spotlight is an option for the lock screen background that displays different background images and occasionally offers suggestions on the lock screen.**Note:** You can also use the [Personalization CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/personalization-csp) settings to set lock screen and desktop background images. |
-| [Manage Windows 10 and Windows Store tips, tricks, and suggestions](manage-tips-and-suggestions.md) | Options to manage the tips, tricks, and suggestions offered by Windows and Windows Store. |
+| [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](manage-tips-and-suggestions.md) | Options to manage the tips, tricks, and suggestions offered by Windows and Microsoft Store. |
| [Manage Windows 10 Start and taskbar layout](windows-10-start-layout-options-and-policies.md) | Organizations might want to deploy a customized Start screen and menu to devices running Windows 10 Pro, Enterprise, or Education. A standard Start layout can be useful on devices that are common to multiple users and devices that are locked down for specialized purposes. |
diff --git a/windows/configuration/stop-employees-from-using-the-windows-store.md b/windows/configuration/stop-employees-from-using-the-windows-store.md
index 4868f99cb9..43f1bbb647 100644
--- a/windows/configuration/stop-employees-from-using-the-windows-store.md
+++ b/windows/configuration/stop-employees-from-using-the-windows-store.md
@@ -1,6 +1,6 @@
---
-title: Configure access to Windows Store (Windows 10)
-description: IT Pros can configure access to Windows Store for client computers in their organization. For some organizations, business policies require blocking access to Windows Store.
+title: Configure access to Microsoft Store (Windows 10)
+description: IT Pros can configure access to Microsoft Store for client computers in their organization. For some organizations, business policies require blocking access to Microsoft Store.
ms.assetid: 7AA60D3D-2A69-45E7-AAB0-B8AFC29C2E97
ms.prod: w10
ms.mktglfcycl: manage
@@ -10,7 +10,7 @@ author: TrudyHa
localizationpriority: high
---
-# Configure access to Windows Store
+# Configure access to Microsoft Store
**Applies to**
@@ -20,23 +20,23 @@ localizationpriority: high
>For more info about the features and functionality that are supported in each edition of Windows, see [Compare Windows 10 Editions](https://www.microsoft.com/en-us/WindowsForBusiness/Compare).
-IT pros can configure access to Windows Store for client computers in their organization. For some organizations, business policies require blocking access to Windows Store.
+IT pros can configure access to Microsoft Store for client computers in their organization. For some organizations, business policies require blocking access to Microsoft Store.
-## Options to configure access to Windows Store
+## Options to configure access to Microsoft Store
-You can use these tools to configure access to Windows Store: AppLocker or Group Policy. For Windows 10, this is only supported on Windows 10 Enterprise edition.
+You can use these tools to configure access to Microsoft Store: AppLocker or Group Policy. For Windows 10, this is only supported on Windows 10 Enterprise edition.
-## Block Windows Store using AppLocker
+## Block Microsoft Store using AppLocker
Applies to: Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile
-AppLocker provides policy-based access control management for applications. You can block access to Windows Store app with AppLocker by creating a rule for packaged apps. You'll give the name of the Windows Store app as the packaged app that you want to block from client computers.
+AppLocker provides policy-based access control management for applications. You can block access to Microsoft Store app with AppLocker by creating a rule for packaged apps. You'll give the name of the Microsoft Store app as the packaged app that you want to block from client computers.
For more information on AppLocker, see [What is AppLocker?](/windows/device-security/applocker/what-is-applocker) For more information on creating an AppLocker rule for app packages, see [Create a rule for packaged apps](/windows/device-security/applocker/create-a-rule-for-packaged-apps).
-**To block Windows Store using AppLocker**
+**To block Microsoft Store using AppLocker**
1. Type secpol in the search bar to find and start AppLocker.
@@ -56,7 +56,7 @@ For more information on AppLocker, see [What is AppLocker?](/windows/device-secu
8. Optional: On **Exceptions**, specify conditions by which to exclude files from being affected by the rule. This allows you to add exceptions based on the same rule reference and rule scope as you set before. Click **Next**.
-## Block Windows Store using Group Policy
+## Block Microsoft Store using Group Policy
Applies to: Windows 10 Enterprise, version 1511, Windows 10 Education
@@ -64,9 +64,9 @@ Applies to: Windows 10 Enterprise, version 1511, Windows 10 Education
> [!Note]
> Not supported on Windows 10 Pro.
-You can also use Group Policy to manage access to Windows Store.
+You can also use Group Policy to manage access to Microsoft Store.
-**To block Windows Store using Group Policy**
+**To block Microsoft Store using Group Policy**
1. Type gpedit in the search bar to find and start Group Policy Editor.
@@ -76,14 +76,14 @@ You can also use Group Policy to manage access to Windows Store.
4. On the **Turn off Store application** setting page, click **Enabled**, and then click **OK**.
-## Block Windows Store using management tool
+## Block Microsoft Store using management tool
Applies to: Windows 10 Mobile
-If you have mobile devices in your organization that you upgraded from earlier versions of Windows Phone 8 to Windows 10 Mobile, existing policies created using the Windows Phone 8.1 configuration service providers (CSP) with your MDM tool will continue to work on Windows 10 Mobile. If you are starting with Windows 10 Mobile, we recommend using [AppLocker](#block-store-applocker) to manage access to Windows Store app.
+If you have mobile devices in your organization that you upgraded from earlier versions of Windows Phone 8 to Windows 10 Mobile, existing policies created using the Windows Phone 8.1 configuration service providers (CSP) with your MDM tool will continue to work on Windows 10 Mobile. If you are starting with Windows 10 Mobile, we recommend using [AppLocker](#block-store-applocker) to manage access to Microsoft Store app.
-When your MDM tool supports Windows Store for Business, the MDM can use these CSPs to block Windows Store app:
+When your MDM tool supports Microsoft Store for Business, the MDM can use these CSPs to block Microsoft Store app:
- [Policy](https://go.microsoft.com/fwlink/p/?LinkId=717030)
@@ -94,19 +94,19 @@ For more information, see [Configure an MDM provider](/microsoft-store/configure
## Show private store only using Group Policy
Applies to Windows 10 Enterprise, version 1607, Windows 10 Education
-If you're using Windows Store for Business and you want employees to only see apps you're managing in your private store, you can use Group Policy to show only the private store. Windows Store app will still be available, but employees can't view or purchase apps. Employees can view and install apps that the admin has added to your organization's private store.
+If you're using Microsoft Store for Business and you want employees to only see apps you're managing in your private store, you can use Group Policy to show only the private store. Microsoft Store app will still be available, but employees can't view or purchase apps. Employees can view and install apps that the admin has added to your organization's private store.
-**To show private store only in Windows Store app**
+**To show private store only in Microsoft Store app**
1. Type **gpedit** in the search bar, and then select **Edit group policy (Control panel)** to find and start Group Policy Editor.
2. In the console tree of the snap-in, go to **User Configuration** or **Computer Configuration** > **Administrative Templates** > **Windows Components**, and then click **Store**.
-3. Right-click **Only display the private store within the Windows Store app** in the right pane, and click **Edit**.
+3. Right-click **Only display the private store within the Microsoft Store app** in the right pane, and click **Edit**.
- This opens the **Only display the private store within the Windows Store app** policy settings.
+ This opens the **Only display the private store within the Microsoft Store app** policy settings.
-4. On the **Only display the private store within the Windows Store app** setting page, click **Enabled**, and then click **OK**.
+4. On the **Only display the private store within the Microsoft Store app** setting page, click **Enabled**, and then click **OK**.
## Related topics
diff --git a/windows/configuration/ue-v/uev-for-windows.md b/windows/configuration/ue-v/uev-for-windows.md
index 8702b65318..83dec42449 100644
--- a/windows/configuration/ue-v/uev-for-windows.md
+++ b/windows/configuration/ue-v/uev-for-windows.md
@@ -13,7 +13,7 @@ ms.prod: w10
**Applies to**
- Windows 10, version 1607
-Many users customize their settings for Windows and for specific applications. Customizable Windows settings include Windows Store appearance, language, background picture, font size, and accent colors. Customizable application settings include language, appearance, behavior, and user interface options.
+Many users customize their settings for Windows and for specific applications. Customizable Windows settings include Microsoft Store appearance, language, background picture, font size, and accent colors. Customizable application settings include language, appearance, behavior, and user interface options.
With User Experience Virtualization (UE-V), you can capture user-customized Windows and application settings and store them on a centrally managed network file share. When users log on, their personalized settings are applied to their work session, regardless of which device or virtual desktop infrastructure (VDI) sessions they log on to.
diff --git a/windows/configuration/windows-diagnostic-data.md b/windows/configuration/windows-diagnostic-data.md
index 7818844702..88a4339635 100644
--- a/windows/configuration/windows-diagnostic-data.md
+++ b/windows/configuration/windows-diagnostic-data.md
@@ -67,7 +67,7 @@ This type of data includes details about the health of the device, operating sys
| Category Name | Description and Examples |
| - | - |
| Device health and crash data | Information about the device and software health such as:
- Error codes and error messages, name and ID of the app, and process reporting the error
- DLL library predicted to be the source of the error -- xyz.dll
- System generated files -- app or product logs and trace files to help diagnose a crash or hang
- System settings such as registry keys
- User generated files – .doc, .ppt, .csv files where they are indicated as a potential cause for a crash or hang
- Details and counts of abnormal shutdowns, hangs, and crashes
- Crash failure data – OS, OS component, driver, device, 1st and 3rd party app data
- Crash and Hang dumps
- The recorded state of the working memory at the point of the crash.
- Memory in use by the kernel at the point of the crash.
- Memory in use by the application at the point of the crash.
- All the physical memory used by Windows at the point of the crash.
- Class and function name within the module that failed.
|
-| Device performance and reliability data | Information about the device and software performance such as:
- User Interface interaction durations -- Start Menu display times, browser tab switch times, app launch and switch times, and Cortana and search performance and reliability.
- Device on/off performance -- Device boot, shutdown, power on/off, lock/unlock times, and user authentication times (fingerprint and face recognition durations).
- In-app responsiveness -- time to set alarm, time to fully render in-app navigation menus, time to sync reading list, time to start GPS navigation, time to attach picture MMS, and time to complete a Windows Store transaction.
- User input responsiveness – onscreen keyboard invocation times for different languages, time to show auto-complete words, pen or touch latencies, latency for handwriting recognition to words, Narrator screen reader responsiveness, and CPU score.
- UI and media performance and glitches/smoothness -- video playback frame rate, audio glitches, animation glitches (stutter when bringing up Start), graphics score, time to first frame, play/pause/stop/seek responsiveness, time to render PDF, dynamic streaming of video from OneDrive performance
- Disk footprint -- Free disk space, out of memory conditions, and disk score.
- Excessive resource utilization – components impacting performance or battery life through high CPU usage during different screen and power states
- Background task performance -- download times, Windows Update scan duration, Windows Defender Antivirus scan times, disk defrag times, mail fetch times, service startup and state transition times, and time to index on-device files for search results
- Peripheral and devices -- USB device connection times, time to connect to a wireless display, printing times, network availability and connection times (time to connect to Wi-Fi, time to get an IP address from DHCP etc.), smart card authentication times, automatic brightness environmental response times
- Device setup -- first setup experience times (time to install updates, install apps, connect to network etc.), time to recognize connected devices (printer and monitor), and time to setup Microsoft Account.
- Power and Battery life – power draw by component (Process/CPU/GPU/Display), hours of screen off time, sleep state transition details, temperature and thermal throttling, battery drain in a power state (screen off or screen on), processes and components requesting power use during screen off, auto-brightness details, time device is plugged into AC vs. battery, battery state transitions
- Service responsiveness - Service URI, operation, latency, service success/error codes, and protocol.
- Diagnostic heartbeat – regular signal to validate the health of the diagnostics system
+| Device performance and reliability data | Information about the device and software performance such as:
- User Interface interaction durations -- Start Menu display times, browser tab switch times, app launch and switch times, and Cortana and search performance and reliability.
- Device on/off performance -- Device boot, shutdown, power on/off, lock/unlock times, and user authentication times (fingerprint and face recognition durations).
- In-app responsiveness -- time to set alarm, time to fully render in-app navigation menus, time to sync reading list, time to start GPS navigation, time to attach picture MMS, and time to complete a Microsoft Store transaction.
- User input responsiveness – onscreen keyboard invocation times for different languages, time to show auto-complete words, pen or touch latencies, latency for handwriting recognition to words, Narrator screen reader responsiveness, and CPU score.
- UI and media performance and glitches/smoothness -- video playback frame rate, audio glitches, animation glitches (stutter when bringing up Start), graphics score, time to first frame, play/pause/stop/seek responsiveness, time to render PDF, dynamic streaming of video from OneDrive performance
- Disk footprint -- Free disk space, out of memory conditions, and disk score.
- Excessive resource utilization – components impacting performance or battery life through high CPU usage during different screen and power states
- Background task performance -- download times, Windows Update scan duration, Windows Defender Antivirus scan times, disk defrag times, mail fetch times, service startup and state transition times, and time to index on-device files for search results
- Peripheral and devices -- USB device connection times, time to connect to a wireless display, printing times, network availability and connection times (time to connect to Wi-Fi, time to get an IP address from DHCP etc.), smart card authentication times, automatic brightness environmental response times
- Device setup -- first setup experience times (time to install updates, install apps, connect to network etc.), time to recognize connected devices (printer and monitor), and time to setup Microsoft Account.
- Power and Battery life – power draw by component (Process/CPU/GPU/Display), hours of screen off time, sleep state transition details, temperature and thermal throttling, battery drain in a power state (screen off or screen on), processes and components requesting power use during screen off, auto-brightness details, time device is plugged into AC vs. battery, battery state transitions
- Service responsiveness - Service URI, operation, latency, service success/error codes, and protocol.
- Diagnostic heartbeat – regular signal to validate the health of the diagnostics system
## Software Setup and Inventory data
@@ -86,7 +86,7 @@ This type of data includes diagnostic details about Microsoft applications that
| - | - |
| Movies | Information about movie consumption functionality on the device such as:
- Video Width, height, color pallet, encoding (compression) type, and encryption type
- Instructions for how to stream content for the user -- the smooth streaming manifest of chunks of content files that must be pieced together to stream the content based on screen resolution and bandwidth
- URL for a specific two second chunk of content if there is an error
- Full screen viewing mode details
|
| Music & TV | Information about music and TV consumption on the device such as:
- Service URL for song being downloaded from the music service – collected when an error occurs to facilitate restoration of service
- Content type (video, audio, surround audio)
- Local media library collection statistics -- number of purchased tracks, number of playlists
- Region mismatch -- User OS Region, and Xbox Live region
|
-| Reading | Information about reading consumption functionality on the device such as:
- App accessing content and status and options used to open a Windows Store book
- Language of the book
- Time spent reading content
- Content type and size details
|
+| Reading | Information about reading consumption functionality on the device such as:
- App accessing content and status and options used to open a Microsoft Store book
- Language of the book
- Time spent reading content
- Content type and size details
|
| Photos App | Information about photos usage on the device such as:
- File source data -- local, SD card, network device, and OneDrive
- Image & video resolution, video length, file sizes types and encoding
- Collection view or full screen viewer use and duration of view
## Browsing, Search and Query data
diff --git a/windows/deployment/change-history-for-deploy-windows-10.md b/windows/deployment/change-history-for-deploy-windows-10.md
index 1fa15b38c4..56563526b0 100644
--- a/windows/deployment/change-history-for-deploy-windows-10.md
+++ b/windows/deployment/change-history-for-deploy-windows-10.md
@@ -21,7 +21,7 @@ This topic lists new and updated topics in the [Deploy Windows 10](index.md) doc
## RELEASE: Windows 10, version 1703
-The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The provisioning topics have been moved to [Configure Windows 10](/windows/configuration/index.md).
+The topics in this library have been updated for Windows 10, version 1703 (also known as the Creators Update). The provisioning topics have been moved to [Configure Windows 10](/windows/configuration/index).
## March 2017
diff --git a/windows/deployment/update/waas-quick-start.md b/windows/deployment/update/waas-quick-start.md
index 917f902b1c..8b7414fd7d 100644
--- a/windows/deployment/update/waas-quick-start.md
+++ b/windows/deployment/update/waas-quick-start.md
@@ -22,19 +22,19 @@ Windows as a service is a new concept, introduced with the release of Windows 10
## Definitions
Some new terms have been introduced as part of Windows as a service, so you should know what these terms mean.
-- **Feature updates** will be released two to three times per year. As the name suggests, these will add new features to Windows 10, delivered in bite-sized chunks compared to the previous practice of Windows releases every 3-5 years.
+- **Feature updates** will be released twice per year, around March and September. As the name suggests, these will add new features to Windows 10, delivered in bite-sized chunks compared to the previous practice of Windows releases every 3-5 years.
- **Quality updates** are released monthly, delivering both security and non-security fixes. These are cumulative, so installing the latest quality update is sufficient to get all the available fixes for a specific Windows 10 feature update.
- **Insider Preview** builds are made available during the development of the features that will be shipped in the next feature update, enabling organizations to validate new features as well as compatibility with existing apps and infrastructure, providing feedback to Microsoft on any issues encountered.
-- **Servicing branches** allow organizations to choose when to deploy new features. Current Branch (CB) deploys the fastest, soon after a feature update is released. Current Branch for Business (CBB) defers the installation of the same feature update by about four months, until that feature update is considered ready for broad deployment. Long Term Servicing Branch (LTSB) is different, used only for specialized devices (which typically don’t run Office) such as those that control medical equipment or ATM machines that need to be kept stable and secure.
+- **Servicing channels** allow organizations to choose when to deploy new features. The Semi-Annual Channel receives feature updates twice per year. The Long Term Servicing Channel, which is designed to be used only for specialized devices (which typically don't run Office) such as those that control medical equipment or ATM machines, receives new feature releases about every three years.
- **Deployment rings** are groups of devices used to initially pilot, and then to broadly deploy, each feature update in an organization.
See [Overview of Windows as a service](waas-overview.md) for more information.
## Key Concepts
-New feature update releases are initially considered **Current Branch (CB) releases**; organizations will use these for pilot deployments to ensure compatibility with existing apps and infrastructure. After about four months, the feature update will be declared as **Current Branch for Business (CBB)**, indicating that it is ready for broad deployment.
+Windows 10 gains new functionality with twice-per-year feature update releases. Initially, organizations will use these feature update releases for pilot deployments to ensure compatibility with existing apps and infrastructure. After a period of time, typically about four months after the feature update release, broad deployment throughout the organization can begin. The exact timeframe is determined by feedback from customers, ISVs, OEMs, and others, with an explicit "ready for broad deployment" declaration signaling this to customers.
-Each Windows 10 feature update (which initially begins as CB and then is declared as CBB) will be serviced with quality updates for a minimum of 18 months after it is released. The total length of time can be longer, as there will be two CBB releases serviced at all times. There will be a minimum of 60 days advanced notice (a grace period) after a CBB declaration occurs before an older feature update is no longer serviced.
+Each Windows 10 feature update will be serviced with quality updates for 18 months from the date of the feature update release.
Windows 10 Enterprise LTSB is a separate **Long Term Servicing Branch (LTSB)** version. Each release is supported for a total of 10 years (five years standard support, five years extended support). New releases are expected about every three years.
@@ -44,9 +44,9 @@ See [Assign devices to servicing branches for Windows 10 updates](waas-servicing
The process for keeping Windows 10 up to date involves deploying a feature update, at an appropriate time after its release. A variety of tools management and patching tools such as Windows Update, Windows Update for Business, Windows Server Update Services, System Center Configuration Manager, and third-party products) can be used to help with this process. [Windows Analytics Upgrade Readiness](https://www.microsoft.com/en-us/WindowsForBusiness/windows-analytics), a free tool to streamline Windows upgrade projects, is another important tool to help.
-Because app compatibility, both for desktop apps and web apps, is outstanding with Windows 10, extensive advanced testing isn’t required. Instead, only business-critical apps need to be tested, with the remaining apps validated through a series of pilot deployment rings. Once these pilot deployments have validated most apps and CBB has been declared, broad deployment can begin.
+Because app compatibility, both for desktop apps and web apps, is outstanding with Windows 10, extensive advanced testing isn’t required. Instead, only business-critical apps need to be tested, with the remaining apps validated through a series of pilot deployment rings. Once these pilot deployments have validated most apps, broad deployment can begin.
-This process repeats with each new feature update, two to three times per year. These are small deployment projects, compared to the big projects that were necessary with the old three-to-five-year Windows release cycles.
+This process repeats with each new feature update, twice per year. These are small deployment projects, compared to the big projects that were necessary with the old three-to-five-year Windows release cycles.
Additional technologies such as BranchCache and Delivery Optimization, both peer-to-peer distribution tools, can help with the distribution of the feature update installation files.
diff --git a/windows/device-security/tpm/manage-tpm-lockout.md b/windows/device-security/tpm/manage-tpm-lockout.md
index 76b1ee2bae..57880902c5 100644
--- a/windows/device-security/tpm/manage-tpm-lockout.md
+++ b/windows/device-security/tpm/manage-tpm-lockout.md
@@ -74,7 +74,7 @@ The TPM Group Policy settings in the following list are located at:
This policy setting allows you to manage the maximum number of authorization failures for the TPM for all standard users. If the total number of authorization failures for all users equals the duration that is set for the policy, all users are prevented from sending commands to the TPM that require authorization.
-For information about mitigating dictionary attacks that use the lockout settings, see [TPM fundamentals](tpm-fundamentals.md#how-the-tpm-mitigates-dictionary-attacks).
+For information about mitigating dictionary attacks that use the lockout settings, see [TPM fundamentals](tpm-fundamentals.md#anti-hammering).
## Use the TPM cmdlets
diff --git a/windows/device-security/tpm/tpm-fundamentals.md b/windows/device-security/tpm/tpm-fundamentals.md
index 044bb0c1be..525a5a312d 100644
--- a/windows/device-security/tpm/tpm-fundamentals.md
+++ b/windows/device-security/tpm/tpm-fundamentals.md
@@ -47,7 +47,7 @@ The following sections provide an overview of the technologies that support the
- [TPM Key Attestation](#key-attestation)
-- [How the TPM mitigates dictionary attacks](#how-the-tpm-mitigates-dictionary-attacks)
+- [Anti-hammering](#anti-hammering)
The following topic describes the TPM Services that can be controlled centrally by using Group Policy settings:
[TPM Group Policy Settings](trusted-platform-module-services-group-policy-settings.md).
@@ -85,17 +85,17 @@ For a TPM to be usable by a trusted application, it must contain an endorsement
TPM key attestation allows a certification authority to verify that a private key is actually protected by a TPM and that the TPM is one that the certification authority trusts. Endorsement keys which have been proven valid can be used to bind the user identity to a device. Moreover, the user certificate with a TPM attested key provides higher security assurance backed up by the non-exportability, anti-hammering, and isolation of keys provided by a TPM.
-## How the TPM mitigates dictionary attacks
+## Anti-hammering
When a TPM processes a command, it does so in a protected environment, for example, a dedicated microcontroller on a discrete chip or a special hardware-protected mode on the main CPU. A TPM can be used to create a cryptographic key that is not disclosed outside the TPM, but is able to be used in the TPM after the correct authorization value is provided.
-TPMs have dictionary attack logic that is designed to prevent brute force attacks that attempt to determine authorization values for using a key. The basic approach is for the TPM to allow only a limited number of authorization failures before it prevents more attempts to use keys and locks. Providing a failure count for individual keys is not technically practical, so TPMs have a global lockout when too many authorization failures occur.
+TPMs have anti-hammering protection that is designed to prevent brute force attacks, or more complex dictionary attacks, that attempt to determine authorization values for using a key. The basic approach is for the TPM to allow only a limited number of authorization failures before it prevents more attempts to use keys and locks. Providing a failure count for individual keys is not technically practical, so TPMs have a global lockout when too many authorization failures occur.
-Because many entities can use the TPM, a single authorization success cannot reset the TPM’s dictionary attack logic. This prevents an attacker from creating a key with a known authorization value and then using it to reset the TPM’s dictionary attack logic. Generally TPMs are designed to forget about authorization failures after a period of time so the TPM does not enter a lockout state unnecessarily. A TPM owner password can be used to reset the TPM’s lockout logic.
+Because many entities can use the TPM, a single authorization success cannot reset the TPM’s anti-hammering protection. This prevents an attacker from creating a key with a known authorization value and then using it to reset the TPM’s protection. Generally, TPMs are designed to forget about authorization failures after a period of time so the TPM does not enter a lockout state unnecessarily. A TPM owner password can be used to reset the TPM’s lockout logic.
-### TPM 2.0 dictionary attack behavior
+### TPM 2.0 anti-hammering
-TPM 2.0 has well defined dictionary attack logic behavior. This is in contrast to TPM 1.2 for which the dictionary attack logic was set by the manufacturer, and the logic varied widely throughout the industry.
+TPM 2.0 has well defined anti-hammering behavior. This is in contrast to TPM 1.2 for which the anti-hammering protection was implemented by the manufacturer, and the logic varied widely throughout the industry.
> [!WARNING]
> For the purposes of this topic, Windows 8 Certified Hardware also pertains to Windows 8.1 systems. The following references to “Windows” include these supported Windows versions.
@@ -106,7 +106,7 @@ Attempts to use a key with an authorization value for the next two hours would n
Windows 8 Certification does not require TPM 2.0 systems to forget about authorization failures when the system is fully powered off or when the system has hibernated. Windows does require that authorization failures are forgotten when the system is running normally, in a sleep mode, or in low power states other than off. If a Windows system with TPM 2.0 is locked, the TPM leaves lockout mode if the system is left on for two hours.
-The dictionary attack logic for TPM 2.0 can be fully reset immediately by sending a reset lockout command to the TPM and providing the TPM owner password. By default, Windows automatically provisions TPM 2.0 and stores the TPM owner password for use by system administrators.
+The anti-hammering protection for TPM 2.0 can be fully reset immediately by sending a reset lockout command to the TPM and providing the TPM owner password. By default, Windows automatically provisions TPM 2.0 and stores the TPM owner password for use by system administrators.
In some enterprise situations, the TPM owner authorization value is configured to be stored centrally in Active Directory, and it is not stored on the local system. An administrator can launch the TPM MMC and choose to reset the TPM lockout time. If the TPM owner password is stored locally, it is used to reset the lockout time. If the TPM owner password is not available on the local system, the administrator needs to provide it. If an administrator attempts to reset the TPM lockout state with the wrong TPM owner password, the TPM does not allow another attempt to reset the lockout state for 24 hours.
@@ -114,12 +114,12 @@ TPM 2.0 allows some keys to be created without an authorization value associate
### Rationale behind the Windows 8.1 and Windows 8 defaults
-Windows relies on the TPM 2.0 dictionary attack protection for multiple features. The defaults that are selected for Windows 8 balance trade-offs for different scenarios.
+Windows relies on the TPM 2.0 anti-hammering protection for multiple features. The defaults that are selected for Windows 8 balance trade-offs for different scenarios.
For example, when BitLocker is used with a TPM plus PIN configuration, it needs the number of PIN guesses to be limited over time. If the computer is lost, someone could make only 32 PIN guesses immediately, and then only one more guess every two hours. This totals about 4415 guesses per year. This makes a good standard for system administrators to determine how many PIN characters to use for BitLocker deployments.
The Windows TPM-based smart card, which is a virtual smart card, can be configured to allow sign in to the system. In contrast with physical smart cards, the sign-in process uses a TPM-based key with an authorization value. The following list shows the advantages of virtual smart cards:
-- Physical smart cards can enforce lockout for only the physical smart card PIN, and they can reset the lockout after the correct PIN is entered. With a virtual smart card, the TPM’s dictionary attack is not reset after a successful authentication. The allowed number of authorization failures before the TPM enters lockout includes many factors.
+- Physical smart cards can enforce lockout for only the physical smart card PIN, and they can reset the lockout after the correct PIN is entered. With a virtual smart card, the TPM’s anti-hammering protection is not reset after a successful authentication. The allowed number of authorization failures before the TPM enters lockout includes many factors.
- Hardware manufacturers and software developers have the option to use the security features of the TPM to meet their requirements.
diff --git a/windows/threat-protection/windows-defender-antivirus/windows-defender-security-center-antivirus.md b/windows/threat-protection/windows-defender-antivirus/windows-defender-security-center-antivirus.md
index 1def305540..ebc8b9c83d 100644
--- a/windows/threat-protection/windows-defender-antivirus/windows-defender-security-center-antivirus.md
+++ b/windows/threat-protection/windows-defender-antivirus/windows-defender-security-center-antivirus.md
@@ -43,7 +43,7 @@ The app also includes the settings and status of:
- Parental and Family Controls
>[!NOTE]
->The Windows Defender Security Center app is a client interface on Windows 10, version 1703. It is not the Windows Defender Advanced Security Center, which is the web portal used to review and manage [Windows Defender Advanced Threat Protection](../windows-defender-atp/windows-defender-advanced-threat-protection.md).
+>The Windows Defender Security Center app is a client interface on Windows 10, version 1703. It is not the Windows Defender Security Center web portal that is used to review and manage [Windows Defender Advanced Threat Protection](../windows-defender-atp/windows-defender-advanced-threat-protection.md).
**Review virus and threat protection settings in the Windows Defender Security Center app:**
diff --git a/windows/threat-protection/windows-defender-atp/windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/windows-defender-advanced-threat-protection.md
index 0963cb7037..183bf2bd6b 100644
--- a/windows/threat-protection/windows-defender-atp/windows-defender-advanced-threat-protection.md
+++ b/windows/threat-protection/windows-defender-atp/windows-defender-advanced-threat-protection.md
@@ -27,7 +27,7 @@ localizationpriority: high
Windows Defender Advanced Threat Protection (Windows Defender ATP) is a security service that enables enterprise customers to detect, investigate, and respond to advanced threats on their networks.
-Get a quick, but in-depth overview of Windows Defender ATP for Windows 10 and the new capabilities in Windows 10, version 1703 see (Windows Defender ATP for Windows 10 Creators Update)[https://technet.microsoft.com/en-au/windows/mt782787].
+Get a quick, but in-depth overview of Windows Defender ATP for Windows 10 and the new capabilities in Windows 10, version 1703 see [Windows Defender ATP for Windows 10 Creators Update](https://technet.microsoft.com/en-au/windows/mt782787).
Windows Defender ATP uses the following combination of technology built into Windows 10 and Microsoft's robust cloud service:
diff --git a/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md b/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md
index 9fbe861ddc..6c53aea745 100644
--- a/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md
+++ b/windows/threat-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune.md
@@ -1,5 +1,5 @@
---
-title: Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune (Windows 10)
+title: Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Intune (Windows 10)
description: After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Intune to associate and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
ms.assetid: d0eaba4f-6d7d-4ae4-8044-64680a40cf6b
keywords: WIP, Enterprise Data Protection
@@ -11,22 +11,22 @@ author: eross-msft
localizationpriority: high
---
-# Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune
+# Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Intune
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later (except Microsoft Azure Rights Management, which is only available on the desktop)
-After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Azure Intune to associate and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
+After you've created and deployed your Windows Information Protection (WIP) policy, you can use Microsoft Intune to associate and deploy your Virtual Private Network (VPN) policy, linking it to your WIP policy.
-## Associate your WIP policy to your VPN policy by using Microsoft Azure Intune
+## Associate your WIP policy to your VPN policy by using Microsoft Intune
Follow these steps to associate your WIP policy with your organization's existing VPN policy.
**To associate your policies**
1. Create your VPN profile. For info about how to do this, see [How to configure VPN settings in Microsoft Intune](https://docs.microsoft.com/en-us/intune-azure/configure-devices/how-to-configure-vpn-settings) and [How to create custom VPN profiles in Microsoft Intune](https://docs.microsoft.com/en-us/intune-azure/configure-devices/create-custom-vpn-profiles#create-a-custom-configuration).
-2. Open the Microsoft Azure Intune mobile application management console, click **Device configuration**, and then click **Create Profile**.
+2. Open the Microsoft Intune mobile application management console, click **Device configuration**, and then click **Create Profile**.
@@ -70,4 +70,4 @@ After you’ve created your VPN policy, you'll need to deploy it to the same gro
>[!NOTE]
->Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
\ No newline at end of file
+>Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
diff --git a/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
index cb3d8f028e..31ea9b52b2 100644
--- a/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
+++ b/windows/threat-protection/windows-information-protection/create-wip-policy-using-intune.md
@@ -1,6 +1,6 @@
---
-title: Create a Windows Information Protection (WIP) policy using Microsoft Azure Intune (Windows 10)
-description: Microsoft Azure Intune helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.
+title: Create a Windows Information Protection (WIP) with enrollment policy using Microsoft Intune (Windows 10)
+description: Microsoft Intune helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your protected apps, your WIP-protection level, and how to find enterprise data on the network.
ms.assetid: 4b307c99-3016-4d6a-9ae7-3bbebd26e721
ms.prod: w10
ms.mktglfcycl: explore
@@ -10,22 +10,25 @@ author: eross-msft
localizationpriority: high
---
-# Create a Windows Information Protection (WIP) policy using Microsoft Azure Intune
+# Create a Windows Information Protection (WIP) with enrollment policy using Microsoft Intune
**Applies to:**
- Windows 10, version 1607 and later
- Windows 10 Mobile, version 1607 and later (except Microsoft Azure Rights Management, which is only available on the desktop)
-Microsoft Azure Intune helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your allowed apps, your WIP-protection level, and how to find enterprise data on the network.
+Microsoft Intune helps you create and deploy your Windows Information Protection (WIP) policy, including letting you choose your allowed apps, your WIP-protection level, and how to find enterprise data on the network.
+
+>[!Important]
+>This topic covers creating a Windows Information Protection (WIP) policy for organizations already managing devices by using Mobile Device Management (MDM) solutions. If your organization uses a mobile application management (MAM) solution to deploy your WIP policy to Intune apps without managing devices, you must follow the instructions in the [Create and deploy Windows Information Protection (WIP) app protection policy with Intune](https://docs.microsoft.com/en-us/intune/deploy-use/create-windows-information-protection-policy-with-intune) topic.
## Add a WIP policy
After you’ve set up Intune for your organization, you must create a WIP-specific policy.
**To add a WIP policy**
-1. Open the Microsoft Azure Intune mobile application management console, click **All settings**, and then click **App policy**.
+1. Open the Microsoft Intune mobile application management console, click **All settings**, and then click **App policy**.
- 
+ 
2. In the **App policy** screen, click **Add a policy**, and then fill out the fields:
- **Name.** Type a name (required) for your new policy.
@@ -36,7 +39,10 @@ After you’ve set up Intune for your organization, you must create a WIP-specif
- **Enrollment state.** Choose **With enrollment** as the enrollment state for your policy.
- 
+ 
+
+ >[!Important]
+ >Choosing **With enrollment** only applies for organizations using MDM. If you're using MAM, you must use these instructions, [Create and deploy Windows Information Protection (WIP) app protection policy with Intune](https://docs.microsoft.com/en-us/intune/deploy-use/create-windows-information-protection-policy-with-intune), instead.
3. Click **Create**.
@@ -53,7 +59,6 @@ The steps to add your apps are based on the type of template being applied. You
>[!Important]
>WIP-aware apps are expected to prevent enterprise data from going to unprotected network locations and to avoid encrypting personal data. On the other hand, WIP-unaware apps might not respect the corporate network boundary, and WIP-unaware apps will encrypt all files they create or modify. This means 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 WIP before adding it to your **Allowed apps** list. If you don’t get this statement, it’s possible that you could experience app compat issues due to an app losing the ability to access a necessary file after revocation.
-
#### Add a Recommended app to your Allowed apps list
For this example, we’re going to add Microsoft Edge, a recommended app, to the **Allowed apps** list.
@@ -62,19 +67,19 @@ For this example, we’re going to add Microsoft Edge, a recommended app, to the
The **Allowed apps** blade appears, showing you any apps that are already included in the list for this policy.
- 
+ 
2. From the **Allowed apps** blade, click **Add apps**.
The **Add apps** blade appears, showing you all **Recommended apps**.
- 
+ 
3. Select each app you want to access your enterprise data, and then click **OK**.
The **Allowed apps** blade updates to show you your selected apps.
- 
+ 
#### Add a Store app to your Allowed apps list
For this example, we’re going to add Microsoft Power BI, a store app, to the **Allowed apps** list.
@@ -97,7 +102,7 @@ For this example, we’re going to add Microsoft Power BI, a store app, to the *
>[!NOTE]
>To add multiple Store apps at the same time, you can click the menu **(…)** at the end of the app row, and then continue to add more apps. When you’re done, click **OK**.
- 
+ 
If you don't know the publisher or product name, you can find them for both desktop devices and Windows 10 Mobile phones by following these steps.
@@ -200,7 +205,7 @@ For this example, we’re going to add WordPad, a desktop app, to the **Allowed
>[!Note]
>To add multiple Desktop apps at the same time, you can click the menu **(…)** at the end of the app row, and then continue to add more apps. When you’re done, click **OK**.
- 
+ 
**To find the Publisher values for Desktop apps**
If you’re unsure about what to include for the publisher, you can run this PowerShell command:
@@ -293,15 +298,15 @@ For this example, we’re going to add an AppLocker XML file to the **Allowed ap
```
-12. After you’ve created your XML file, you need to import it by using Microsoft Azure Intune.
+12. After you’ve created your XML file, you need to import it by using Microsoft Intune.
-**To import your list of Allowed apps using Microsoft Azure Intune**
+**To import your list of Allowed apps using Microsoft Intune**
1. From the **Allowed apps** area, click **Import apps**.
The blade changes to let you add your import file.
- 
+ 
2. Browse to your exported AppLocker policy file, and then click **Open**.
@@ -343,7 +348,7 @@ We recommend that you start with **Silent** or **Allow Overrides** while verifyi
The **Required settings** blade appears.
- 
+ 
|Mode |Description |
|-----|------------|
@@ -367,7 +372,7 @@ Starting with Windows 10, version 1703, Intune automatically determines your cor
2. If the identity isn’t correct, or if you need to add additional domains, type info into the **Corporate identity** field. For example, `contoso.com|newcontoso.com`.
- 
+ 
### Choose where apps can access enterprise data
After you've added a protection mode to your apps, you'll need to decide where those apps can access enterprise data on your network.
@@ -387,7 +392,7 @@ There are no default locations included with WIP, you must add each of your netw
The **Add network boundary** blade appears.
- 
+ 
3. Select the type of network boundary to add from the **Boundary type** box.
@@ -440,7 +445,7 @@ There are no default locations included with WIP, you must add each of your netw
6. Decide if you want to Windows to look for additional network settings:
- 
+ 
- **Enterprise Proxy Servers list is authoritative (do not auto-detect).** Click this box if you want Windows to treat the proxy servers you specified in the network boundary definition as the complete list of proxy servers available on your network. If you clear this box, Windows will search for additional proxy servers in your immediate network.
@@ -459,7 +464,7 @@ After you create and deploy your WIP policy to your employees, Windows begins to
2. In the **Upload a Data Recovery Agent (DRA) certificate to allow recovery of encrypted data** box, click **Browse** to add a data recovery certificate for your policy.
- 
+ 
### Choose your optional WIP-related settings
After you've decided where your protected apps can access enterprise data on your network, you’ll be asked to decide if you want to add any optional WIP settings.
@@ -468,7 +473,7 @@ After you've decided where your protected apps can access enterprise data on you
1. Choose to set any or all optional settings:
- 
+ 
- **Prevent corporate data from being accessed by apps when the device is locked. Applies only to Windows 10 Mobile.** Determines whether to encrypt enterprise data using a key that's protected by an employee's PIN code on a locked device. Apps won't be able to read corporate data when the device is locked. The options are:
@@ -497,7 +502,7 @@ After you've decided where your protected apps can access enterprise data on you
### Choose to set up Azure Rights Management with WIP
WIP can integrate with Microsoft Azure Rights Management to enable secure sharing of files by using removable drives such as USB drives. For more info about Azure Rights Management, see [Microsoft Azure Rights Management](https://products.office.com/en-us/business/microsoft-azure-rights-management). To integrate Azure Rights Management with WIP, you must already have Azure Rights Management set up.
-To configure WIP to use Azure Rights Management, you must set the **AllowAzureRMSForEDP** MDM setting to **1** in Microsoft Azure Intune. This setting tells WIP to encrypt files copied to removable drives with Azure Rights Management, so they can be shared amongst your employees on computers running at least Windows 10, version 1703.
+To configure WIP to use Azure Rights Management, you must set the **AllowAzureRMSForEDP** MDM setting to **1** in Microsoft Intune. This setting tells WIP to encrypt files copied to removable drives with Azure Rights Management, so they can be shared amongst your employees on computers running at least Windows 10, version 1703.
Optionally, if you don’t want everyone in your organization to be able to share your enterprise data, you can set the **RMSTemplateIDForEDP** MDM setting to the **TemplateID** of the Azure Rights Management template used to encrypt the data. You must make sure to mark the template with the **EditRightsData** option.
@@ -505,11 +510,21 @@ Optionally, if you don’t want everyone in your organization to be able to shar
>For more info about setting the **AllowAzureRMSForEDP** and the **RMSTemplateIDForEDP** MDM settings, see the [EnterpriseDataProtection CSP](https://msdn.microsoft.com/windows/hardware/commercialize/customize/mdm/enterprisedataprotection-csp) topic. For more info about setting up and using a custom template, see [Configuring custom templates for the Azure Rights Management service](https://docs.microsoft.com/en-us/information-protection/deploy-use/configure-custom-templates) topic.
## Related topics
-- [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md)
-- [Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Azure Intune](create-vpn-and-wip-policy-using-intune.md)
-- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)
-- [Azure RMS Documentation Update for May 2016](https://blogs.technet.microsoft.com/enterprisemobility/2016/05/31/azure-rms-documentation-update-for-may-2016/)
- [What is Azure Rights Management?]( https://docs.microsoft.com/en-us/information-protection/understand-explore/what-is-azure-rms)
+- [Create and deploy Windows Information Protection (WIP) app protection policy with Intune](https://docs.microsoft.com/en-us/intune/deploy-use/create-windows-information-protection-policy-with-intune)
+
+- [Intune MAM Without Enrollment](https://blogs.technet.microsoft.com/configmgrdogs/2016/02/04/intune-mam-without-enrollment/)
+
+- [Deploy your Windows Information Protection (WIP) policy](deploy-wip-policy-using-intune.md)
+
+- [Associate and deploy your Windows Information Protection (WIP) and VPN policies by using Microsoft Intune](create-vpn-and-wip-policy-using-intune.md)
+
+- [General guidance and best practices for Windows Information Protection (WIP)](guidance-and-best-practices-wip.md)
+
+- [Azure RMS Documentation Update for May 2016](https://blogs.technet.microsoft.com/enterprisemobility/2016/05/31/azure-rms-documentation-update-for-may-2016/)
+
+
+
>[!NOTE]
>Help to make this topic better by providing us with edits, additions, and feedback. For info about how to contribute to this topic, see [Contributing to TechNet content](https://github.com/Microsoft/windows-itpro-docs/blob/master/CONTRIBUTING.md).
diff --git a/windows/whats-new/whats-new-windows-10-version-1703.md b/windows/whats-new/whats-new-windows-10-version-1703.md
index 6b9af04119..f6b99a4592 100644
--- a/windows/whats-new/whats-new-windows-10-version-1703.md
+++ b/windows/whats-new/whats-new-windows-10-version-1703.md
@@ -139,12 +139,12 @@ Some of the highlights of the new library include:
New features for Windows Defender AV in Windows 10, version 1703 include:
-- [Updates to how the Block at First Sight feature can be configured](/windows/windows-defender-antivirus/configure-block-at-first-sight-windows-defender-antivirus)
-- [The ability to specify the level of cloud-protection](/windows/windows-defender-antivirus/specify-cloud-protection-level-windows-defender-antivirus)
-- [Windows Defender Antivirus protection in the Windows Defender Security Center app](/windows/windows-defender-antivirus/windows-defender-security-center-antivirus)
+- [Updates to how the Block at First Sight feature can be configured](/windows/threat-protection/windows-defender-antivirus/configure-block-at-first-sight-windows-defender-antivirus)
+- [The ability to specify the level of cloud-protection](/windows/threat-protection/windows-defender-antivirus/specify-cloud-protection-level-windows-defender-antivirus)
+- [Windows Defender Antivirus protection in the Windows Defender Security Center app](/windows/threat-protection/windows-defender-antivirus/windows-defender-security-center-antivirus)
-In Windows 10, version 1607, we [invested heavily in helping to protect against ransomware](https://blogs.windows.com/business/2016/11/11/defending-against-ransomware-with-windows-10-anniversary-update/#UJlHc6SZ2Zm44jCt.97), and we continue that investment in version 1703 with [updated beahvior monitoring and always-on real-time protection](/windows/windows-defender-antivirus/configure-real-time-protection-windows-defender-antivirus).
+In Windows 10, version 1607, we [invested heavily in helping to protect against ransomware](https://blogs.windows.com/business/2016/11/11/defending-against-ransomware-with-windows-10-anniversary-update/#UJlHc6SZ2Zm44jCt.97), and we continue that investment in version 1703 with [updated behavior monitoring and always-on real-time protection](/windows/threat-protection/windows-defender-antivirus/configure-real-time-protection-windows-defender-antivirus).
You can read more about ransomware mitigations and detection capability in Windows Defender AV in the [Ransomware Protection in Windows 10 Anniversary Update whitepaper (PDF)](http://wincom.blob.core.windows.net/documents/Ransomware_protection_in_Windows_10_Anniversary_Update.pdf) and at the [Microsoft Malware Protection Center blog](https://blogs.technet.microsoft.com/mmpc/category/research/ransomware/).
+ 
+ 
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++
+ ++