Merge remote-tracking branch 'refs/remotes/origin/jdrs' into rs1

windows/deploy/provision-pcs-with-apps-and-certificates.md

@@ -59,15 +59,28 @@ 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](../manage/acquire-apps-windows-store-for-business.md), 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. 
+
 1. In the **Available customizations** pane, go to **Runtime settings** > **UniversalAppInstall**. 
 
-2. For **UserContextApp**, specify the **PackageFamilyName** for the app. `(how to find package family name)`
+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.
+
+    ![details for offline app package](images/uwp-family.png)
 
 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. `(how will they know?)`
+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. 
+
+    ![required frameworks for offline app package](images/uwp-dependencies.png)
+
+5. For **DeviceContextAppLicense**, enter the **LicenseProductID**. In Windows Store for Business, you generate the license for the app on the app's download page.
+
+    ![generate license for offline app](images/uwp-license.png)
+
+[Learn more about distributing offline apps from the Windows Store for Business.](../manage/distribute-offline-apps.md)
+
+> **Note:** Removing a provisioning package will not remove any apps installed by device context in that provisioning package.
 
-5. For **UserContextAppLicense**, enter the **LicenseProductID**. `(where to get)`
 
 
 ### Add a certificate to your package

windows/keep-secure/vpn-profile-options.md

@@ -53,8 +53,7 @@ A VPN profile configured with LockDown secures the device to only allow network
  
 ## Learn more
 
-[VPNv2 configuration service provider (CSP) reference](http://go.microsoft.com/fwlink/p/?LinkId=617588)
+- [Learn how to configure VPN connections in Microsoft Intune](https://docs.microsoft.com/en-us/intune/deploy-use/vpn-connections-in-microsoft-intune)
+- [VPNv2 configuration service provider (CSP) reference](http://go.microsoft.com/fwlink/p/?LinkId=617588)
+- [How to Create VPN Profiles in Configuration Manager](http://go.microsoft.com/fwlink/p/?LinkId=618028)
 
-[How to Create VPN Profiles in Configuration Manager](http://go.microsoft.com/fwlink/p/?LinkId=618028)
-
-[Help users connect to their work using VPN profiles with Microsoft Intune](http://go.microsoft.com/fwlink/p/?LinkId=618029)