diff --git a/README.md b/README.md index 4dc91651ab..f5b28b423b 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,6 @@ # win-cpub-itpro-docs This repo hosts the WDG ITPro content that is published to TechNet. -This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. \ No newline at end of file +This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information, see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments. + +English Handoff Folder Structure Demo! diff --git a/devices/surface-hub/create-a-device-account-using-office-365.md b/devices/surface-hub/create-a-device-account-using-office-365.md index a39e64d4cc..1f4a231d66 100644 --- a/devices/surface-hub/create-a-device-account-using-office-365.md +++ b/devices/surface-hub/create-a-device-account-using-office-365.md @@ -29,7 +29,7 @@ If you prefer to use a graphical user interface, you can create a device account 1. Sign in to Office 365 by visiting http://portal.office.com/admin/ 2. Provide the admin credentials for your Office 365 tenant. This will take you to your Office 365 Admin Center. - ![office 365 admin center. ](images/setupdeviceaccto365-02.png) + ![Office 365 admin center.](images/setupdeviceaccto365-02.png) 3. Once you are at the Office 365 Admin Center, navigate to **Users** in the left panel, and then click **Active Users**. @@ -37,13 +37,13 @@ If you prefer to use a graphical user interface, you can create a device account 4. On the controls above the list of users, click **+** to create a new user. You'll need to enter a **Display name**, **User name**, **Password** and an email address for the recipient of the password. Optionally you can change the password manually, but we recommend that you use the auto-generated option. You also need to assign this account a license that gives the account access to Exchange and Skype for Business services. - ![screen to create a new user account. ](images/setupdeviceaccto365-04.png) + ![screen to create a new user account.](images/setupdeviceaccto365-04.png) Click **Create**. 5. Once the account has been successfully created, click **Close** on the resulting dialog box, and you will see the admin center Active Users list again. - ![confirmation screen for creating a new account. ](images/setupdeviceaccto365-05.png) + ![Confirmation screen for creating a new account.](images/setupdeviceaccto365-05.png) 6. Select the user you just created from the **Active Users** list. You need to disable the Skype for Business license, because you can’t create a Skype Meeting Room with this option. @@ -51,7 +51,7 @@ If you prefer to use a graphical user interface, you can create a device account In the right panel you can see the account properties and several optional actions. The process so far has created a regular Skype account for this user, which you need to disable. Click **Edit** for the **Assigned license** section, then click the dropdown arrow next to the license to expand the details. - ![assign license for skype for business online.](images/setupdeviceaccto365-07.png) + ![assign license for Skype for Business online.](images/setupdeviceaccto365-07.png) From the list, uncheck **Skype for Business Online (plan 2)** (this license may vary depending on your organization), and click **SAVE**. @@ -59,39 +59,39 @@ If you prefer to use a graphical user interface, you can create a device account 1. In the Office 365 Admin Center’s left panel, click **ADMIN**, and then click **Exchange**. - ![office 365 admin center, showing exchange active users. ](images/setupdeviceaccto365-08.png) + ![Office 365 admin center, showing exchange active users.](images/setupdeviceaccto365-08.png) 2. This will open another tab on your browser to take you to the Exchange Admin Center, where you can create and set the Mailbox Setting for Surface Hub. - ![exchange admin center. ](images/setupdeviceaccto365-09.png) + ![Exchange admin center.](images/setupdeviceaccto365-09.png) 3. To create a Mobile Device Mailbox Policy, click **Mobile** from the left panel and then click **Mobile device mailbox policies**. Surface Hubs require an account with a mobile device mailbox policy that does not require a password, so if you already have an existing policy that matches this requirement, you can apply that policy to the account. Otherwise use the following steps to create a new one to be used only for Surface Hub device accounts. - ![excahnge admin center - creating a mobile device mailbox policy. ](images/setupdeviceaccto365-10.png) + ![Excahnge admin center - creating a mobile device mailbox policy.](images/setupdeviceaccto365-10.png) 4. To create a New Surface Hub mobile device mailbox policy, click the **+** button from the controls above the list of policies to add a new policy. For the name, provide a name that will help you distinguish this policy from other device accounts (for example, *SurfaceHubDeviceMobilePolicy*). Make sure the policy does not require a password for the devices assigned to, so make sure **Require a Password** remains unchecked, then click **Save**. - ![image showing new mobile device policy](images/setupdeviceaccto365-11.png) + ![Image showing new mobile device policy.](images/setupdeviceaccto365-11.png) 5. After you have created the new mobile device mailbox policy, go back to the **Exchange Admin Center** and you will see the new policy listed. - ![image with new mobile device mailbox policy in exchange admin center. ](images/setupdeviceaccto365-12.png) + ![Image with new mobile device mailbox policy in Exchange admin center.](images/setupdeviceaccto365-12.png) 6. Now, to apply the ActiveSync policy without using PowerShell, you can do the following: In the EAC, click **Recipients** > **Mailboxes** and then select a mailbox. - ![image showing mailbox in exchange admin center. ](images/setupdeviceaccto365-13.png) + ![Image showing mailbox in Exchange admin center.](images/setupdeviceaccto365-13.png) 7. In the Details pane, scroll to **Phone and Voice Features** and click **View details** to display the **Mobile Device Details** screen. - ![image showing mobile device details for the mailbox. ](images/setupdeviceaccto365-14.png) + ![Image showing mobile device details for the mailbox.](images/setupdeviceaccto365-14.png) 8. The mobile device mailbox policy that’s currently assigned is displayed. To change the mobile device mailbox policy, click **Browse**. - ![image with details for the mobile device policy. ](images/setupdeviceaccto365-15.png) + ![Image with details for the mobile device policy.](images/setupdeviceaccto365-15.png) 9. Choose the appropriate mobile device mailbox policy from the list, click **OK** and then click **Save**. - ![image showing multiple mobile device mailbox policies. ](images/setupdeviceaccto365-16.png) + ![Image showing multiple mobile device mailbox policies.](images/setupdeviceaccto365-16.png) ### Use PowerShell to complete device account creation @@ -107,11 +107,11 @@ In order to run cmdlets used by these PowerShell scripts, the following must be 1. Run Windows PowerShell as Administrator. - ![image showing how to start windows powershell and run as administrator. ](images/setupdeviceaccto365-17.png) + ![Image showing how to start Windows PowerShell and run as administrator.](images/setupdeviceaccto365-17.png) 2. Create a Credentials object, then create a new session that connects to Skype for Business Online, and provide the global tenant administrator account, then click **OK**. - ![image for windows powershell credential request. ](images/setupdeviceaccto365-18.png) + ![Image for Windows PowerShell credential request. ](images/setupdeviceaccto365-18.png) 3. To connect to Microsoft Online Services, run: @@ -119,7 +119,7 @@ In order to run cmdlets used by these PowerShell scripts, the following must be Connect-MsolService -Credential $Cred ``` - ![image showing powershell cmdlet.](images/setupdeviceaccto365-19.png) + ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-19.png) 4. Now to connect to Skype for Business Online Services, run: @@ -127,7 +127,7 @@ In order to run cmdlets used by these PowerShell scripts, the following must be $sfbsession = New-CsOnlineSession -Credential $cred ``` - ![image showing powershell cmdlet.](images/setupdeviceaccto365-20.png) + ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-20.png) 5. Finally, to connect to Exchange Online Services, run: @@ -136,7 +136,7 @@ In order to run cmdlets used by these PowerShell scripts, the following must be "https://outlook.office365.com/powershell-liveid/" -Credential $cred -Authentication "Basic" –AllowRedirection ``` - ![image showing powershell cmdlet.](images/setupdeviceaccto365-21.png) + ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-21.png) 6. Now you have to import the Skype for Business Online Session and the Exchange Online session you have just created, which will import the Exchange and Skype Commands so you can use them locally. @@ -147,7 +147,7 @@ In order to run cmdlets used by these PowerShell scripts, the following must be Note that this could take a while to complete. - ![image showing powershell cmdlet.](images/setupdeviceaccto365-22.png) + ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-22.png) 7. Once you’re connected to the online services you need to run a few more cmdlets to configure this account as a Surface Hub device account. @@ -180,11 +180,11 @@ Now that you're connected to the online services, you can finish setting up the You will see the correct email address. - ![image showing powershell cmdlet.](images/setupdeviceaccto365-23.png) + ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-23.png) 2. You need to convert the account into to a room mailbox, so run: - ![image showing powershell cmdlet.](images/setupdeviceaccto365-24.png) + ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-24.png) ``` syntax Set-Mailbox $strEmail -Type Room @@ -196,7 +196,7 @@ Now that you're connected to the online services, you can finish setting up the Set-Mailbox $strEmail -RoomMailboxPassword (ConvertTo-SecureString -String "" -AsPlainText -Force) -EnableRoomMailboxAccount $true ``` - ![image showing powershell cmdlet.](images/setupdeviceaccto365-25.png) + ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-25.png) 4. Various Exchange properties can be set on the device account to improve the meeting experience. You can see which properties need to be set in the [Exchange properties](exchange-properties-for-surface-hub-device-accounts.md) section. @@ -205,7 +205,7 @@ Now that you're connected to the online services, you can finish setting up the Set-CalendarProcessing -Identity $acctUpn -AddAdditionalResponse $true -AdditionalResponse "This is a room!" ``` - ![image showing powershell cmdlet.](images/setupdeviceaccto365-26.png) + ![Image showing PowerShell cmdlet.](images/setupdeviceaccto365-26.png) 5. If you decide to have the password not expire, you can set that with PowerShell cmdlets too. See [Password management](password-management-for-surface-hub-device-accounts.md) for more information. @@ -260,11 +260,11 @@ You can use the Exchange Admin Center to create a device account: 1. Sign in to your Exchange Admin Center using Exchange admin credentials. 2. Once you are at the Exchange Admin Center (EAC), navigate to **Recipients** in the left panel. - ![image showing mailboxes in exchange admin center. ](images/setupdeviceacctexch-01.png) + ![Image showing mailboxes in Exchange admin center.](images/setupdeviceacctexch-01.png) 3. On the controls above the list of mailboxess, choose **+** to create a new one, and provide a **Display name**, **Name**, and **User logon name**, and then click **Save**. - ![image showing creating a new mailbox. ](images/setupdeviceacctexch-02.png) + ![Image showing creating a new mailbox.](images/setupdeviceacctexch-02.png) ### Create a mobile device mailbox policy from the Exchange Admin Center @@ -274,37 +274,37 @@ You can use the Exchange Admin Center to create a device account: 1. Go to the Exchange Admin Center. - ![image showing exchange admin center. ](images/setupdeviceacctexch-03.png) + ![Image showing Exchange admin center.](images/setupdeviceacctexch-03.png) 2. To create a mobile device mailbox policy, click **Mobile** from the left panel, then **Mobile device mailbox policies**. Surface Hubs require an account with a mobile device mailbox policy that does not require a password, so if you already have an existing policy that matches this requirement, you can apply that policy to the account. Otherwise use the following steps to create a new one to be used only for Surface Hub device accounts. - ![image showing using exchange admin center to create a mobile device mailbox policy. ](images/setupdeviceacctexch-05.png) + ![Image showing using Exchange admin center to create a mobile device mailbox policy.](images/setupdeviceacctexch-05.png) 3. To create a new mobile device account mailbox policy, click the **+** button from the controls above the list of policies to add a new policy. For the name provide a name that will help you distinguish this policy from other device accounts (for example, *SurfaceHubDeviceMobilePolicy*). The policy must not be password-protected, so make sure **Require a Password** remains unchecked, then click **Save**. - ![image showing new mobile device mailbox policy. ](images/setupdeviceacctexch-06.png) + ![Image showing new mobile device mailbox policy.](images/setupdeviceacctexch-06.png) 4. After you have created the new mobile device mailbox policy, go back to the Exchange Admin Center and you will see the new policy listed. - ![image showing new mobile device mailbox policy in exchange admin center. ](images/setupdeviceacctexch-07.png) + ![Image showing new mobile device mailbox policy in Exchange admin center.](images/setupdeviceacctexch-07.png) 5. To apply the ActiveSync policy without using PowerShell, you can do the following: - In the EAC, click **Recipients** > **Mailboxes** and select a mailbox. - ![image showing exchange admin center. ](images/setupdeviceacctexch-08.png) + ![image showing exchange admin center.](images/setupdeviceacctexch-08.png) - In the **Details** pane, scroll to **Phone and Voice Features** and click **View details** to display the **Mobile Device Details** screen. - ![image showing mailbox details. ](images/setupdeviceacctexch-09.png) + ![image showing mailbox details.](images/setupdeviceacctexch-09.png) - The mobile device mailbox policy that’s currently assigned is displayed. To change the mobile device mailbox policy, click **Browse**. - ![image showing the currently assigned mobile device mailbox policy. ](images/setupdeviceacctexch-10.png) + ![image showing the currently assigned mobile device mailbox policy.](images/setupdeviceacctexch-10.png) - Choose the appropriate mobile device mailbox policy from the list, click **OK** and then click **Save**. - ![image showing list of mobile device mailbox policies. ](images/setupdeviceacctexch-11.png) + ![image showing list of mobile device mailbox policies.](images/setupdeviceacctexch-11.png) ### Use PowerShell to configure the account diff --git a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md index d63259487e..aeb2e566ac 100644 --- a/devices/surface-hub/create-and-test-a-device-account-surface-hub.md +++ b/devices/surface-hub/create-and-test-a-device-account-surface-hub.md @@ -116,7 +116,7 @@ You can check online for updated versions at [Surface Hub device account scripts Your infrastructure will likely fall into one of three configurations. Which configuration you have will affect how you prepare for device setup. -![](images/deploymentoptions-01.png) +![Image showing deployment options: online, on-premises, or hybrid.](images/deploymentoptions-01.png) - [Online deployment (Office 365)](online-deployment-surface-hub-device-accounts.md): Your organization’s environment is deployed entirely on Office 365. - [On-premises deployment](on-premises-deployment-surface-hub-device-accounts.md): Your organization has servers that it controls, where Active Directory, Exchange, and Skype for Business (or Lync) are hosted. diff --git a/devices/surface-hub/device-reset-surface-hub.md b/devices/surface-hub/device-reset-surface-hub.md index e630d1f23b..d2e58dc6fc 100644 --- a/devices/surface-hub/device-reset-surface-hub.md +++ b/devices/surface-hub/device-reset-surface-hub.md @@ -29,10 +29,23 @@ Initiating a reset will return the device to the last cumulative Windows update, - Local admins on the device - Configurations from MDM or the Settings app +**To reset a Surface Hub** +1. On your Surface Hub, open **Settings**. + + ![Image showing Settings app for Surface Hub.](images/sh-settings.png) + +2. Click **Update & Security**. + + ![Image showing Update & Security group in Settings app for Surface Hub.](images/sh-settings-update-security.png) + +3. Click **Recovery**, and then click **Get started**. + + ![Image showing Reset device option in Settings app for Surface Hub.](images/sh-settings-reset-device.png) + **Important Note**
Performing a device reset may take up to 6 hours. Do not interrupt the reset process. Interrupting the process will render the device inoperable, requiring warranty service to return to normal functionality. -After the reset, you'll be taken through the [first run program](first-run-program-surface-hub.md) again. +After the reset, Surface Hub restarts the [first run program](first-run-program-surface-hub.md) again. ## Related topics diff --git a/devices/surface-hub/first-run-program-surface-hub.md b/devices/surface-hub/first-run-program-surface-hub.md index da4eafbf85..449c447e5c 100644 --- a/devices/surface-hub/first-run-program-surface-hub.md +++ b/devices/surface-hub/first-run-program-surface-hub.md @@ -46,7 +46,7 @@ This is the first screen you'll see when you power up the Surface Hub for the fi   -![icd options checklist](images/setuplocale.png) +![Image showing ICD options checklist.](images/setuplocale.png) ### Details @@ -72,7 +72,7 @@ If no wired connection can be found, then the device will attempt to set up a wi If your device does not detect a wired connection that it can use to connect to a network or the Internet, you will see this page. Here you can either connect to a wireless network, or skip making the network connection. -![](images/setupnetworksetup-1.png) +![Image shoring Network setup page.](images/setupnetworksetup-1.png) ### Details @@ -97,7 +97,7 @@ If you want to connect to a secured wireless network from this page, click on th This page will be shown when you've selected a secured wireless network. -![](images/setupnetworksetup-3.png) +![Image showing wireless network setup page.](images/setupnetworksetup-3.png) ### Details @@ -121,11 +121,11 @@ This page will be shown when the device detects a wired connection with limited - You can select **Enter proxy settings** which will allow you to specify how to use the network proxy. You'll be taken to the next screen. -![](images/setupnetworksetup-2.png) +![Image showing network proxy page.](images/setupnetworksetup-2.png) This is the screen you'll see if you clicked **Enter proxy settings** on the previous screen. -![](images/setupnetworksetup-4.png) +![Image showing proxy server setting details.](images/setupnetworksetup-4.png) ### Details @@ -149,7 +149,7 @@ You can skip connecting to a network by selecting **Skip this step**. You'll be This screen is purely informational, and shows which recommended settings have been enabled by default. -![](images/setupsetupforyou.png) +![Image showing set up for you page.](images/setupsetupforyou.png) ### Details @@ -170,7 +170,7 @@ On this page, the Surface Hub will ask for credentials for the device account th   -![icd options checklist](images/setupdeviceacct.png) +![Image showing Enter device account info page.](images/setupdeviceacct.png) ### Details @@ -192,7 +192,7 @@ If you skip setting it up now, you can add a device account later by using the S If you click **Skip setting up a device account**, the device will display a dialog box showing what will happen if the device doesn't have a device account. If you choose **Yes, skip this**, you will be sent to the [Name this device page](#name-this-device). -![icd options checklist](images/setupskipdeviceacct.png) +![Image showing message the is displaed to confirm you want to skip creating a device account.](images/setupskipdeviceacct.png) ### What happens? @@ -211,7 +211,7 @@ The device will use the UPN or DOMAIN\\User name and password for the device acc This page will only be shown if there's a problem. Typically, it means that the device account that you provided was found in Active Directory (AD) or Azure Active Directory (Azure AD), but the Exchange server for the account was not discovered. -![icd options checklist](images/setupexchangeserver-01.png) +![Image showing Exchange server page.](images/setupexchangeserver-01.png) ### Details @@ -230,7 +230,7 @@ You can enable Exchange services for a device account later by using the Setting If you click **Skip setting up Exchange services**, the device will display a dialog showing what will happen. If you choose **Yes, skip this**, then Exchange services will not be set up. -![icd options checklist](images/setupexchangeserver-02.png) +![Image showing confirmation message that is displayed when you skip setting up Exchange services.](images/setupexchangeserver-02.png) ### What happens? @@ -249,7 +249,7 @@ This page will be shown when: - Exchange supported protocols are not supported by the Surface Hub. - Exchange returns incorrect XML. -![icd options checklist](images/setupexchangepolicies.png) +![Image showing Exchange policis page.](images/setupexchangepolicies.png) ### Details @@ -273,7 +273,7 @@ If you choose to skip this check, the Surface Hub will stop looking for the Exch This page asks you to provide two names that will be used for identifying the Surface Hub. -![icd options checklist](images/setupnamedevice.png) +![Image showing Name this device page.](images/setupnamedevice.png) ### Details @@ -307,7 +307,7 @@ Because every Surface Hub can be used by any number of authenticated employees,   -![icd options checklist](images/setupsetupadmins.png) +![Image showing Set up admins for this device page.](images/setupsetupadmins.png) ### Details @@ -348,7 +348,7 @@ Joining Azure AD has two primary benefits: 1. Some employees from your organization will be able to access the device as admins, and will be able to start the Settings app and configure the device. People that have admin permissions will be defined in your Azure AD subscription. 2. If your Azure AD is connected to a mobile device management (MDM) solution, the device will enroll with that MDM solution so you can apply policies and configuration. -![](images/setupjoiningazuread-1.png) +![Image showing message when you join your Surface Hub to Azure Active Directory.](images/setupjoiningazuread-1.png) ### Details @@ -357,11 +357,11 @@ The following input is required: - **User's UPN:** The user principal name (UPN) of an account that can join Azure AD. - **Password:** The password of the account you’re using to join Azure AD. -![](images/setupjoiningazuread-2.png) +![Image showing account log in info.](images/setupjoiningazuread-2.png) If you get to this point and don't have valid credentials for an Azure AD account, the device will allow you to continue by creating a local admin account. Click **Set up Windows with a local account instead**. -![](images/setupjoiningazuread-3.png) +![Image showing Set up an admin account page.](images/setupjoiningazuread-3.png) ### What happens? @@ -373,7 +373,7 @@ This page will ask for credentials to join a domain so that the Surface Hub can Once the device has been domain joined, you must specify a security group from the domain you joined. This security group will be provisioned as administrators on the Surface Hub, and anyone from the security group can enter their domain credentials to access Settings. -![icd options checklist](images/setupdomainjoin.png) +![Image showing Set up admins using domain join page.](images/setupdomainjoin.png) ### Details @@ -385,7 +385,7 @@ The following input is required: After the credentials are verified, you will be asked to type a security group name. This input is required. -![icd options checklist](images/setupsecuritygroup-1.png) +![Image showing Enter a security group page.](images/setupsecuritygroup-1.png) ### What happens? @@ -401,7 +401,7 @@ If the join is successful, you'll see the **Enter a security group** page. When If you decide not to use Azure Active Directory (Azure AD) or Active Directory (AD) to manage the Surface Hub, you'll need to create a local admin account. -![](images/setuplocaladmin.png) +![Image showing Set up an admin account for local admin.](images/setuplocaladmin.png) ### Details diff --git a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md index fae114b8da..7d9bfa37be 100644 --- a/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md +++ b/devices/surface-hub/hybrid-deployment-surface-hub-device-accounts.md @@ -21,17 +21,17 @@ Use this procedure if you use Exchange on-prem. - In **Active Directory Users and Computers** AD tool, right-click on the folder or Organizational Unit that your Surface Hub accounts will be created in, click **New**, and **User**. - Type the display name from the previous cmdlet into the **Full name** box, and the alias into the **User logon name** box. Click **Next**.

