Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

education/index.md

@@ -25,7 +25,7 @@ ms.date: 10/30/2017
                                 </div>
                             </li>
                             <li>
-                                <a href="https://docs.microsoft.com/microsoft-365/education/deploy/top-10" target="_blank">
+                                <a href="https://www.microsoft.com/en-us/education/itdm/default.aspx" target="_blank">
                                     <div class="cardSize">
                                         <div class="cardPadding">
                                             <div class="card">

store-for-business/app-inventory-management-microsoft-store-for-business.md

@@ -9,7 +9,7 @@ ms.pagetype: store
 author: TrudyHa
 ms.author: TrudyHa
 ms.topic: conceptual
-ms.date: 06/07/2018
+ms.date: 10/23/2018
 ---
 
 # App inventory management for Microsoft Store for Business and Education
@@ -19,7 +19,7 @@ ms.date: 06/07/2018
 -   Windows 10
 -   Windows 10 Mobile
 
-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.
+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.
 
@@ -68,16 +68,26 @@ Each app in the Store for Business has an online, or an offline license. For mor
 
 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
+## Assign apps
+For online-licensed apps, you can assign apps directly to people in your organization.  
 
-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.
+**To assign an app to an employee**
 
-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).
+1.	Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://businessstore.microsoft.com).
+2.	Click **Manage**, and then choose **Inventory**.
+3.	Find an app, click the ellipses, 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 Microsoft Store app, and then click **Install**. Also, in the Microsoft Store app, they can find the app under **My Library**.
+
+There are other options for distributing apps:
+- **Use a management tool** - 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).
+- **Distribute from private store** - You can also add apps to your private store, and let people get them on their own. For more information, see [Distribute apps from private store](#distribute-apps-from-private-store)
+
+## Distribute apps from private store
 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).
 
+### Add apps to your private store
 **To make an app in Apps & software available in your private store**
 
 1.  Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://businessstore.microsoft.com).
@@ -88,6 +98,7 @@ Once an app is in your private store, people in your org can install the app on
 The value under **Private store** for the app will change to pending. It will take approximately thirty-six 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.
 
+### Get and remove private store apps
 **To claim an app from the private store**
 
 1.	Sign in to your computer with your Azure Active Directory (AD) credentials, and start the Microsoft Store app.
@@ -107,14 +118,20 @@ If you decide that you don't want an app available for employees to install on t
 
 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**
+### Private store availability
+On the details page for each app, you can directly assign an app to a user, or for apps in your private store, you can set **Private store availability**.
 
-1.	Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://businessstore.microsoft.com).
-2.	Click **Manage**, and then choose **Inventory**.
-3.	Find an app, click the ellipses, and then choose **Assign to people**.
-4.	Type the email address for the employee that you're assigning the app to, and click **Confirm**.
+Settings **Private store availability** allows you to choose which groups of people can see an app in the private store:
+- No one - The app isn't in your private store
+- Everyone - The app is available to anyone in your organization
+- Specific groups - The app is available to all users in assigned security groups
 
-Employees will receive an email with a link that will install the app on their device. Click the link to start the Microsoft Store app, and then click **Install**. Also, in the Microsoft Store app, they can find the app under **My Library**.
+**To assign security groups to an app** 
+1. Sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com) or [Microsoft Store for Education](https://businessstore.microsoft.com).
+2. Click **Manage**, and then choose **Products & services**.
+3. Find an app, choose the ellipses, and then choose **View license details**.
+4. Click **Private store availability**, select **Specific groups**, and then click **Assign groups**. 
+5. Enter a name or email address for the security group you want to use, and then click **Add groups**.
 
 ## Manage app licenses
 
@@ -123,9 +140,9 @@ For each app in your inventory, you can view and manage license details. This gi
 **To view license details**
 
 1. Sign in to [Microsoft Store for Business](https://go.microsoft.com/fwlink/p/?LinkId=691845) or [Microsoft Store for Education](https://businessstore.microsoft.com).
-2. Click **Manage**, and then choose **Apps & software**.
+2. Click **Manage**, and then choose **Products & services**.
 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:
+4. On the app details 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:
 
     - Assign the app to other people in your organization.
     - Reclaim app licenses.

windows/client-management/advanced-troubleshooting-802-authentication.md

@@ -5,7 +5,7 @@ keywords: advanced troubleshooting, 802.1x authentication, troubleshooting, auth
 ms.prod: w10
 ms.mktglfcycl:
 ms.sitesec: library
-author: mikeblodge
+author: kaushika-msft
 ms.localizationpriority: medium
 ms.author: mikeblodge
 ms.date: 10/29/2018
@@ -24,7 +24,7 @@ This troubleshooting technique applies to any scenario in which wireless or wire
 N/A
  
 ### Data Collection
-Markdown - Advanced Troubleshooting 802.1x Authentication Data Collection
+[Advanced Troubleshooting 802.1x Authentication Data Collection](https://docs.microsoft.com/en-us/windows/client-management/data-collection-for-802-authentication)
  
 ### Troubleshooting
 - Viewing the NPS events in the Windows Security Event log is one of the most useful troubleshooting methods to obtain information about failed authentications.

windows/client-management/data-collection-for-802-authentication.md

@@ -5,7 +5,7 @@ keywords: troubleshooting, data collection, data, 802.1x authentication, authent
 ms.prod: w10
 ms.mktglfcycl:
 ms.sitesec: library
-author: mikeblodge
+author: kaushika-msft
 ms.localizationpriority: medium
 ms.author: mikeblodge
 ms.date: 10/29/2018

windows/deployment/update/windows-analytics-get-started.md

@@ -83,7 +83,7 @@ The compatibility update scans your devices and enables application usage tracki
 
 | **Operating System** | **Updates** |
 |----------------------|-----------------------------------------------------------------------------|
-| Windows 10        | Windows 10 includes the compatibility update, so you will automatically have the latest compatibility update so long as you continue to keep your Windows 10 devices up-to-date with cummulative updates.  |
+| Windows 10        | Windows 10 includes the compatibility update, so you will automatically have the latest compatibility update so long as you continue to keep your Windows 10 devices up-to-date with cumulative updates.  |
 | Windows 8.1          | [KB 2976978](https://catalog.update.microsoft.com/v7/site/Search.aspx?q=KB2976978)<br>Performs diagnostics on the Windows 8.1 systems that participate in the Windows Customer Experience Improvement Program. These diagnostics help determine whether compatibility issues might be encountered when the latest Windows operating system is installed. <br>For more information about this update, see <https://support.microsoft.com/kb/2976978>|
 | Windows 7 SP1        | [KB2952664](https://catalog.update.microsoft.com/v7/site/Search.aspx?q=KB2952664) <br>Performs diagnostics on the Windows 7 SP1 systems that participate in the Windows Customer Experience Improvement Program. These diagnostics help determine whether compatibility issues might be encountered when the latest Windows operating system is installed. <br>For more information about this update, see <https://support.microsoft.com/kb/2952664>|