mirror of
https://github.com/MicrosoftDocs/windows-itpro-docs.git
synced 2025-05-16 15:27:22 +00:00
Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158
This commit is contained in:
LizRoss
commit
dfb0c3ad5a
@ -11,6 +11,11 @@ This topic lists new and updated topics in the Microsoft Edge documentation for
|
||||
|
||||
For a detailed feature list of what's in the current Microsoft Edge releases, the Windows Insider Preview builds, and what was introduced in previous releases, see the [Microsoft Edge changelog](https://developer.microsoft.com/microsoft-edge/platform/changelog/).
|
||||
|
||||
## July 2016
|
||||
|New or changed topic | Description |
|
||||
|----------------------|-------------|
|
||||
|[Microsoft Edge - Deployment Guide for IT Pros](index.md)| Updated to include support for Windows Server 2016 and a note about the Long Term Servicing Branch (LTSB) |
|
||||
|
||||
|
||||
## June 2016
|
||||
|New or changed topic | Description |
|
||||
|
||||
@ -30,7 +30,7 @@ Existing devices running Windows 10 Pro, currently activated with the original O
|
||||
|
||||
Customers with Academic Volume Licensing agreements with rights for Windows can get Windows 10 Pro Education through the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx), available at a later date.
|
||||
|
||||
Customers that deploy Windows 10 Pro are able to configure the product to have similar feature settings to Windows 10 Pro Education using policies. More detailed information on these policies and the configuration steps required is available in [MManage Windows 10 and Windows Store tips, tricks and suggestions](http://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Pro read the [document](http://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment.
|
||||
Customers that deploy Windows 10 Pro are able to configure the product to have similar feature settings to Windows 10 Pro Education using policies. More detailed information on these policies and the configuration steps required is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](http://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Pro read the [document](http://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment.
|
||||
|
||||
## Windows 10 Education
|
||||
|
||||
|
||||
BIN
windows/deploy/images/check_blu.png
Normal file
BIN
windows/deploy/images/check_blu.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
@ -17,17 +17,22 @@ author: greg-lindsay
|
||||
|
||||
With Windows 10, you can quickly upgrade from one edition of Windows 10 to another, provided the upgrade path is supported. For information on what edition of Windows 10 is right for you, see [Compare Windows 10 Editions](http://go.microsoft.com/fwlink/p/?LinkID=690882). For a comprehensive list of all possible upgrade paths to Windows 10, see [Windows 10 upgrade paths](windows-10-upgrade-paths.md).
|
||||
|
||||
The following table shows the methods and paths available to change the edition of Windows 10 that is running on your computer.
|
||||
The following table shows the methods and paths available to change the edition of Windows 10 that is running on your computer. **Note**: The reboot requirement for upgrading from Pro to Enterprise was removed in version 1607.
|
||||
|
||||
X = unsupported <BR>
|
||||
✔ (green) = supported; reboot required<BR>
|
||||
✔ (blue) = supported; no reboot required.
|
||||
|
||||
|
||||
|Method |Home > Pro |Home > Education |Pro > Education |Pro > Enterprise |Ent > Education |Mobile > Mobile Enterprise |
|
||||
|-------|-----------|-----------------|----------------|-----------------|----------------|--------|
|
||||
| Using mobile device management (MDM) | | | | | | |
|
||||
| Using a provisioning package | | | | | | |
|
||||
| Using a command-line tool | | | | | | |
|
||||
| Entering a product key manually | | | | | | |
|
||||
| Using mobile device management (MDM) | | | | | | |
|
||||
| Using a provisioning package | | | | | | |
|
||||
| Using a command-line tool | | | | | | |
|
||||
| Entering a product key manually | | | | | | |
|
||||
| Purchasing a license from the Windows Store | | | | | | |
|
||||
|
||||
**Note**<br>Each desktop edition in the table also has an N and KN edition. These editions have had media-related functionality removed. Devices with N or KN editions installed can be upgraded to corresponding N or KN editions using the same methods.
|
||||
>**Note**: Each desktop edition in the table also has an N and KN edition. These editions have had media-related functionality removed. Devices with N or KN editions installed can be upgraded to corresponding N or KN editions using the same methods.
|
||||
|
||||
## Upgrade using mobile device management (MDM)
|
||||
- To upgrade desktop editions of Windows 10 using MDM, you'll need to enter the product key for the upgraded edition in the **UpgradeEditionWithProductKey** policy setting of the **WindowsLicensing** CSP. For more info, see [WindowsLicensing CSP](http://go.microsoft.com/fwlink/p/?LinkID=690907).
|
||||
|
||||
@ -16,6 +16,7 @@ This topic lists new and updated topics in the [Keep Windows 10 secure](index.md
|
||||
|
||||
|New or changed topic | Description |
|
||||
|----------------------|-------------|
|
||||
|[Protect your enterprise data using Windows Information Protection (WIP)](protect-enterprise-data-using-wip.md) |Updated various topics throughout this section for new name and new UI in Microsoft Intune and System Center Configuration Manager. |
|
||||
|[Create and verify an Encrypting File System (EFS) Data Recovery Agent (DRA) certificate](create-and-verify-an-efs-dra-certificate.md) |New |
|
||||
|[Mandatory settings for Windows Information Protection (WIP)](mandatory-settings-for-wip.md) |New |
|
||||
|[Create a Windows Information Protection (WIP) policy using Microsoft Intune](create-wip-policy-using-intune.md) |New |
|
||||
|
||||
@ -80,7 +80,7 @@ The final step to making your VPN configuration work with WIP, is to link your t
|
||||
|
||||
3. Type a name (required) and an optional description for your policy into the **Name** and **Description** boxes.
|
||||
|
||||
|
||||
|
||||
|
||||
4. In the **OMA-URI Settings** area, click **Add** to add your **WIPModeID** info.
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
---
|
||||
title: List of enlightened Microsoft apps for use with Windows Information Protection(WIP) (Windows 10)
|
||||
title: List of enlightened Microsoft apps for use with Windows Information Protection (WIP) (Windows 10)
|
||||
description: Learn the difference between enlightened and unenlightened apps, and then review the list of enlightened apps provided by Microsoft along with the text you will need to use to add them to your Protected Apps list.
|
||||
ms.assetid: 17c85ea3-9b66-4b80-b511-8f277cb4345f
|
||||
keywords: WIP, Windows Information Protection, EDP, Enterprise Data Protection
|
||||
|
||||
@ -18,7 +18,7 @@ author: eross-msft
|
||||
|
||||
With the increase of employee-owned devices in the enterprise, there’s also an increasing risk of accidental data leak through apps and services, like email, social media, and the public cloud, which are outside of the enterprise’s control. For example, when an employee sends the latest engineering pictures to their personal email account, copies and pastes product info into a tweet, or saves an in-progress sales report to their public cloud storage.
|
||||
|
||||
Windows Information Protection (WIP) helps to protect against this potential data leakage without otherwise interfering with the employee experience. EDP also helps to protect enterprise apps and data against accidental data leak on enterprise-owned devices and personal devices that employees bring to work without requiring changes to your environment or other apps. Finally, another data protection technology, Azure Rights Management also works alongside EDP to extend data protection for data that leaves the device, such as when email attachments are sent from an enterprise aware version of a rights management mail client.
|
||||
Windows Information Protection (WIP) helps to protect against this potential data leakage without otherwise interfering with the employee experience. WIP also helps to protect enterprise apps and data against accidental data leak on enterprise-owned devices and personal devices that employees bring to work without requiring changes to your environment or other apps. Finally, another data protection technology, Azure Rights Management also works alongside WIP to extend data protection for data that leaves the device, such as when email attachments are sent from an enterprise aware version of a rights management mail client.
|
||||
|
||||
## Prerequisites
|
||||
You’ll need this software to run WIP in your enterprise:
|
||||
@ -28,7 +28,7 @@ You’ll need this software to run WIP in your enterprise:
|
||||
|Windows 10, version 1607 | Microsoft Intune<br>-OR-<br>System Center Configuration Manager<br>-OR-<br>Your current company-wide 3rd party mobile device management (MDM) solution. For info about 3rd party MDM solutions, see the documentation that came with your product. If your 3rd party MDM does not have UI support for the policies, refer to the [EnterpriseDataProtection CSP](https://msdn.microsoft.com/en-us/library/windows/hardware/mt697634.aspx) documentation.|
|
||||
|
||||
## How WIP works
|
||||
EDP helps address your everyday challenges in the enterprise. Including:
|
||||
WIP helps address your everyday challenges in the enterprise. Including:
|
||||
|
||||
- Helping to prevent enterprise data leaks, even on employee-owned devices that can't be locked down.
|
||||
|
||||
@ -46,7 +46,7 @@ You can set WIP to 1 of 4 protection and management modes:
|
||||
|Block |WIP looks for inappropriate data sharing practices and stops the employee from completing the action. This can include sharing enterprise data to non-enterprise-protected apps in addition to sharing enterprise data between apps or attempting to share outside of your organization’s network.|
|
||||
|Override |WIP looks for inappropriate data sharing, warning employees if they do something deemed potentially unsafe. However, this management mode lets the employee override the policy and share the data, logging the action to your audit log, accessible through the [Reporting CSP](http://go.microsoft.com/fwlink/p/?LinkID=746459). |
|
||||
|Silent |WIP runs silently, logging inappropriate data sharing, without blocking anything that would’ve been prompted for employee interaction while in Override mode. Unallowed actions, like apps inappropriately trying to access a network resource or WIP-protected data, are still blocked.|
|
||||
|Off |WIP is turned off and doesn't help to protect or audit your data.<p>After you turn off EDP, an attempt is made to decrypt any closed EDP-tagged files on the locally attached drives. |
|
||||
|Off |WIP is turned off and doesn't help to protect or audit your data.<p>After you turn off WIP, an attempt is made to decrypt any closed WIP-tagged files on the locally attached drives. |
|
||||
<p>**Note**<br>For more info about setting your WIP-protection modes, see either [Create a Windows Information Protection (WIP) policy using Intune](create-wip-policy-using-intune.md) or [Create and deploy a Windows Information Protection (WIP) policy using Configuration Manager](create-wip-policy-using-sccm.md), depending on your management solution.
|
||||
|
||||
## Why use WIP?
|
||||
|
||||
@ -19,7 +19,7 @@ author: TrudyHa
|
||||
|
||||
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 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.
|
||||
|
||||
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.
|
||||
|
||||
@ -28,15 +28,20 @@ All of these apps are treated the same once they are in your inventory and you c
|
||||
Store for Business shows this info for each app in your inventory:
|
||||
|
||||
- Name
|
||||
|
||||
- Access to actions for the app
|
||||
|
||||
- Last modified date
|
||||
|
||||
- Supported devices
|
||||
|
||||
- Last modified
|
||||
- Available licenses
|
||||
- Private store status
|
||||
|
||||
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)
|
||||
- Purchase additional licenses
|
||||
- Assign license
|
||||
- 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.
|
||||
|
||||
### Find apps in your inventory
|
||||
|
||||
There are a couple of ways to find specific apps, or groups of apps in your inventory.
|
||||
|
||||
@ -25,15 +25,13 @@ You can make an app available in your private store when you acquire the app, or
|
||||
|
||||
1. Sign in to the [Store for Business](https://businessstore.microsoft.com).
|
||||
|
||||
2. Click an app and then click **Get the app** to acquire the app for your organization.
|
||||
|
||||
3. You'll have a few options for distributing the app -- choose **Add to your private store where all people in your organization can find and install it.**
|
||||
2. Click an app, choose the license type, and then click **Get the app** to acquire the app for your organization.
|
||||
|
||||
|
||||
|
||||
It will take approximately twelve hours before the app is available in the private store.
|
||||
Windows Store for Business add the app to your **Inventory**. Click **Manage**, **Inventory** for app distribution options.
|
||||
|
||||
**To make an app in inventory available in your private store**
|
||||
**To make an app in Inventory available in your private store**
|
||||
|
||||
1. Sign in to the [Store for Business](https://businessstore.microsoft.com).
|
||||
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 52 KiB |
BIN
windows/manage/images/wsfb-inventory.png
Normal file
BIN
windows/manage/images/wsfb-inventory.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB After Width: | Height: | Size: 34 KiB |
@ -37,7 +37,7 @@ You can add users and groups, as well as update some of the settings associated
|
||||
<tbody>
|
||||
<tr class="odd">
|
||||
<td align="left"><p>[Update Windows Store for Business account settings](update-windows-store-for-business-account-settings.md)</p></td>
|
||||
<td align="left"><p>The <strong>Account information</strong> 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</p></td>
|
||||
<td align="left"><p>The <strong>Account information</strong> page in Windows Store for Business shows information about your organization that you can update, including: organization information, payment options, and offline licensing settings.</p></td>
|
||||
</tr>
|
||||
<tr class="even">
|
||||
<td align="left"><p>[Manage user accounts in Windows Store for Business](manage-users-and-groups-windows-store-for-business.md)</p></td>
|
||||
|
||||
@ -97,7 +97,7 @@ This table lists the global user accounts and the permissions they have in the S
|
||||
|
||||
### Store for Business roles and permissions
|
||||
|
||||
Store for Businesshas 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.
|
||||
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.
|
||||
|
||||
This table lists the roles and their permissions.
|
||||
|
||||
|
||||
@ -110,7 +110,7 @@ Not all cards available in all countries. When you add a payment option, Store f
|
||||
**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**.
|
||||
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**.
|
||||
|
||||
@ -118,13 +118,13 @@ Once you click Next, the information you provided will be validated with a tes
|
||||
|
||||
**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**:
|
||||
**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.
|
||||
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.
|
||||
|
||||
**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.
|
||||
|
||||
@ -132,6 +132,14 @@ Once you click Next, the information you provided will be validated with a tes
|
||||
|
||||
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 can decide whether or not offline licenses are shown for apps in Windows Store for Business.
|
||||
|
||||
**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.
|
||||
|
||||
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.
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user