Merge branch 'master' into 7087905

mdop/TOC.md

@@ -3,10 +3,12 @@
 ## [Application Virtualization]()
 ### [Application Virtualization 5](appv-v5/)
 ### [Application Virtualization 4](appv-v4/)
+### [SoftGrid Application Virtualization](softgrid-application-virtualization.md)
 ## [Diagnostics and Recovery Toolset]()
 ### [Diagnostics and Recovery Toolset 10](dart-v10/)
 ### [Diagnostics and Recovery Toolset 8](dart-v8/)
 ### [Diagnostics and Recovery Toolset 7](dart-v7/)
+### [Diagnostics and Recovery Toolset 6.5](dart-v65.md)
 ## [Microsoft Bitlocker Administration and Monitoring]()
 ### [Microsoft Bitlocker Administration and Monitoring 2.5](mbam-v25/)
 ### [Microsoft Bitlocker Administration and Monitoring 2](mbam-v2/)

mdop/dart-v65.md

@@ -0,0 +1,9 @@
+---
+title: Diagnostics and Recovery Toolset 6.5
+description: Diagnostics and Recovery Toolset 6.5
+author: jamiejdt
+---
+
+# Diagnostics and Recovery Toolset 6.5
+
+Selecting the link for [Diagnostics and Recovery Toolset 6.5 documentation](https://technet.microsoft.com/en-us/library/jj713388.aspx) will take you to another website. Use your browser's **Back** button to return to this page.   

mdop/softgrid-application-virtualization.md

@@ -0,0 +1,9 @@
+---
+title: SoftGrid Application Virtualization
+description: SoftGrid Application Virtualization
+author: jamiejdt
+---
+
+# SoftGrid Application Virtualization
+
+Selecting the link for [SoftGrid Application Virtualization documentation](https://technet.microsoft.com/en-us/library/bb906040.aspx) will take you to another website. Use your browser's **Back** button to return to this page.   

windows/deploy/usmt-requirements.md

@@ -44,24 +44,14 @@ The following table lists the operating systems supported in USMT.
 </thead>
 <tbody>
 <tr class="odd">
-<td align="left"><p>Windows® XP Professional</p></td>
-<td align="left"><p>X</p></td>
-<td align="left"><p></p></td>
-</tr>
-<tr class="even">
-<td align="left"><p>Windows XP Professional x64 Edition</p></td>
-<td align="left"><p>X</p></td>
-<td align="left"><p></p></td>
-</tr>
-<tr class="odd">
 <td align="left"><p>32-bit versions of Windows Vista</p></td>
 <td align="left"><p>X</p></td>
-<td align="left"><p>X</p></td>
+<td align="left"><p></p></td>
 </tr>
 <tr class="even">
 <td align="left"><p>64-bit versions of Windows Vista</p></td>
 <td align="left"><p>X</p></td>
-<td align="left"><p>X</p></td>
+<td align="left"><p></p></td>
 </tr>
 <tr class="odd">
 <td align="left"><p>32-bit versions of Windows 7</p></td>
@@ -101,7 +91,7 @@ The following table lists the operating systems supported in USMT.
 **Note**  
 You can migrate a 32-bit operating system to a 64-bit operating system. However, you cannot migrate a 64-bit operating system to a 32-bit operating system.
 
-USMT does not support any of the Windows Server® operating systems, Windows 2000, or any of the starter editions for Windows XP, Windows Vista, or Windows 7. In addition, USMT only supports migration from Windows XP with Service Pack 3.
+USMT does not support any of the Windows Server® operating systems, Windows 2000, Windows XP, or any of the starter editions for Windows Vista or Windows 7.
 
  
 

windows/keep-secure/device-guard-deployment-guide.md

@@ -585,14 +585,11 @@ Figure 11. Device Guard properties in the System Summary
 
 ## Catalog files
 
-
 Enforcement of Device Guard on a system requires that every trusted application have a signature or its binary hashes added to the code integrity policy. For many organizations, this can be an issue when considering unsigned LOB applications. To avoid the requirement that organizations repackage and sign these applications, Windows 10 includes a tool called Package Inspector that monitors an installation process for any deployed and executed binary files. If the tool discovers such files, it itemizes them in a catalog file. These catalog files offer you a way to trust your existing unsigned applications, whether developed in house or by a third party, as well as trust signed applications for which you do not want to trust the signer but rather the specific application. When created, these files can be signed, the signing certificates added to your existing code integrity policies, and the catalog files themselves distributed to the clients.
 
 **Note**  
 The Enterprise edition of Windows 10 or Windows Server 2016 is required to create and use catalog files.
 
- 
-
 ### <a href="" id="create-catalog-files"></a>
 
 **Create catalog files**
@@ -648,8 +645,6 @@ When you establish a naming convention it makes it easier to detect deployed cat
 **Note**  
 This scan catalogs the hash values for each discovered binary file. If the applications that were scanned are updated, complete this process again to trust the new binaries’ hash values.
 
- 
-
 When finished, the files will be saved to your desktop. To trust this catalog file within a code integrity policy, the catalog must first be signed. Then, the signing certificate can be included in the code integrity policy, and the catalog file can be distributed to the individual client machines. Catalog files can be signed by using a certificate and SignTool.exe, a free tool available in the Windows SDK. For more information about signing catalog files with SignTool.exe, see the [Catalog signing with SignTool.exe](#catsign-signtool) section.
 
 ### <a href="" id="catsign-signtool"></a>
@@ -668,34 +663,12 @@ If you do not have a code signing certificate, please see the [Create a Device G
 
 1.  Initialize the variables that will be used:
 
-    <span codelanguage=""></span>
+    '$ExamplePath=$env:userprofile+"\Desktop"'
-    <table>
+    
-    <colgroup>
+    '$CatFileName=$ExamplePath+"\LOBApp-Contoso.cat"'
-    <col width="100%" />
-    </colgroup>
-    <tbody>
-    <tr class="odd">
-    <td align="left"><pre><code>$ExamplePath=$env:userprofile+&quot;\Desktop&quot;</code></pre></td>
-    </tr>
-    </tbody>
-    </table>
 
-    <span codelanguage=""></span>
+   **Note**  
-    <table>
+   In this example, you use the catalog file you created in the [Create catalog files](#create-catalog-files) section. If you are signing another catalog file, be sure to update the *$ExamplePath* and *$CatFileName* variables with the correct information.
-    <colgroup>
-    <col width="100%" />
-    </colgroup>
-    <tbody>
-    <tr class="odd">
-    <td align="left"><pre><code>$CatFileName=$ExamplePath+&quot;\LOBApp-Contoso.cat&quot;</code></pre></td>
-    </tr>
-    </tbody>
-    </table>
-
-    **Note**  
-    In this example, you use the catalog file you created in the [Create catalog files](#create-catalog-files) section. If you are signing another catalog file, be sure to update the *$ExamplePath* and *$CatFileName* variables with the correct information.
-
-     
 
 2.  Import the code signing certificate. Import the code signing certificate that will be used to sign the catalog file to the signing user’s personal store. In this example, you use the certificate that you created in the [Create a Device Guard code signing certificate](#create-dg-code) section.
 
@@ -750,14 +723,12 @@ To deploy a catalog file with Group Policy:
 
 2.  Create a new GPO: right-click the DG Enabled PCs OU, and then click **Create a GPO in this domain, and Link it here**, as shown in Figure 13.
 
-    **Note**  
+   **Note**  
-    The DG Enabled PCs OU is just an example of where to link the test GPO that you created in this section. You can use any OU name. Also, security group filtering is an option when you consider policy partitioning options based on the strategy discussed in the [Approach enterprise code integrity deployment](#approach-enterprise) section.
+   The DG Enabled PCs OU is just an example of where to link the test GPO that you created in this section. You can use any OU name. Also, security group filtering is an option when you consider policy partitioning options based on the strategy discussed in the [Approach enterprise code integrity deployment](#approach-enterprise) section.
 
-     
+   ![figure 13](images/dg-fig13-createnewgpo.png)
 
-    ![figure 13](images/dg-fig13-createnewgpo.png)
+   Figure 13. Create a new GPO
-
-    Figure 13. Create a new GPO
 
 3.  Name the new GPO **Contoso DG Catalog File GPO Test**.
 
@@ -1443,19 +1414,17 @@ To deploy and manage a code integrity policy with Group Policy:
 
 6.  In the **Display Code Integrity Policy** dialog box, select the **Enabled** option, and then specify the code integrity policy deployment path.
 
-    In this policy setting, you specify either the local path in which the policy will exist on the client computer or a Universal Naming Convention (UNC) path that the client computers will look to retrieve the latest version of the policy. This example copied the DeviceGuardPolicy.bin file onto the test machine and will enable this setting and use the file path C:\\Windows\\System32\\CodeIntegrity\\DeviceGuardPolicy.bin, as shown in Figure 26.
+   In this policy setting, you specify either the local path in which the policy will exist on the client computer or a Universal Naming Convention (UNC) path that the client computers will look to retrieve the latest version of the policy. This example copied the DeviceGuardPolicy.bin file onto the test machine and will enable this setting and use the file path C:\\Windows\\System32\\CodeIntegrity\\DeviceGuardPolicy.bin, as shown in Figure 26.
 
-    **Note**  
+   **Note**  
-    *DeviceGuardPolicy.bin* is not a required policy name: It was simply used in the [Create code integrity policies from golden PCs](#create-code-golden) section and so is used here, as well. Also, this policy file does not need to be copied to every computer. Alternatively, you can copy the code integrity policies to a file share to which the computer accounts have access. Any policy selected here is converted to SIPolicy.p7b when it is deployed to the individual client computers.
+   *DeviceGuardPolicy.bin* is not a required policy name: It was simply used in the [Create code integrity policies from golden PCs](#create-code-golden) section and so is used here, as well. Also, this policy file does not need to be copied to every computer. Alternatively, you can copy the code integrity policies to a file share to which the computer accounts have access. Any policy selected here is converted to SIPolicy.p7b when it is deployed to the individual client computers.
 
-     
+   ![figure 26](images/dg-fig26-enablecode.png)
 
-    ![figure 26](images/dg-fig26-enablecode.png)
+   Figure 26. Enable the code integrity policy
 
-    Figure 26. Enable the code integrity policy
+   **Note**  
-
+   You may have noticed that the GPO setting references a .p7b file and this example uses a .bin file for the policy. Regardless of the type of policy you deploy (.bin, .p7b, or .p7), they are all converted to SIPolicy.p7b when dropped on the Windows 10 client computers. Make your code integrity policies friendly and allow the system to convert the policy names for you to ensure that the policies are easily distinguishable when viewed in a share or any other central repository.
-    **Note**  
-    You may have noticed that the GPO setting references a .p7b file and this example uses a .bin file for the policy. Regardless of the type of policy you deploy (.bin, .p7b, or .p7), they are all converted to SIPolicy.p7b when dropped on the Windows 10 client computers. Make your code integrity policies friendly and allow the system to convert the policy names for you to ensure that the policies are easily distinguishable when viewed in a share or any other central repository.
 
      
 

windows/manage/acquire-apps-windows-store-for-business.md

@@ -0,0 +1,51 @@
+---
+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.
+ms.prod: W10
+ms.mktglfcycl: manage
+ms.sitesec: library
+---
+
+# 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).
+
+## 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.
+
+For more information, see [Apps in the Windows Store for Business](apps-in-windows-store-for-business.md). 
+
+## 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:
+- VISA 
+- MasterCard 
+- Discover 
+- American Express 
+- 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:
+- 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  
+1.	Log in to http://businessstore.microsoft.com
+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**.
+
+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. 
+
+Store for Business adds the app to your inventory. From **Inventory**, 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 offline-licensed apps, see [Distribute offline apps](distribute-offline-apps.md).

windows/manage/manage-inventory-windows-store-for-business.md

@@ -0,0 +1,69 @@
+---
+title: Manage inventory in Windows Store for Business (Windows 10)
+description: When you acquire apps from the Windows Store for Business, we add them to the Inventory for your organization. Once an app is part of your inventory, you can distribute the app, and manage licenses.
+ms.prod: W10
+ms.mktglfcycl: manage
+ms.sitesec: library
+---
+
+# Manage inventory in Window Store for Business
+When you acquire apps from the Windows Store for Business, we add them to the inventory for your organization. Once an app is part of your inventory, you can distribute the app, and manage licenses.
+
+## Distribute apps
+You can assign apps to people, or you can make apps available in your 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).
+
+**To make an app in inventory 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. 
+
+Employees can claim apps that admins added to the private store by doing the following.
+
+**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**.
+
+Another way to distribute apps is by assigning them to people in your organization. 
+
+**To assign an app to an employee**
+
+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 **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 **MyLibrary**. 
+
+## Manage licenses
+For apps in inventory, when you assign an app to an employee, a license for the app is assigned to them. You can manage these licenses, either by assigning them, or reclaiming them so you can assign them to another employee. You can also remove an app from the private store. 
+
+**To assign licenses**
+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 **View license details**.
+4.  Click **Assign to people**, type the name you are assigning the license to, and then click **Assign**. 
+
+Store for Business assigns a license to the person, and adds them to the list of assigned licenses. 
+
+**To reclaim licenses**
+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 **View license details**.
+4.  Click the name of the person you are reclaiming the license from, and then click **Reclaim licenses**. 
+
+Store for Business reclaims the license, and updates the number of avialable licenses. After you reclaim a license, you can assign a license to another employee. 
+
+**To remove an app from the private store**
+
+If you decide that you don't want an app available for employees to install on their own, you can remove it from your 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**.
+
+The app will still be in your inventory, but your employees will not have access to the app from your private store. 

windows/manage/manage-orders-windows-store-for-business.md

@@ -0,0 +1,70 @@
+---
+title: Manage app orders in Windows Store for Business (Windows 10)
+description: You can view your order history with Windows Store for Business. 
+ms.prod: W10
+ms.mktglfcycl: manage
+ms.sitesec: library
+---
+
+# Manage app orders in Windows Store for Business
+
+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. 
+
+**Order history** lists orders in chronological order and shows:
+- Date ordered
+- Product name
+- Product publisher
+- Total cost
+- Order status. 
+
+Click to expand an order, and the following info is available:
+- Who purchased the app
+- Order number
+- Quantity purchased
+- Cost breakdown
+- Links to view your invoice, buy more, or request a refund
+
+## Invoices
+
+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.  
+
+**Refunds for free apps**
+ 
+ For free apps, there isn't really a refund to request -- you're removing the app from your inventory. You must first reclaim any assigned licenses, and then you can remove the app from your organization's inventory. 
+ 
+ **Refunds for apps that have a price**
+ 
+ There are a few requirements for apps that have a price:
+ - **Timing** - Refunds are available for the first 30 days after you place your order. For example, if your order is placed on June 1, you can self-refund through June 30.
+ - **Avaialble licenses** - You need to have enough available licenses to cover the number of licenses in the order you are refunding. For example, if you purchased 10 copies of an app and you want to request a refund, you must have at least 10 licenses of the app available in your inventory -- those 10 licenses can't be assigned to people in your organization.
+ - **Whole order refunds only** - You must refund the complete amount of apps in an order. You can't refund a part of an order. For example, if you purchased 10 copies of an app, but later found you only needed 5 copies, you'll need to request a refund for the 10 apps, and then make a separate order for 5 apps. If you have had multiple orders of the same app, you can refund one order but still keep the rest of the inventory.  
+
+**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**.
+
+For free apps, the app will be removed from your inventory. 
+
+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.  

windows/manage/settings-reference-windows-store-for-business.md

@@ -5,7 +5,6 @@ ms.assetid: 34F7FA2B-B848-454B-AC00-ECA49D87B678
 ms.prod: W10
 ms.mktglfcycl: manage
 ms.sitesec: library
-author: TrudyHa
 ---
 
 # Settings reference: Windows Store for Business
@@ -21,11 +20,10 @@ The Windows Store for Business has a group of settings that admins use to manage
 |                      |                                                                                                                                                                                                                                                                                                                                                                                                                    |
 |----------------------|--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
 | Setting              | Description                                                                                                                                                                                                                                                                                                                                                                                                        |
-| Account information  | Provides info on these configured settings for your Store for Business account . These settings include: country or region, default domain, organization name, and language preference. You can make updates to these settings with Office 365 or Azure management portals. For more information, see [Manage settings for the Windows Store for Business](manage-settings-windows-store-for-business.md). |
+| 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).<p>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).                                                                                                                                                                                       |
-| Offline licensing    | 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).                                                                                                                                                                                                                                      |
 | 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).                                                                                                                                                                                                                        |
 

windows/manage/update-windows-store-for-business-account-settings.md

@@ -1,7 +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.
-ms.assetid: CEFFF451-D7D2-4A35-AF28-4A72B9582585
 ms.prod: W10
 ms.mktglfcycl: manage
 ms.sitesec: library
@@ -16,39 +15,124 @@ author: TrudyHa
 -   Windows 10
 -   Windows 10 Mobile
 
-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. These are settings in the Azure AD directory that you used when signing up for Store for Business
+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.
 
-If you need to change any of these settings, you can use Office 365 admin portal, or Azure admin portal.
+## Organization information
+ 
+We’ll need your business address, email contact, and tax-exemption certificates that apply to your country or locale.
+ 
+**Business address and email contact**<br>Before purchasing apps that have a fee, you need to add or update your organization's business address, and contact email address . 
 
-**To make updates to Store for Business directory settings in Office 365**
+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. 
 
-1.  [Sign in to Office 365](http://go.microsoft.com/fwlink/p/?LinkId=708616) with your work or school account.
+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. 
 
-2.  Go to the [Office 365 admin center](http://go.microsoft.com/fwlink/p/?LinkId=708620).
+To update Organization information, click **Edit organization information**.
 
-3.  Select your organization's name on the right side of the page.
+## 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:
+- Austria
+- Belgium
+- Croatia
+- Czech Republic
+- Denmark
+- Finland
+- France
+- Germany
+- Greece
+- Hungary
+- Ireland
+- Italy
+- Malta
+- Netherlands
+- Norway
+- Poland
+- Portugal
+- Romania
+- Slovakia
+- South Africa
+- Spain
+- Sweden
+- Switzerland
+- United Kingdom
 
-4.  Change the information you want to update, and then click **Save.**
+These countries can provide their VAT number or local equivalent in **Account information**. However, they can only acquire free apps.  
 
-For more information about updating organization information, see [Change your organization's address, technical contact email, and other information](http://go.microsoft.com/fwlink/p/?LinkId=708621).
+|Market| Tax identifier |
-
+|------|----------------|
-**To make updates to Store for Business directory settings in Azure management portal**
+| Brazil | CPNJ (required), CCMID  (optional) |
-
+| India | CST ID, VAT ID |
-1.  Sign in to the Azure Portal as Administrator.
+| Taiwan | Unified business number|
-
-2.  Click **Active Directory**.
-
-3.  On the **Directory** tab, choose your directory
-
-4.  Click the **Configure** tab.
-
-For more information about updating organization information, see [Add your own domain name in Azure AD](http://go.microsoft.com/fwlink/p/?LinkId=708622).
-
- 
-
- 
 
 
+**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. 
+
+**To start a service request**
+1.  Sign in to the [Store for Business](http://businessstore.microsoft.com).
+2.	Click **Support**, and then under **Store or account support** click **Start a service request**.
+
+You’ll need this documentation:
+
+|Country or locale | Documentation |
+|------------------|----------------|
+| United States | Sales Tax Exemption Certificate |
+| Canada | Certificate of Exemption (or equivalent letter of authorization) |
+| Ireland | 13B/56A Tax Exemption Certificate| 
+| International organizations that hold tax exaemption | Certification / letter confirmation from local tax authorities |
 
 
+**Calculating tax**
+
+Sales taxes are calculated against the unit price, and then aggregated. 
+ 
+For example:<br>
+(unit price X tax rate) X quantity = total sales tax
+
+-or-
+
+($1.29 X .095) X 100 = $12.25
+
+##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)
+
+**Note**:<br>
+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 **Settings**, 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**. 
+
+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**: <br>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 **Settings**, 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. 
+ 
+**Note**:<br> 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.
+
+##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 Store for Business. This model means organizations can deploy apps when users or devices do not have connectivity to the Store. 
+
+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.
+