- ![new object box for creating a new user in active directory](images/hybriddeployment-01a.png) + ![New object box for creating a new user in active directory.](images/hybriddeployment-01a.png) - Type the password for this account. You'll need to retype it for verification. Make sure the **Password never expires** checkbox is the only option selected. >**Important** Selecting **Password never expires** is a requirement for Skype for Business on the Surface Hub. Your domain rules may prohibit passwords that don't expire. If so, you'll need to create an exception for each Surface Hub device account. - ![image showing password dialog box](images/hybriddeployment-02a.png) + ![Image showing password dialog box.](images/hybriddeployment-02a.png) - Click **Finish** to create the account. - ![image with account name, logon name, and password options for new user](images/hybriddeployment-03a.png) + ![Image with account name, logon name, and password options for new user.](images/hybriddeployment-03a.png) 2. After you've created the account, run a directory synchronization. When it's complete, go to the users page in your Office 365 admin center and verify that the account created in the previous steps has merged to online. @@ -223,17 +223,17 @@ Use this procedure if you use Exchange online. - In **Active Directory Users and Computers** AD tool, right-click on the folder or Organizational Unit that your Surface Hub accounts will be created in, click **New**, and **User**. - Type the display name from the previous cmdlet into the **Full name** box, and the alias into the **User logon name** box. Click **Next**. - ![new object box for creating a new user in active directory](images/hybriddeployment-01a.png) + ![New object box for creating a new user in Active Directory.](images/hybriddeployment-01a.png) - Type the password for this account. You'll need to retype it for verification. Make sure the **Password never expires** checkbox is the only option selected. >**Important** Selecting **Password never expires** is a requirement for Skype for Business on the Surface Hub. Your domain rules may prohibit passwords that don't expire. If so, you'll need to create an exception for each Surface Hub device account. - ![image showing password dialog box](images/hybriddeployment-02a.png) + ![Image showing password dialog box.](images/hybriddeployment-02a.png) - Click **Finish** to create the account. - ![image with account name, logon name, and password options for new user](images/hybriddeployment-03a.png) + ![Image with account name, logon name, and password options for new user.](images/hybriddeployment-03a.png) 6. Directory synchronization. diff --git a/devices/surface-hub/images/sh-settings-reset-device.png b/devices/surface-hub/images/sh-settings-reset-device.png new file mode 100644 index 0000000000..bdb16e8e20 Binary files /dev/null and b/devices/surface-hub/images/sh-settings-reset-device.png differ diff --git a/devices/surface-hub/images/sh-settings-update-security.png b/devices/surface-hub/images/sh-settings-update-security.png new file mode 100644 index 0000000000..44bb2202f0 Binary files /dev/null and b/devices/surface-hub/images/sh-settings-update-security.png differ diff --git a/devices/surface-hub/images/sh-settings.png b/devices/surface-hub/images/sh-settings.png new file mode 100644 index 0000000000..12783739ed Binary files /dev/null and b/devices/surface-hub/images/sh-settings.png differ diff --git a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md index 061bfada43..5fe5d1931c 100644 --- a/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md +++ b/devices/surface-hub/manage-settings-with-mdm-for-surface-hub.md @@ -30,7 +30,7 @@ If you joined your Surface Hub to an Azure Active Directory (Azure AD) subscript Alternatively, the device can be enrolled like any other Windows device by going to **Settings** > **Accounts** > **Work access**. -![image showing enroll in device maagement page. ](images/managesettingsmdm-enroll.png) +![Image showing enroll in device maagement page.](images/managesettingsmdm-enroll.png) ### Manage a device through MDM diff --git a/devices/surface-hub/prepare-your-environment-for-surface-hub.md b/devices/surface-hub/prepare-your-environment-for-surface-hub.md index 8656c33064..d4af065b4b 100644 --- a/devices/surface-hub/prepare-your-environment-for-surface-hub.md +++ b/devices/surface-hub/prepare-your-environment-for-surface-hub.md @@ -29,7 +29,7 @@ In order to function properly, the Surface Hub must have access to a wired or wi - Can receive an IP address using DHCP - Open ports: - HTTPS: 443 - - HTTP: 8080 + - HTTP: 80 A wired connection is preferred. @@ -79,7 +79,7 @@ In order to ensure that your environment is ready for the Surface Hub, verify th - It must have these ports open: - HTTPS: 443 - - HTTP: 8080 + - HTTP: 80 If your network runs through a proxy, you'll need the proxy address or script information as well. diff --git a/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md b/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md index f3ecf5f2d4..0d7c350af6 100644 --- a/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md +++ b/devices/surface-hub/provisioning-packages-for-certificates-surface-hub.md @@ -58,9 +58,7 @@ In order to create and deploy provisioning packages, all of the following are re ### Install the Windows Imaging and Configuration Designer 1. The Windows Imaging and Configuration Designer (ICD) is installed as part of the Windows 10 ADK. The installer for the ADK can be downloaded from the [Microsoft Download Center](http://go.microsoft.com/fwlink/?LinkId=718147). - >**Note**  The ADK must be installed on a separate PC, not on the Surface Hub. - -   + >**Note**  The ADK must be installed on a separate PC, not on the Surface Hub.   2. Run the installer, and set your preferences for installation. When asked what features you want to install, you will see a checklist like the one in the following figure. Note that **Windows Performance Toolkit** and **Windows Assessment Toolkit** should be unchecked, as they are not needed to run the ICD. @@ -73,7 +71,7 @@ In order to create and deploy provisioning packages, all of the following are re All four of these features are required to run the ICD and create a package for the Surfact Hub. - ![icd options checklist](images/idcfeatureschecklist.png) + ![Image showing Windows ADK install page - select features to install.](images/idcfeatureschecklist.png) 3. Continue with the installer until the ADK is installed. This may take a while, because the installer downloads remote content. @@ -83,29 +81,29 @@ This example will demonstrate how to create a provisioning package to install a 1. On the PC that had the Windows 10 ADK installed, open ICD and choose the **New provisioning package** tile from the main menu. - ![icd tiles](images/wicd-screen01a.png) + ![Image showing Start page in Windows Imaging and Configuration Designer.](images/wicd-screen01a.png) 2. When the **New project** dialog box opens, type whatever name you like in the **Name** box. The **Location** and **Description** boxes can also be filled at your discretion, though we recommend using the **Description** box to help you distinguish among multiple packages. Click **Next**. - ![icd tiles](images/wicd-screen02a.png) + ![Image showing New project screen for Windows Imaging and Configuration Designer.](images/wicd-screen02a.png) Select the settings that are **Common to all Windows editions**, and click **Next**. - ![icd tiles](images/wicd-screen02b.png) + ![Image showing project settings in Windows Imaging and Configuration Designer.](images/wicd-screen02b.png) When asked to import a provisioning package, just click **Finish.** - ![icd tiles](images/wicd-screen02c.png) + ![Image showing option for importing a provisioning package.](images/wicd-screen02c.png) 3. ICD's main screen will be displayed. This is where you create the provisioning package. In the **Available customizations** pane, expand **Runtime settings** and then expand **Certificates**. Click **Root certificates**. - ![icd tiles](images/wicd-screen03a.png) + ![Image showing Windows Imaging and Configuration Designer's man page.](images/wicd-screen03a.png) In the center pane, you’ll be asked to specify a **CertificateName** for the Root certificate. You can set this to whatever you want. For the example, we've used the same name as the project. Click **Add**, and an entry will be added in the left pane. 4. In the **Available customizations** pane on the left, a new category has appeared for **CertificatePath** underneath the **CertificateName** you provided. There’s also a red exclamation icon indicating that there is a required field that needs to be set. Click **CeritficatePath**. - ![icd tiles](images/wicd-screen04a.png) + ![Image showing available customizations in Windows Imaging and Configuration Designer.](images/wicd-screen04a.png) 5. In the center pane, you’ll be asked to specify the path for the certificate. Enter the name of the .cer file that you want to deploy, either by typing or clicking **Browse**. It must be a root certificate. The provisioning package created will copy the .cer file into the package it creates. @@ -238,15 +236,15 @@ The following two methods for deploying provisioning packages apply to any kind 3. Navigate to **System > Work Access**. Under the header **Related settings**, click on **Add or remove a management package**. 4. Here, click the button for **Add a package**. - ![](images/provisioningpackagesettings-01.png) + ![Image showing provisioining packages page in Settings.](images/provisioningpackagesettings-01.png) 5. Click **Removable media** from the dropdown list. You will see a list of available provisioning packages on the **Settings** page. - ![](images/provisioningpackagesettings-02.png) + ![Image showing add a package page in Settings.](images/provisioningpackagesettings-02.png) 6. Choose your package and click **Add**. - ![](images/provisioningpackagesettings-03.png) + ![Image showing select a package box.](images/provisioningpackagesettings-03.png) 7. You may have to re-enter the admin credentials if User Access Control (UAC) asks for them. 8. You’ll see a confirmation dialog box. Click **Yes, add it**. The certificate will be installed. diff --git a/devices/surface-hub/use-room-control-system-with-surface-hub.md b/devices/surface-hub/use-room-control-system-with-surface-hub.md index 590099c5ec..79edc9e9a3 100644 --- a/devices/surface-hub/use-room-control-system-with-surface-hub.md +++ b/devices/surface-hub/use-room-control-system-with-surface-hub.md @@ -68,7 +68,7 @@ You can use a standard RJ-11 (6P6C) connector to connect the Surface Hub serial This diagram shows the correct pinout used for an RJ-11 (6P6C) to DB9 cable. -![image showing the wiring diagram.](images/room-control-wiring-diagram.png) +![Image showing the wiring diagram.](images/room-control-wiring-diagram.png) ## Command sets diff --git a/devices/surface-hub/wireless-network-management-for-surface-hub.md b/devices/surface-hub/wireless-network-management-for-surface-hub.md index c68b67eb32..a84ca0aa97 100644 --- a/devices/surface-hub/wireless-network-management-for-surface-hub.md +++ b/devices/surface-hub/wireless-network-management-for-surface-hub.md @@ -25,33 +25,33 @@ If a wired network connection is not available, the Surface Hub can use a wirele 1. On the Surface Hub, open **Settings** and enter your admin credentials. 2. Click **System**, and then click **Network & Internet**. Under **Wi-Fi**, choose an access point. If you want Surface Hub to automatically connect to this access point, click **Connect automatically**. Click **Connect**. - ![](images/networkmgtwireless-01.png) + ![Image showing Wi-Fi settings, Network & Internet page.](images/networkmgtwireless-01.png) 3. If the network is secured, you'll be asked to enter the security key. Click **Next** to connect. - ![](images/networkmgtwireless-02.png) + ![Image showing security key and password prompts for connecting to secured Wi-Fi.](images/networkmgtwireless-02.png) ### Review wireless settings 1. On the Surface Hub, open **Settings** and enter your admin credentials. 2. Click **System**, click **Network & Internet**, then **Wi-Fi**, and then click **Advanced options**. - ![](images/networkmgtwireless-03.png) + ![Image showing where to find Advanced options for Network & Internect, Wi-Fi settings.](images/networkmgtwireless-03.png) 3. The system will show you the properties for the wireless network connection. - ![](images/networkmgtwireless-04.png) + ![Image showing properties for connected Wi-Fi.](images/networkmgtwireless-04.png) ### Review wired settings 1. On the Surface Hub, open **Settings** and enter your admin credentials. 2. Click **System**, click **Network & Internet**, then click on the network under Ethernet. - ![](images/networkmgtwired-01.png) + ![Image showing Network & Internet, Ethernet settings page.](images/networkmgtwired-01.png) 3. The system will show you the properties for the wired network connection. - ![](images/networkmgtwired-02.png) + ![Image showing properties for ethernet connection.](images/networkmgtwired-02.png) ## Related topics diff --git a/devices/surface/TOC.md b/devices/surface/TOC.md index 260fedc51d..5000472050 100644 --- a/devices/surface/TOC.md +++ b/devices/surface/TOC.md @@ -15,4 +15,6 @@ ## [Surface Diagnostic Toolkit](surface-diagnostic-toolkit.md) ## [Surface Dock Updater](surface-dock-updater.md) ## [Surface Enterprise Management Mode](surface-enterprise-management-mode.md) +### [Enroll and configure Surface devices with SEMM](enroll-and-configure-surface-devices-with-semm.md) +### [Unenroll Surface devices from SEMM](unenroll-surface-devices-from-semm.md) diff --git a/devices/surface/deploy-surface-app-with-windows-store-for-business.md b/devices/surface/deploy-surface-app-with-windows-store-for-business.md index 01fc609a8f..4c35222e31 100644 --- a/devices/surface/deploy-surface-app-with-windows-store-for-business.md +++ b/devices/surface/deploy-surface-app-with-windows-store-for-business.md @@ -81,6 +81,8 @@ Figure 5 shows the required frameworks for the Surface app. *Figure 5. Required frameworks for the Surface app* +>**Note:**  The version numbers of the Surface app and required frameworks will change as the apps are updated. Check for the latest version of Surface app and each framework in Windows Store for Business. Always use the Surface app and recommended framework versions as provided by Windows Store for Business. Using outdated frameworks or the incorrect versions may result in errors or application crashes. + To download the required frameworks for the Surface app, follow these steps: 1. Click the **Download** button under **Microsoft.VCLibs.140.00_14.0.23816.0_x64__8wekyb3d8bbwe**. This downloads the Microsoft.VCLibs.140.00_14.0.23816.0_x64__8wekyb3d8bbwe.Appx file to your specified folder. 2. Click the **Download** button under **Microsoft.NET.Native.Runtime.1.1_1.1.23406.0_x64__8wekyb3d8bbwe**. This downloads the Microsoft.NET.Native.Runtime.1.1_1.1.23406.0_x64__8wekyb3d8bbwe.Appx file to your specified folder. diff --git a/devices/surface/enroll-and-configure-surface-devices-with-semm.md b/devices/surface/enroll-and-configure-surface-devices-with-semm.md new file mode 100644 index 0000000000..08696c682d --- /dev/null +++ b/devices/surface/enroll-and-configure-surface-devices-with-semm.md @@ -0,0 +1,135 @@ +--- +title: Enroll and configure Surface devices with SEMM (Surface) +description: Learn how to create a Surface UEFI configuration package to control the settings of Surface UEFI, as well as enroll a Surface device in SEMM. +keywords: surface enterprise management +ms.prod: w10 +ms.mktglfcycl: manage +ms.pagetype: surface, devices, security +ms.sitesec: library +author: jobotto +--- + +# Enroll and configure Surface devices with SEMM + +With Microsoft Surface Enterprise Management Mode (SEMM), you can securely configure the settings of Surface UEFI on a Surface device and manage those settings on Surface devices in your organization. When a Surface device is managed by SEMM, that device is considered to be *enrolled* (sometimes referred to as activated). This article shows you how to create a Surface UEFI configuration package that will not only control the settings of Surface UEFI, but will also enroll a Surface device in SEMM. + +For a more high-level overview of SEMM, see [Microsoft Surface Enterprise Management Mode](https://technet.microsoft.com/en-us/itpro/surface/surface-enterprise-management-mode). + +#### Download and install Microsoft Surface UEFI Configurator +The tool used to create SEMM packages is Microsoft Surface UEFI Configurator. You can download Microsoft Surface UEFI Configurator from the [Surface Tools for IT](https://www.microsoft.com/en-us/download/details.aspx?id=46703) page in the Microsoft Download Center. +Run the Microsoft Surface UEFI Configurator Windows Installer (.msi) file to start the installation of the tool. When the installer completes, find Microsoft Surface UEFI Configurator in the All Apps section of your Start menu. + +>**Note**:  Microsoft Surface UEFI Configurator is supported only on Windows 10. + +## Create a Surface UEFI configuration package + +The Surface UEFI configuration package performs both the role of applying a new configuration of Surface UEFI settings to a Surface device managed with SEMM and the role of enrolling Surface devices in SEMM. The creation of a configuration package requires you to have a signing certificate to be used with SEMM to secure the configuration of UEFI settings on each Surface device. For more information about the requirements for the SEMM certificate, see [Microsoft Surface Enterprise Management Mode](https://technet.microsoft.com/en-us/itpro/surface/surface-enterprise-management-mode). + +To create a Surface UEFI configuration package, follow these steps: + +1. Open Microsoft Surface UEFI Configurator from the Start menu. +2. Click **Start**. +3. Click **Configuration Package**, as shown in Figure 1. + + ![Create a package for SEMM enrollment](images\surface-semm-enroll-fig1.png "Create a package for SEMM enrollment") + + *Figure 1. Select Configuration Package to create a package for SEMM enrollment and configuration* + +4. Click **Certificate Protection** to add your exported certificate file with private key (.pfx), as shown in Figure 2. Browse to the location of your certificate file, select the file, and then click **OK**. + + ![Add the SEM certificate and Surface UEFI password to configuration package](images\surface-semm-enrollment-fig2.png "Add the SEM certificate and Surface UEFI password to configuration package") + + *Figure 2. Add the SEMM certificate and Surface UEFI password to a Surface UEFI configuration package* + +5. When you are prompted to confirm the certificate password, enter and confirm the password for your certificate file, and then click **OK**. +6. Click **Password Protection** to add a password to Surface UEFI. This password will be required whenever you boot to UEFI. If this password is not entered, only the **PC information**, **About**, **Enterprise management**, and **Exit** pages will be displayed. This step is optional. +7. When you are prompted, enter and confirm your chosen password for Surface UEFI, and then click **OK**. If you want to clear an existing Surface UEFI password, leave the password field blank. +8. If you do not want the Surface UEFI package to apply to a particular device, on the **Choose which Surface type you want to target** page, click the slider beneath the corresponding Surface Book or Surface Pro 4 image so that it is in the **Off** position. (As shown in Figure 3.) + + ![Choose devices for package compatibility](images\surface-semm-enroll-fig3.png "Choose devices for package compatibility") + + *Figure 3. Choose the devices for package compatibility* + +9. Click **Next**. +10. If you want to deactivate a component on managed Surface devices, on the **Choose which components you want to activate or deactivate** page, click the slider next to any device or group of devices you want to deactivate so that the slider is in the **Off** position. (Shown in Figure 4.) The default configuration for each device is **On**. Click the **Reset** button if you want to return all sliders to the default position. + + ![Disable or enable Surface components](images\surface-semm-enroll-fig4.png "Disable or enable Surface components") + + *Figure 4. Disable or enable individual Surface components* + +11. Click **Next**. +12. To enable or disable advanced options in Surface UEFI or the display of Surface UEFI pages, on the **Choose the advanced settings for your devices** page, click the slider beside the desired setting to configure that option to **On** or **Off** (shown in Figure 5). In the **UEFI Front Page** section, you can use the sliders for **Security**, **Devices**, and **Boot** to control what pages are available to users who boot into Surface UEFI. (For more information about Surface UEFI settings, see [Manage Surface UEFI settings](https://technet.microsoft.com/en-us/itpro/surface/manage-surface-uefi-settings).) Click **Build** when you have finished selecting options to generate and save the package. + + ![Control advanced Surface UEFI settings and Surface UEFI pages](images\surface-semm-enroll-fig5.png "Control advanced Surface UEFI settings and Surface UEFI pages") + + *Figure 5. Control advanced Surface UEFI settings and Surface UEFI pages with SEMM* + +13. In the **Save As** dialog box, specify a name for the Surface UEFI configuration package, browse to the location where you would like to save the file, and then click **Save**. +14. When the package is created and saved, the **Successful** page is displayed. + +>**Note**:  Record the certificate thumbprint characters that are displayed on this page, as shown in Figure 6. You will need these characters to confirm enrollment of new Surface devices in SEMM. Click **End** to complete package creation and close Microsoft Surface UEFI Configurator. + +![Display of certificate thumbprint characters](images\surface-semm-enroll-fig6.png "Display of certificate thumbprint characters") + +*Figure 6. The last two characters of the certificate thumbprint are displayed on the Successful page* + +Now that you have created your Surface UEFI configuration package, you can enroll or configure Surface devices. + +>**Note**:  When a Surface UEFI configuration package is created, a log file is created on the desktop with details of the configuration package settings and options. + +## Enroll a Surface device in SEMM +When the Surface UEFI configuration package is executed, the SEMM certificate and Surface UEFI configuration files are staged in the firmware storage of the Surface device. When the Surface device reboots, Surface UEFI processes these files and begins the process of applying the Surface UEFI configuration or enrolling the Surface device in SEMM, as shown in Figure 7. + +![SEMM process for configuration of Surface UEFI or enrollment](images\surface-semm-enroll-fig7.png "SEMM process for configuration of Surface UEFI or enrollment") + +*Figure 7. The SEMM process for configuration of Surface UEFI or enrollment of a Surface device* + +Before you begin the process to enroll a Surface device in SEMM, ensure that you have the last two characters of the certificate thumbprint on hand. You will need these characters to confirm the device’s enrollment (see Figure 6). + +To enroll a Surface device in SEMM with a Surface UEFI configuration package, follow these steps: + +1. Run the Surface UEFI configuration package .msi file on the Surface device you want to enroll in SEMM. This will provision the Surface UEFI configuration file in the device’s firmware. +2. Select the **I accept the terms in the License Agreement** check box to accept the End User License Agreement (EULA), and then click **Install** to begin the installation process. +3. Click **Finish** to complete the Surface UEFI configuration package installation and restart the Surface device when you are prompted to do so. +4. Surface UEFI will load the configuration file and determine that SEMM is not enabled on the device. Surface UEFI will then begin the SEMM enrollment process, as follows: + * Surface UEFI will verify that the SEMM configuration file contains a SEMM certificate. + * Surface UEFI will prompt you to enter to enter the last two characters of the certificate thumbprint to confirm enrollment of the Surface device in SEMM, as shown in Figure 8. + + ![SEMM enrollment requires last two characters of certificate thumbprint](images\surface-semm-enroll-fig8.png "SEMM enrollment requires last two characters of certificate thumbprint") + + *Figure 8. Enrollment in SEMM requires the last two characters of the certificate thumbprint* + + * Surface UEFI will store the SEMM certificate in firmware and apply the configuration settings that are specified in the Surface UEFI configuration file. + +5. The Surface device is now enrolled in SEMM and will boot to Windows. + +You can verify that a Surface device has been successfully enrolled in SEMM by looking for **Microsoft Surface Configuration Package** in **Programs and Features** (as shown in Figure 9), or in the events stored in the **Microsoft Surface UEFI Configurator** log, found under **Applications and Services Logs** in Event Viewer (as shown in Figure 10). + +![Verify enrollment of Surface device in SEMM in Programs and Features](images\surface-semm-enroll-fig9.png "Verify enrollment of Surface device in SEMM in Programs and Features") + +*Figure 9. Verify the enrollment of a Surface device in SEMM in Programs and Features* + +![Verify enrollment of Surface device in SEMM in Event Viewer](images\surface-semm-enroll-fig10.png "Verify enrollment of Surface device in SEMM in Event Viewer") + +*Figure 10. Verify the enrollment of a Surface device in SEMM in Event Viewer* + +You can also verify that the device is enrolled in SEMM in Surface UEFI – while the device is enrolled, Surface UEFI will contain the **Enterprise management** page (as shown in Figure 11). + +![Surface UEFI Enterprise management page](images\surface-semm-enroll-fig11.png "Surface UEFI Enterprise management page") + +*Figure 11. The Surface UEFI Enterprise management page* + + +## Configure Surface UEFI settings with SEMM + +After a device is enrolled in SEMM, you can run Surface UEFI configuration packages signed with the same SEMM certificate to apply new Surface UEFI settings. These settings are applied automatically the next time the device boots, without any interaction from the user. You can use application deployment solutions like System Center Configuration Manager to deploy Surface UEFI configuration packages to Surface devices to change or manage the settings in Surface UEFI. + +For more information about how to deploy Windows Installer (.msi) files with Configuration Manager, see [Deploy and manage applications with System Center Configuration Manager](https://technet.microsoft.com/library/mt627959). + +If you have secured Surface UEFI with a password, users without the password who attempt to boot to Surface UEFI will only have the **PC information**, **About**, **Enterprise management**, and **Exit** pages displayed to them. + +If you have not secured Surface UEFI with a password or a user enters the password correctly, settings that are configured with SEMM will be dimmed (unavailable) and the text Some settings are managed by your organization will be displayed at the top of the page, as shown in Figure 12. + +![Settings managed by SEMM disabled in Surface UEFI](images\surface-semm-enroll-fig12.png "Settings managed by SEMM disabled in Surface UEFI") + +*Figure 12. Settings managed by SEMM will be disabled in Surface UEFI* \ No newline at end of file diff --git a/devices/surface/images/surface-enroll-semm-fig1.png b/devices/surface/images/surface-enroll-semm-fig1.png new file mode 100644 index 0000000000..0db814ae84 Binary files /dev/null and b/devices/surface/images/surface-enroll-semm-fig1.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig1.png b/devices/surface/images/surface-semm-enroll-fig1.png new file mode 100644 index 0000000000..0db814ae84 Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig1.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig10.png b/devices/surface/images/surface-semm-enroll-fig10.png new file mode 100644 index 0000000000..e61cf3d70a Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig10.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig11.png b/devices/surface/images/surface-semm-enroll-fig11.png new file mode 100644 index 0000000000..91c03fef5e Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig11.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig12.png b/devices/surface/images/surface-semm-enroll-fig12.png new file mode 100644 index 0000000000..d6c0505c16 Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig12.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig3.png b/devices/surface/images/surface-semm-enroll-fig3.png new file mode 100644 index 0000000000..2d66b485f9 Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig3.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig4.png b/devices/surface/images/surface-semm-enroll-fig4.png new file mode 100644 index 0000000000..39b0c797e7 Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig4.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig5.png b/devices/surface/images/surface-semm-enroll-fig5.png new file mode 100644 index 0000000000..b3d3db34c7 Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig5.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig6.png b/devices/surface/images/surface-semm-enroll-fig6.png new file mode 100644 index 0000000000..95b1c1b24b Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig6.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig7.png b/devices/surface/images/surface-semm-enroll-fig7.png new file mode 100644 index 0000000000..26a640ac0c Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig7.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig8.png b/devices/surface/images/surface-semm-enroll-fig8.png new file mode 100644 index 0000000000..a1421da21c Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig8.png differ diff --git a/devices/surface/images/surface-semm-enroll-fig9.png b/devices/surface/images/surface-semm-enroll-fig9.png new file mode 100644 index 0000000000..9229ee255d Binary files /dev/null and b/devices/surface/images/surface-semm-enroll-fig9.png differ diff --git a/devices/surface/images/surface-semm-enrollment-fig2.png b/devices/surface/images/surface-semm-enrollment-fig2.png new file mode 100644 index 0000000000..1a5649b01e Binary files /dev/null and b/devices/surface/images/surface-semm-enrollment-fig2.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig1.png b/devices/surface/images/surface-semm-unenroll-fig1.png new file mode 100644 index 0000000000..b0247d3871 Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig1.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig10.png b/devices/surface/images/surface-semm-unenroll-fig10.png new file mode 100644 index 0000000000..968bf44d8c Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig10.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig11.png b/devices/surface/images/surface-semm-unenroll-fig11.png new file mode 100644 index 0000000000..c5e86d2b65 Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig11.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig12.png b/devices/surface/images/surface-semm-unenroll-fig12.png new file mode 100644 index 0000000000..d9a3e0617b Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig12.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig13.png b/devices/surface/images/surface-semm-unenroll-fig13.png new file mode 100644 index 0000000000..cfe16c3a99 Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig13.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig14.png b/devices/surface/images/surface-semm-unenroll-fig14.png new file mode 100644 index 0000000000..5c95097c8d Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig14.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig2.png b/devices/surface/images/surface-semm-unenroll-fig2.png new file mode 100644 index 0000000000..5affd8cef6 Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig2.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig3.png b/devices/surface/images/surface-semm-unenroll-fig3.png new file mode 100644 index 0000000000..45c1ae38ed Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig3.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig4.png b/devices/surface/images/surface-semm-unenroll-fig4.png new file mode 100644 index 0000000000..c4ecf92b1b Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig4.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig5.png b/devices/surface/images/surface-semm-unenroll-fig5.png new file mode 100644 index 0000000000..9229ee255d Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig5.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig6.png b/devices/surface/images/surface-semm-unenroll-fig6.png new file mode 100644 index 0000000000..91c03fef5e Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig6.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig7.png b/devices/surface/images/surface-semm-unenroll-fig7.png new file mode 100644 index 0000000000..0dcbace491 Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig7.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig8.png b/devices/surface/images/surface-semm-unenroll-fig8.png new file mode 100644 index 0000000000..77e7e05407 Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig8.png differ diff --git a/devices/surface/images/surface-semm-unenroll-fig9.png b/devices/surface/images/surface-semm-unenroll-fig9.png new file mode 100644 index 0000000000..b40ccb2449 Binary files /dev/null and b/devices/surface/images/surface-semm-unenroll-fig9.png differ diff --git a/devices/surface/unenroll-surface-devices-from-semm.md b/devices/surface/unenroll-surface-devices-from-semm.md new file mode 100644 index 0000000000..5e31091376 --- /dev/null +++ b/devices/surface/unenroll-surface-devices-from-semm.md @@ -0,0 +1,148 @@ +--- +title: Unenroll Surface devices from SEMM (Surface) +description: Learn how to unenroll a device from SEMM by using a Surface UEFI reset package or the Recovery Request option. +keywords: surface enterprise management +ms.prod: w10 +ms.mktglfcycl: manage +ms.pagetype: surface, devices, security +ms.sitesec: library +author: jobotto +--- + +# Unenroll Surface devices from SEMM + +When a Surface device is enrolled in Surface Enterprise Management Mode (SEMM), a certificate is stored in the firmware of that device. The presence of that certificate and the enrollment in SEMM prevent any unauthorized changes to Surface UEFI settings or options while the device is enrolled in SEMM. To restore control of Surface UEFI settings to the user, the Surface device must be unenrolled from SEMM, a process sometimes described as reset or recovery. There are two methods you can use to unenroll a device from SEMM—a Surface UEFI reset package and a Recovery Request. + +>**Warning:**  To unenroll a device from SEMM and restore user control of Surface UEFI settings, you must have the SEMM certificate that was used to enroll the device in SEMM. If this certificate becomes lost or corrupted, it is not possible to unenroll from SEMM. Back up and protect your SEMM certificate accordingly. + +For more information about SEMM, see [Microsoft Surface Enterprise Management Mode](https://technet.microsoft.com/en-us/itpro/surface/surface-enterprise-management-mode). + +## Unenroll a Surface device from SEMM with a Surface UEFI reset package + +The Surface UEFI reset package is the primary method you use to unenroll a Surface device from SEMM. Like a Surface UEFI configuration package, the reset package is a Windows Installer (.msi) file that configures SEMM on the device. Unlike the configuration package, the reset package will reset the Surface UEFI configuration on a Surface device to its default settings, remove the SEMM certificate, and unenroll the device from SEMM. + +Reset packages are created specifically for an individual Surface device. To begin the process of creating a reset package, you will need the serial number of the device you want to unenroll, as well as the SEMM certificate used to enroll the device. You can find the serial number of your Surface device on the **PC information** page of Surface UEFI, as shown in Figure 1. This page is displayed even if Surface UEFI is password protected and the incorrect password is entered. + +![Serial number of Surface device is displayed](images\surface-semm-unenroll-fig1.png "Serial number of Surface device is displayed") + +*Figure 1. The serial number of the Surface device is displayed on the Surface UEFI PC information page* + +>**Note:**  To boot to Surface UEFI, press **Volume Up** and **Power** simultaneously while the device is off. Hold **Volume Up** until the Surface logo is displayed and the device begins to boot. + +To create a Surface UEFI reset package, follow these steps: + +1. Open Microsoft Surface UEFI Configurator from the Start menu. +2. Click **Start**. +3. Click **Reset Package**, as shown in Figure 2. + + ![Select Reset Package to create a package to unenroll Surface device from SEMM](images\surface-semm-unenroll-fig2.png "Select Reset Package to create a package to unenroll Surface device from SEMM") + + *Figure 2. Click Reset Package to create a package to unenroll a Surface device from SEMM* + +4. Click **Certificate Protection** to add your SEMM certificate file with private key (.pfx), as shown in Figure 3. Browse to the location of your certificate file, select the file, and then click **OK**. + + ![Add the SEMM certificate to Surface UEFI reset package](images\surface-semm-unenroll-fig3.png "Add the SEMM certificate to Surface UEFI reset package") + + *Figure 3. Add the SEMM certificate to a Surface UEFI reset package* + +5. Click **Next**. +6. Type the serial number of the device you want to unenroll from SEMM (as shown in Figure 4), and then click **Build** to generate the Surface UEFI reset package. + + ![Create a Surface UEFI reset package with serial number of Surface device](images\surface-semm-unenroll-fig4.png "Create a Surface UEFI reset package with serial number of Surface device") + + *Figure 4. Use the serial number of your Surface device to create a Surface UEFI reset package* + +7. In the **Save As** dialog box, specify a name for the Surface UEFI reset package, browse to the location where you would like to save the file, and then click **Save**. +8. When the package generation has completed, the **Successful** page is displayed. Click **End** to complete package creation and close Microsoft Surface UEFI Configurator. + +Run the Surface UEFI reset package Windows Installer (.msi) file on the Surface device to unenroll the device from SEMM. The reset package will require a reboot to perform the unenroll operation. After the device has been unenrolled, you can verify the successful removal by ensuring that the **Microsoft Surface Configuration Package** item in **Programs and Features** (shown in Figure 5) is no longer present. + +![Screen that shows device is enrolled in SEMM](images\surface-semm-unenroll-fig5.png "Screen that shows device is enrolled in SEMM") + +*Figure 5. The presence of the Microsoft Surface Configuration Package item in Programs and Features indicates that the device is enrolled in SEMM* + +## Unenroll a Surface device from SEMM with a Recovery Request + +In some scenarios, a Surface UEFI reset package may not be a viable option to unenroll a Surface device from SEMM (for example, where Windows has become unusable). In these scenarios you can unenroll the device by using a Recovery Request generated from within Surface UEFI. The Recovery Request process can be initiated even on devices where you do not have the Surface UEFI password. + +The Recovery Request process is initiated from Surface UEFI on the Surface device, approved with Microsoft Surface UEFI Configurator on another computer, and then completed in Surface UEFI. Like the reset package, approving a Recovery Request with Microsoft Surface UEFI Configurator requires access to the SEMM certificate that was used to enroll the Surface device. + +To initiate a Recovery Request, follow these steps: + +1. Boot the Surface device that is to be unenrolled from SEMM to Surface UEFI. +2. Type the Surface UEFI password if you are prompted to do so. +3. Click the **Enterprise management** page, as shown in Figure 6. + + ![Enterprise Management page](images\surface-semm-unenroll-fig6.png "Enterprise Management page") + + *Figure 6. The Enterprise management page is displayed in Surface UEFI on devices enrolled in SEMM* + +4. Click or press **Get Started**. +5. Click or press **Next** to begin the Recovery Request process. + >**Note:**  A Recovery Request expires two hours after it is created. If a Recovery Request is not completed in this time, you will have to restart the Recovery Request process. +6. Select **SEMM Certificate** from the list of certificates displayed on the **Choose a SEMM reset key** page (shown in Figure 7), and then click or press **Next**. + + ![Select SEMM certificate for your Recovery Request](images\surface-semm-unenroll-fig7.png "Select SEMM certificate for your Recovery Request") + + *Figure 7. Choose SEMM Certificate for your Recovery Request (Reset Request)* + +7. On the **Enter SEMM reset verification code** page you can click the **QR Code** or **Text** buttons to display your Recovery Request (Reset Request) as shown in Figure 8, or the **USB** button to save your Recovery Request (Reset Request) as a file to a USB drive, as shown in Figure 9. + + ![Recovery Request displayed as a QR Code](images\surface-semm-unenroll-fig8.png "Recovery Request displayed as a QR Code") + + *Figure 8. A Recovery Request (Reset Request) displayed as a QR Code* + + ![Save a recovery request to a USB drive](images\surface-semm-unenroll-fig9.png "Save a recovery request to a USB drive") + + *Figure 9. Save a Recovery Request (Reset Request) to a USB drive* + + * To use a QR Code Recovery Request (Reset Request), use a QR reader app on a mobile device to read the code. The QR reader app will translate the QR code into an alphanumeric string. You can then email or message that string to the administrator that will produce the reset verification code with Microsoft Surface UEFI Configurator. + * To use a Recovery Request (Reset Request) saved to a USB drive as a file, use the USB drive to transfer the file to the computer where Microsoft Surface UEFI Configurator will be used to produce the Reset Verification Code. The file can also be copied from the USB drive on another device to be emailed or transferred over the network. + * To use the Recovery Request (Reset Request) as text, simply type the text directly into Microsoft Surface UEFI Configurator. + +8. Open Microsoft Surface UEFI Configurator from the Start menu on another computer. +>**Note:**  Microsoft Surface UEFI Configurator must run in an environment that is able to authenticate the certificate chain for the SEMM certificate. +9. Click **Start**. +10. Click **Recovery Request**, as shown in Figure 10. + + ![Start process to approve a Recovery Request](images\surface-semm-unenroll-fig10.png "Start process to approve a Recovery Request") + + *Figure 10. Click Recovery Request to begin the process to approve a Recovery Request* + +11. Click **Certificate Protection** to authenticate the Recovery Request with the SEMM certificate. +12. Browse to and select your SEMM certificate file, and then click **OK**. +13. When you are prompted to enter the certificate password as shown in Figure 11, type and confirm the password for the certificate file, and then click **OK**. + + ![Type password for SEMM certificate](images\surface-semm-unenroll-fig11.png "Type password for SEMM certificate") + + *Figure 11. Type the password for the SEMM certificate* + +14. Click **Next**. +15. Enter the Recovery Request (Reset Request), and then click **Generate** to create a reset verification code (as shown in Figure 12). + + ![Enter the recovery request](images\surface-semm-unenroll-fig12.png "Enter the recovery request") + + *Figure 12. Enter the Recovery Request (Reset Request)* + + * If you displayed the Recovery Request (Reset Request) as text on the Surface device being reset, use the keyboard to type the Recovery Request (Reset Request) in the provided field. + * If you displayed the Recovery Request (Reset Request) as a QR Code and then used a messaging or email application to send the code to the computer with Microsoft Surface UEFI Configurator, copy and paste the code into the provided field. + * If you saved the Recovery Request (Reset Request) as a file to a USB drive, click the **Import** button, browse to and select the Recovery Request (Reset Request) file, and then click **OK**. + +16. The reset verification code is displayed in Microsoft Surface UEFI Configurator, as shown in Figure 13. + + ![Display of the reset verification code](images\surface-semm-unenroll-fig13.png "Display of the reset verification code") + + *Figure 13. The reset verification code displayed in Microsoft Surface UEFI Configurator* + + * Click the **Share** button to send the reset verification code by email. + +17. Enter the reset verification code in the provided field on the Surface device (shown in Figure 8), and then click or press **Verify** to reset the device and unenroll the device from SEMM. +18. Click or press **Restart now** on the **SEMM reset successful** page to complete the unenrollment from SEMM, as shown in Figure 14. + + ![Example display of successful unenrollment from SEMM](images\surface-semm-unenroll-fig14.png "Example display of successful unenrollment from SEMM") + + *Figure 14. Successful unenrollment from SEMM* + +19. Click **End** in Microsoft Surface UEFI Configurator to complete the Recovery Request (Reset Request) process and close Microsoft Surface UEFI Configurator. + + diff --git a/education/windows/take-a-test-multiple-pcs.md b/education/windows/take-a-test-multiple-pcs.md index 7ab6d68a18..d0d6052781 100644 --- a/education/windows/take-a-test-multiple-pcs.md +++ b/education/windows/take-a-test-multiple-pcs.md @@ -20,10 +20,10 @@ author: jdeckerMS Many schools use online testing for formative and summative assessments. It's critical that students use a secure browser that prevents them from using other computer or Internet resources during the test. The **Take a Test** app in Windows 10, Version 1607, creates the right environment for taking a test: - A Microsoft Edge browser window opens, showing just the test and nothing else. +- The clipboard is cleared. - Students aren’t able to go to other websites. - Students can’t open or access other apps. - Students can't share, print, or record their screens. -- Students can’t copy or paste. - Students can’t change settings, extend their display, see notifications, get updates, or use autofill features. - Cortana is turned off. diff --git a/education/windows/take-a-test-single-pc.md b/education/windows/take-a-test-single-pc.md index a1fa849959..fece24bac1 100644 --- a/education/windows/take-a-test-single-pc.md +++ b/education/windows/take-a-test-single-pc.md @@ -20,10 +20,10 @@ author: jdeckerMS The **Take a Test** app in Windows 10, Version 1607, creates the right environment for taking a test: - A Microsoft Edge browser window opens, showing just the test and nothing else. +- The clipboard is cleared. - Students aren’t able to go to other websites. - Students can’t open or access other apps. - Students can't share, print, or record their screens. -- Students can’t copy or paste. - Students can’t change settings, extend their display, see notifications, get updates, or use autofill features. - Cortana is turned off. diff --git a/education/windows/take-tests-in-windows-10.md b/education/windows/take-tests-in-windows-10.md index 9e881238b6..c0de33cc5b 100644 --- a/education/windows/take-tests-in-windows-10.md +++ b/education/windows/take-tests-in-windows-10.md @@ -20,10 +20,10 @@ author: jdeckerMS Many schools use online testing for formative and summative assessments. It's critical that students use a secure browser that prevents them from using other computer or Internet resources during the test. The **Take a Test** app in Windows 10, Version 1607, creates the right environment for taking a test: - **Take a Test** shows just the test and nothing else. +- **Take a Test** clears the clipboard. - Students aren’t able to go to other websites. - Students can’t open or access other apps. - Students can't share, print, or record their screens. -- Students can’t copy or paste. - Students can’t change settings, extend their display, see notifications, get updates, or use autofill features. - Cortana is turned off. diff --git a/windows/deploy/TOC.md b/windows/deploy/TOC.md index a6d2e9d108..b6c4d77abb 100644 --- a/windows/deploy/TOC.md +++ b/windows/deploy/TOC.md @@ -1,4 +1,5 @@ # [Deploy Windows 10](index.md) +## [Deploy Windows 10 in a test lab](windows-10-poc.md) ## [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) ## [Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md) ### [Get started with the Microsoft Deployment Toolkit (MDT)](get-started-with-the-microsoft-deployment-toolkit.md) diff --git a/windows/deploy/images/PoC.png b/windows/deploy/images/PoC.png new file mode 100644 index 0000000000..de73506071 Binary files /dev/null and b/windows/deploy/images/PoC.png differ diff --git a/windows/deploy/index.md b/windows/deploy/index.md index d4254111b1..a67f501d11 100644 --- a/windows/deploy/index.md +++ b/windows/deploy/index.md @@ -16,6 +16,7 @@ Learn about deploying Windows 10 for IT professionals. |Topic |Description | |------|------------| |[Change history for Deploy Windows 10](change-history-for-deploy-windows-10.md) |This topic lists new and updated topics in the Deploy Windows 10 documentation for [Windows 10 and Windows 10 Mobile](../index.md). | +|[Deploy Windows 10 in a test lab](windows-10-poc.md) |This guide provides instructions for setting up a proof of concept (PoC) lab using Hyper-V and a minimum amount of resources. | |[Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) |To successfully deploy the Windows 10 operating system in your organization, it is important to understand the different ways that it can be deployed, especially now that there are new scenarios to consider. Choosing among these scenarios, and understanding the key capabilities and limitations of each, is a key task. | |[Deploy Windows 10 with the Microsoft Deployment Toolkit](deploy-windows-10-with-the-microsoft-deployment-toolkit.md) |This guide will walk you through the process of deploying Windows 10 in an enterprise environment using the Microsoft Deployment Toolkit (MDT), and MDT 2013 Update 2 specifically. | |[Deploy Windows 10 with System Center 2012 R2 Configuration Manager](deploy-windows-10-with-system-center-2012-r2-configuration-manager.md) |If you have Microsoft System Center 2012 R2 Configuration Manager in your environment, you will most likely want to use it to deploy Windows 10. This topic will show you how to set up Configuration Manager for operating system deployment and how to integrate Configuration Manager with the Microsoft Deployment Toolkit (MDT) or, more specifically, MDT 2013 Update 2. | diff --git a/windows/deploy/windows-10-poc-mdt.md b/windows/deploy/windows-10-poc-mdt.md new file mode 100644 index 0000000000..04cb2496e2 --- /dev/null +++ b/windows/deploy/windows-10-poc-mdt.md @@ -0,0 +1,28 @@ +--- +title: Placeholder (Windows 10) +description: Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: deploy +author: greg-lindsay +--- + +# Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit + +**Applies to** + +- Windows 10 + +## In this guide + +## Related Topics + +  + +  + + + + + diff --git a/windows/deploy/windows-10-poc-sccm.md b/windows/deploy/windows-10-poc-sccm.md new file mode 100644 index 0000000000..3e43d7c402 --- /dev/null +++ b/windows/deploy/windows-10-poc-sccm.md @@ -0,0 +1,28 @@ +--- +title: Placeholder (Windows 10) +description: Deploy Windows 10 in a test lab using System Center Configuration Manager +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.pagetype: deploy +author: greg-lindsay +--- + +# Deploy Windows 10 in a test lab using System Center Configuration Manager + +**Applies to** + +- Windows 10 + +## In this guide + +## Related Topics + +  + +  + + + + + diff --git a/windows/deploy/windows-10-poc.md b/windows/deploy/windows-10-poc.md index fd3ebe6339..c24209c3e2 100644 --- a/windows/deploy/windows-10-poc.md +++ b/windows/deploy/windows-10-poc.md @@ -8,73 +8,178 @@ ms.pagetype: deploy author: greg-lindsay --- -# Deploy Windows 10 in a test lab +# Step by step guide: Demonstrate Windows 10 deployment in a test lab + **Applies to** - Windows 10 -## Setting up a proof of concept deployment lab +## In this guide -This following topics provide instructions for setting up a proof of concept (PoC) lab where you can deploy Windows 10 in a private environment using a minimum amount of resources. The lab utilizes the Microsoft Hyper-V platform to run virtual machines that provide all the services and tools required to deploy Windows 10 on a network. +This guide provides instructions for configuring a test lab to be used as a proof of concept (PoC) environment where you can deploy Windows 10. The PoC enviroment is configured using Hyper-V and a minimum amount of resources. Additional guides leverage the PoC environment and provide detailed steps for deploying Windows 10 under common scenarios with current deployment tools. The following topics are available in this guide: - +
+ + + + + + + - + - - - - - - - - - - + + +
Topic Description
[Hardware and software requirements](#hardware-and-software-requirements)Prerequisites to configure the PoC environment.
[Lab setup](#lab-setup)A summary of the PoC environment.
[Configure the PoC environment](#configure-the-poc-environment)Instructions are provided for installing and configuring Hyper-V and configuring VHDs in preparation for different deployment scenarios.Step by step instructions to configure the PoC environment.
Topic 2Description 2
Topic 3Description 3
Topic 4Description 4
[Step by step: Deploy Windows 10](#windows-10-poc-guides)Child topics that provide step by step instructions to deploy Windows 10 using the PoC environment.
+## Hardware and software requirements + +Two computers are required to complete this guide: + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
**Computer 1****Computer 2**
RoleHyper-V hostClient
DescriptionThis computer will run Hyper-V, the Hyper-V management tools, and the Hyper-V Windows PowerShell module.This computer is a test system on your corporate network that will be converted to a VHD.
OSWindows 8/8.1/10 or Windows Server 2012/2012 R2/2016Windows 7 or a later
EditionEnterprise, Professional, or EducationAny
Architecture64-bitAny*
RAM8 GB RAM (16 GB recommended)Any
Disk50 GB available hard disk space (100 GB recommended)Any
CPUSLAT-Capable CPUAny
NetworkInternet connectionAny
+ +>*Retaining applications and settings during the upgrade process requires that architecture (32 or 64-bit) is the same before and after the upgrade. + +## Lab setup + +The Hyper-V host computer is configured to host four VMs on a private, proof of concept network. Links are provided to download trial versions of Windows Server 2012 and all deployment tools necessary to complete the lab. +- Two VMs are running Windows Server 2012 R2 with required network services and tools installed. +- Two VMs are client systems: One VM is intended to mirror a host on your corporate network and one VM is running Windows 10 to demonstrate the hardware replacement scenario. + +See the following diagram: + +![PoC](images/poc.png) + +**Note**: +>If you have an existing Hyper-V host, you can use this host if desired and skip the Hyper-V installation section in this guide. If your Hyper-V host is running Windows Server 2008 R2, you must enable PowerShell functionality to complete the steps in this guide. + +>The two Windows Server VMs can be combined into a single VM to conserve RAM and disk space if required. However, instructions in this guide assume two server systems are used. Using two servers enables Active Directory Domain Services and DHCP to be installed on a server that is not directly connected to the corporate network. This mitigates the risk of clients on the corporate network receiving DHCP leases from the PoC network (i.e. "rogue" DHCP), and limits NETBIOS service broadcasts to the corporate network. + ## Configure the PoC environment -### Requirements +### In this section -To complete the procedures in this topic +[Install Hyper-V](#install-hyper-v)
+[Download VHDs](#download-vhds)
+[Configure Hyper-V](#configure-hyper-v)
+[Configure VHDs](#configure-vhds)
+[Verify the configuration](#verify-the-configuration) ### Install Hyper-V Use one of the following procedures to install Hyper-V on the Hyper-V host computer: -Install Hyper-V on a computer running Windows 8/8.1 or Windows 10 -Starting with Windows 8, the host computer’s microprocessor must support second level address translation (SLAT) to install Hyper-V. See [Hyper-V: List of SLAT-Capable CPUs for Hosts](http://social.technet.microsoft.com/wiki/contents/articles/1401.hyper-v-list-of-slat-capable-cpus-for-hosts.aspx) for more information. +- [Install Hyper-V on a computer running Windows 8/8.1/10](#to-install-hyper-v-on-a-computer-running-windows-8-8-1-10)
+- [Install Hyper-V on a computer running Windows Server 2012/2012 R2/2016](#to-install-hyper-v-on-a-computer-running-windows-server-2012-2012-r2-2016) -If your processor supports SLAT Hyper-V Manager is already included in Windows under Programs and Features. +####To install Hyper-V on a computer running Windows 8/8.1/10 -[hyper-v feature](images/hyper-v-feature.png) +1. Verify that the computer supports Hyper-V. -Note If you installed a 32-bit version of Windows, you won’t be able to create and manage local virtual machines. To fully manage virtual machines by using the host computer, you must install the 64-bit version of Windows 8.1 or Windows 8. + Starting with Windows 8, the host computer’s microprocessor must support second level address translation (SLAT) to install Hyper-V. See [Hyper-V: List of SLAT-Capable CPUs for Hosts](http://social.technet.microsoft.com/wiki/contents/articles/1401.hyper-v-list-of-slat-capable-cpus-for-hosts.aspx) for more information. To verify your computer supports SLAT, open an administrator command prompt, type systeminfo, press ENTER, and review the section displayed at the bottom of the output, next to Hyper-V Requirements. + + See the following example: + + ``` + C:\>systeminfo + ... + Hyper-V Requirements: VM Monitor Mode Extensions: Yes + Virtualization Enabled In Firmware: Yes + Second Level Address Translation: Yes + Data Execution Prevention Available: Yes + ``` + In this example, the computer supports SLAT and Hyper-V. + + If one or more requirements are evaluated as "No" then the computer does not support installing Hyper-V. However, if only the virtualization setting is incompatible, you might be able to enable virtualization in the BIOS and change the "Virtualization Enabled In Firmware" setting from "No" to "Yes." The location of this setting will depend on the manufacturer and BIOS version, but is typically found associated with the BIOS security settings. -The Hyper-V feature is not installed by default in Windows 8. To get it, you can use the following Windows PowerShell command: + Note: A 64-bit operating system is requried to run Hyper-V. -Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V –All +2. Enable Hyper-V. -You can also install it via the Control Panel in Windows under Turn Windows features on or off, as shown here: + The Hyper-V feature is not installed by default. To get it, open an elevated Windows PowerShell window and type the following command: -Important If you know that your processor supports SLAT, but you still get an error message that states Hyper-V cannot be installed, you might need to enable virtualization in the BIOS. The location of this setting will depend on the manufacturer and BIOS version. The following image shows an example of the required settings (under Security) in a Hewlett-Packard BIOS for an Intel processor: + ``` + Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V –All + ``` + When you are prompted to restart the computer, choose Yes. The computer might restart more than once. + + You can also install Hyper-V using the Control Panel in Windows, under Turn Windows features on or off, as shown below: + + ![hyper-v feature](images/hyper-v-feature.png) -[security BIOS settings](images/sec-bios.png) - -### Configure Hyper-V +####To install Hyper-V on a computer running Windows Server 2012/2012 R2/2016 ### Download VHDs +### Configure Hyper-V + ### Configure VHDs +## Windows 10 PoC guides + +- [Step by step: Deploy Windows 10 PoC with System Center Configuration Manager](windows-10-poc-sccm.md) +- [Step by step: Deploy Windows 10 PoC with the Microsoft Deployment Toolkit](windows-10-poc-mdt.md) + ## Related Topics [Windows 10 deployment scenarios](windows-10-deployment-scenarios.md) diff --git a/windows/deploy/windows-10-upgrade-paths.md b/windows/deploy/windows-10-upgrade-paths.md index 39684b8f94..3d7f0d96e9 100644 --- a/windows/deploy/windows-10-upgrade-paths.md +++ b/windows/deploy/windows-10-upgrade-paths.md @@ -392,7 +392,7 @@ The following table summarizes the free upgrade paths to Windows 10. For a list - Windows 8/8.1 Pro Professional + Windows 8/8.1 Pro Windows 10 Pro diff --git a/windows/keep-secure/TOC.md b/windows/keep-secure/TOC.md index dae960fbac..504f41304c 100644 --- a/windows/keep-secure/TOC.md +++ b/windows/keep-secure/TOC.md @@ -701,6 +701,7 @@ ### [Windows Defender in Windows 10](windows-defender-in-windows-10.md) #### [Update and manage Windows Defender in Windows 10](get-started-with-windows-defender-for-windows-10.md) #### [Configure Windows Defender in Windows 10](configure-windows-defender-in-windows-10.md) +#### [Use PowerShell cmdlets for Windows Defender](use-powershell-cmdlets-windows-defender-for-windows-10.md) #### [Troubleshoot Windows Defender in Windows 10](troubleshoot-windows-defender-in-windows-10.md) ### [Windows Firewall with Advanced Security](windows-firewall-with-advanced-security.md) #### [Isolating Windows Store Apps on Your Network](isolating-apps-on-your-network.md) diff --git a/windows/keep-secure/active-directory-accounts.md b/windows/keep-secure/active-directory-accounts.md index 6594344d4d..3b4ee0e979 100644 --- a/windows/keep-secure/active-directory-accounts.md +++ b/windows/keep-secure/active-directory-accounts.md @@ -68,7 +68,7 @@ In Active Directory, default local accounts are used by administrators to manage Each default local account is automatically assigned to a security group that is preconfigured with the appropriate rights and permissions to perform specific tasks. Active Directory security groups collect user accounts, computer accounts, and other groups into manageable units. For more information, see [Active Directory Security Groups](active-directory-security-groups.md). -On an Active Directory domain controller, each default local account is referred to as a security principal. A security principal is a directory object that is used to secure and manage Active Directory services that provide access to domain controller resources. A security principal includes objects such as user accounts, computer accounts, security groups, or the threads or processes that run in the security context of a user or computer account. For more information, see [Security Principals Technical Overview](security-principals.md). +On an Active Directory domain controller, each default local account is referred to as a security principal. A security principal is a directory object that is used to secure and manage Active Directory services that provide access to domain controller resources. A security principal includes objects such as user accounts, computer accounts, security groups, or the threads or processes that run in the security context of a user or computer account. For more information, see [Security Principals](security-principals.md). A security principal is represented by a unique security identifier (SID).The SIDs that are related to each of the default local accounts in Active Directory are described in the sections below. @@ -350,7 +350,7 @@ Because it is impossible to predict the specific errors that will occur for any **Important**   Rebooting a computer is the only reliable way to recover functionality as this will cause both the computer account and user accounts to log back in again. Logging in again will request new TGTs that are valid with the new KRBTGT, correcting any KRBTGT related operational issues on that computer. - +For information about how to help mitigate the risks associated with a potentially compromised KRBTGT account, see [KRBTGT Account Password Reset Scripts now available for customers](http://blogs.microsoft.com/cybertrust/2015/02/11/krbtgt-account-password-reset-scripts-now-available-for-customers/). ### Read-only domain controllers and the KRBTGT account @@ -474,7 +474,7 @@ Each default local account in Active Directory has a number of account settings

Provides support for the Data Encryption Standard (DES). DES supports multiple levels of encryption, including Microsoft Point-to-Point Encryption (MPPE) Standard (40-bit and 56-bit), MPPE standard (56-bit), MPPE Strong (128-bit), Internet Protocol security (IPSec) DES (40-bit), IPSec 56-bit DES, and IPSec Triple DES (3DES).

Note   -

DES is not enabled by default in Windows Server 2008 R2, Windows Server 2012, Windows Server 2012 R2, Windows 7, Windows 8, and Windows 8.1. For these operating systems, you must configure your computers to use the DES-CBC-MD5 or DES-CBC-CRC cipher suites. If your environment requires DES, then this setting might affect compatibility with client computers or services and applications in your environment. For more information, see [Hunting down DES in order to securely deploy Kerberos](http://blogs.technet.com/b/askds/archive/2010/10/19/hunting-down-des-in-order-to-securely-deploy-kerberos.aspx).

+

DES is not enabled by default in Windows Server operating systems starting with Windows Server 2008 R2, nor in Windows client operating systems starting with Windows 7. For these operating systems, computers will not use DES-CBC-MD5 or DES-CBC-CRC cipher suites by default. If your environment requires DES, then this setting might affect compatibility with client computers or services and applications in your environment. For more information, see [Hunting down DES in order to securely deploy Kerberos](http://blogs.technet.com/b/askds/archive/2010/10/19/hunting-down-des-in-order-to-securely-deploy-kerberos.aspx).

  @@ -571,7 +571,7 @@ If the administrators in your environment can sign in locally to managed servers - **Better**. Do not grant administrators membership in the local Administrator group on the computer in order to restrict the administrator from bypassing these protections. -- **Ideal**. Restrict workstations from having any network connectivity, except for the domain controllers and servers that the administrator accounts are used to manage. Alternately, use AppLocker application control policies to restrict all applications from running, except for the operating system and approved administrative tools and applications. For more information about AppLocker, see [AppLocker Overview](http://technet.microsoft.com/library/hh831440.aspx). +- **Ideal**. Restrict workstations from having any network connectivity, except for the domain controllers and servers that the administrator accounts are used to manage. Alternately, use AppLocker application control policies to restrict all applications from running, except for the operating system and approved administrative tools and applications. For more information about AppLocker, see [AppLocker](applocker-overview.md). The following procedure describes how to block Internet access by creating a Group Policy Object (GPO) that configures an invalid proxy address on administrative workstations. These instructions apply only to computers running Internet Explorer and other Windows components that use these proxy settings. @@ -584,7 +584,7 @@ In this procedure, the workstations are dedicated to domain administrators. By s 2. Create computer accounts for the new workstations. - > **Note**  You might have to delegate permissions to join the domain by using [KB 932455](http://support.microsoft.com/kb/932455) if the account that joins the workstations to the domain does not already have permissions to join computers to the domain. + > **Note**  You might have to delegate permissions to join computers to the domain if the account that joins the workstations to the domain does not already have them. For more information, see [Delegation of Administration in Active Directory](http://social.technet.microsoft.com/wiki/contents/articles/20292.delegation-of-administration-in-active-directory.aspx). ![Active Directory local accounts](images/adlocalaccounts-proc1-sample1.gif) @@ -846,14 +846,6 @@ In addition, installed applications and management agents on domain controllers ## See also +- [Security Principals](security-principals.md) -[Security Principals Technical Overview](security-principals.md) - - -  - -  - - - - +- [Access Control Overview](access-control.md) diff --git a/windows/keep-secure/active-directory-security-groups.md b/windows/keep-secure/active-directory-security-groups.md index 195b7371a2..630308945a 100644 --- a/windows/keep-secure/active-directory-security-groups.md +++ b/windows/keep-secure/active-directory-security-groups.md @@ -986,7 +986,7 @@ This security group has not changed since Windows Server 2008. Members of the Cloneable Domain Controllers group that are domain controllers may be cloned. In Windows Server 2012 R2 and Windows Server 2012, you can deploy domain controllers by copying an existing virtual domain controller. In a virtual environment, you no longer have to repeatedly deploy a server image that is prepared by using sysprep.exe, promote the server to a domain controller, and then complete additional configuration requirements for deploying each domain controller (including adding the virtual domain controller to this security group). -For more information, see [Introduction to Active Directory Domain Services (AD DS) Virtualization (Level 100)](https://technet.microsoft.com/en-us/library/hh831734.aspx). +For more information, see [Introduction to Active Directory Domain Services (AD DS) Virtualization (Level 100)](https://technet.microsoft.com/library/hh831734.aspx). This security group was introduced in Windows Server 2012, and it has not changed in subsequent versions. @@ -1302,7 +1302,7 @@ This security group has not changed since Windows Server 2008. Members of DNSAdmins group have access to network DNS information. The default permissions are as follows: Allow: Read, Write, Create All Child objects, Delete Child objects, Special Permissions. -For information about other means to secure the DNS server service, see [Securing the DNS Server Service](http://technet.microsoft.com/library/cc731367.aspx). +For more information about security and DNS, see [DNSSEC in Windows Server 2012](https://technet.microsoft.com/library/dn593694(v=ws.11).aspx). This security group has not changed since Windows Server 2008. @@ -1742,7 +1742,7 @@ Members of this group are Read-Only Domain Controllers in the enterprise. Except Read-only domain controllers address some of the issues that are commonly found in branch offices. These locations might not have a domain controller. Or, they might have a writable domain controller, but not the physical security, network bandwidth, or local expertise to support it. -For more information, see [AD DS: Read-Only Domain Controllers](http://technet.microsoft.com/library/cc732801.aspx). +For more information, see [What Is an RODC?](https://technet.microsoft.com/library/cc771030.aspx). The Enterprise Read-Only Domain Controllers group applies to versions of the Windows Server operating system listed in the [Active Directory Default Security Groups table](#bkmk-groupstable). @@ -1866,7 +1866,7 @@ This security group has not changed since Windows Server 2008. This group is authorized to create, edit, or delete Group Policy Objects in the domain. By default, the only member of the group is Administrator. -For information about other features you can use with this security group, see [Group Policy Planning and Deployment Guide](http://technet.microsoft.com/library/cc754948.aspx). +For information about other features you can use with this security group, see [Group Policy Overview](https://technet.microsoft.com/library/hh831791.aspx). The Group Policy Creators Owners group applies to versions of the Windows Server operating system listed in the [Active Directory Default Security Groups table](#bkmk-groupstable). @@ -2525,7 +2525,7 @@ This group has no default members. Because members of this group can load and un The Print Operators group applies to versions of the Windows Server operating system listed in the [Active Directory Default Security Groups table](#bkmk-groupstable). -This security group has not changed since Windows Server 2008. However, in Windows Server 2008 R2, functionality was added to manage print administration. For more information, see [Assigning Delegated Print Administrator and Printer Permission Settings in Windows Server 2008 R2](http://technet.microsoft.com/library/ee524015(WS.10).aspx). +This security group has not changed since Windows Server 2008. However, in Windows Server 2008 R2, functionality was added to manage print administration. For more information, see [Assign Delegated Print Administrator and Printer Permission Settings in Windows Server 2012](https://technet.microsoft.com/library/jj190062(v=ws.11).aspx). @@ -2602,7 +2602,7 @@ Depending on the account’s domain functional level, members of the Protected U The Protected Users group applies to versions of the Windows Server operating system listed in the [Active Directory Default Security Groups table](#bkmk-groupstable). -This group was introduced in Windows Server 2012 R2. For more information about how this group works, see [Protected Users Security Group](https://technet.microsoft.com/en-us/library/dn466518.aspx). +This group was introduced in Windows Server 2012 R2. For more information about how this group works, see [Protected Users Security Group](https://technet.microsoft.com/library/dn466518.aspx). The following table specifies the properties of the Protected Users group. @@ -2724,7 +2724,7 @@ This security group has not changed since Windows Server 2008. Servers that are members in the RDS Endpoint Servers group can run virtual machines and host sessions where user RemoteApp programs and personal virtual desktops run. This group needs to be populated on servers running RD Connection Broker. Session Host servers and RD Virtualization Host servers used in the deployment need to be in this group. -For information about Remote Desktop Services, see [Remote Desktop Services Design Guide](http://technet.microsoft.com/library/gg750997.aspx). +For information about Remote Desktop Services, see [Host desktops and apps in Remote Desktop Services](https://technet.microsoft.com/library/mt718499.aspx). This security group was introduced in Windows Server 2012, and it has not changed in subsequent versions. @@ -2844,7 +2844,7 @@ This security group was introduced in Windows Server 2012, and it has not chang Servers in the RDS Remote Access Servers group provide users with access to RemoteApp programs and personal virtual desktops. In Internet facing deployments, these servers are typically deployed in an edge network. This group needs to be populated on servers running RD Connection Broker. RD Gateway servers and RD Web Access servers that are used in the deployment need to be in this group. -For information about RemoteApp programs, see [Overview of RemoteApp](http://technet.microsoft.com/library/cc755055.aspx) +For more information, see [Host desktops and apps in Remote Desktop Services](https://technet.microsoft.com/library/mt718499.aspx). This security group was introduced in Windows Server 2012, and it has not changed in subsequent versions. @@ -2978,7 +2978,7 @@ Because administration of a Read-only domain controller can be delegated to a do - Read-only Domain Name System (DNS) -For information about deploying a Read-only domain controller, see [Read-Only Domain Controllers Step-by-Step Guide](http://technet.microsoft.com/library/cc772234.aspx). +For information about deploying a Read-only domain controller, see [Understanding Planning and Deployment for Read-Only Domain Controllers](https://technet.microsoft.com/library/cc754719(v=ws.10).aspx). This security group was introduced in Windows Server 2008, and it has not changed in subsequent versions. @@ -3041,7 +3041,7 @@ Members of the Remote Management Users group can access WMI resources over manag The Remote Management Users group is generally used to allow users to manage servers through the Server Manager console, whereas the [WinRMRemoteWMIUsers\_](#bkmk-winrmremotewmiusers-) group is allows remotely running Windows PowerShell commands. -For more information, see [WS-Management Protocol (Windows)](http://msdn.microsoft.com/library/aa384470.aspx) and [About WMI (Windows)](http://msdn.microsoft.com/library/aa384642.aspx). +For more information, see [What's New in MI?](https://msdn.microsoft.com/library/jj819828(v=vs.85).aspx) and [About WMI](http://msdn.microsoft.com/library/aa384642.aspx). This security group was introduced in Windows Server 2012, and it has not changed in subsequent versions. @@ -3105,9 +3105,10 @@ Computers that are members of the Replicator group support file replication in a **Important**   In Windows Server 2008 R2, FRS cannot be used for replicating DFS folders or custom (non-SYSVOL) data. A Windows Server 2008 R2 domain controller can still use FRS to replicate the contents of a SYSVOL shared resource in a domain that uses FRS for replicating the SYSVOL shared resource between domain controllers. -However, Windows Server 2008 R2 servers cannot use FRS to replicate the contents of any replica set apart from the SYSVOL shared resource. The DFS Replication service is a replacement for FRS, and it can be used to replicate the contents of a SYSVOL shared resource, DFS folders, and other custom (non-SYSVOL) data. You should migrate all non-SYSVOL FRS replica sets to DFS Replication. For more information, see [File Replication Service (FRS) Is Deprecated in Windows Server 2008 R2 (Windows).](http://msdn.microsoft.com/library/windows/desktop/ff384840.aspx) +However, Windows Server 2008 R2 servers cannot use FRS to replicate the contents of any replica set apart from the SYSVOL shared resource. The DFS Replication service is a replacement for FRS, and it can be used to replicate the contents of a SYSVOL shared resource, DFS folders, and other custom (non-SYSVOL) data. You should migrate all non-SYSVOL FRS replica sets to DFS Replication. For more information, see: -  +- [File Replication Service (FRS) Is Deprecated in Windows Server 2008 R2 (Windows)](http://msdn.microsoft.com/library/windows/desktop/ff384840.aspx) +- [DFS Namespaces and DFS Replication Overview](https://technet.microsoft.com/library/jj127250(v=ws.11).aspx) This security group has not changed since Windows Server 2008. @@ -3581,21 +3582,10 @@ This security group was introduced in Windows Server 2012, and it has not chang
-  - ## See also +- [Security Principals](security-principals.md) -[Security Principals Technical Overview](security-principals.md) - - -[Special Identities](special-identities.md) - - -  - -  - - - +- [Special Identities](special-identities.md) +- [Access Control Overview](access-control.md) diff --git a/windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md b/windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md index eb028e5f03..5f10d77fb7 100644 --- a/windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md +++ b/windows/keep-secure/add-apps-to-protected-list-using-custom-uri.md @@ -1,6 +1,6 @@ --- -title: Add multiple apps to your enterprise data protection (EDP) Protected Apps list (Windows 10) -description: Add multiple apps to your enterprise data protection (EDP) Protected Apps list at the same time, by using the Microsoft Intune Custom URI functionality and the AppLocker. +title: Add apps to your enterprise data protection (EDP) policy by using the Microsoft Intune custom URI functionality (Windows 10) +description: Add multiple apps to your enterprise data protection (EDP) allowed app list at the same time, by using the Microsoft Intune Custom URI functionality and AppLocker. ms.assetid: b50db35d-a2a9-4b78-a95d-a1b066e66880 keywords: EDP, Enterprise Data Protection, protected apps, protected app list ms.prod: w10 @@ -10,7 +10,7 @@ ms.sitesec: library author: eross-msft --- -# Add multiple apps to your enterprise data protection (EDP) Protected Apps list +# Add apps to your enterprise data protection (EDP) policy by using the Microsoft Intune custom URI functionality **Applies to:** - Windows 10 Insider Preview @@ -18,7 +18,7 @@ author: eross-msft [Some information relates to pre-released product, which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.] -Add multiple apps to your enterprise data protection (EDP) **Protected Apps** list at the same time, by using the Microsoft Intune Custom URI functionality and AppLocker. For more info about how to create a custom URI using Intune, see [Windows 10 custom policy settings in Microsoft Intune](http://go.microsoft.com/fwlink/p/?LinkID=691330). +Add multiple apps to your enterprise data protection (EDP) allowed app list at the same time, by using the Microsoft Intune Custom URI functionality and AppLocker. For more info about how to create a custom URI using Intune, see [Windows 10 custom policy settings in Microsoft Intune](http://go.microsoft.com/fwlink/p/?LinkID=691330). **Important**   Results can be unpredictable if you configure your policy using both the UI and the Custom URI method together. We recommend using a single method for each policy. diff --git a/windows/keep-secure/change-history-for-keep-windows-10-secure.md b/windows/keep-secure/change-history-for-keep-windows-10-secure.md index 9db6ea63fb..812c222e48 100644 --- a/windows/keep-secure/change-history-for-keep-windows-10-secure.md +++ b/windows/keep-secure/change-history-for-keep-windows-10-secure.md @@ -12,6 +12,13 @@ author: brianlic-msft # Change history for Keep Windows 10 secure This topic lists new and updated topics in the [Keep Windows 10 secure](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md). +## July 2016 + +|New or changed topic | Description | +|----------------------|-------------| +|[Create an enterprise data protection (EDP) policy using System Center Configuration Manager](create-edp-policy-using-sccm.md) |New | + + ## June 2016 |New or changed topic | Description | diff --git a/windows/keep-secure/create-edp-policy-using-sccm.md b/windows/keep-secure/create-edp-policy-using-sccm.md index fa412028a7..edfc06c2ec 100644 --- a/windows/keep-secure/create-edp-policy-using-sccm.md +++ b/windows/keep-secure/create-edp-policy-using-sccm.md @@ -1,6 +1,6 @@ --- title: Create and deploy an enterprise data protection (EDP) policy using System Center Configuration Manager (Windows 10) -description: Configuration Manager (version 1511 or later) helps you create and deploy your enterprise data protection (EDP) policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. +description: Configuration Manager (version 1606 or later) helps you create and deploy your enterprise data protection (EDP) policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. ms.assetid: 85b99c20-1319-4aa3-8635-c1a87b244529 keywords: EDP, Enterprise Data Protection, SCCM, System Center Configuration Manager, Configuration Manager ms.prod: w10 @@ -15,28 +15,14 @@ author: eross-msft - Windows 10 Insider Preview - Windows 10 Mobile Preview -- System Center Configuration Manager (version 1511 or later) +- System Center Configuration Manager (version 1605 Tech Preview or later) [Some information relates to pre-released product, which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.] -Configuration Manager (version 1511 or later) helps you create and deploy your enterprise data protection (EDP) policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. +System Center Configuration Manager (version 1605 Tech Preview or later) helps you create and deploy your enterprise data protection (EDP) policy, including letting you choose your protected apps, your EDP-protection mode, and how to find enterprise data on the network. -## In this topic: -- [Add an EDP policy](#add-an-edp-policy) - -- [Choose which apps can access your enterprise data](#choose-which-apps-can-access-your-enterprise-data) - -- [Manage the EDP protection level for your enterprise data](#manage-the-edp-protection-level-for-your-enterprise-data) - -- [Define your enterprise-managed identity domains](#define-your-enterprise-managed-identity-domains) - -- [Choose where apps can access enterprise data](#choose-where-apps-can-access-enterprise-data) - -- [Choose your optional EDP-related settings](#choose-your-optional-EDP-related-settings) - -- [Review your configuration choices in the Summary screen](#review-your-configuration-choices-in-the-summary-screen) - -- [Deploy the EDP policy](#deploy-the-edp-policy) +>**Important**
+If you previously created an EDP policy using System Center Configuration Manager version 1511 or 1602, you’ll need to recreate it using version 1605 Tech Preview or later. Editing an EDP policy created in version 1511 or 1602 is not supported in version 1605 Tech Preview. There is no migration path between EDP policies across these versions. ## Add an EDP policy After you’ve installed and set up System Center Configuration Manager for your organization, you must create a configuration item for EDP, which in turn becomes your EDP policy. @@ -66,60 +52,126 @@ The **Create Configuration Item Wizard** starts. ![Create Configuration Item wizard, choose the supported platforms for the policy](images/edp-sccm-supportedplat.png) -6. On the **Device Settings** screen, click **Enterprise Data Protection**, and then click **Next**. +6. On the **Device Settings** screen, click **Enterprise data protection**, and then click **Next**. ![Create Configuration Item wizard, choose the enterprise data protection settings](images/edp-sccm-devicesettings.png) -The **Configure Enterprise Data Protection settings** page appears, where you'll configure your policy for your organization. +The **Configure enterprise data protection settings** page appears, where you'll configure your policy for your organization. -## Choose which apps can access your enterprise data -During the policy-creation process in Configuration Manager, you can choose the apps you want to give access to your enterprise data through EDP. Apps included in this list can protect data on behalf of the enterprise and are restricted from copying or moving enterprise data to unprotected apps or unprotected network locations. +### Add app rules to your policy +During the policy-creation process in System Center Configuration Manager, you can choose the apps you want to give access to your enterprise data through EDP. Apps included in this list can protect data on behalf of the enterprise and are restricted from copying or moving enterprise data to unprotected apps. -The steps to add your apps are based on the type of app it is; either a Universal Windows Platform (UWP) app, or a signed Classic Windows application. +The steps to add your app rules are based on the type of rule template being applied. You can add a store app (also known as a Universal Windows Platform (UWP) app), a signed desktop app (also known as a Classic Windows app), or an AppLocker policy file. -**Important**
EDP-aware apps are expected to prevent enterprise data from going to unprotected network locations and to avoid encrypting personal data. On the other hand, EDP-unaware apps might not respect the corporate network boundary and will encrypt all files they create or modify, meaning that they could encrypt personal data and cause data leaks during the revocation process. Care must be taken to get a support statement from the software provider that their app is safe with EDP before adding it to your **Protected App** list. +>**Important**
+EDP-aware apps are expected to prevent enterprise data from going to unprotected network locations and to avoid encrypting personal data. On the other hand, EDP-unaware apps might not respect the corporate network boundary, and EDP-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. -**To add a UWP app** +Care must be taken to get a support statement from the software provider that their app is safe with EDP before adding it to your **App rules** 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. -1. From the **Configure the following apps to be protected by EDP** table in the **Protected Apps** area, click **Add.** +#### Add a store app rule to your policy +For this example, we’re going to add Microsoft OneNote, a store app, to the **App Rules** list. -2. Click **Universal App**, type the **Publisher Name** and the **Product Name** into the associated boxes, and then click **OK**. If you don't have the publisher or product name, you can find them by following these steps. +**To add a store app** - **To find the Publisher and Product name values for Microsoft Store apps without installing them** +1. From the **App rules** area, click **Add**. + + The **Add app rule** box appears. - 1. Go to the [Windows Store for Business](http://go.microsoft.com/fwlink/p/?LinkID=722910) website, and find your app. For example, Microsoft OneNote. + ![Create Configuration Item wizard, add a universal store app](images/edp-sccm-adduniversalapp.png) - 2. Copy the ID value from the app URL. For example, Microsoft OneNote's ID URL is https://www.microsoft.com/store/apps/onenote/9wzdncrfhvjl, and you'd copy the ID value, `9wzdncrfhvjl`. +2. Add a friendly name for your app into the **Title** box. In this example, it’s *Microsoft OneNote*. - 3. In a browser, run the Store for Business portal web API, to return a JavaScript Object Notation (JSON) file that includes the publisher and product name values. For example, run https://bspmts.mp.microsoft.com/v1/public/catalog/Retail/Products/*9wzdncrfhvjl*/applockerdata, where *9wzdncrfhvjl* is replaced with your ID value. +3. Click **Allow** from the **Enterprise data protection mode** drop-down list. - The API runs and opens a text editor with the app details. + Allow turns on EDP, helping to protect that app’s corporate data through the enforcement of EDP restrictions. If you want to exempt an app, you can follow the steps in the [Exempt apps from EDP restrictions](#exempt-apps-from-edp) section. - ``` json +4. Pick **Store App** from the **Rule template** drop-down list. + + The box changes to show the store app rule options. + +5. Type the name of the app and the name of its publisher, and then click **OK**. For this UWP app example, the **Publisher** is `CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US` and the **Product name** is `Microsoft.Office.OneNote`. + +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. + +**To find the Publisher and Product Name values for Store apps without installing them** + +1. Go to the [Windows Store for Business](http://go.microsoft.com/fwlink/p/?LinkID=722910) website, and find your app. For example, Microsoft OneNote. + + >**Note**
+ If your app is already installed on desktop devices, you can use the AppLocker local security policy MMC snap-in to gather the info for adding the app to the protected apps list. For info about how to do this, see the steps in the [Add an AppLocker policy file](#add-an-applocker-policy-file) section. + +2. Copy the ID value from the app URL. For example, Microsoft OneNote's ID URL is https://www.microsoft.com/store/apps/onenote/9wzdncrfhvjl, and you'd copy the ID value, `9wzdncrfhvjl`. + +3. In a browser, run the Store for Business portal web API, to return a JavaScript Object Notation (JSON) file that includes the publisher and product name values. For example, run https://bspmts.mp.microsoft.com/v1/public/catalog/Retail/Products/9wzdncrfhvjl/applockerdata, where `9wzdncrfhvjl` is replaced with your ID value. + + The API runs and opens a text editor with the app details. + + ``` json { - "packageIdentityName": "Microsoft.Office.OneNote", - "publisherCertificateName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" + "packageIdentityName": "Microsoft.Office.OneNote", + "publisherCertificateName": "CN=Microsoft Corporation, O=Microsoft Corporation, L=Redmond, S=Washington, C=US" + } + ``` + +4. Copy the `publisherCertificateName` value and paste them into the **Publisher Name** box, copy the `packageIdentityName` value into the **Product Name** box of Intune. + + >**Important**
+ The JSON file might also return a `windowsPhoneLegacyId` value for both the **Publisher Name** and **Product Name** boxes. This means that you have an app that’s using a XAP package and that you must set the **Product Name** as `windowsPhoneLegacyId`, and set the **Publisher Name** as “CN=” followed by the `windowsPhoneLegacyId`.

For example: + ```json + { + "windowsPhoneLegacyId": "ca05b3ab-f157-450c-8c49-a1f127f5e71d", } ``` - 4. Copy the `publisherCertificateName` value and paste them into the **Publisher Name** box, copy the `packageIdentityName` value into the **Product Name** box of the **Add app** box, and then click **OK**. -

**Important**
If you don’t see the **Product Name** box, it could mean that your tenant is not on the latest build and that you need to wait until it's upgraded. Same applies if you see the **AppId** box. The **AppId** box has been removed in the latest build and should disappear (along with any entries) when your tenant is upgraded. -

**Important**
The JSON file might also return a `windowsPhoneLegacyId` value for both the **Publisher Name** and **Product Name** boxes. This means that you have an app that’s using a XAP package and that you must set the **Product Name** as `windowsPhoneLegacyId`, and set the **Publisher Name** as “CN=” followed by the `windowsPhoneLegacyId`.

For example:
  +**To find the Publisher and Product Name values for apps installed on Windows 10 mobile phones** +1. If you need to add mobile apps that aren't distributed through the Store for Business, you must use the **Windows Device Portal** feature. - ``` + >**Note**
+ Your PC and phone must be on the same wireless network. + +2. On the Windows Phone, go to **Settings**, choose **Update & security**, and then choose **For developers**. + +3. On the **For developers** screen, turn on **Developer mode**, turn on **Device Discovery**, and then turn on **Device Portal**. + +4. Copy the URL in the **Device Portal** area into your device's browser, and then accept the SSL certificate. + +5. In the **Device discovery** area, press **Pair**, and then enter the PIN into the website from the previous step. + +6. On the **Apps** tab of the website, you can see details for the running apps, including the publisher and product names. + +7. Start the app for which you're looking for the publisher and product name values. + +8. Copy the `publisherCertificateName` value and paste it into the **Publisher Name** box and the `packageIdentityName` value into the **Product Name** box of Intune. + + >**Important**
+ The JSON file might also return a `windowsPhoneLegacyId` value for both the **Publisher Name** and **Product Name** boxes. This means that you have an app that’s using a XAP package and that you must set the **Product Name** as `windowsPhoneLegacyId`, and set the **Publisher Name** as “CN=” followed by the `windowsPhoneLegacyId`.

For example: + ```json { - "windowsPhoneLegacyId": "ca05b3ab-f157-450c-8c49-a1f127f5e71d", + "windowsPhoneLegacyId": "ca05b3ab-f157-450c-8c49-a1f127f5e71d", } ``` - ![Create Configuration Item wizard, add a Universal Windows Platform (UWP) app](images/edp-sccm-adduniversalapp.png) +#### Add a desktop app rule to your policy +For this example, we’re going to add Internet Explorer, a desktop app, to the **App Rules** list. -**To add a Classic Windows application** +**To add a desktop app to your policy** +1. From the **App rules** area, click **Add**. + + The **Add app rule** box appears. -1. From the **Configure the following apps to be protected by EDP** table in the **Protected Apps** area, click **Add.** -

A dialog box appears, letting you pick whether the app is a **Universal App** or a **Desktop App**. + ![Create Configuration Item wizard, add a classic desktop app](images/edp-sccm-adddesktopapp.png) -2. Click **Desktop App**, pick the options you want (see table), and then click **OK**. +2. Add a friendly name for your app into the **Title** box. In this example, it’s *Internet Explorer*. + +3. Click **Allow** from the **Enterprise data protection mode** drop-down list. + + Allow turns on EDP, helping to protect that app’s corporate data through the enforcement of EDP restrictions. If you want to exempt an app, you can follow the steps in the [Exempt apps from EDP restrictions](#exempt-apps-from-edp) section. + +4. Pick **Desktop App** from the **Rule template** drop-down list. + + The box changes to show the desktop app rule options. + +5. Pick the options you want to include for the app rule (see table), and then click **OK**. @@ -139,21 +191,21 @@ The steps to add your apps are based on the type of app it is; either a Universa - + - - - - - + - + + + + +
All files for the specified product, signed by the named publisher.
Publisher, Product Name, and File Name selectedPublisher, Product Name, and Binary name selected Any version of the named file or package for the specified product, signed by the named publisher.
Publisher, Product Name, File Name, and File Version, Exactly, selectedSpecified version of the named file or package for the specified product, signed by the named publisher.
Publisher, Product Name, File Name, and File Version, And above selectedPublisher, Product Name, Binary name, and File Version, and above, selected Specified version or newer releases of the named file or package for the specified product, signed by the named publisher.

This option is recommended for enlightened apps that weren't previously enlightened.

Publisher, Product Name, File Name, and File Version, And below selectedPublisher, Product Name, Binary name, and File Version, And below selected Specified version or older releases of the named file or package for the specified product, signed by the named publisher.
Publisher, Product Name, Binary name, and File Version, Exactly selectedSpecified version of the named file or package for the specified product, signed by the named publisher.
If you’re unsure about what to include for the publisher, you can run this PowerShell command: @@ -172,43 +224,166 @@ Path Publisher ``` Where the text, `O=MICROSOFT CORPORATION, L=REDMOND, S=WASHINGTON, C=US` is the publisher name to enter in the **Publisher Name** box. -![Create Configuration Item wizard, add a Classic Windows app](images/edp-sccm-adddesktopapp.png) +#### Add an AppLocker policy file +For this example, we’re going to add an AppLocker XML file to the **App Rules** list. You’ll use this option if you want to add multiple apps at the same time. For more info about AppLocker, see the [AppLocker](https://technet.microsoft.com/en-us/itpro/windows/keep-secure/applocker-overview) content. -## Manage the EDP-protection level for your enterprise data -After you've added the apps you want to protect with EDP, you'll need to apply an app management mode. +**To create an app rule and xml file using the AppLocker tool** +1. Open the Local Security Policy snap-in (SecPol.msc). + +2. In the left pane, expand **Application Control Policies**, expand **AppLocker**, and then click **Packaged App Rules**. -We recommend that you start with **Silent** or **Override** while verifying with a small group that you have the right apps on your **Protected Apps** list. After you're done, you can change to your final enforcement policy, either **Override** or **Block**. + ![Local security snap-in, showing the Packaged app Rules](images/intune-local-security-snapin.png) + +3. Right-click in the right-hand pane, and then click **Create New Rule**. + + The **Create Packaged app Rules** wizard appears. + +4. On the **Before You Begin** page, click **Next**. + + ![Create Packaged app Rules wizard, showing the Before You Begin page](images/intune-applocker-before-begin.png) + +5. On the **Permissions** page, make sure the **Action** is set to **Allow** and the **User or group** is set to **Everyone**, and then click **Next**. + + ![Create Packaged app Rules wizard, showing the Before You Begin page](images/intune-applocker-permissions.png) + +6. On the **Publisher** page, click **Select** from the **Use an installed packaged app as a reference** area. + + ![Create Packaged app Rules wizard, showing the Publisher](images/intune-applocker-publisher.png) + +7. In the **Select applications** box, pick the app that you want to use as the reference for your rule, and then click **OK**. For this example, we’re using Microsoft Photos. + + ![Create Packaged app Rules wizard, showing the Select applications page](images/intune-applocker-select-apps.png) + +8. On the updated **Publisher** page, click **Create**. + + ![Create Packaged app Rules wizard, showing the Microsoft Photos on the Publisher page](images/intune-applocker-publisher-with-app.png) + +9. Review the Local Security Policy snap-in to make sure your rule is correct. + + ![Local security snap-in, showing the new rule](images/intune-local-security-snapin-updated.png) + +10. In the left pane, right-click on **AppLocker**, and then click **Export policy**. + + The **Export policy** box opens, letting you export and save your new policy as XML. + + ![Local security snap-in, showing the Export Policy option](images/intune-local-security-export.png) + +11. In the **Export policy** box, browse to where the policy should be stored, give the policy a name, and then click **Save**. + + The policy is saved and you’ll see a message that says 1 rule was exported from the policy. + + **Example XML file**
+ This is the XML file that AppLocker creates for Microsoft Photos. + + ```xml + + + + + + + + + + + + + + + + ``` +12. After you’ve created your XML file, you need to import it by using System Center Configuration Manager. + +**To import your Applocker policy file app rule using 1System Center Configuration Manager** +1. From the **App rules** area, click **Add**. + + The **Add app rule** box appears. + + ![Create Configuration Item wizard, add an AppLocker policy](images/edp-sccm-addapplockerfile.png) + +2. Add a friendly name for your app into the **Title** box. In this example, it’s *Allowed app list*. + +3. Click **Allow** from the **Enterprise data protection mode** drop-down list. + + Allow turns on EDP, helping to protect that app’s corporate data through the enforcement of EDP restrictions. If you want to exempt an app, you can follow the steps in the [Exempt apps from EDP restrictions](#exempt-apps-from-edp) section. + +4. Pick the **AppLocker policy file** from the **Rule template** drop-down list. + + The box changes to let you import your AppLocker XML policy file. + +5. Click the ellipsis (...) to browse for your AppLocker XML file, click **Open**, and then click **OK** to close the **Add app rule** box. + + The file is imported and the apps are added to your **App Rules** list. + +#### Exempt apps from EDP restrictions +If you're running into compatibility issues where your app is incompatible with EDP, but still needs to be used with enterprise data, you can exempt the app from the EDP restrictions. This means that your apps won't include auto-encryption or tagging and won't honor your network restrictions. It also means that your exempted apps might leak. + +**To exempt a store app, a desktop app, or an AppLocker policy file app rule** + +1. From the **App rules** area, click **Add**. + + The **Add app rule** box appears. + +2. Add a friendly name for your app into the **Title** box. In this example, it’s *Exempt apps list*. + +3. Click **Exempt** from the **Enterprise data protection mode** drop-down list. + + Be aware that when you exempt apps, they’re allowed to bypass the EDP restrictions and access your corporate data. To allow apps, see the [Add app rules to your policy](#add-app-rules-to-your-policy) section of this topic. + +4. Fill out the rest of the app rule info, based on the type of rule you’re adding: + + - **Store app.** Follow the **Publisher** and **Product name** instructions in the [Add a store app rule to your policy](#add-a-store-app-rule-to-your-policy) section of this topic. + + - **Desktop app.** Follow the **Publisher**, **Product name**, **Binary name**, and **Version** instructions in the [Add a desktop app rule to your policy](#add-a-desktop-app-rule-to-your-policy) section of this topic. + + - **AppLocker policy file.** Follow the **Import** instructions in the [Add an AppLocker policy file](#add-an-applocker-policy-file) section of this topic, using a list of exempted apps. + +5. Click **OK**. + +### Manage the EDP-protection level for your enterprise data +After you've added the apps you want to protect with EDP, you'll need to apply a management and protection mode. + +We recommend that you start with **Silent** or **Override** while verifying with a small group that you have the right apps on your protected apps list. After you're done, you can change to your final enforcement policy, either **Override** or **Block**. |Mode |Description | |-----|------------| -|Block |EDP looks for inappropriate data sharing practices and stops the employee from completing the action. This can include sharing info across non-enterprise-protected apps in addition to sharing enterprise data between other people and devices outside of your enterprise. | +|Block |EDP looks for inappropriate data sharing practices and stops the employee from completing the action. This can include sharing info across non-enterprise-protected apps in addition to sharing enterprise data between other people and devices outside of your enterprise.| |Override |EDP 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 |EDP runs silently, logging inappropriate data sharing, without blocking anything. | -|Off (not recommended) |EDP is turned off and doesn't help to protect or audit your data. -

After you turn off EDP, an attempt is made to decrypt any closed EDP-tagged files on the locally attached drives. | +|Silent |EDP 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 EDP-protected data, are still blocked.| +|Off (not recommended) |EDP is turned off and doesn't help to protect or audit your data.

After you turn off EDP, an attempt is made to decrypt any closed EDP-tagged files on the locally attached drives.| ![Create Configuration Item wizard, choose your EDP-protection level](images/edp-sccm-appmgmt.png) -## Define your enterprise-managed identity domains -Specify your company’s enterprise identity, expressed as your primary internet domain. For example, if your company is Contoso, its enterprise identity might be contoso.com. The first listed domain (in this example, contoso.com) is the primary enterprise identity string used to tag files protected by any app on the **Protected App** list. +### Define your enterprise-managed identity domains +Corporate identity, usually expressed as your primary internet domain (for example, contoso.com), helps to identify and tag your corporate data from apps you’ve marked as protected by EDP. For example, emails using contoso.com are identified as being corporate and are restricted by your enterprise data protection policies. -You can also specify all the domains owned by your enterprise that are used for user accounts, separating them with the "|" character. For example, if Contoso also has some employees with email addresses or user accounts on the fabrikam.com domain, you would use contoso.com|fabrikam.com. +You can specify multiple domains owned by your enterprise by separating them with the "|" character. For example, (contoso.com|newcontoso.com). With multiple domains, the first one is designated as your corporate identity and all of the additional ones as being owned by the first one. We strongly recommend that you include all of your email address domains in this list. -This list of managed identity domains, along with the primary domain, make up the identity of your managing enterprise. User identities (user@domain) that end in any of the domains on this list, are considered managed. +**To add your corporate identity** -![Create Configuration Item wizard, Add the primary Internet domain for your enterprise identity](images/sccm-primary-domain.png) +- Type the name of your corporate identity into the **Corporate identity** field. For example, `contoso.com` or `contoso.com|newcontoso.com`. -**To add your primary domain** + ![Create Configuration Item wizard, Add the primary Internet domain for your enterprise identity](images/edp-sccm-corp-identity.png) -- Type the name of your primary domain into the **Primary domain** field. For example, *contoso.com*.

-If you have multiple domains, you must separate them with the "|" character. For example, contoso.com|fabrikam.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. -## Choose where apps can access enterprise data -After you've added a management level to your protected apps, you'll need to decide where those apps can access enterprise data on your network. There are 6 options, including your network domain, cloud domain, proxy server, internal proxy server, IPv4 range, and IPv6 range. +There are no default locations included with EDP, you must add each of your network locations. This area applies to any network endpoint device that gets an IP address in your enterprise’s range and is also bound to one of your enterprise domains, including SMB shares. Local file system locations should just maintain encryption (for example, on local NTFS, FAT, ExFAT). -**To specify where your protected apps can find and send enterprise data on the network** +>**Important**
+- Every EDP policy should include policy that defines your enterprise network locations. +- Classless Inter-Domain Routing (CIDR) notation isn’t supported for EDP configurations. + +**To define where your protected apps can find and send enterprise data on you network** + +1. Add additional network locations your apps can access by clicking **Add**. + + The **Add or edit corporate network definition** box appears. + +2. Type a name for your corporate network element into the **Name** box, and then pick what type of network element it is, from the **Network element** drop-down box. This can include any of the options in the following table. + + ![Add or edit corporate network definition box, Add your enterprise network locations](images/edp-sccm-add-network-domain.png) -1. Add additional network locations your apps can access by clicking **Add**, and then choosing your location type, including: @@ -216,65 +391,145 @@ After you've added a management level to your protected apps, you'll need to dec - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + +
Network location typeDescription
Enterprise Cloud Domaincontoso.sharepoint.com,proxy1.contoso.com|
office.com|proxy2.contoso.com
Specify the cloud resources traffic to restrict to your protected apps.

For each cloud resource, you may also specify an internal proxy server that routes your traffic from your **Enterprise Internal Proxy Server** policy. If you have multiple resources, you must use the | delimiter. Include the "|" delimiter just before the "|" if you don’t use proxies. For example: [URL,Proxy]|[URL,Proxy].

Enterprise Cloud Resources**With proxy:** contoso.sharepoint.com,proxy.contoso.com|
contoso.visualstudio.com,proxy.contoso.com

**Without proxy:** contoso.sharepoint.com|contoso.visualstudio.com

Specify the cloud resources to be treated as corporate and protected by EDP.

For each cloud resource, you may also optionally specify an internal proxy server that routes your traffic through your Enterprise Internal Proxy Server.

If you have multiple resources, you must separate them using the "|" delimiter. If you don’t use proxy servers, you must also include the "," delimiter just before the "|". For example: `URL <,proxy>|URL <,proxy>`.

If Windows is unable to determine whether an app should be allowed to connect to a network resource, it will automatically block the connection. If instead you want Windows to allow the connections to happen, you can add the `/*AppCompat*/` string to this setting. For example: `URL <,proxy>|URL <,proxy>|/*AppCompat*/`

Enterprise Network Domaindomain1.contoso.com,domain2.contoso.comSpecify the DNS suffix used in your environment. All traffic to the fully-qualified domains using this DNS suffix will be protected. If you have multiple resources, you must use the "," delimiter.

This setting works with the IP Ranges settings to detect whether a network endpoint is enterprise or personal on private networks.

Enterprise Network Domain Names (Required)corp.contoso.com,region.contoso.comSpecify the DNS suffixes used in your environment. All traffic to the fully-qualified domains appearing in this list will be protected.

This setting works with the IP ranges settings to detect whether a network endpoint is enterprise or personal on private networks.

If you have multiple resources, you must separate them using the "," delimiter.

Enterprise Proxy Serverdomain1.contoso.com:80;domain2.contoso.com:137Specify the proxy server and the port traffic is routed through. If you have multiple resources, you must use the ";" delimiter.

This setting is required if you use a proxy in your network. If you don't have a proxy server, you might find that enterprise resources are unavailable when a client is behind a proxy, such as when using certain Wi-Fi hotspots at hotels and restaurants.

Enterprise Proxy Serversproxy.contoso.com:80;proxy2.contoso.com:137Specify your externally-facing proxy server addresses, along with the port through which traffic is allowed and protected with EDP.

This list shouldn’t include any servers listed in the Enterprise Internal Proxy Servers list, which are used for EDP-protected traffic.

This setting is also required if you use a proxy in your network. If you don't have a proxy server, you might find that enterprise resources are unavailable when a client is behind a proxy, such as when you’re visiting another company and not on that company’s guest network.

If you have multiple resources, you must separate them using the ";" delimiter.

Enterprise Internal Proxy Serverproxy1.contoso.com;proxy2.contoso.comSpecify the proxy servers your cloud resources will go through. If you have multiple resources, you must use the ";" delimiter.Enterprise Internal Proxy Serverscontoso.internalproxy1.com;contoso.internalproxy2.comSpecify the proxy servers your devices will go through to reach your cloud resources.

Using this server type indicates that the cloud resources you’re connecting to are enterprise resources.

This list shouldn’t include any servers listed in the Enterprise Proxy Servers list, which are used for non-EDP-protected traffic.

If you have multiple resources, you must separate them using the ";" delimiter.

Enterprise IPv4 Range**Starting IPv4 Address:** 3.4.0.1
**Ending IPv4 Address:** 3.4.255.254
**Custom URI:** 3.4.0.1-3.4.255.254,10.0.0.1-10.255.255.254
Specify the addresses for a valid IPv4 value range within your intranet.

If you are adding a single range, you can enter the starting and ending addresses into your management system’s UI. If you want to add multiple addresses, we suggest creating a Custom URI, using the "-" delimiter between start and end of a range, and the "," delimiter to separate ranges.

Enterprise IPv4 Range (Required)**Starting IPv4 Address:** 3.4.0.1
**Ending IPv4 Address:** 3.4.255.254
**Custom URI:** 3.4.0.1-3.4.255.254,
10.0.0.1-10.255.255.254
Specify the addresses for a valid IPv4 value range within your intranet. These addresses, used with your Enterprise Network Domain Names, define your corporate network boundaries.

If you have multiple ranges, you must separate them using the "," delimiter.

Enterprise IPv6 Range**Starting IPv6 Address:** 2a01:110::
**Ending IPv6 Address:** 2a01:110:7fff:ffff:ffff:ffff:ffff:ffff
**Custom URI:** 2a01:110::-2a01:110:7fff:ffff:ffff:ffff:ffff:ffff,fd00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
Specify the addresses for a valid IPv6 value range within your intranet.

If you are adding a single range, you can enter the starting and ending addresses into your management system’s UI. If you want to add multiple addresses, we suggest creating a Custom URI, using the "-" delimiter between start and end of a range, and the "," delimiter to separate ranges.

**Starting IPv6 Address:** 2a01:110::
**Ending IPv6 Address:** 2a01:110:7fff:ffff:ffff:ffff:ffff:ffff
**Custom URI:** 2a01:110:7fff:ffff:ffff:ffff:ffff:ffff,
fd00::-fdff:ffff:ffff:ffff:ffff:ffff:ffff:ffff
Specify the addresses for a valid IPv6 value range within your intranet. These addresses, used with your Enterprise Network Domain Names, define your corporate network boundaries.

If you have multiple ranges, you must separate them using the "," delimiter.

Neutral Resourcessts.contoso.com,sts.contoso2.comSpecify your authentication redirection endpoints for your company.

These locations are considered enterprise or personal, based on the context of the connection before the redirection.

If you have multiple resources, you must separate them using the "," delimiter.

- ![Create Configuration Item wizard, specify the network locations that can be accessed by the protected apps](images/edp-sccm-primarydomain2.png) +3. Add as many locations as you need, and then click **OK**. -2. Add as many locations as you need, and then click **OK**.

-The **Add or Edit Enterprise Network Locations box** closes. + The **Add or edit corporate network definition** box closes. -3. In the **Use a data recovery certificate in case of data loss** box, click **Browse** to add a data recovery certificate for your policy.

-Adding a data recovery certificate helps you to access locally-protected files on the device. For example, if an employee leaves the company and the IT department has to access EDP-protected data from a Windows 10 company computer. This can also help recover data in case an employee's device is accidentally revoked. For more info about how to find and export your data recovery certificate, see the[Data Recovery and Encrypting File System (EFS)](http://go.microsoft.com/fwlink/p/?LinkId=761462) topic. +4. Decide if you want to Windows to look for additional network settings. -## Choose your optional EDP-related settings + ![Create Configuration Item wizard, Add whether to search for additional network settings](images/edp-sccm-optsettings.png) + + - **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. + + - **Enterprise IP Ranges list is authoritative (do not auto-detect).** Click this box if you want Windows to treat the IP ranges you specified in the network boundary definition as the complete list of IP ranges available on your network. If you clear this box, Windows will search for additional IP ranges on any domain-joined devices connected to your network. + + - **Show the enterprise data protection icon overlay on your allowed apps that are EDP-unaware in the Windows Start menu and on corporate file icons in the File Explorer.** Click this box if you want the enterprise data protection icon overlay to appear on corporate files or in the Start menu, on top the tiles for your unenlightened protected apps. + +5. In the required **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. + + After you create and deploy your EDP policy to your employees, Windows will begin to encrypt your corporate data on the employees’ local device drive. If somehow the employees’ local encryption keys get lost or revoked, the encrypted data can become unrecoverable. To help avoid this possibility, the DRA certificate lets Windows use an included public key to encrypt the local data, while you maintain the private key that can unencrypt the data. + + For more info about how to find and export your data recovery certificate, see the [Data Recovery and Encrypting File System (EFS)](http://go.microsoft.com/fwlink/p/?LinkId=761462) topic. + + ![Create Configuration Item wizard, Add a data recovery agent (DRA) certificate](images/edp-sccm-dra.png) + +#### Create and verify an Encrypting File System (EFS) DRA certificate for EDP +If you don’t already have an EFS DRA certificate, you’ll need to create and extract one from your system before you can use EDP in your organization. For the purposes of this section, we’ll use the file name EFSDRA; however, this name can be replaced with anything that makes sense to you. + +>**Important**
If you already have an EFS DRA certificate for your organization, you can skip creating a new one. Just use your current EFS DRA certificate in your policy. + +**To manually create an EFS DRA certificate** +1. On a computer without an EFS DRA certificate installed, open a command prompt with elevated rights, and then navigate to where you want to store the certificate. +2. Run this command: + + `cipher /r:`
Where `` is the name of the .cer and .pfx files that you want to create. + +3. When prompted, type and confirm a password to help protect your new Personal Information Exchange (.pfx) file. + + The EFSDRA.cer and EFSDRA.pfx files are created in the location you specified in Step 1. + + **Important**
Because these files can be used to decrypt any EDP file, you must protect them accordingly. We highly recommend storing them as a public key (PKI) on a smart card with strong protection, stored in a secured physical location. + +4. Add your EFS DRA certificate to your EDP policy by using Step 3 of the [Choose where apps can access enterprise data](#choose-where-apps-can-access-enterprise-data) section of this topic. + +**To verify your data recovery certificate is correctly set up on an EDP client computer** +1. Open an app on your protected app list, and then create and save a file so that it’s encrypted by EDP. + +2. Open a command prompt with elevated rights, navigate to where you stored the file you just created, and then run this command: + + `cipher /c `
Where `` is the name of the file you created in Step 1. + +3. Make sure that your data recovery certificate is listed in the **Recovery Certificates** list. + +**To recover your data using the EFS DRA certificate in a test environment** +1. Copy your EDP-encrypted file to a location where you have admin access. + +2. Install the EFSDRA.pfx file, using your password. + +3. Open a command prompt with elevated rights, navigate to the encrypted file, and then run this command: + + `cipher /d `
Where `` is the name of your encrypted file. For example, corporatedata.docx. + +### Choose your optional EDP-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 EDP settings. -**To add your optional settings** -- Choose to set any or all of the optional EDP-related settings: +![Create Configuration Item wizard, Choose any additional, optional settings](images/edp-sccm-additionalsettings.png) - - **Block the user from decrypting data that was created or edited by the apps configured above.** Clicking **No**, or leaving the setting blank, lets your employees right-click to decrypt their protected app data, along with the option to decrypt data in the **Save As** box and the **Save As** file picker . Clicking **Yes** removes the **Decrypt** option and saves all data for protected apps as enterprise-encrypted. +**To set your optional settings** +1. Choose to set any or all of the optional settings: - - **Protect app content when the device is in a locked state for the apps configured above.** Clicking **Yes** lets EDP help to secure protected app content when a mobile device is locked. We recommend turning this option on to help prevent data leaks from things such as email text that appears on the **Lock** screen of a Windows 10 Mobile phone. + - **Show the Personal option in the File ownership menus of File Explorer and the Save As dialog box.** Determines whether users can see the Personal option for files within File Explorer and the **Save As** dialog box. The options are: + + - **Yes, or not configured (recommended).** Employees can choose whether a file is **Work** or **Personal** in File Explorer and the **Save As** dialog box. + + - **No.** Hides the **Personal** option from employees. Be aware that if you pick this option, apps that use the **Save As** dialog box might encrypt new files as corporate data unless a different file path is given during the original file creation. After this happens, decryption of work files becomes more difficult. - ![Create Configuration Item wizard, choose additional optional settings for enterprise data protection](images/edp-sccm-optsettings.png) + - **Prevent corporate data from being accessed by apps when the device is locked. Applies only to Windows 10 Mobile**. Determines whether apps can show corporate data on a Windows 10 Mobile device **Lock** screen. The options are: + + - **Yes (recommended).** Stop apps from reading corporate data on Windows 10 Mobile device when the screen is locked. + + - **No, or not configured.** Allows apps to read corporate data on Windows 10 Mobile device when the screen is locked. -## Review your configuration choices in the Summary screen + - **Allow Windows Search to search encrypted corporate data and Store apps.** Determines whether Windows Search can search and index encrypted corporate data and Store apps. The options are: + + - **Yes.** Allows Windows Search to search and index encrypted corporate data and Store apps. + + - **No, or not configured (recommended).** Stops Windows Search from searching and indexing encrypted corporate data and Store apps. + + - **Revoke local encryption keys during the unerollment process.** Determines whether to revoke a user’s local encryption keys from a device when it’s unenrolled from enterprise data protection. If the encryption keys are revoked, a user no longer has access to encrypted corporate data. The options are: + + - **Yes, or not configured (recommended).** Revokes local encryption keys from a device during unenrollment. + + - **No.** Stop local encryption keys from being revoked from a device during unenrollment. For example, if you’re migrating between Mobile Device Management (MDM) solutions. + +2. After you pick all of the settings you want to include, click **Summary**. + +### Review your configuration choices in the Summary screen After you've finished configuring your policy, you can review all of your info on the **Summary** screen. **To view the Summary screen** -- Click the **Summary** button to review your policy choices, and then click **Next** to finish and to save your policy.

-A progress bar appears, showing you progress for your policy. After it's done, click **Close** to return to the **Configuration Items** page. +- Click the **Summary** button to review your policy choices, and then click **Next** to finish and to save your policy. + + ![Create Configuration Item wizard, Summary screen for all of your policy choices](images/edp-sccm-summaryscreen.png) + + A progress bar appears, showing you progress for your policy. After it's done, click **Close** to return to the **Configuration Items** page. - ![Create Configuration Item wizard, review the Summary screen before creating the policy](images/edp-sccm-summaryscreen.png) ## Deploy the EDP policy After you’ve created your EDP policy, you'll need to deploy it to your organization's devices. For info about your deployment options, see these topics: @@ -283,7 +538,7 @@ After you’ve created your EDP policy, you'll need to deploy it to your organiz - [How to Deploy Configuration Baselines in Configuration Manager]( http://go.microsoft.com/fwlink/p/?LinkId=708226) ## Related topics -- [System Center Configuration Manager and Endpoint Protection (Version 1511)](http://go.microsoft.com/fwlink/p/?LinkId=717372) +- [System Center Configuration Manager and Endpoint Protection (Version 1606)](http://go.microsoft.com/fwlink/p/?LinkId=717372) - [TechNet documentation for Configuration Manager](http://go.microsoft.com/fwlink/p/?LinkId=691623) - [Manage mobile devices with Configuration Manager and Microsoft Intune](http://go.microsoft.com/fwlink/p/?LinkId=691624) diff --git a/windows/keep-secure/device-guard-deployment-guide.md b/windows/keep-secure/device-guard-deployment-guide.md index cefd614f3c..90d7c6aa3a 100644 --- a/windows/keep-secure/device-guard-deployment-guide.md +++ b/windows/keep-secure/device-guard-deployment-guide.md @@ -57,7 +57,7 @@ AppLocker and Device Guard should run side-by-side in your organization, which o **Device Guard with Credential Guard** -Although Credential Guard is not a feature within Device Guard, many organizations will likely deploy Credential Guard alongside Device Guard for additional protection against credential theft. Similar to virtualization-based protection of kernel mode code integrity, Credential Guard leverages hypervisor technology to protect domain credentials. This mitigation is targeted at resisting the use of pass-the-hash and pass-the-ticket techniques. By employing multifactor authentication with Credential Guard, organizations can gain additional protection against such threats. For information about how to deploy Credential Guard to your Windows 10 Enterprise clients, see the [Enable Credential Guard](#enable-cg) section. In addition to the client-side enablement of Credential Guard, organizations can deploy mitigations at both the CA and domain controller level to help prevent credential theft. Microsoft will be releasing details about these additional mitigations in the future. +Although Credential Guard is not a feature within Device Guard, many organizations will likely deploy Credential Guard alongside Device Guard for additional protection against credential theft. Similar to virtualization-based protection of kernel mode code integrity, Credential Guard leverages hypervisor technology to protect domain credentials. This mitigation is targeted at resisting the use of pass-the-hash and pass-the-ticket techniques. By employing multifactor authentication with Credential Guard, organizations can gain additional protection against such threats. For information about how to deploy Credential Guard to your Windows 10 Enterprise clients, see the [Enable Credential Guard](#enable-cg) section. In addition to the client-side enablement of Credential Guard, organizations can deploy mitigations at both the CA and domain controller level to help prevent credential theft. Refer to the [Credential Guard](credential-guard.md) documentation for guidance on these additional mitigations. **Unified manageability** diff --git a/windows/keep-secure/dynamic-access-control.md b/windows/keep-secure/dynamic-access-control.md index c3cdcb2c32..643a78aa1c 100644 --- a/windows/keep-secure/dynamic-access-control.md +++ b/windows/keep-secure/dynamic-access-control.md @@ -132,16 +132,8 @@ If clients do not recognize Dynamic Access Control, there must be a two-way trus If claims are transformed when they leave a forest, all domain controllers in the user’s forest root must be set at the Windows Server 2012 or higher functional level. -A file server running Windows Server 2012 or Windows Server 2012 R2 must have a Group Policy setting that specifies whether it needs to get user claims for user tokens that do not carry claims. This setting is set by default to **Automatic**, which results in this Group Policy setting to be turned **On** if there is a central policy that contains user or device claims for that file server. If the file server contains discretionary ACLs that include user claims, you need to set this Group Policy to **On** so that the server knows to request claims on behalf of users that do not provide claims when they access the server. - -## Additional resource - -[Access control overview](access-control.md) - -  - -  - - +A file server running a server operating system that supports Dyamic Access Control must have a Group Policy setting that specifies whether it needs to get user claims for user tokens that do not carry claims. This setting is set by default to **Automatic**, which results in this Group Policy setting to be turned **On** if there is a central policy that contains user or device claims for that file server. If the file server contains discretionary ACLs that include user claims, you need to set this Group Policy to **On** so that the server knows to request claims on behalf of users that do not provide claims when they access the server. +## See also +- [Access control overview](access-control.md) diff --git a/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md b/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md index 9f8709dce5..1a19780713 100644 --- a/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md +++ b/windows/keep-secure/get-started-with-windows-defender-for-windows-10.md @@ -110,8 +110,8 @@ You can also enable email scanning using the following PowerShell parameter: 2. Type **Set-MpPreference -DisableEmailScanning $false**. Read more about this in: -- • [Scripting with Windows PowerShell](https://technet.microsoft.com/library/bb978526.aspx) -- • [Defender Cmdlets](https://technet.microsoft.com/library/dn433280.aspx) +- [Scripting with Windows PowerShell](https://technet.microsoft.com/library/bb978526.aspx) +- [Defender Cmdlets](https://technet.microsoft.com/library/dn433280.aspx) ## Manage archive scans in Windows Defender diff --git a/windows/keep-secure/images/edp-sccm-add-network-domain.png b/windows/keep-secure/images/edp-sccm-add-network-domain.png new file mode 100644 index 0000000000..505a3ca5fe Binary files /dev/null and b/windows/keep-secure/images/edp-sccm-add-network-domain.png differ diff --git a/windows/keep-secure/images/edp-sccm-addapplockerfile.png b/windows/keep-secure/images/edp-sccm-addapplockerfile.png new file mode 100644 index 0000000000..36d4508747 Binary files /dev/null and b/windows/keep-secure/images/edp-sccm-addapplockerfile.png differ diff --git a/windows/keep-secure/images/edp-sccm-adddesktopapp.png b/windows/keep-secure/images/edp-sccm-adddesktopapp.png index 5ceed9bc66..18b1970f81 100644 Binary files a/windows/keep-secure/images/edp-sccm-adddesktopapp.png and b/windows/keep-secure/images/edp-sccm-adddesktopapp.png differ diff --git a/windows/keep-secure/images/edp-sccm-additionalsettings.png b/windows/keep-secure/images/edp-sccm-additionalsettings.png new file mode 100644 index 0000000000..3bd31c8e27 Binary files /dev/null and b/windows/keep-secure/images/edp-sccm-additionalsettings.png differ diff --git a/windows/keep-secure/images/edp-sccm-adduniversalapp.png b/windows/keep-secure/images/edp-sccm-adduniversalapp.png index bd5009afdc..cd8b78c72d 100644 Binary files a/windows/keep-secure/images/edp-sccm-adduniversalapp.png and b/windows/keep-secure/images/edp-sccm-adduniversalapp.png differ diff --git a/windows/keep-secure/images/edp-sccm-appmgmt.png b/windows/keep-secure/images/edp-sccm-appmgmt.png index 0a9d23f405..52a6ef5fd9 100644 Binary files a/windows/keep-secure/images/edp-sccm-appmgmt.png and b/windows/keep-secure/images/edp-sccm-appmgmt.png differ diff --git a/windows/keep-secure/images/edp-sccm-corp-identity.png b/windows/keep-secure/images/edp-sccm-corp-identity.png new file mode 100644 index 0000000000..940d60acf1 Binary files /dev/null and b/windows/keep-secure/images/edp-sccm-corp-identity.png differ diff --git a/windows/keep-secure/images/edp-sccm-devicesettings.png b/windows/keep-secure/images/edp-sccm-devicesettings.png index 3056cc1c96..1573ef06d7 100644 Binary files a/windows/keep-secure/images/edp-sccm-devicesettings.png and b/windows/keep-secure/images/edp-sccm-devicesettings.png differ diff --git a/windows/keep-secure/images/edp-sccm-dra.png b/windows/keep-secure/images/edp-sccm-dra.png new file mode 100644 index 0000000000..d823ecb78d Binary files /dev/null and b/windows/keep-secure/images/edp-sccm-dra.png differ diff --git a/windows/keep-secure/images/edp-sccm-generalscreen.png b/windows/keep-secure/images/edp-sccm-generalscreen.png index 788cef4b8a..e0013f5b2d 100644 Binary files a/windows/keep-secure/images/edp-sccm-generalscreen.png and b/windows/keep-secure/images/edp-sccm-generalscreen.png differ diff --git a/windows/keep-secure/images/edp-sccm-network-domain.png b/windows/keep-secure/images/edp-sccm-network-domain.png new file mode 100644 index 0000000000..0fff54b6d2 Binary files /dev/null and b/windows/keep-secure/images/edp-sccm-network-domain.png differ diff --git a/windows/keep-secure/images/edp-sccm-optsettings.png b/windows/keep-secure/images/edp-sccm-optsettings.png index d786610c07..65365356da 100644 Binary files a/windows/keep-secure/images/edp-sccm-optsettings.png and b/windows/keep-secure/images/edp-sccm-optsettings.png differ diff --git a/windows/keep-secure/images/edp-sccm-primarydomain2.png b/windows/keep-secure/images/edp-sccm-primarydomain2.png deleted file mode 100644 index 5cb9990baf..0000000000 Binary files a/windows/keep-secure/images/edp-sccm-primarydomain2.png and /dev/null differ diff --git a/windows/keep-secure/images/edp-sccm-summaryscreen.png b/windows/keep-secure/images/edp-sccm-summaryscreen.png index 2e9d7b138b..2cbb827d7a 100644 Binary files a/windows/keep-secure/images/edp-sccm-summaryscreen.png and b/windows/keep-secure/images/edp-sccm-summaryscreen.png differ diff --git a/windows/keep-secure/images/edp-sccm-supportedplat.png b/windows/keep-secure/images/edp-sccm-supportedplat.png index dc72f15692..7add4926a9 100644 Binary files a/windows/keep-secure/images/edp-sccm-supportedplat.png and b/windows/keep-secure/images/edp-sccm-supportedplat.png differ diff --git a/windows/keep-secure/images/intune-applocker-before-begin.png b/windows/keep-secure/images/intune-applocker-before-begin.png new file mode 100644 index 0000000000..3f6a79c8d6 Binary files /dev/null and b/windows/keep-secure/images/intune-applocker-before-begin.png differ diff --git a/windows/keep-secure/images/intune-applocker-permissions.png b/windows/keep-secure/images/intune-applocker-permissions.png new file mode 100644 index 0000000000..901c861793 Binary files /dev/null and b/windows/keep-secure/images/intune-applocker-permissions.png differ diff --git a/windows/keep-secure/images/intune-applocker-publisher-with-app.png b/windows/keep-secure/images/intune-applocker-publisher-with-app.png new file mode 100644 index 0000000000..29f08e03f0 Binary files /dev/null and b/windows/keep-secure/images/intune-applocker-publisher-with-app.png differ diff --git a/windows/keep-secure/images/intune-applocker-publisher.png b/windows/keep-secure/images/intune-applocker-publisher.png new file mode 100644 index 0000000000..42da98610a Binary files /dev/null and b/windows/keep-secure/images/intune-applocker-publisher.png differ diff --git a/windows/keep-secure/images/intune-applocker-select-apps.png b/windows/keep-secure/images/intune-applocker-select-apps.png new file mode 100644 index 0000000000..38ba06d474 Binary files /dev/null and b/windows/keep-secure/images/intune-applocker-select-apps.png differ diff --git a/windows/keep-secure/images/intune-local-security-export.png b/windows/keep-secure/images/intune-local-security-export.png new file mode 100644 index 0000000000..56b27c2387 Binary files /dev/null and b/windows/keep-secure/images/intune-local-security-export.png differ diff --git a/windows/keep-secure/images/intune-local-security-snapin-updated.png b/windows/keep-secure/images/intune-local-security-snapin-updated.png new file mode 100644 index 0000000000..d794b8976c Binary files /dev/null and b/windows/keep-secure/images/intune-local-security-snapin-updated.png differ diff --git a/windows/keep-secure/images/intune-local-security-snapin.png b/windows/keep-secure/images/intune-local-security-snapin.png new file mode 100644 index 0000000000..492f3fc50a Binary files /dev/null and b/windows/keep-secure/images/intune-local-security-snapin.png differ diff --git a/windows/keep-secure/local-accounts.md b/windows/keep-secure/local-accounts.md index 3507e2b4cb..3e94ade971 100644 --- a/windows/keep-secure/local-accounts.md +++ b/windows/keep-secure/local-accounts.md @@ -48,7 +48,7 @@ This topic describes the following: - [Create unique passwords for local accounts with administrative rights](#sec-create-unique-passwords) -For information about security principals, see [Security Principals Technical Overview](security-principals.md). +For information about security principals, see [Security Principals](security-principals.md). ## Default local user accounts @@ -99,7 +99,7 @@ As a security best practice, use your local (non-Administrator) account to sign In comparison, on the Windows client operating system, a user with a local user account that has Administrator rights is considered the system administrator of the client computer. The first local user account that is created during installation is placed in the local Administrators group. However, when multiple users run as local administrators, the IT staff has no control over these users or their client computers. -In this case, Group Policy can be used to enable secure settings that can control the use of the local Administrators group automatically on every server or client computer. For more information about Group Policy, see [Group Policy Overview](http://technet.microsoft.com/library/hh831791.aspx) and [Group Policy](http://technet.microsoft.com/windowsserver/bb310732.aspx). +In this case, Group Policy can be used to enable secure settings that can control the use of the local Administrators group automatically on every server or client computer. For more information about Group Policy, see [Group Policy Overview](http://technet.microsoft.com/library/hh831791.aspx). **Note**   Blank passwords are not allowed in the versions designated in the **Applies To** list at the beginning of this topic. @@ -141,7 +141,7 @@ The security identifiers (SIDs) that pertain to the default HelpAssistant accoun For the Windows Server operating system, Remote Assistance is an optional component that is not installed by default. You must install Remote Assistance before it can be used. -In comparison, for the Windows client operating system, the HelpAssistant account is enabled on installation by default. For more information about remote desktop connections for those client operating systems designated in the **Applies To** list at the beginning of this topic, see [Enable Remote Desktop](http://technet.microsoft.com/library/dd744299.aspx). +In comparison, for the Windows client operating system, the HelpAssistant account is enabled on installation by default. ## Default local system accounts @@ -200,7 +200,7 @@ In addition, UAC can require administrators to specifically approve applications For example, a default feature of UAC is shown when a local account signs in from a remote computer by using Network logon (for example, by using NET.EXE USE). In this instance, it is issued a standard user token with no administrative rights, but with the ability to request or receive elevation. Consequently, local accounts that sign in by using Network logon cannot access administrative shares such as C$, or ADMIN$, or perform any remote administration. -For summary information about UAC, see [User Account Control](http://technet.microsoft.com/library/cc731416.aspx). For detailed information about special conditions when you use UAC, see [User Account Control](http://technet.microsoft.com/library/cc772207.aspx). +For more information about UAC, see [User Account Control](user-account-control-overview.md). The following table shows the Group Policy and registry settings that are used to enforce local account restrictions for remote access. @@ -384,10 +384,7 @@ The following table shows the Group Policy settings that are used to deny networ

Policy name

-

[Deny log on through Remote Desktop Services](deny-log-on-through-remote-desktop-services.md)

-

(Windows Server 2008 R2 and later.)

-

Deny logon through Terminal Services

-

(Windows Server 2008)

+

[Deny log on through Remote Desktop Services](deny-log-on-through-remote-desktop-services.md)

@@ -437,23 +434,16 @@ The following table shows the Group Policy settings that are used to deny networ 1. Navigate to Computer Configuration\\Policies\\Windows Settings and Local Policies, and then click **User Rights Assignment**. - **Note**   - Depending on the Windows operating system, you can choose the name of the Remote Interactive logon user right. + 2. Double-click **Deny log on through Remote Desktop Services**, and then select **Define these settings**. -   - - 2. On computers that run Windows Server 2008, double-click **Deny logon through Terminal Services**, and then select **Define these policy settings**. - - 3. On computers running Windows Server 2012 R2, Windows Server 2012, and Windows Server 2008 R2, double-click **Deny logon through Remote Desktop Services**, and then select **Define these settings**. - - 4. Click **Add User or Group**, type the user name of the default Administrator account, and > **OK**. (The default name is Administrator on US English installations, but it can be renamed either by policy or manually. + 3. Click **Add User or Group**, type the user name of the default Administrator account, and > **OK**. (The default name is Administrator on US English installations, but it can be renamed either by policy or manually. **Important**   In the **User and group names** box, type the user name of the account that you identified at the start of this process. Do not click **Browse** and do not type the domain name or the local computer name in this dialog box. For example, type only **Administrator**. If the text that you typed resolves to a name that is underlined or includes a domain name, it restricts the wrong account and causes this mitigation to work incorrectly. Also, be careful that you do not enter the group name Administrator because this also blocks domain accounts in that group.   - 5. For any additional local accounts in the Administrators group on all of the workstations that you are setting up, click **Add User or Group**, type the user names of these accounts in the dialog box in the same manner as the previous step, and > **OK**. + 4. For any additional local accounts in the Administrators group on all of the workstations that you are setting up, click **Add User or Group**, type the user names of these accounts in the dialog box in the same manner as the previous step, and > **OK**. 8. Link the GPO to the first **Workstations** OU as follows: @@ -498,16 +488,8 @@ Passwords can be randomized by: The following resources provide additional information about technologies that are related to local accounts. -- [Security Principals Technical Overview](security-principals.md) +- [Security Principals](security-principals.md) -- [Security Identifiers Technical Overview](security-identifiers.md) +- [Security Identifiers](security-identifiers.md) - [Access Control Overview](access-control.md) - -  - -  - - - - diff --git a/windows/keep-secure/microsoft-accounts.md b/windows/keep-secure/microsoft-accounts.md index 2c38dba1d0..910e6fac1f 100644 --- a/windows/keep-secure/microsoft-accounts.md +++ b/windows/keep-secure/microsoft-accounts.md @@ -14,7 +14,7 @@ ms.pagetype: security This topic for the IT professional explains how a Microsoft account works to enhance security and privacy for users, and how you can manage this consumer account type in your organization. -Microsoft sites, services, and properties such as Windows Live, MSN, Xbox LIVE, Zune, Windows Phone, and computers running Windows 8.1, Windows 8, and Windows RT use a Microsoft account as a mean of identifying users. Microsoft account is the name for what was previously called Windows Live ID. It has user-defined secrets associated with it, and it consists of a unique email address and a password. +Microsoft sites, services, and properties such as Windows Live, MSN, Xbox LIVE, Zune, Windows Phone, and computers running Windows 10, Windows 8.1, Windows 8, and Windows RT use a Microsoft account as a mean of identifying users. Microsoft account is the name for what was previously called Windows Live ID. It has user-defined secrets associated with it, and it consists of a unique email address and a password. There are some benefits and considerations when using Microsoft accounts in the enterprise. For more information, see [Microsoft account in the enterprise](#bkmk-msaccountintheenterprise) later in this topic. @@ -82,11 +82,11 @@ Although the Microsoft account was designed to serve consumers, you might find s - **Download Windows Store apps**: - If your enterprise chooses to distribute software through the Windows Store, your users can use their Microsoft accounts to download and use them on up to five devices running any version of Windows 8.1, Windows 8, or Windows RT. + If your enterprise chooses to distribute software through the Windows Store, your users can use their Microsoft accounts to download and use them on up to five devices running any version of Windows 10, Windows 8.1, Windows 8, or Windows RT. - **Single sign-on**: - Your users can use Microsoft account credentials to sign in to devices running Windows 8.1, Windows 8 or Windows RT. When they do this, Windows works with your Windows Store app to provide authenticated experiences for them. Users can associate a Microsoft account with their sign-in credentials for Windows Store apps or websites, so that these credentials roam across any devices running these supported versions. + Your users can use Microsoft account credentials to sign in to devices running Windows 10, Windows 8.1, Windows 8 or Windows RT. When they do this, Windows works with your Windows Store app to provide authenticated experiences for them. Users can associate a Microsoft account with their sign-in credentials for Windows Store apps or websites, so that these credentials roam across any devices running these supported versions. - **Personalized settings synchronization**: @@ -155,14 +155,6 @@ Within your organization, you can set application control policies to regulate a ## See also +- [Managing Privacy: Using a Microsoft Account to Logon and Resulting Internet Communication](https://technet.microsoft.com/library/jj884082(v=ws.11).aspx) -[Managing Privacy: Using a Microsoft Account to Logon and Resulting Internet Communication](https://technet.microsoft.com/library/jj884082(v=ws.11).aspx) - - -  - -  - - - - +- [Access Control Overview](access-control.md) diff --git a/windows/keep-secure/overview-create-edp-policy.md b/windows/keep-secure/overview-create-edp-policy.md index 0ca5b7cbd1..119659b070 100644 --- a/windows/keep-secure/overview-create-edp-policy.md +++ b/windows/keep-secure/overview-create-edp-policy.md @@ -1,6 +1,6 @@ --- title: Create an enterprise data protection (EDP) policy (Windows 10) -description: Microsoft Intune and System Center Configuration Manager (version 1511 or later) helps you create and deploy your enterprise data protection (EDP) policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. +description: Microsoft Intune and System Center Configuration Manager (version 1605 Technical Preview or later) helps you create and deploy your enterprise data protection (EDP) policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. ms.assetid: d2059e74-94bd-4e54-ab59-1a7b9b52bdc6 ms.prod: w10 ms.mktglfcycl: explore @@ -17,13 +17,13 @@ author: eross-msft [Some information relates to pre-released product, which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.] -Microsoft Intune and System Center Configuration Manager (version 1511 or later) helps you create and deploy your enterprise data protection (EDP) policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. +Microsoft Intune and System Center Configuration Manager (version 1605 Technical Preview or later) helps you create and deploy your enterprise data protection (EDP) policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. ## In this section |Topic |Description | |------|------------| |[Create an enterprise data protection (EDP) policy using Microsoft Intune](create-edp-policy-using-intune.md) |Intune helps you create and deploy your EDP policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. | -|[Create and deploy an enterprise data protection (EDP) policy using System Center Configuration Manager](create-edp-policy-using-sccm.md) |Configuration Manager (version 1511 or later) helps you create and deploy your EDP policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. | +|[Create and deploy an enterprise data protection (EDP) policy using System Center Configuration Manager](create-edp-policy-using-sccm.md) |Configuration Manager (version 1605 Technical Preview or later) helps you create and deploy your EDP policy, including letting you choose your protected apps, your EDP-protection level, and how to find enterprise data on the network. |     diff --git a/windows/keep-secure/protect-enterprise-data-using-edp.md b/windows/keep-secure/protect-enterprise-data-using-edp.md index 1603119340..8f09a2e896 100644 --- a/windows/keep-secure/protect-enterprise-data-using-edp.md +++ b/windows/keep-secure/protect-enterprise-data-using-edp.md @@ -2,7 +2,7 @@ title: Protect your enterprise data using enterprise data protection (EDP) (Windows 10) description: 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. ms.assetid: 6cca0119-5954-4757-b2bc-e0ea4d2c7032 -keywords: EDP, enterprise data protection +keywords: EDP, Enterprise Data Protection ms.prod: w10 ms.mktglfcycl: explore ms.sitesec: library @@ -18,34 +18,34 @@ author: eross-msft [Some information relates to pre-released product, which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.] -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. +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 from their personal email account, copies and pastes product info into a tweet, or saves an in-progress sales report to their public cloud storage. -Enterprise data protection (EDP) 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. +Enterprise data protection (EDP) 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. ## Prerequisites You’ll need this software to run EDP in your enterprise: |Operating system | Management solution | |-----------------|---------------------| -|Windows 10 Insider Preview | Microsoft Intune
-OR-
System Center Configuration Manager (version 1511 or later)
-OR-
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.| +|Windows 10 Insider Preview | Microsoft Intune
-OR-
System Center Configuration Manager (version 1605 Tech Preview or later)
-OR-
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 EDP works EDP 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. +- Helping to prevent enterprise data leaks, even on employee-owned devices that can't be locked down. -- Reducing employee frustrations because of restrictive data management policies on enterprise-owned devices. +- Reducing employee frustrations because of restrictive data management policies on enterprise-owned devices. -- Helping to maintain the ownership and control of your enterprise data. +- Helping to maintain the ownership and control of your enterprise data. -- Helping control the network and data access and data sharing for apps that aren’t enterprise-aware. +- Helping control the network and data access and data sharing for apps that aren’t enterprise aware. ### EDP-protection modes You can set EDP to 1 of 4 protection and management modes: |Mode|Description| |----|-----------| -|Block |EDP 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.| +|Block |EDP looks for inappropriate data sharing practices and stops the employee from completing the action. This can include sharing info across non-enterprise-protected apps in addition to sharing enterprise data between apps or attempting to share outside of your organization’s network.| |Override |EDP 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 |EDP 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 EDP-protected data, are still blocked.| |Off |EDP is turned off and doesn't help to protect or audit your data.

After you turn off EDP, an attempt is made to decrypt any closed EDP-tagged files on the locally attached drives. | @@ -60,20 +60,32 @@ EDP gives you a new way to manage data policy enforcement for apps and documents - **Copying or downloading enterprise data.** When an employee or an app downloads content from a location like SharePoint, a network share, or an enterprise web location, while using an EDP-protected device, EDP encrypts the data on the device. - - **Using allowed apps.** Managed apps (apps that you've included on the protected apps list in your EDP policy) are allowed to access your enterprise data and will interact differently when used with unallowed, non-enterprise aware, or personal-only apps. For example, if EDP management is set to Block, your employees can copy and paste from one protected app to another protected app, but not to personal apps. Imagine an HR person wants to copy a job description from a protected app to the internal career website, an enterprise-protected location, but goofs and tries to paste into a personal app instead. The paste action fails and a notification pops up, saying that the app couldn’t paste because of a policy restriction. The HR person then correctly pastes to the career website without a problem. + - **Using allowed apps.** Managed apps (apps that you've included on the protected apps list in your EDP policy) are allowed to access your enterprise data and will interact differently when used with unallowed, non-enterprise aware, or personal-only apps. For example, if EDP management is set to **Block**, your employees can copy and paste from one protected app to another protected app, but not to personal apps. Imagine an HR person wants to copy a job description from a protected app to the internal career website, an enterprise-protected location, but goofs and tries to paste into a personal app instead. The paste action fails and a notification pops up, saying that the app couldn’t paste because of a policy restriction. The HR person then correctly pastes to the career website without a problem. - - **Managed apps and restrictions.** With EDP you can control which apps can access and use your enterprise data. After adding an app to your protected apps list, the app is trusted with enterprise data. All apps not on this list are blocked from accessing your enterprise data, depending on your EDP management-mode.

You don’t have to modify line-of-business apps that never touch personal data to list them as protected apps; just include them in your protected apps list. + - **Managed apps and restrictions.** With EDP you can control which apps can access and use your enterprise data. After adding an app to your **Protected App** list, the app is trusted with enterprise data. All apps that aren’t on this list are blocked from accessing your enterprise network resources and your EDP-protected data.

+ You don’t have to modify line-of-business apps that never touch personal data to list them as protected apps; just include them in the **Protected App** list. - - **Deciding your level of data access.** EDP lets you block, allow overrides, or audit employees' data sharing actions. Blocking the action stops it immediately. Allowing overrides let the employee know there's a risk, but lets him or her continue to share the data while recording and auditing the action. Silent just logs the action without blocking anything that the employee could've overridden while using that setting; collecting info that can help you to see patterns of inappropriate sharing so you can take educative action or find apps that should be added to your protected apps list. + - **Deciding your level of data access.** EDP lets you block, allow overrides, or audit employees' data sharing actions. Blocking the action stops it immediately. Allowing overrides let the employee know there's a risk, but lets him or her continue to share the data while recording and auditing the action. Silent just logs the action without blocking anything that the employee could've overridden while using that setting; collecting info that can help you to see patterns of inappropriate sharing so you can take educative action or find apps that should be added to your **Protected App** list. - - **Data encryption at rest.** EDP helps protect enterprise data on local files and on removable media.

Apps such as Microsoft Word work with EDP to help continue your data protection across local files and removable media. These apps are being referred to as, enterprise aware. For example, if an employee opens EDP-encrypted content from Word, edits the content, and then tries to save the edited version with a different name, Word automatically applies EDP to the new document. + - **Continuous data encryption.** EDP helps protect enterprise data on local files and on removable media.

+ Apps such as Microsoft Word work with EDP to help continue your data protection across local files and removable media. These apps are being referred to as, enterprise aware. For example, if an employee opens EDP-encrypted content from Word, edits the content, and then tries to save the edited version with a different name, Word automatically applies EDP to the new document. - - **Helping prevent accidental data disclosure to public spaces.** EDP helps protect your enterprise data from being accidentally shared to public spaces, such as public cloud storage. For example, if Dropbox™ isn’t on your protected apps list, employees won’t be able to sync encrypted files to their personal cloud storage. Instead, if the employee stores the content to an app on your protected apps list, like Microsoft OneDrive for Business, the encrypted files can sync freely to the business cloud, while maintaining the encryption locally. + - **Helping prevent accidental data disclosure to public spaces.** EDP helps protect your enterprise data from being accidentally shared to public spaces, such as public cloud storage. For example, if Dropbox™ isn’t on your **Protected App** list, employees won’t be able to sync encrypted files to their personal cloud storage. Instead, if the employee stores the content to an app on your **Protected Apps** list, like Microsoft OneDrive for Business, the encrypted files can sync freely to the cloud, while maintaining the encryption. - **Helping prevent accidental data disclosure to removable media.** EDP helps prevent enterprise data from leaking when it's copied or transferred to removable media. For example, if an employee puts enterprise data on a Universal Serial Bus (USB) drive that also has personal data, the enterprise data remains encrypted while the personal data doesn’t. - **Remove access to enterprise data from enterprise-protected devices.** EDP gives admins the ability to revoke enterprise data from one or many MDM-enrolled devices, while leaving personal data alone. This is a benefit when an employee leaves your company, or in the case of a stolen device. After determining that the data access needs to be removed, you can unenroll the device so when it connects to the network, the user's encryption key for the device is revoked and the enterprise data becomes unreadable.

**Note**
System Center Configuration Manager also allows you to revoke enterprise data. However, it does it by performing a factory reset of the device. +## Current limitations with EDP +EDP is still in development and is not yet integrated with Azure Rights Management. This means that while you can deploy an EDP-configured policy to a protected device, that protection is restricted to a single user on the device. Additionally, the EDP-protected data must be stored on NTFS, FAT, or ExFAT file systems. + +Use the following table to identify the scenarios that require Azure Rights Management, the behavior when Azure Rights Management is not used with EDP, and the recommended workarounds. + +|EDP scenario |Without Azure Rights Management |Workaround | +|-------------|--------------------------------|-----------| +|Saving enterprise data to USB drives |Data in the new location remains encrypted, but becomes inaccessible on other devices or for other users. For example, the file won't open or the file opens, but doesn't contain readable text. |Share files with fellow employees through enterprise file servers or enterprise cloud locations. If data must be shared via USB, employees can decrypt protected files, but it will be audited.

We strongly recommend educating employees about how to limit or eliminate the need for this decryption. | +|Synchronizing data to other services or public cloud storage |Synchronized files aren't protected on additional services or as part of public cloud storage. |Stop the app from synchronizing or don't add the app to your **Protected App** list.

For more info about adding apps to the **Protected App** list, see either the [Create an enterprise data protection (EDP) policy using Intune](create-edp-policy-using-intune.md) or the [Create and deploy an enterprise data protection (EDP) policy using Configuration Manager](create-edp-policy-using-sccm.md) topic, depending on your management solution. + ## Next steps After deciding to use EDP in your enterprise, you need to: diff --git a/windows/keep-secure/security-identifiers.md b/windows/keep-secure/security-identifiers.md index 76c632236f..72f2b8e95b 100644 --- a/windows/keep-secure/security-identifiers.md +++ b/windows/keep-secure/security-identifiers.md @@ -41,7 +41,7 @@ SIDs always remain unique. Security authorities never issue the same SID twice, ## Security identifier architecture -A security identifier is a data structure in binary format that contains a variable number of values. The first values in the structure contain information about the SID structure. The remaining values are arranged in a hierarchy (similar to a telephone number), and they identify the SID-issuing authority (for example, the Windows Server 2012 operating system), the SID-issuing domain, and a particular security principal or group. The following image illustrates the structure of a SID. +A security identifier is a data structure in binary format that contains a variable number of values. The first values in the structure contain information about the SID structure. The remaining values are arranged in a hierarchy (similar to a telephone number), and they identify the SID-issuing authority (for example, “NT Authority”), the SID-issuing domain, and a particular security principal or group. The following image illustrates the structure of a SID. ![](images/security-identifider-architecture.jpg) diff --git a/windows/keep-secure/security-principals.md b/windows/keep-secure/security-principals.md index c91126837d..8bf4f7abd7 100644 --- a/windows/keep-secure/security-principals.md +++ b/windows/keep-secure/security-principals.md @@ -138,10 +138,6 @@ For descriptions and settings information about the domain security groups that For descriptions and settings information about the Special Identities group, see [Special Identities](special-identities.md). -  - -  - - - +## See also +- [Access Control Overview](access-control.md) \ No newline at end of file diff --git a/windows/keep-secure/service-accounts.md b/windows/keep-secure/service-accounts.md index 3996bebaf3..e326562c98 100644 --- a/windows/keep-secure/service-accounts.md +++ b/windows/keep-secure/service-accounts.md @@ -102,55 +102,8 @@ Virtual accounts apply to the Windows operating systems that are designated in t The following table provides links to additional resources that are related to standalone managed service accounts, group managed service accounts, and virtual accounts. - ---- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Content typeReferences

Product evaluation

[What's New for Managed Service Accounts](https://technet.microsoft.com/library/hh831451(v=ws.11).aspx)

-

[Managed Service Accounts Documentation for Windows 7 and Windows Server 2008 R2](http://technet.microsoft.com/library/ff641731.aspx)

-

[Service Accounts Step-by-Step Guide](http://technet.microsoft.com/library/dd548356.aspx)

-

[Getting Started with Group Managed Service Accounts](https://technet.microsoft.com/library/jj128431(v=ws.11).aspx)

Deployment

[Windows Server 2012: Group Managed Service Accounts - Ask Premier Field Engineering (PFE) Platforms - Site Home - TechNet Blogs](http://blogs.technet.com/b/askpfeplat/archive/2012/12/17/windows-server-2012-group-managed-service-accounts.aspx)

Operations

[Managed Service Accounts in Active Directory](http://technet.microsoft.com/library/dd378925.aspx)

Tools and settings

[Managed Service Accounts in Active Directory Domain Services](http://technet.microsoft.com/library/dd378925.aspx)

Community resources

[Managed Service Accounts: Understanding, Implementing, Best Practices, and Troubleshooting](http://blogs.technet.com/b/askds/archive/2009/09/10/managed-service-accounts-understanding-implementing-best-practices-and-troubleshooting.aspx)

Related technologies

[Security Principals Technical Overview](security-principals.md)

-

[What's new in Active Directory Domain Services](https://technet.microsoft.com/library/mt163897.aspx)

- -  - -  - -  - - - - +| Content type | References | +|---------------|-------------| +| **Product evaluation** | [What's New for Managed Service Accounts](https://technet.microsoft.com/library/hh831451(v=ws.11).aspx)
[Getting Started with Group Managed Service Accounts](https://technet.microsoft.com/library/jj128431(v=ws.11).aspx) | +| **Deployment** | [Windows Server 2012: Group Managed Service Accounts - Ask Premier Field Engineering (PFE) Platforms - Site Home - TechNet Blogs](http://blogs.technet.com/b/askpfeplat/archive/2012/12/17/windows-server-2012-group-managed-service-accounts.aspx) | +| **Related technologies** | [Security Principals](security-principals.md)
[What's new in Active Directory Domain Services](https://technet.microsoft.com/library/mt163897.aspx) | \ No newline at end of file diff --git a/windows/keep-secure/special-identities.md b/windows/keep-secure/special-identities.md index 69c4ad8674..2e3aa71e3e 100644 --- a/windows/keep-secure/special-identities.md +++ b/windows/keep-secure/special-identities.md @@ -1002,21 +1002,10 @@ Any user accessing the system through Terminal Services has the Terminal Server -  - ## See also +- [Active Directory Security Groups](active-directory-security-groups.md) -[Active Directory Security Groups](active-directory-security-groups.md) - - -[Security Principals Technical Overview](security-principals.md) - - -  - -  - - - +- [Security Principals](security-principals.md) +- [Access Control Overview](access-control.md) \ No newline at end of file diff --git a/windows/keep-secure/use-powershell-cmdlets-windows-defender-for-windows-10.md b/windows/keep-secure/use-powershell-cmdlets-windows-defender-for-windows-10.md new file mode 100644 index 0000000000..e81dff792a --- /dev/null +++ b/windows/keep-secure/use-powershell-cmdlets-windows-defender-for-windows-10.md @@ -0,0 +1,43 @@ +--- +title: Use PowerShell cmdlets to configure and run Windows Defender in Windows 10 +description: In Windows 10, you can use PowerShell cmdlets to run scans, update definitions, and change settings in Windows Defender. +keywords: scan, command line, mpcmdrun, defender +search.product: eADQiWindows 10XVcnh +ms.pagetype: security +ms.prod: w10 +ms.mktglfcycl: manage +ms.sitesec: library +ms.pagetype: security +author: iaanw +--- + +# Use PowerShell cmdlets to configure and run Windows Defender + +**Applies to:** + +- Windows 10 + +You can use PowerShell to perform various functions in Windows Defender. Similar to the command prompt or command line, PowerShell is a task-based command-line shell and scripting language designed especially for system administration, and you can read more about it at the [PowerShell hub on MSDN](https://msdn.microsoft.com/en-us/powershell/mt173057.aspx). + +For a list of the cmdlets and their functions and available parameters, see the [Defender cmdlets](https://technet.microsoft.com/en-us/library/dn433280.aspx) topic. + +PowerShell cmdlets are most useful in Windows Server environments that don't rely on a graphical user interface (GUI) to configure software. + +> **Note:**  PowerShell cmdlets should not be used as a replacement for a full network policy management infrastructure, such as [System Center Configuration Manager](https://technet.microsoft.com/en-us/library/gg682129.aspx), [Group Policy Management Console](https://technet.microsoft.com/en-us/library/cc731212.aspx), or [Windows Defender Group Policy ADMX templates](https://support.microsoft.com/en-us/kb/927367). + +PowerShell is typically installed under the folder _%SystemRoot%\system32\WindowsPowerShell_. + + +**Use Windows Defender PowerShell cmdlets** + +1. Click **Start**, type **powershell**, and press **Enter**. +2. Click **Windows PowerShell** to open the interface. + > **Note:**  You may need to open an administrator-level version of PowerShell. Right-click the item in the Start menu, click **Run as administrator** and click **Yes** at the permissions prompt. +3. Enter the command and parameters. + +To open online help for any of the cmdlets type the following: + +```text +Get-Help -Online +``` +Omit the `-online` parameter to get locally cached help. diff --git a/windows/keep-secure/windows-defender-in-windows-10.md b/windows/keep-secure/windows-defender-in-windows-10.md index 2dc00afede..0f5d4d28f0 100644 --- a/windows/keep-secure/windows-defender-in-windows-10.md +++ b/windows/keep-secure/windows-defender-in-windows-10.md @@ -19,7 +19,7 @@ This topic provides an overview of Windows Defender, including a list of system For more important information about running Windows Defender on a server platform, see [Windows Defender Overview for Windows Server Technical Preview](https://technet.microsoft.com/library/dn765478.aspx). -Take advantage of Windows Defender by configuring the settings and definitions using the following tools: +Take advantage of Windows Defender by configuring settings and definitions using the following tools: - Microsoft Active Directory *Group Policy* for settings - Windows Server Update Services (WSUS) for definitions diff --git a/windows/keep-secure/windows-security-baselines.md b/windows/keep-secure/windows-security-baselines.md index 770c21fa50..d9f379c2a6 100644 --- a/windows/keep-secure/windows-security-baselines.md +++ b/windows/keep-secure/windows-security-baselines.md @@ -12,7 +12,7 @@ author: brianlic-msft Microsoft is dedicated to provide our customers with a secure operating system, such as Windows 10 and Windows Server, as well as secure apps, such as Microsoft Edge. In addition to the security assurance of its products, Microsoft also enables you to have fine control of your environments by providing various configuration capabilities. Even though Windows and Windows Server are designed to be secure out-of-the-box, a large number of organizations still want more granular control of their security configurations. To navigate these large number of controls, organizations need guidance for configuring various security features. Microsoft provides this guidance in the form of security baselines. -We recommend implementing an industry-standard configuration that is broadly known and well-tested, such as a Mirosoft security baseline, as opposed to creating one yourself. This helps increase flexibility and reduce costs. +We recommend implementing an industry-standard configuration that is broadly known and well-tested, such as a Microsoft security baseline, as opposed to creating one yourself. This helps increase flexibility and reduce costs. ## What are security baselines? @@ -36,21 +36,27 @@ To help faster deployments and increase the ease of managing Windows, Microsoft You can use security baselines to: - Ensure that user and device configuration settings are compliant with the baseline. - - Set configuration settings. For example, you can use Group Policy, System Center Configuration Manager, or Microsoft Intune to configure a device with the setting values specified in the baseline. - + - Set configuration settings. For example, you can use Group Policy, System Center Configuration Manager, or Microsoft Intune to configure a device with the setting values specified in the baseline. ## Where can I get the security baselines? Here's a list of security baselines that are currently available. > **Note:** If you want to know what has changed with each security baseline, or if you want to stay up-to-date on what’s happening with them, check out the [Microsoft Security Guidance](http://blogs.technet.microsoft.com/secguide) blog. - + ### Windows 10 security baselines - [Windows 10, Version 1511 security baseline](http://go.microsoft.com/fwlink/p/?LinkID=799381) - [Windows 10, Version 1507 security baseline](http://go.microsoft.com/fwlink/p/?LinkID=799380) - + + ### Windows Server security baselines - + - [Windows Server 2012 R2 security baseline](http://go.microsoft.com/fwlink/p/?LinkID=799382) +## How can I monitor security baseline deployments? + +Microsoft’s Operation Management Services (OMS) helps you monitor security baseline deployments across your servers. To find out more, check out [Operations Management Suite](https://aka.ms/omssecscm). + +You can use [System Center Configuration Manager](https://www.microsoft.com/cloud-platform/system-center-configuration-manager) to monitor security baseline deployments on client devices within your organization. + \ No newline at end of file diff --git a/windows/manage/TOC.md b/windows/manage/TOC.md index 9a7fe85b18..4c43c597ce 100644 --- a/windows/manage/TOC.md +++ b/windows/manage/TOC.md @@ -28,7 +28,7 @@ ### [Reset a Windows 10 Mobile device](reset-a-windows-10-mobile-device.md) ## [Join Windows 10 Mobile to Azure Active Directory](join-windows-10-mobile-to-azure-active-directory.md) ## [Configure devices without MDM](configure-devices-without-mdm.md) -## [Windows 10 servicing options for updates and upgrades](introduction-to-windows-10-servicing.md) +## [Windows 10 servicing options](introduction-to-windows-10-servicing.md) ## [Application development for Windows as a service](application-development-for-windows-as-a-service.md) ## [Windows Store for Business](windows-store-for-business.md) ### [Sign up and get started](sign-up-windows-store-for-business-overview.md) diff --git a/windows/manage/app-inventory-managemement-windows-store-for-business.md b/windows/manage/app-inventory-managemement-windows-store-for-business.md index d58572c900..ca7d24b2a2 100644 --- a/windows/manage/app-inventory-managemement-windows-store-for-business.md +++ b/windows/manage/app-inventory-managemement-windows-store-for-business.md @@ -23,7 +23,7 @@ The **Inventory** page in Windows Store for Business shows all apps in your inve 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. -![](images/wsfb-inventoryaddprivatestore.png) +![Image shows Inventory page in Windows Store for Business with status status options for an app.](images/wsfb-inventoryaddprivatestore.png) Store for Business shows this info for each app in your inventory: @@ -168,13 +168,13 @@ For each app in your inventory, you can view and manage license details. This gi 2. Click **Manage**, and then choose **Inventory**. -3. Click the ellipses for and app, and then choose **View license details**. +3. Click the ellipses for an app, and then choose **View license details**. - ![](images/wsfb-inventory-viewlicense.png) + ![Image showing Inventory page in Windows Store for Business.](images/wsfb-inventory-viewlicense.png) You'll see the names of people in your organization who have installed the app and are using one of the licenses. - ![](images/wsfb-licensedetails.png) + ![Image showing assigned licenses for an app.](images/wsfb-licensedetails.png) On **Assigned licenses**, you can do several things: @@ -190,9 +190,9 @@ For each app in your inventory, you can view and manage license details. This gi **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**. + - Click **Assign to people**, type the email address for the employee that you're assigning the app to, and click **Assign**. - ![](images/wsfb-licenseassign.png) + ![Image showing Assign to people dialog for assigning app licenses to people in your organization.](images/wsfb-licenseassign.png) Store for Business updates the list of assigned licenses. @@ -200,7 +200,7 @@ For each app in your inventory, you can view and manage license details. This gi - Choose the person you want to reclaim the license from, click **Reclaim licenses**, and then click **Reclaim licenses**. - ![](images/wsfb-licensereclaim.png) + ![Image showing Assign to people dialog for reclaiming app licenses from people in your organization.](images/wsfb-licensereclaim.png) Store for Business updates the list of assigned licenses. diff --git a/windows/manage/distribute-apps-from-your-private-store.md b/windows/manage/distribute-apps-from-your-private-store.md index c81973c29f..500ff0c7b4 100644 --- a/windows/manage/distribute-apps-from-your-private-store.md +++ b/windows/manage/distribute-apps-from-your-private-store.md @@ -23,29 +23,29 @@ You can make an app available in your private store when you acquire the app, or **To acquire an app and make it available in your private store** -1. Sign in to the Store for Business. +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.** - ![](images/wsfb-distribute.png) + ![Image showing Distribute options for app in the Windows Store for Business.](images/wsfb-distribute.png) It will take approximately twelve hours before the app is available in the private store. **To make an app in inventory available in your private store** -1. Sign in to the Store for Business. +1. Sign in to the [Store for Business](https://businessstore.microsoft.com). 2. Click **Manage**, and then choose **Inventory**. - ![](images/wsfb-manageinventory.png) + ![Image showing Manage menu in Windows Store for Business.](images/wsfb-manageinventory.png) 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**. - ![](images/wsfb-inventoryaddprivatestore.png) + ![Image showing options from Action for each app in Inventory.](images/wsfb-inventoryaddprivatestore.png) 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. diff --git a/windows/manage/distribute-apps-with-management-tool.md b/windows/manage/distribute-apps-with-management-tool.md index 484fa6b93b..102b4d6d01 100644 --- a/windows/manage/distribute-apps-with-management-tool.md +++ b/windows/manage/distribute-apps-with-management-tool.md @@ -48,14 +48,14 @@ If your vendor doesn’t support the ability to synchronize applications from th 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. -![](images/wsfb-offline-distribute-mdm.png) +![Image showing flow for distributing offline-licensed app from Windows Store for Business to employees in your organization.](images/wsfb-offline-distribute-mdm.png) ## 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 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. -![](images/wsfb-online-distribute-mdm.png) +![Image showing flow for distributing online-licensed app from Wndows Store for Business.](images/wsfb-online-distribute-mdm.png) ## Related topics diff --git a/windows/plan/images/fig1-deferupgrades.png b/windows/manage/images/fig1-deferupgrades.png similarity index 100% rename from windows/plan/images/fig1-deferupgrades.png rename to windows/manage/images/fig1-deferupgrades.png diff --git a/windows/plan/images/fig2-deploymenttimeline.png b/windows/manage/images/fig2-deploymenttimeline.png similarity index 100% rename from windows/plan/images/fig2-deploymenttimeline.png rename to windows/manage/images/fig2-deploymenttimeline.png diff --git a/windows/plan/images/fig3-overlaprelease.png b/windows/manage/images/fig3-overlaprelease.png similarity index 100% rename from windows/plan/images/fig3-overlaprelease.png rename to windows/manage/images/fig3-overlaprelease.png diff --git a/windows/manage/index.md b/windows/manage/index.md index fa16723bc3..570fd79769 100644 --- a/windows/manage/index.md +++ b/windows/manage/index.md @@ -57,7 +57,7 @@ Learn about managing and updating Windows 10.

Create a runtime provisioning package to apply settings, profiles, and file assets to a device running Windows 10 Pro, Windows 10 Enterprise, Windows 10 Education, Windows 10 Mobile, or Windows 10 Mobile Enterprise.

-

[Windows 10 servicing options for updates and upgrades](introduction-to-windows-10-servicing.md)

+

[Windows 10 servicing options](introduction-to-windows-10-servicing.md)

This article describes the new servicing options available in Windows 10, Windows 10 Mobile, and Windows 10 IoT Core (IoT Core) and how they enable enterprises to keep their devices current with the latest feature upgrades. It also covers related topics, such as how enterprises can make better use of Windows Update, and what the new servicing options mean for support lifecycles.

diff --git a/windows/manage/introduction-to-windows-10-servicing.md b/windows/manage/introduction-to-windows-10-servicing.md index 0325ebfeac..8e531b3827 100644 --- a/windows/manage/introduction-to-windows-10-servicing.md +++ b/windows/manage/introduction-to-windows-10-servicing.md @@ -10,27 +10,46 @@ ms.pagetype: security, servicing author: greg-lindsay --- -# Windows 10 servicing options for updates and upgrades +# Windows 10 servicing options **Applies to** - Windows 10 - Windows 10 IoT Core (IoT Core) -This article describes the new servicing options available in Windows 10 and IoT Core and how they enable enterprises to keep their devices current with the latest feature upgrades. It also covers related topics, such as how enterprises can make better use of Windows Update, and what the new servicing options mean for support lifecycles. +This article provides detailed information about new servicing options available in Windows 10 and IoT Core. It also provides information on how enterprises can make better use of Windows Update, and what the new servicing options mean for support lifecycles. Before reading this article, you should understand the new Windows 10 servicing model. For an overview of this servicing model, see: [Windows 10 servicing overview](../plan/windows-10-servicing-options.md). For Windows 10 current version numbers by servicing option see: [Windows 10 release information](https://technet.microsoft.com/en-us/windows/mt679505.aspx). - -**Note**   -Several of the figures in this article show multiple feature upgrades of Windows being released by Microsoft over time. Be aware that these figures were created with dates that were chosen for illustrative clarity, not for release roadmap accuracy, and should not be used for planning purposes.   -## Introduction +## Key terminology -In enterprise IT environments, the desire to provide users with the latest technologies needs to be balanced with the need for manageability and cost control. In the past, many enterprises managed their Windows deployments homogeneously and performed large-scale upgrades to new releases of Windows (often in parallel with large-scale hardware upgrades) about every three to six years. Today, the rapid evolution of Windows as a platform for device-like experiences is causing businesses to rethink their upgrade strategies. Especially with the release of Windows 10, there are good business reasons to keep a significant portion of your enterprise's devices *current* with the latest release of Windows. For example, during the development of Windows 10, Microsoft: -- Streamlined the Windows product engineering and release cycle so that Microsoft can deliver the features, experiences, and functionality customers want, more quickly than ever. -- Created new ways to deliver and install feature upgrades and servicing updates that simplify deployments and on-going management, broaden the base of employees who can be kept current with the latest Windows capabilities and experiences, and lower total cost of ownership. -- Implemented new servicing options – referred to as Current Branch (CB), Current Branch for Business (CBB), and Long-Term Servicing Branch (LTSB) – that provide pragmatic solutions to keep more devices more current in enterprise environments than was previously possible. +The following terms are used When discussing the new Windows 10 servicing model: -The remainder of this article provides additional information about each of these areas. This article also provides an overview of the planning implications of the three Windows 10 servicing options (summarized in Table 1) so that IT administrators can be well-grounded conceptually before they start a Windows 10 deployment project. + + + + + + + + + + + + + + + + + + + + + +
**Term****Description**
UpgradeA new Windows 10 release that contains additional features and capabilities, released two to three times per year.
UpdatePackages of security fixes, reliability fixes, and other bug fixes that are released periodically, typically once a month on Update Tuesday (sometimes referred to as Patch Tuesday). With Windows 10, these are cumulative in nature.
BranchThe windows servicing branch is one of four choices: Windows Insider, Current Branch, Current Branch for Business, or Long-Term Servicing Branch. Branches are determined by the frequency with which the computer is configured to receive feature updates.
RingA ring is a groups of PCs that are all on the same branch and have the same update settings. Rings can be used internally by organizations to better control the upgrade rollout process.
+ +## Windows 10 servicing + +The following table provides an overview of the planning implications of the three Windows 10 servicing options so that IT administrators can be well-grounded conceptually before they start a Windows 10 deployment project. Table 1. Windows 10 servicing options @@ -91,7 +110,7 @@ At the end of each approximately four month period, Microsoft executes a set of Although Windows 10 will enable IT administrators to defer installation of new feature upgrades using Windows Update, enterprises may also want additional control over how and when Windows Update installs releases. With this need in mind, Microsoft [announced Windows Update for Business](http://go.microsoft.com/fwlink/p/?LinkId=624798) in May of 2015. Microsoft designed Windows Update for Business to provide IT administrators with additional Windows Update-centric management capabilities, such as the ability to deploy updates to groups of devices and to define maintenance windows for installing releases. This article will be updated with additional information about the role of Windows Update for Business in servicing Windows 10 devices as it becomes available. -## Windows 10 servicing options +## Windows 10 servicing branches Historically, because of the length of time between releases of new Windows versions, and the relatively low number of enterprise devices that were upgraded to newer versions of Windows during their deployment lifetimes, most IT administrators defined servicing as installing the updates that Microsoft published every month. Looking forward, because Microsoft will be publishing new feature upgrades on a continual basis, *servicing* will also include (on some portion of an enterprise's devices) installing new feature upgrades as they become available. In fact, when planning to deploy Windows 10 on a device, one of the most important questions for IT administrators to ask is, “What should happen to this device when Microsoft publishes a new feature upgrade?” This is because Microsoft designed Windows 10 to provide businesses with multiple servicing options, centered on enabling different rates of feature upgrade adoption. In particular, IT administrators can configure Windows 10 devices to: @@ -100,6 +119,144 @@ In fact, when planning to deploy Windows 10 on a device, one of the most import - Receive only servicing updates for the duration of their Windows 10 deployment in order to reduce the number of non-essential changes made to the device. For more information, see [Install servicing updates only by using Long-Term Servicing Branch (LTSB) servicing](#install-updates-ltsb). The breakout of a company’s devices by the categories above is likely to vary significantly by industry and other factors. What is most important is that companies can decide what works best for them and can choose different options for different devices. +## Current Branch versus Current Branch for Business + +When the development of a new Windows 10 feature upgrade is complete, it is initially offered to Current Branch computers; those computers configured for Current Branch for Business will receive the feature upgrade (with additional fixes) at a later date, generally at least four months later. An additional deferral of at least eight months is available to organizations that use tools to control the update process. During this time, monthly security updates will continue to be made available to machines not yet upgraded. + +The process to configure a PC for Current Branch for Business is simple. The **Defer upgrades** setting needs to be configured, either manually (through the Settings app), by using Group Policy, or by using mobile device management (MDM). + +![figure 1](images/fig1-deferupgrades.png) + +Figure 1. Configure the **Defer upgrades** setting + +Most organizations today leverage Windows Server Update Services (WSUS) or System Center Configuration Manager to update their PCs. With Windows 10, this does not need to change; all updates are controlled through approvals or automatic deployment rules configured in those products, so new upgrades will not be deployed until the organization chooses. The **Defer upgrades** setting can function as an additional validation check, so that Current Branch for Business machines that are targeted with a new upgrade prior to the end of the initial four-month deferral period will decline to install it; they can install the upgrade any time within the eight-month window after that initial four-month deferral period. + +For computers configured to receive updates from Windows Update directly, the **Defer upgrades** setting directly controls when the PC will be upgraded. Computers that are not configured to defer upgrades will be upgraded at the time of the initial Current Branch release; computers that are configured to defer upgrades will be upgraded four months later. + +With Windows 10 it is now possible to manage updates for PCs and tablets that have a higher degree of mobility and are not joined to a domain. For these PCs, you can leverage mobile device management (MDM) services or Windows Update for Business to provide the same type of control provided today with WSUS or Configuration Manager. + +For PCs enrolled in a mobile device management (MDM) service, Windows 10 provides new update approval mechanisms that could be leveraged to delay the installation of a new feature upgrade or any other update. Windows Update for Business will eventually provide these and other capabilities to manage upgrades and updates; more details on these capabilities will be provided when they are available later in 2015. + +With the release of each Current Branch feature update, new ISO images will be made available. You can use these images to upgrade existing machines or to create new custom images. These feature upgrades will also be published with WSUS to enable simple deployment to devices already running Windows 10. + +Unlike previous versions of Windows, the servicing lifetime of Current Branch or Current Branch for Business is finite. You must install new feature upgrades on machines running these branches in order to continue receiving monthly security updates. This requires new ways of thinking about software deployment. It is best to align your deployment schedule with the Current Branch release schedule: + +- Begin your evaluation process with the Windows Insider Program releases. +- Perform initial pilot deployments by using the Current Branch. +- Expand to broad deployment after the Current Branch for Business is available. +- Complete deployments by using that release in advance of the availability of the next Current Branch. + +![figure 2](images/fig2-deploymenttimeline.png) + +Figure 2. Deployment timeline + +Some organizations may require more than 12 months to deploy Windows 10 to all of their existing PCs. To address this, it may be necessary to deploy multiple Windows 10 releases, switching to these new releases during the deployment project. Notice how the timelines can overlap, with the evaluation of one release happening during the pilot and deployment of the previous release: + +![figure 3](images/fig3-overlaprelease.png) + +Figure 3. Overlapping releases + +As a result of these overlapping timelines, organizations can choose which release to deploy. Note though that by continuing for longer with one release, that gives you less time to deploy the subsequent release (to both existing Windows 10 PCs as well as newly-migrated ones), so staying with one release for the full lifetime of that release can be detrimental overall. + +## Long-Term Servicing Branch + +For specialized devices, Windows 10 Enterprise Long Term Servicing Branch (LTSB) ISO images will be made available. These are expected to be on a variable schedule, less often than CB and CBB releases. Once released, these will be supported with security and reliability fixes for an extended period; no new features will be added over its servicing lifetime. Note that LTSB images will not contain most in-box Universal Windows Apps (for example, Microsoft Edge, Cortana, the Windows Store, the Mail and Calendar apps) because the apps or the services that they use will be frequently updated with new functionality and therefore cannot be supported on PCs running the LTSB OS. + +These LTSB images can be used to upgrade existing machines or to create new custom images. + +Note that Windows 10 Enterprise LTSB installations fully support the Universal Windows Platform, with the ability to run line-of-business apps created using the Windows SDK, Visual Studio, and related tools capable of creating Universal Windows apps. For apps from other ISVs (including those published in the Windows Store), contact the ISV to confirm if they will provide long-term support for their specific apps. + +As mentioned previously, there are few, if any, scenarios where an organization would use the Long-Term Servicing Branch for every PC – or even for a majority of them. + +## Windows Insider Program + +During the development of a new Windows 10 feature update, preview releases will be made available to Windows Insider Program participants. This enables those participants to try out new features, check application compatibility, and provide feedback during the development process. + +To obtain Windows Insider Program builds, the Windows Insider Program participants must opt in through the Settings app, and specify their Microsoft account. + +Occasionally (typically as features are made available to those in the Windows Insider Program “slow” ring), new ISO images will be released to enable deployment validation, testing, and image creation. + +## Switching between branches + +During the life of a particular PC, it may be necessary or desirable to switch between the available branches. Depending on the branch you are using, the exact mechanism for doing this can be different; some will be simple, others more involved. + + +++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
For a PC that uses…Changing to…You need to:
Windows Insider ProgramCurrent BranchWait for the final Current Branch release.
Current Branch for BusinessNot directly possible, because Windows Insider Program machines are automatically upgraded to the Current Branch release at the end of the development cycle.
Long-Term Servicing BranchNot directly possible (requires wipe-and-load).
Current BranchInsiderUse the Settings app to enroll the device in the Windows Insider Program.
Current Branch for BusinessSelect the Defer upgrade setting, or move the PC to a target group or flight that will not receive the next upgrade until it is business ready. Note that this change will not have any immediate impact; it only prevents the installation of the next Current Branch release.
Long-Term Servicing BranchNot directly possible (requires wipe-and-load).
Current Branch for BusinessInsiderUse the Settings app to enroll the device in the Windows Insider Program.
Current BranchDisable the Defer upgrade setting, or move the PC to a target group or flight that will receive the latest Current Branch release.
Long-Term Servicing BranchNot directly possible (requires wipe-and-load).
Long-Term Servicing BranchInsiderUse media to upgrade to the latest Windows Insider Program build.
Current BranchUse media to upgrade to a later Current Branch build. (Note that the Current Branch build must be a later build.)
Current Branch for BusinessUse media to upgrade to a later Current Branch for Business build (Current Branch build plus fixes). Note that it must be a later build.
+ ## Plan for Windows 10 deployment The remainder of this article focuses on the description of the three options outlined above, and their planning implications, in more detail. In practice, IT administrators have to focus on two areas when planning a Windows 10 device deployment: @@ -111,19 +268,21 @@ The content that follows will provide IT administrators with the context needed **How Microsoft releases Windows 10 feature upgrades** -When it is time to release a build as a new feature upgrade for Windows 10, Microsoft performs several processes in sequence. The first process involves creating either one or two servicing branches in a source code management system. These branches (shown in Figure 1) are required to produce feature upgrade installation media and servicing update packages that can be deployed on different Windows 10 editions, running in different configurations. +>Some figures in this article show multiple feature upgrades of Windows being released by Microsoft over time. Be aware that these figures were created with dates that were chosen for illustrative clarity, not for release roadmap accuracy, and should not be used for planning purposes. -![figure 1](images/w10servicing-f1-branches.png) +When it is time to release a build as a new feature upgrade for Windows 10, Microsoft performs several processes in sequence. The first process involves creating either one or two servicing branches in a source code management system. These branches (shown in Figure 4) are required to produce feature upgrade installation media and servicing update packages that can be deployed on different Windows 10 editions, running in different configurations. -Figure 1. Feature upgrades and servicing branches +![figure 4](images/w10servicing-f1-branches.png) -In all cases, Microsoft creates a servicing branch (referred to in Figure 1 as Servicing Branch \#1) that is used to produce releases for approximately one year (although the lifetime of the branch will ultimately depend on when Microsoft publishes subsequent feature upgrade releases). If Microsoft has selected the feature upgrade to receive long-term servicing-only support, Microsoft also creates a second servicing branch (referred to in Figure 1 as Servicing Branch \#2) that is used to produce servicing update releases for up to 10 years. +Figure 4. Feature upgrades and servicing branches -As shown in Figure 2, when Microsoft publishes a new feature upgrade, Servicing Branch \#1 is used to produce the various forms of media needed by OEMs, businesses, and consumers to install Windows 10 Home, Pro, Education, and Enterprise editions. Microsoft also produces the files needed by Windows Update to distribute and install the feature upgrade, along with *targeting* information that instructs Windows Update to only install the files on devices configured for *immediate* installation of feature upgrades. +In all cases, Microsoft creates a servicing branch (referred to in Figure 4 as Servicing Branch \#1) that is used to produce releases for approximately one year (although the lifetime of the branch will ultimately depend on when Microsoft publishes subsequent feature upgrade releases). If Microsoft has selected the feature upgrade to receive long-term servicing-only support, Microsoft also creates a second servicing branch (referred to in Figure 4 as Servicing Branch \#2) that is used to produce servicing update releases for up to 10 years. -![figure 2](images/win10servicing-fig2-featureupgrade.png) +As shown in Figure 5, when Microsoft publishes a new feature upgrade, Servicing Branch \#1 is used to produce the various forms of media needed by OEMs, businesses, and consumers to install Windows 10 Home, Pro, Education, and Enterprise editions. Microsoft also produces the files needed by Windows Update to distribute and install the feature upgrade, along with *targeting* information that instructs Windows Update to only install the files on devices configured for *immediate* installation of feature upgrades. -Figure 2. Producing feature upgrades from servicing branches +![figure 5](images/win10servicing-fig2-featureupgrade.png) + +Figure 5. Producing feature upgrades from servicing branches Approximately four months after publishing the feature upgrade, Microsoft uses Servicing Branch \#1 again to *republish* updated installation media for Windows 10 Pro, Education, and Enterprise editions. The updated media contains the exact same feature upgrade as contained in the original media except Microsoft also includes all the servicing updates that were published since the feature upgrade was first made available. This enables the feature upgrade to be installed on a device more quickly, and in a way that is potentially less obtrusive to users. @@ -131,15 +290,15 @@ Concurrently, Microsoft also changes the way the feature upgrade is published in **How Microsoft publishes the Windows 10 Enterprise LTSB Edition** -If Microsoft has selected the feature upgrade to receive long-term servicing support, Servicing Branch \#2 is used to publish the media needed to install the Windows 10 Enterprise LTSB edition. The time between releases of feature upgrades with long-term servicing support will vary between one and three years, and is strongly influenced by input from customers regarding the readiness of the release for long-term enterprise deployment. Figure 2 shows the Windows 10 Enterprise LTSB edition being published at the same time as the other Windows 10 editions, which mirrors the way editions were actually published for Windows 10 in July of 2015. It is important to note that this media is never published to Windows Update for deployment. Installations of the Enterprise LTSB edition on devices must be performed another way. +If Microsoft has selected the feature upgrade to receive long-term servicing support, Servicing Branch \#2 is used to publish the media needed to install the Windows 10 Enterprise LTSB edition. The time between releases of feature upgrades with long-term servicing support will vary between one and three years, and is strongly influenced by input from customers regarding the readiness of the release for long-term enterprise deployment. Figure 5 shows the Windows 10 Enterprise LTSB edition being published at the same time as the other Windows 10 editions, which mirrors the way editions were actually published for Windows 10 in July of 2015. It is important to note that this media is never published to Windows Update for deployment. Installations of the Enterprise LTSB edition on devices must be performed another way. **How Microsoft releases Windows 10 servicing updates** -As shown in Figure 3, servicing branches are also used by Microsoft to produce servicing updates containing fixes for security vulnerabilities and other important issues. Servicing updates are published in a way that determines the Windows 10 editions on which they can be installed. For example, servicing updates produced from a given servicing branch can only be installed on devices running a Windows 10 edition produced from the same servicing branch. In addition, because Windows 10 Home does not support deferred installation of feature upgrades, servicing updates produced from Servicing Branch \#1 are targeted at devices running Windows 10 Home only until Microsoft publishes feature upgrades for deferred installation. +As shown in Figure 6, servicing branches are also used by Microsoft to produce servicing updates containing fixes for security vulnerabilities and other important issues. Servicing updates are published in a way that determines the Windows 10 editions on which they can be installed. For example, servicing updates produced from a given servicing branch can only be installed on devices running a Windows 10 edition produced from the same servicing branch. In addition, because Windows 10 Home does not support deferred installation of feature upgrades, servicing updates produced from Servicing Branch \#1 are targeted at devices running Windows 10 Home only until Microsoft publishes feature upgrades for deferred installation. -![figure 3](images/win10servicing-fig3.png) +![figure 6](images/win10servicing-fig3.png) -Figure 3. Producing servicing updates from servicing branches +Figure 6. Producing servicing updates from servicing branches **Release installation alternatives** @@ -162,24 +321,24 @@ Because there is a one-to-one mapping between servicing options and servicing br Although Microsoft is currently planning to release approximately two to three feature upgrades per year, the actual frequency and timing of releases will vary. Because the servicing lifetimes of feature upgrades typically end when the servicing lifetimes of other, subsequent feature upgrades begin, the lengths of servicing lifetimes will also vary. -![figure 4](images/win10servicing-fig4-upgradereleases.png) +![figure 7](images/win10servicing-fig4-upgradereleases.png) -Figure 4. Example release cadence across multiple feature upgrades +Figure 7. Example release cadence across multiple feature upgrades To show the variability of servicing lifetimes, and show the paths that feature upgrade installations will take when Windows Update and Windows Server Update Services are used for deployments, Figure 4 contains three feature upgrade releases (labeled *X*, *Y*, and *Z*) and their associated servicing branches. The time period between publishing X and Y is four months, and the time period between publishing Y and Z is six months. X and Z have long-term servicing support, and Y has shorter-term servicing support only. -The same underlying figure will be used in subsequent figures to show all three servicing options in detail. It is important to note that Figure 4 is provided for illustration of servicing concepts only and should not be used for actual Windows 10 release planning. +The same underlying figure will be used in subsequent figures to show all three servicing options in detail. It is important to note that Figure 7 is provided for illustration of servicing concepts only and should not be used for actual Windows 10 release planning. To simplify the servicing lifetime and feature upgrade behavior explanations that follow, this document refers to branch designations for a specific feature upgrade as the +0 versions, the designations for the feature upgrade after the +0 version as the +1 (or successor) versions, and the designation for the feature upgrade after the +1 version as the +2 (or second successor) versions. ### **Immediate feature upgrade installation with Current Branch (CB) servicing** -As shown in Figure 5, the Current Branch (CB) designation refers to Servicing Branch \#1 during the period that starts when Microsoft publishes a feature upgrade targeted for devices configured for *immediate* installation and ends when Microsoft publishes the *successor* feature upgrade targeted for devices configured for *immediate* installation. +As shown in Figure 8, the Current Branch (CB) designation refers to Servicing Branch \#1 during the period that starts when Microsoft publishes a feature upgrade targeted for devices configured for *immediate* installation and ends when Microsoft publishes the *successor* feature upgrade targeted for devices configured for *immediate* installation. -![figure 5](images/win10servicing-fig5.png) +![figure 8](images/win10servicing-fig5.png) -Figure 5. Immediate installation with Current Branch Servicing +Figure 8. Immediate installation with Current Branch Servicing The role of Servicing Branch \#1 during the CB period is to produce feature upgrades and servicing updates for Windows 10 devices configured for *immediate* installation of new feature upgrades. Microsoft refers to devices configured this way as being *serviced from CBs*. The Windows 10 editions that support servicing from CBs are Home, Pro, Education, and Enterprise. The Current Branch designation is intended to reflect the fact that devices serviced using this approach will be kept as current as possible with respect to the latest Windows 10 feature upgrade release. Windows 10 Home supports Windows Update for release deployment. Windows 10 editions (Pro, Education, and Enterprise) support Windows Update, Windows Server Update Services, Configuration Manager, and other configuration management systems: @@ -191,11 +350,11 @@ It is important to note that devices serviced from CBs must install two to three ### **Deferred feature upgrade installation with Current Branch for Business (CBB) servicing** -As shown in Figure 6, the Current Branch for Business (CBB) designation refers to Servicing Branch \#1 during the period that starts when Microsoft republishes a feature upgrade targeted for devices configured for *deferred* installation and ends when Microsoft republishes the *second successor* feature upgrade targeted for devices configured for *deferred* installation. +As shown in Figure 9, the Current Branch for Business (CBB) designation refers to Servicing Branch \#1 during the period that starts when Microsoft republishes a feature upgrade targeted for devices configured for *deferred* installation and ends when Microsoft republishes the *second successor* feature upgrade targeted for devices configured for *deferred* installation. -![figure 6](images/win10servicing-fig6.png) +![figure 9](images/win10servicing-fig6.png) -Figure 6. Deferred installation with Current Branch for Business Servicing +Figure 9. Deferred installation with Current Branch for Business Servicing The role of Servicing Branch \#1 during the CBB period is to produce feature upgrades and servicing updates for Windows 10 devices configured for *deferred* installation of new feature upgrades. Microsoft refers to devices configured this way as being *serviced from CBBs*. The Windows 10 editions that support servicing from CBBs are Pro, Education, and Enterprise. The Current Branch for Business designation is intended to reflect the fact that many businesses require IT administrators to test feature upgrades prior to deployment, and servicing devices from CBBs is a pragmatic solution for businesses with testing constraints to remain as current as possible. Windows 10 (Pro, Education, and Enterprise editions) support release deployment by using Windows Update, Windows Server Update Services, Configuration Manager, and other configuration management systems: @@ -208,11 +367,11 @@ Microsoft designed Windows 10 servicing lifetime policies so that CBBs will rec **Install servicing updates only by using Long-Term Servicing Branch (LTSB) servicing** -As shown in Figure 7, the Long-Term Servicing Branch (LTSB) designation refers to Servicing Branch \#2 from beginning to end. LTSBs begin when a feature upgrade with long-term support is published by Microsoft and end after 10 years. It is important to note that only the Windows 10 Enterprise LTSB edition supports long-term servicing, and there are important differences between this edition and other Windows 10 editions regarding upgradability and feature set (described below in the [Considerations when configuring devices for servicing updates only](#servicing-only) section). +As shown in Figure 10, the Long-Term Servicing Branch (LTSB) designation refers to Servicing Branch \#2 from beginning to end. LTSBs begin when a feature upgrade with long-term support is published by Microsoft and end after 10 years. It is important to note that only the Windows 10 Enterprise LTSB edition supports long-term servicing, and there are important differences between this edition and other Windows 10 editions regarding upgradability and feature set (described below in the [Considerations when configuring devices for servicing updates only](#servicing-only) section). -![figure 7](images/win10servicing-fig7.png) +![figure 10](images/win10servicing-fig7.png) -Figure 7. Servicing updates only using LTSB Servicing +Figure 10. Servicing updates only using LTSB Servicing The role of LTSBs is to produce servicing updates for devices running Windows 10 configured to install servicing updates only. Devices configured this way are referred to as being *serviced from LTSBs*. The Long-Term Servicing Branch designation is intended to reflect the fact that this servicing option is intended for scenarios where changes to software running on devices must be limited to essential updates (such as those for security vulnerabilities and other important issues) for the duration of deployments. Windows 10 Enterprise LTSB supports release deployment by using Windows Update, Windows Server Update Services, Configuration Manager, and other configuration management systems: diff --git a/windows/manage/manage-access-to-private-store.md b/windows/manage/manage-access-to-private-store.md index 47ddaea3ef..8e2f813d33 100644 --- a/windows/manage/manage-access-to-private-store.md +++ b/windows/manage/manage-access-to-private-store.md @@ -23,7 +23,7 @@ Organizations might want control the set of apps that are available to their emp 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: -![](images/wsfb-wsappprivatestore.png) +![Image showing the Windows Store app, with a private store tab highlighted.](images/wsfb-wsappprivatestore.png) Organizations using an MDM to manage apps can use a policy to show only the private store. When your MDM supports the Store for Business, the MDM can use the [Policy CSP](https://msdn.microsoft.com/library/windows/hardware/dn904962.aspx#group-policy-table). More specifically, the **ApplicationManagement/RequirePrivateStoreOnly** policy. diff --git a/windows/manage/manage-private-store-settings.md b/windows/manage/manage-private-store-settings.md index 1eb1190a30..6132f1e513 100644 --- a/windows/manage/manage-private-store-settings.md +++ b/windows/manage/manage-private-store-settings.md @@ -19,9 +19,9 @@ author: TrudyHa 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 name of your private store is shown on a tab in the Windows Store. +The name of your private store is shown on a tab in the Windows Store app. -![](images/wsfb-wsappprivatestore.png) +![Image showing Windows Store app with private store tab highlighted.](images/wsfb-wsappprivatestore.png) You can change the name of your private store in Store for Business. @@ -33,13 +33,13 @@ You can change the name of your private store in Store for Business. You'll see your private store name. - ![](images/wsfb-privatestore.png) + ![Image showing Private store page in Windows Store for Business.](images/wsfb-privatestore.png) 3. Click **Change**. 4. Type a new display name for your private store, and click **Save**. - ![](images/wsfb-renameprivatestore.png) + ![Image showing Private store dialog used to change private store display name.](images/wsfb-renameprivatestore.png)   diff --git a/windows/manage/roles-and-permissions-windows-store-for-business.md b/windows/manage/roles-and-permissions-windows-store-for-business.md index 4fbfcc521e..92d9f7e5e8 100644 --- a/windows/manage/roles-and-permissions-windows-store-for-business.md +++ b/windows/manage/roles-and-permissions-windows-store-for-business.md @@ -204,11 +204,11 @@ These permissions allow people to: 2. Click **Settings**, and then choose **Permissions**. - ![](images/wsfb-settings-permissions.png) + ![Image showing Permissions page in Windows Store for Business.](images/wsfb-settings-permissions.png) 3. Click **Add people**, type a name, choose the role you want to assign, and click **Save** . - ![](images/wsfb-permissions-assignrole.png) + ![Image showing Assign roles to people box in Windows Store for Business.](images/wsfb-permissions-assignrole.png) 4. diff --git a/windows/manage/sign-up-windows-store-for-business.md b/windows/manage/sign-up-windows-store-for-business.md index 89ca4e135b..643d42eddf 100644 --- a/windows/manage/sign-up-windows-store-for-business.md +++ b/windows/manage/sign-up-windows-store-for-business.md @@ -34,7 +34,7 @@ Before signing up for the Store for Business, make sure you're the global admini - 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. - ![](images/wsfb-landing.png) + ![Image showing Windows Store for Business page with invitation to sign up, or sign in.](images/wsfb-landing.png) **To sign up for Azure AD accounts through Office 365 for Business** @@ -44,43 +44,43 @@ Before signing up for the Store for Business, make sure you're the global admini Type the required info and click **Next.** - ![](images/wsfb-onboard-1.png) + ![Image showing Welcome page for sign up process.](images/wsfb-onboard-1.png) - Step 2: Create an ID. We'll use info you provided on the previous page to build your user ID. Check the info and click **Next**. - ![](images/wsfb-onboard-2.png) + ![Image showing Create your user ID page for sign up process.](images/wsfb-onboard-2.png) - Step 3: You're in. Let us know how you'd like to receive a verification code, and click either **Text me**, or **Call me**. We'll send you a verification code - ![](images/wsfb-onboard-3.png) + ![Image showing confirmation page as part of sign up process.](images/wsfb-onboard-3.png) - Verification. Type your verification code and click **Create my account**. - ![](images/wsfb-onboard-4.png) + ![Image showing verification code step.](images/wsfb-onboard-4.png) - Save this info. Be sure to save the portal sign-in page and your user ID info. Click **You're ready to go**. - ![](images/wsfb-onboard-5.png) + ![Image showing sign-in page and user ID for Windows Store for Business. ](images/wsfb-onboard-5.png) - 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. - ![](images/wsfb-onboard-7.png) + ![Image showing sign-in page for Windows Store for Business.](images/wsfb-onboard-7.png) 3. Read through and accept Store for Business terms. 4. Welcome to the Store for Business. Click **Next** to continue. - ![](images/wsfb-firstrun.png) + ![Image showing welcome message for Windows Store for Business.](images/wsfb-firstrun.png) ### Next steps diff --git a/windows/plan/TOC.md b/windows/plan/TOC.md index d6212238a6..fc128ba315 100644 --- a/windows/plan/TOC.md +++ b/windows/plan/TOC.md @@ -1,6 +1,6 @@ # [Plan for Windows 10 deployment](index.md) ## [Change history for Plan for Windows 10 deployment](change-history-for-plan-for-windows-10-deployment.md) -## [Windows 10 servicing options](windows-10-servicing-options.md) +## [Windows 10 servicing overview](windows-10-servicing-options.md) ## [Windows 10 deployment considerations](windows-10-deployment-considerations.md) ## [Windows 10 compatibility](windows-10-compatibility.md) ## [Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md) diff --git a/windows/plan/index.md b/windows/plan/index.md index e57a04c1cb..e8c8cdb020 100644 --- a/windows/plan/index.md +++ b/windows/plan/index.md @@ -16,7 +16,7 @@ Windows 10 provides new deployment capabilities, scenarios, and tools by buildi |Topic |Description | |------|------------| |[Change history for Plan for Windows 10 deployment](change-history-for-plan-for-windows-10-deployment.md) |This topic lists new and updated topics in the Plan for Windows 10 deployment documentation for [Windows 10 and Windows 10 Mobile](../index.md). | -|[Windows 10 servicing options](windows-10-servicing-options.md) |Windows 10 provides a new model for organizations to deploy and upgrade Windows by providing updates to features and capabilities through a continual process. | +|[Windows 10 servicing overview](windows-10-servicing-options.md) |Windows 10 provides a new model for organizations to deploy and upgrade Windows by providing updates to features and capabilities through a continual process. | |[Windows 10 deployment considerations](windows-10-deployment-considerations.md) |There are new deployment options in Windows 10 that help you simplify the deployment process and automate migration of existing settings and applications. | |[Windows 10 compatibility](windows-10-compatibility.md) |Windows 10 will be compatible with most existing PC hardware; most devices running Windows 7, Windows 8, or Windows 8.1 will meet the requirements for Windows 10. | |[Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md) |There are specific infrastructure requirements to deploy and manage Windows 10 that should be in place prior to significant Windows 10 deployments within your organization. | diff --git a/windows/plan/windows-10-servicing-options.md b/windows/plan/windows-10-servicing-options.md index 2e67c97c04..df404e912e 100644 --- a/windows/plan/windows-10-servicing-options.md +++ b/windows/plan/windows-10-servicing-options.md @@ -7,56 +7,43 @@ ms.prod: w10 ms.mktglfcycl: plan ms.pagetype: servicing ms.sitesec: library -author: mtniehaus +author: greg-lindsay --- -# Windows 10 servicing options - +# Windows 10 servicing overview **Applies to** - - Windows 10 - Windows 10 Mobile -Windows 10 provides a new model for organizations to deploy and upgrade Windows by providing updates to features and capabilities through a continual process. +This topic provides an overview of the new servicing model for Windows 10. For more detailed information about this model, refer to [Windows 10 servicing options](../manage/introduction-to-windows-10-servicing.md). -Traditionally, new versions of Windows have been released every few years. The deployment of those new versions within an organization would then become a project, either by leveraging a “wipe and load” process to deploy the new operating system version to existing machines, or by migrating to the new operating system version as part of the hardware replacement cycle. Either way, organizations would invest significant time and effort to complete the required tasks. +## The Windows servicing model -With Windows 10, a new model is being adopted. Instead of new features being added only in new releases that happen every few years, the goal is to provide new features two to three times per year, continually providing new capabilities while maintaining a high level of hardware and application compatibility. This new model, referred to as Windows as a service, requires organizations to rethink how they deploy and upgrade Windows. It is no longer a project that happens “every few years”; it is a continual process. +Traditionally, new versions of Windows have been released every few years. The deployment of those new versions within an organization would then become a project, either by leveraging a "wipe and load" process to deploy the new operating system version to existing computers, or by migrating to the new operating system version as part of the hardware replacement cycle. Either way, a significant amount of time and effort was required to complete these tasks. -To support this process, you need to use simpler deployment methods. By combining these simpler methods (for example, in-place upgrade) with new techniques to deploy in phases to existing devices, you can reduce the amount of effort required overall, by taking the effort that used to be performed as part of a traditional deployment project and spreading it across a broad period of time. +With Windows 10, a new model is being adopted. This new model, referred to as "Windows as a service," requires organizations to rethink how they deploy and upgrade Windows. It is no longer a project that happens every few years, it is a continual process. -## Key terminology +## Windows as a service +Instead of new features being added only in new releases that happen every few years, the goal of Windows as a service is to continually provide new capabilities. New features are provided or updated two to three times per year, while maintaining a high level of hardware and application compatibility. -With the shift to this new Windows as a service model, it is important to understand the distinction between two key terms: +This new model uses simpler deployment methods, reducing the overall amount of effort required for Windows servicing. By combining these simpler methods (such as in-place upgrade) with new techniques to deploy upgrades in phases to existing devices, the effort that used to be performed as part of a traditional deployment project is spread across a broad period of time. -- **Upgrade**. A new Windows 10 release that contains additional features and capabilities, released two to three times per year. +## Windows 10 servicing branches -- **Update**. Packages of security fixes, reliability fixes, and other bug fixes that are released periodically, typically once a month on Update Tuesday (sometimes referred to as Patch Tuesday). With Windows 10, these are cumulative in nature. +The concept of branching goes back many years, and represents how Windows has traditionally been written and serviced. Each release of Windows was from a particular branch of the Windows code, and updates would be made to that release for the lifecycle of that release. This concept still applies now with Windows 10, but is much more visible because it is incorporated directly into the servicing model. -In addition to these terms, some additional concepts need to be understood: - -- **Branches**. The concept of “branching” goes back many years, and represents how Windows has traditionally been written and serviced: Each release was from a particular branch of the Windows code, and updates would be made to that release for the lifecycle of that release. This concept still applies now with Windows 10, but is much more visible because of the increased frequency of upgrades. - -- **Rings**. The concept of “rings” defines a mechanism for Windows 10 deployment to targeted groups of PCs; each ring represents another group. These are used as part of the release mechanism for new Windows 10 upgrades, and should be used internally by organizations to better control the upgrade rollout process. - -## Windows 10 branch overview - - -To support different needs and use cases within your organization, you can select among different branches: +During the development of Windows 10, Microsoft implemented the following new servicing options: ![branches](images/branch.png) -- **Windows Insider Program**. To see new features before they are released, to provide feedback on those new features, and to initially validate compatibility with existing applications and hardware, small numbers of PCs can leverage the Windows Insider Program branch. These would typically be dedicated lab machines used for IT testing, secondary PCs used by IT administrators, and other non-critical devices. +**Windows Insider Program**: To see new features before they are released, to provide feedback on those new features, and to initially validate compatibility with existing applications and hardware, a small number of PCs can leverage the Windows Insider Program branch. These are typically dedicated lab machines used for IT testing, secondary PCs used by IT administrators, and other non-critical devices. +**Current Branch (CB)**: For early adopters, IT teams, and other broader piloting groups, the Current Branch (CB) can be used to further validate application compatibility and newly-released features. +**Current Branch for Business (CBB)**. For the majority of people in an organization, the Current Branch for Business (CBB) allows for a staged deployment of new features over a longer period of time. +**Long-Term Servicing Branch (LTSB)**: For critical or specialized devices (for example, operation of factory floor machinery, point-of-sale systems, automated teller machines), the Long-Term Servicing Branch (LTSB) provides a version of Windows 10 Enterprise that receives no new features, while continuing to be supported with security and other updates for a long time. (Note that the Long-Term Servicing Branch is a separate Windows 10 Enterprise image, with many in-box apps, including Microsoft Edge, Cortana, and Windows Store, removed.)
-- **Current Branch**. For early adopters, IT teams, and other broader piloting groups, the Current Branch (CB) can be used to further validate application compatibility and newly-released features. - -- **Current Branch for Business**. For the majority of people in an organization, the Current Branch for Business (CBB) allows for a staged deployment of new features over a longer period of time. - -- **Long-Term Servicing Branch**. For critical or specialized devices (for example, operation of factory floor machinery, point-of-sale systems, automated teller machines), the Long-Term Servicing Branch (LTSB) provides a version of Windows 10 Enterprise that receives no new features, while continuing to be supported with security and other updates for a long time. (Note that the Long-Term Servicing Branch is a separate Windows 10 Enterprise image, with many in-box apps, including Microsoft Edge, Cortana, and Windows Store, removed.) - -Most organizations will leverage all of these choices, with the mix determined by how individual PCs are used. Some examples: +These servicing options provide pragmatic solutions to keep more devices more current in enterprise environments than was previously possible. Most organizations will leverage all of these choices, with the mix determined by how individual PCs are used. Some examples are shown in the table below: | Industry | Windows Insider Program | Current Branch | Current Branch for Business | Long-Term Servicing Branch | |--------------------|-------------------------|----------------|-----------------------------|----------------------------| @@ -66,8 +53,6 @@ Most organizations will leverage all of these choices, with the mix determined b | Consulting | 10% | 50% | 35% | 5% | | Software developer | 30% | 60% | 5% | 5% | -  - Because every organization is different, the exact breakdown will vary even within a specific industry; these should be considered only examples, not specific recommendations. To determine the appropriate mix for a specific organization, profile how individual PCs are used within the organization, and target them with the appropriate branch. - Retailers often have critical devices (for example, point-of-sale systems) in stores which results in higher percentages of PCs on the Long-Term Servicing Branch. But those used by information workers in support of the retail operations would leverage Current Branch for Business to receive new features. @@ -82,169 +67,12 @@ Because every organization is different, the exact breakdown will vary even with Note that there are few, if any, scenarios where an entire organization would use the Long-Term Servicing Branch for all PCs – or even for a majority of them. -For more information about the Windows as a service model, refer to [Windows 10 servicing options for updates and upgrades](../manage/introduction-to-windows-10-servicing.md). +In addition to implementing these new servicing options, Microsoft streamlined the Windows product engineering and release cycle so that Microsoft can deliver new features, experiences, and functionality more quickly than ever. Microsoft also created new ways to deliver and install feature upgrades and servicing updates that simplify deployments and on-going management, broaden the base of employees who can be kept current with the latest Windows capabilities and experiences, and lower total cost of ownership. -## Current Branch versus Current Branch for Business - - -When the development of a new Windows 10 feature upgrade is complete, it is initially offered to Current Branch computers; those computers configured for Current Branch for Business will receive the feature upgrade (with additional fixes) at a later date, generally at least four months later. An additional deferral of at least eight months is available to organizations that use tools to control the update process. During this time, monthly security updates will continue to be made available to machines not yet upgraded. - -The process to configure a PC for Current Branch for Business is simple. The **Defer upgrades** setting needs to be configured, either manually (through the Settings app), by using Group Policy, or by using mobile device management (MDM). - -![figure 1](images/fig1-deferupgrades.png) - -Figure 1. Configure the **Defer upgrades** setting - -Most organizations today leverage Windows Server Update Services (WSUS) or System Center Configuration Manager to update their PCs. With Windows 10, this does not need to change; all updates are controlled through approvals or automatic deployment rules configured in those products, so new upgrades will not be deployed until the organization chooses. The **Defer upgrades** setting can function as an additional validation check, so that Current Branch for Business machines that are targeted with a new upgrade prior to the end of the initial four-month deferral period will decline to install it; they can install the upgrade any time within the eight-month window after that initial four-month deferral period. - -For computers configured to receive updates from Windows Update directly, the **Defer upgrades** setting directly controls when the PC will be upgraded. Computers that are not configured to defer upgrades will be upgraded at the time of the initial Current Branch release; computers that are configured to defer upgrades will be upgraded four months later. - -With Windows 10 it is now possible to manage updates for PCs and tablets that have a higher degree of mobility and are not joined to a domain. For these PCs, you can leverage mobile device management (MDM) services or Windows Update for Business to provide the same type of control provided today with WSUS or Configuration Manager. - -For PCs enrolled in a mobile device management (MDM) service, Windows 10 provides new update approval mechanisms that could be leveraged to delay the installation of a new feature upgrade or any other update. Windows Update for Business will eventually provide these and other capabilities to manage upgrades and updates; more details on these capabilities will be provided when they are available later in 2015. - -With the release of each Current Branch feature update, new ISO images will be made available. You can use these images to upgrade existing machines or to create new custom images. These feature upgrades will also be published with WSUS to enable simple deployment to devices already running Windows 10. - -Unlike previous versions of Windows, the servicing lifetime of Current Branch or Current Branch for Business is finite. You must install new feature upgrades on machines running these branches in order to continue receiving monthly security updates. This requires new ways of thinking about software deployment. It is best to align your deployment schedule with the Current Branch release schedule: - -- Begin your evaluation process with the Windows Insider Program releases. - -- Perform initial pilot deployments by using the Current Branch. - -- Expand to broad deployment after the Current Branch for Business is available. - -- Complete deployments by using that release in advance of the availability of the next Current Branch. - -![figure 2](images/fig2-deploymenttimeline.png) - -Figure 2. Deployment timeline - -Some organizations may require more than 12 months to deploy Windows 10 to all of their existing PCs. To address this, it may be necessary to deploy multiple Windows 10 releases, switching to these new releases during the deployment project. Notice how the timelines can overlap, with the evaluation of one release happening during the pilot and deployment of the previous release: - -![figure 3](images/fig3-overlaprelease.png) - -Figure 3. Overlapping releases - -As a result of these overlapping timelines, organizations can choose which release to deploy. Note though that by continuing for longer with one release, that gives you less time to deploy the subsequent release (to both existing Windows 10 PCs as well as newly-migrated ones), so staying with one release for the full lifetime of that release can be detrimental overall. - -## Long-Term Servicing Branch - - -For specialized devices, Windows 10 Enterprise Long Term Servicing Branch (LTSB) ISO images will be made available. These are expected to be on a variable schedule, less often than CB and CBB releases. Once released, these will be supported with security and reliability fixes for an extended period; no new features will be added over its servicing lifetime. Note that LTSB images will not contain most in-box Universal Windows Apps (for example, Microsoft Edge, Cortana, the Windows Store, the Mail and Calendar apps) because the apps or the services that they use will be frequently updated with new functionality and therefore cannot be supported on PCs running the LTSB OS. - -These LTSB images can be used to upgrade existing machines or to create new custom images. - -Note that Windows 10 Enterprise LTSB installations fully support the Universal Windows Platform, with the ability to run line-of-business apps created using the Windows SDK, Visual Studio, and related tools capable of creating Universal Windows apps. For apps from other ISVs (including those published in the Windows Store), contact the ISV to confirm if they will provide long-term support for their specific apps. - -As mentioned previously, there are few, if any, scenarios where an organization would use the Long-Term Servicing Branch for every PC – or even for a majority of them. - -## Windows Insider Program - - -During the development of a new Windows 10 feature update, preview releases will be made available to Windows Insider Program participants. This enables those participants to try out new features, check application compatibility, and provide feedback during the development process. - -To obtain Windows Insider Program builds, the Windows Insider Program participants must opt in through the Settings app, and specify their Microsoft account. - -Occasionally (typically as features are made available to those in the Windows Insider Program “slow” ring), new ISO images will be released to enable deployment validation, testing, and image creation. - -## Switching between branches - - -During the life of a particular PC, it may be necessary or desirable to switch between the available branches. Depending on the branch you are using, the exact mechanism for doing this can be different; some will be simple, others more involved. - - ----- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
For a PC that uses…Changing to…You need to:
Windows Insider ProgramCurrent BranchWait for the final Current Branch release.
Current Branch for BusinessNot directly possible, because Windows Insider Program machines are automatically upgraded to the Current Branch release at the end of the development cycle.
Long-Term Servicing BranchNot directly possible (requires wipe-and-load).
Current BranchInsiderUse the Settings app to enroll the device in the Windows Insider Program.
Current Branch for BusinessSelect the Defer upgrade setting, or move the PC to a target group or flight that will not receive the next upgrade until it is business ready. Note that this change will not have any immediate impact; it only prevents the installation of the next Current Branch release.
Long-Term Servicing BranchNot directly possible (requires wipe-and-load).
Current Branch for BusinessInsiderUse the Settings app to enroll the device in the Windows Insider Program.
Current BranchDisable the Defer upgrade setting, or move the PC to a target group or flight that will receive the latest Current Branch release.
Long-Term Servicing BranchNot directly possible (requires wipe-and-load).
Long-Term Servicing BranchInsiderUse media to upgrade to the latest Windows Insider Program build.
Current BranchUse media to upgrade to a later Current Branch build. (Note that the Current Branch build must be a later build.)
Current Branch for BusinessUse media to upgrade to a later Current Branch for Business build (Current Branch build plus fixes). Note that it must be a later build.
- -  +Windows 10 enables organizations to fulfill the desire to provide users with the latest features while balancing the need for manageability and cost control. To keep pace with technology, there are good business reasons to keep a significant portion of your enterprise's devices *current* with the latest release of Windows. ## Related topics - -[Windows 10 deployment considerations](windows-10-deployment-considerations.md) - -[Windows 10 compatibility](windows-10-compatibility.md) - -[Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md) - -  - -  - - - - - +[Windows 10 deployment considerations](windows-10-deployment-considerations.md)
+[Windows 10 compatibility](windows-10-compatibility.md)
+[Windows 10 infrastructure requirements](windows-10-infrastructure-requirements.md) \ No newline at end of file diff --git a/windows/whats-new/edp-whats-new-overview.md b/windows/whats-new/edp-whats-new-overview.md index f52da0a12c..4b157c50e8 100644 --- a/windows/whats-new/edp-whats-new-overview.md +++ b/windows/whats-new/edp-whats-new-overview.md @@ -18,7 +18,7 @@ author: eross-msft [Some information relates to pre-released product, which may be substantially modified before it's commercially released. Microsoft makes no warranties, express or implied, with respect to the information provided here.] -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. +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 from their personal email account, copies and pastes product info into a tweet, or saves an in-progress sales report to their public cloud storage. Enterprise data protection (EDP) 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.