diff --git a/devices/surface-hub/change-history-surface-hub.md b/devices/surface-hub/change-history-surface-hub.md index 595a61e131..efa2e4ddcf 100644 --- a/devices/surface-hub/change-history-surface-hub.md +++ b/devices/surface-hub/change-history-surface-hub.md @@ -8,7 +8,7 @@ ms.sitesec: library ms.pagetype: surfacehub author: jdeckerms ms.author: jdecker -ms.date: 01/17/2018 +ms.date: 02/16/2018 ms.localizationpriority: medium --- @@ -16,6 +16,12 @@ ms.localizationpriority: medium This topic lists new and updated topics in the [Surface Hub Admin Guide]( surface-hub-administrators-guide.md). +## February 2018 + +New or changed topic | Description +--- | --- +[Manage settings with an MDM provider (Surface Hub)](manage-settings-with-mdm-for-surface-hub.md) | Updated instructions for custom settings using Microsoft Intune. + ## January 2018 New or changed topic | Description 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 23eb0e418f..7e530429bf 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 @@ -9,7 +9,7 @@ ms.sitesec: library ms.pagetype: surfacehub, mobility author: jdeckerms ms.author: jdecker -ms.date: 01/17/2018 +ms.date: 02/16/2018 ms.localizationpriority: medium --- @@ -212,38 +212,9 @@ The data type is also stated in the CSP documentation. The most common data type ## Example: Manage Surface Hub settings with Microsoft Intune -You can use Microsoft Intune to manage Surface Hub settings. +You can use Microsoft Intune to manage Surface Hub settings. For custom settings, follow the instructions in [How to configure custom device settings in Microsoft Intune](https://docs.microsoft.com/intune/custom-settings-configure). For **Platform**, select **Windows 10 and later**, and in **Profile type**, select **Device restrictions (Windows 10 Team)**. -**To create a configuration policy from a template** -You'll use the **Windows 10 Team general configuration policy** as the template. - -1. On the [Intune management portal](https://manage.microsoft.com), sign in with your Intune administrator account. -2. On the left-hand navigation menu, click **Policy**. -3. In the Overview page, click **Add Policy**. -4. On **Select a template for the new policy**, expand **Windows**, select **General Configuration (Windows 10 Team and later)**, and then click **Create Policy**. - - ![template for Windows 10 Team](images/intune-template.png) -5. Configure your policy, then click **Save Policy** - - ![save policy](images/intune-save-policy.png) -6. When prompted, click **Yes** to deploy your new policy to a user or device group. For more information, see [Use groups to manage users and devices in Microsoft Intune](https://docs.microsoft.com/intune/deploy-use/use-groups-to-manage-users-and-devices-with-microsoft-intune). - -**To create a custom configuration policy** - -You’ll need to create a custom policy using the **Custom Configuration (Windows 10 Desktop and Mobile and later)** template to manage settings that are not available in the **Windows 10 Team general configuration policy** template. - -1. On the [Intune management portal](https://manage.microsoft.com), sign in with your Intune administrator account. -2. On the left-hand navigation menu, click **Policy**. -3. On the Overview page, click **Add Policy**. -4. On **Select a template for the new policy**, expand **Windows**, select **Custom Configuration (Windows 10 Desktop and Mobile and later)**, and then click **Create Policy**. -5. Type a name and optional description for the policy. -6. Under OMA-URI Settings, click **Add**. -7. Complete the form to create a new setting, and then click **OK**. - - ![example of OMA URI form](images/oma-uri.png) -8. Repeat Steps 6 and 7 for each setting you want to configure with this policy. -9. After you're done, click **Save Policy** and deploy it to a user or device group. ## Example: Manage Surface Hub settings with System Center Configuration Manager diff --git a/mdop/mbam-v25/TOC.md b/mdop/mbam-v25/TOC.md index d465652210..22008a42bb 100644 --- a/mdop/mbam-v25/TOC.md +++ b/mdop/mbam-v25/TOC.md @@ -55,6 +55,7 @@ #### [How to Enable BitLocker by Using MBAM as Part of a Windows Deployment](how-to-enable-bitlocker-by-using-mbam-as-part-of-a-windows-deploymentmbam-25.md) #### [How to Deploy the MBAM Client by Using a Command Line](how-to-deploy-the-mbam-client-by-using-a-command-line.md) ### [MBAM 2.5 Deployment Checklist](mbam-25-deployment-checklist.md) +### [Upgrading to MBAM 2.5 SP1 from MBAM 2.5](upgrading-to-mbam-25-sp1-from-mbam-25.md) ### [Upgrading to MBAM 2.5 or MBAM 2.5 SP1 from Previous Versions](upgrading-to-mbam-25-or-mbam-25-sp1-from-previous-versions.md) ### [Removing MBAM Server Features or Software](removing-mbam-server-features-or-software.md) ## [Operations for MBAM 2.5](operations-for-mbam-25.md) diff --git a/mdop/mbam-v25/upgrading-to-mbam-25-sp1-from-mbam-25.md b/mdop/mbam-v25/upgrading-to-mbam-25-sp1-from-mbam-25.md new file mode 100644 index 0000000000..f650f130b3 --- /dev/null +++ b/mdop/mbam-v25/upgrading-to-mbam-25-sp1-from-mbam-25.md @@ -0,0 +1,44 @@ +--- +title: Upgrading to MBAM 2.5 SP1 from MBAM 2.5 +description: Upgrading to MBAM 2.5 SP1 from MBAM 2.5 +author: kaushika-msft +ms.assetid: +ms.pagetype: mdop, security +ms.mktglfcycl: manage +ms.sitesec: library +ms.prod: w10 +ms.date: 2/16/2018 +--- + +# Upgrading to MBAM 2.5 SP1 from MBAM 2.5 +This topic describes the process for upgrading the Microsoft BitLocker Administration and Monitoring (MBAM) Server 2.5 and the MBAM Client from 2.5 to MBAM 2.5 SP1. + +### Before you begin, download the September 2017 servicing release +[Desktop Optimization Pack](https://www.microsoft.com/en-us/download/details.aspx?id=56126) + +#### Steps to upgrade the MBAM Database (SQL Server) +1. Using the MBAM Configurator; remove the Reports roll from the SQL server, or wherever the SSRS database is housed (Could be on the same server or different one, depending on your environment) +Note: You will not see an option to remove the Databases; this is expected.   +2. Install 2.5 SP1 (Located with MDOP - Microsoft Desktop Optimization Pack 2015 from the Volume Licensing Service Center site: +3. Do not configure it at this time  +4. Install the September Rollup: https://www.microsoft.com/en-us/download/details.aspx?id=56126 +5. Using the MBAM Configurator; re-add the Reports rollup +6. This will configure the SSRS connection using the latest MBAM code from the rollup  +7. Using the MBAM Configurator; re-add the SQL Database roll on the SQL Server. +- At the end, you will be warned that the DBs already exist and weren’t created, but this is  expected. +- This process updates the existing databases to the current version being installed       + +#### Steps to upgrade the MBAM Server (Running MBAM and IIS) +1. Using the MBAM Configurator; remove the Admin and Self Service Portals from the IIS server +2. Install MBAM 2.5 SP1 +3. Do not configure it at this time   +4. Install the September 2017 Rollup on the IIS server(https://www.microsoft.com/en-us/download/details.aspx?id=56126) +5. Using the MBAM Configurator; re-add the Admin and Self Service Portals to the IIS server  +6. This will configure the sites using the latest MBAM code from the June Rollup +- Open an elevated command prompt, Type: **IISRESET** and Hit Enter. + +#### Steps to upgrade the MBAM Clients/Endpoints +1. Uninstall the 2.5 Agent from client endpoints +2. Install the 2.5 SP1 Agent on the client endpoints +3. Push out the September Rollup Client update to clients running the 2.5 SP1 Agent  +4. There is no need to uninstall existing client prior to installing the September Rollup.   diff --git a/store-for-business/images/msfb-ps-collection-idp.png b/store-for-business/images/msfb-ps-collection-idp.png new file mode 100644 index 0000000000..ddd8907d6b Binary files /dev/null and b/store-for-business/images/msfb-ps-collection-idp.png differ diff --git a/store-for-business/images/perf-improvement-icon.png b/store-for-business/images/perf-improvement-icon.png new file mode 100644 index 0000000000..74be488894 Binary files /dev/null and b/store-for-business/images/perf-improvement-icon.png differ diff --git a/store-for-business/images/private-store-icon.png b/store-for-business/images/private-store-icon.png new file mode 100644 index 0000000000..f09679693f Binary files /dev/null and b/store-for-business/images/private-store-icon.png differ diff --git a/store-for-business/manage-private-store-settings.md b/store-for-business/manage-private-store-settings.md index dc2a945599..93d1f09234 100644 --- a/store-for-business/manage-private-store-settings.md +++ b/store-for-business/manage-private-store-settings.md @@ -7,7 +7,7 @@ ms.mktglfcycl: manage ms.sitesec: library ms.pagetype: store author: TrudyHa -ms.date: 11/30/2017 +ms.date: 2/15/2018 ms.localizationpriority: high --- @@ -25,21 +25,25 @@ The name of your private store is shown on a tab in Microsoft Store app, or on [ ![Image showing Microsoft Store app with private store tab highlighted.](images/wsfb-wsappprivatestore.png) You can change the name of your private store in Microsoft Store. - \ No newline at end of file diff --git a/store-for-business/whats-new-microsoft-store-business-education.md b/store-for-business/whats-new-microsoft-store-business-education.md index 2afacd4204..fd595f2771 100644 --- a/store-for-business/whats-new-microsoft-store-business-education.md +++ b/store-for-business/whats-new-microsoft-store-business-education.md @@ -6,7 +6,7 @@ ms.mktglfcycl: manage ms.sitesec: library ms.pagetype: store author: TrudyHa -ms.date: 2/8/2018 +ms.date: 2/16/2018 --- # What's new in Microsoft Store for Business and Education @@ -15,11 +15,12 @@ Microsoft Store for Business and Education regularly releases new and improved f ## Latest updates for Store for Business and Education -**January 2018** +**January & February, 2018** | | | |--------------------------------------|---------------------------------| | ![Microsoft Store for Business Products & services page.](images/product-and-service-icon.png) |**One place for apps, software, and subscriptions**

The new **Products & services** page in Microsoft Store for Business and Education gives customers a single place to manage all products and services. This includes Apps, Software, and Subscriptions that your organization acquired or manages through Microsoft Store for Business. This change centralizes these products, but the platform changes also improve overall performance.

**Applies to**:
Microsoft Store for Business
Microsoft Store for Education | +| ![Private store collections](images/private-store-icon.png) |**Create collections of apps in your private store**

Use **collections** to customize your private store. Collections allow you to create groups of apps that are commonly used in your organization or school -- you might create a collection for a Finance department, or a 6th-grade class.

[Get more info](https://docs.microsoft.com/microsoft-store/manage-private-store-settings#private-store-collections)

**Applies to**:
Microsoft Store for Business
Microsoft Store for Education | | ![Upgrade Office 365 trial subscription.](images/office-logo.png) |**Upgrade Office 365 trial subscription**

Customers with Office 365 trials can now transition their trial to a paid subscription in Microsoft Store for Business. This works for trials you acquired from Microsoft Store for Business, or Office Admin Portal.

**Applies to**:
Microsoft Store for Business
Microsoft Store for Education | | ![Image showing Settings icon.](images/mpsa-link.png) |**Supporting Microsoft Product and Services Agreement customers**

If you are purchasing under the Microsoft Products and Services Agreement (MPSA), you can use Microsoft Store for Business. Here you will find access to Products & Services purchased, Downloads & Keys, Software Assurance benefits, Order history, and Agreement details. Also, we added the ability to associate your purchasing account to your tenant.

**Applies to**:
Microsoft Store for Business
Microsoft Store for Education | | ![Image showing Settings icon.](images/invite-people.png) |**Microsoft Product and Services Agreement customers can invite people to take roles**

MPSA admins can invite people to take Microsoft Store for Business roles even if the person is not in their tenant. You provide an email address when you assign the role, and we'll add the account to your tenant and assign the role.

**Applies to**:
Microsoft Store for Business
Microsoft Store for Education | @@ -30,6 +31,7 @@ Microsoft Store for Business and Education regularly releases new and improved f We’ve been working on bug fixes and performance improvements to provide you a better experience. Stay tuned for new features! | | | |-----------------------|---------------------------------| +| ![Private store performance icon](images/perf-improvement-icon.png) |**Performance improvements in private store**

We've made it significantly faster for you to update the private store. Many changes to the private store are available immediately after you make them.

[Get more info](https://docs.microsoft.com/microsoft-store/manage-private-store-settings#private-store-performance)

**Applies to**:
Microsoft Store for Business
Microsoft Store for Education | | | **Manage Windows device deployment with Windows AutoPilot Deployment**

In Microsoft Store for Business, you can manage devices for your organization and apply an AutoPilot deployment profile to your devices. When people in your organization run the out-of-box experience on the device, the profile configures Windows, based on the AutoPilot deployment profile you applied to the device.

[Get more info](add-profile-to-devices.md)

**Applies to**:
Microsoft Store for Business
Microsoft Store for Education | | ![Microsoft Store for Business Settings page, Distribute tab showing app requests setting.](images/msfb-wn-1709-app-request.png) |**Request an app**

People in your organization can reqest additional licenses for apps in your private store, and then Admins or Purchasers can make the purchases.

[Get more info](https://docs.microsoft.com/microsoft-store/acquire-apps-microsoft-store-for-business#request-apps)

**Applies to**:
Microsoft Store for Business
Microsoft Store for Education | || ![Image showing Add a Collection.](images/msfb-add-collection.png) |**Private store collections**

You can groups of apps in your private store with **Collections**. This can help you organize apps and help people find apps for their job or classroom.

[Get more info](https://review.docs.microsoft.com/microsoft-store/manage-private-store-settings?branch=msfb-14856406#add-a-collection)

**Applies to**:
Microsoft Store for Business
Microsoft Store for Education | diff --git a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md index efdd0f54a8..f37871b6d2 100644 --- a/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md +++ b/windows/configuration/manage-connections-from-windows-operating-system-components-to-microsoft-services.md @@ -36,6 +36,7 @@ You should not extract this package to the windows\\system32 folder because it w Applying the Windows Restricted Traffic Limited Functionality Baseline is the same as applying each setting covered in this article. It is recommended that you restart a device after making configuration changes to it. +Note that **Get Help** and **Give us Feedback** links no longer work after the Windows Restricted Traffic Limited Functionality Baseline is applied. We are always striving to improve our documentation and welcome your feedback. You can provide feedback by contacting telmhelp@microsoft.com. @@ -88,17 +89,17 @@ See the following table for a summary of the management settings for Windows 10 | Setting | UI | Group Policy | MDM policy | Registry | Command line | | - | :-: | :-: | :-: | :-: | :-: | | [1. Automatic Root Certificates Update](#automatic-root-certificates-update) | | ![Check mark](images/checkmark.png) | | | | -| [2. Cortana and Search](#bkmk-cortana) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | +| [2. Cortana and Search](#bkmk-cortana) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | | [3. Date & Time](#bkmk-datetime) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | | | [4. Device metadata retrieval](#bkmk-devinst) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | | | [5. Find My Device](#find-my-device) | | ![Check mark](images/checkmark.png) | | | | | [6. Font streaming](#font-streaming) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | | -| [7. Insider Preview builds](#bkmk-previewbuilds) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | +| [7. Insider Preview builds](#bkmk-previewbuilds) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | | [8. Internet Explorer](#bkmk-ie) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | | | [9. Live Tiles](#live-tiles) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | | | [10. Mail synchronization](#bkmk-mailsync) | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | | [11. Microsoft Account](#bkmk-microsoft-account) | | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | -| [12. Microsoft Edge](#bkmk-edge) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | +| [12. Microsoft Edge](#bkmk-edge) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | | [13. Network Connection Status Indicator](#bkmk-ncsi) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | | | [14. Offline maps](#bkmk-offlinemaps) | ![Check mark](images/checkmark.png) | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | | | [15. OneDrive](#bkmk-onedrive) | | ![Check mark](images/checkmark.png) | | ![Check mark](images/checkmark.png) | | @@ -1065,7 +1066,17 @@ To turn off **Choose apps that can use your microphone**: ### 17.5 Notifications -In the **Notifications** area, you can choose which apps have access to notifications. +To turn off notifications network usage: + +- Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **Start Menu and Taskbar** > **Notifications** > **Turn off Notifications network usage** + + - Set to **Enabled**. + + -or- + +- Create a REG\_DWORD registry setting in **HKEY_LOCAL_MACHINE\\SOFTWARE\\Policies\\Microsoft\\Windows\\CurrentVersion\\PushNotifications!NoCloudApplicationNotification**, with a value of 1 (one) + +In the **Notifications** area, you can also choose which apps have access to notifications. To turn off **Let apps access my notifications**: diff --git a/windows/deployment/TOC.md b/windows/deployment/TOC.md index d306bd8ea5..c2d63ceca8 100644 --- a/windows/deployment/TOC.md +++ b/windows/deployment/TOC.md @@ -15,6 +15,7 @@ ### [Overview of Windows AutoPilot](windows-autopilot/windows-10-autopilot.md) ### [Windows 10 upgrade paths](upgrade/windows-10-upgrade-paths.md) +#### [Windows 10 downgrade paths](upgrade/windows-10-downgrade-paths.md) ### [Windows 10 edition upgrade](upgrade/windows-10-edition-upgrades.md) ### [Windows 10 volume license media](windows-10-media.md) diff --git a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md index 91d87362f3..7fc29c58f5 100644 --- a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md +++ b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md @@ -31,7 +31,7 @@ To request an Olympia Corp account, please fill out the survey at [https://aka.m ## Enrollment guidelines -Welcome to Olympia Corp. Here are the steps to add your account to your PC. +Welcome to Olympia Corp. Here are the steps needed to Enroll. As part of Windows Insider Lab for Enterprise, you can upgrade to Windows 10 Enterprise from Windows 10 Pro. This upgrade is optional. Since certain features such as Windows Defender Application Guard are only available on Windows 10 Enterprise, we recommend you to upgrade. @@ -43,7 +43,9 @@ Choose one of the following two enrollment options: -### Keep your current Windows 10 edition +### Set up an Azure Active Directory REGISTERED Windows 10 device + +- This is the Bring Your Own Device (BYOD) method - your device will receive Olympia policies and features, but a new account will not be created ([additional info]).(https://docs.microsoft.com/en-us/azure/active-directory/device-management-azuread-registered-devices-windows10-setup) 1. Go to **Start > Settings > Accounts > Access work or school**. To see this setting, you need to have administrator rights to your PC (see [local administrator](https://support.microsoft.com/en-us/instantanswers/5de907f1-f8ba-4fd9-a89d-efd23fee918c/create-a-local-user-or-administrator-account-in-windows-10)). @@ -77,7 +79,9 @@ Choose one of the following two enrollment options: -### Upgrade your Windows 10 edition from Pro to Enterprise +### Set up Azure Active Directory JOINED Windows 10 device + +- This method will upgrade your Windows 10 Pro license to Enterprise and create a new account ([additional info]).(https://docs.microsoft.com/en-us/azure/active-directory/device-management-azuread-joined-devices-setup) 1. Go to **Start > Settings > Accounts > Access work or school**. To see this setting, you need to have administrator rights to your PC (see [local administrator](https://support.microsoft.com/en-us/instantanswers/5de907f1-f8ba-4fd9-a89d-efd23fee918c/create-a-local-user-or-administrator-account-in-windows-10)). diff --git a/windows/deployment/upgrade/windows-10-downgrade-paths.md b/windows/deployment/upgrade/windows-10-downgrade-paths.md new file mode 100644 index 0000000000..d095a3d449 --- /dev/null +++ b/windows/deployment/upgrade/windows-10-downgrade-paths.md @@ -0,0 +1,160 @@ +--- +title: Windows 10 downgrade paths (Windows 10) +description: You can downgrade Windows 10 if the downgrade path is supported. +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +ms.localizationpriority: high +ms.pagetype: mobile +author: greg-lindsay +ms.date: 02/15/2018 +--- + +# Windows 10 downgrade paths +**Applies to** + +- Windows 10 + +## Downgrading Windows 10 + +This topic provides a summary of supported Windows 10 downgrade paths. You might need to downgrade the edition of Windows 10, for example, if an Enterprise license is expired. + +If a downgrade is supported, then your apps and settings can be migrated from the current edition to the downgraded edition. If a path is not supported, then a clean install is required. + +To perform a downgrade, you can use the same methods as when performing an [edition upgrade](windows-10-edition-upgrades.md). + +Downgrading from any edition of Windows 10 to Windows 7, 8, or 8.1 is not supported, unless you are performing a rollback of a previous upgrade. You also cannot downgrade from a later version to an earlier version of the same edition (Ex: Windows 10 Pro 1709 to 1703) unless the rollback process is used. + +>**Windows 10 LTSC/LTSB**: Due to [naming changes](https://docs.microsoft.com/en-us/windows/deployment/update/waas-overview#naming-changes), product versions that display Windows 10 LTSB will be replaced with Windows 10 LTSC in subsequent feature updates. The term LTSC is used here to refer to all long term servicing versions. + +>**Windows N/KN**: Windows "N" and "KN" SKUs follow the same rules shown below. + +### Supported Windows 10 downgrade paths + +>[!NOTE] +>Edition changes that are considered upgrades (Ex: Pro to Enterprise) are not shown here. Switching between different editions of Pro is supported. This is not strictly considered an edition downgrade, but is included here for clarity. + +✔ = Supported downgrade path
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Destination edition
      HomeProPro for WorkstationsPro EducationSEducationEnterprise LTSCEnterprise
Starting edition
Home
Pro✔✔✔
Pro for Workstations✔✔✔
Pro Education✔✔✔
S✔✔✔
Education✔✔✔✔
Enterprise LTSC
Enterprise✔✔✔✔✔
+ + +## Related Topics + +[Windows 10 deployment scenarios](../windows-10-deployment-scenarios.md)
+[Windows upgrade and migration considerations](windows-upgrade-and-migration-considerations.md)
+[Windows 10 edition upgrade](windows-10-edition-upgrades.md)
+[Windows 10 upgrade paths](windows-10-upgrade-paths.md) + + + + + diff --git a/windows/deployment/upgrade/windows-10-edition-upgrades.md b/windows/deployment/upgrade/windows-10-edition-upgrades.md index b139ec0d0a..f46f0eb146 100644 --- a/windows/deployment/upgrade/windows-10-edition-upgrades.md +++ b/windows/deployment/upgrade/windows-10-edition-upgrades.md @@ -91,6 +91,11 @@ You can run the changepk.exe command-line tool to upgrade devices to a supported `changepk.exe /ProductKey ` +You can also upgrade using slmgr.vbs and a [KMS client setup key](https://docs.microsoft.com/en-us/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/jj612867(v%3dws.11)). For example, the following command will upgrade to Windows 10 Enterprise. + +`Cscript.exe c:\windows\system32\slmgr.vbs /ipk NPPR9-FWDCX-D2C8J-H872K-2YT43` + + ## Upgrade by manually entering a product key If you are upgrading only a few devices, you may want to enter a product key for the upgraded edition manually. diff --git a/windows/deployment/upgrade/windows-10-upgrade-paths.md b/windows/deployment/upgrade/windows-10-upgrade-paths.md index f3fa9fd3a5..45eeec2f16 100644 --- a/windows/deployment/upgrade/windows-10-upgrade-paths.md +++ b/windows/deployment/upgrade/windows-10-upgrade-paths.md @@ -29,6 +29,7 @@ This topic provides a summary of available upgrade paths to Windows 10. You can ✔ = Full upgrade is supported including personal data, settings, and applications.
D = Edition downgrade; personal data is maintained, applications and settings are removed. +
@@ -380,7 +381,8 @@ D = Edition downgrade; personal data is maintained, applications and settings ar [Windows 10 deployment scenarios](../windows-10-deployment-scenarios.md)
[Windows upgrade and migration considerations](windows-upgrade-and-migration-considerations.md)
-[Windows 10 edition upgrade](windows-10-edition-upgrades.md) +[Windows 10 edition upgrade](windows-10-edition-upgrades.md)
+[Windows 10 downgrade paths](windows-10-downgrade-paths.md) diff --git a/windows/security/threat-protection/TOC.md b/windows/security/threat-protection/TOC.md index c7591e103c..fdfc93411b 100644 --- a/windows/security/threat-protection/TOC.md +++ b/windows/security/threat-protection/TOC.md @@ -187,9 +187,6 @@ #### [Review events and errors on endpoints with Event Viewer](windows-defender-atp\event-error-codes-windows-defender-advanced-threat-protection.md) ### [Windows Defender Antivirus compatibility with Windows Defender ATP](windows-defender-atp\defender-compatibility-windows-defender-advanced-threat-protection.md) - -## [Windows Defender Antivirus in Windows 10](windows-defender-antivirus\windows-defender-antivirus-in-windows-10.md) -### [Windows Defender AV in the Windows Defender Security Center app](windows-defender-antivirus\windows-defender-security-center-antivirus.md) ## [Windows Defender Antivirus in Windows 10](windows-defender-antivirus\windows-defender-antivirus-in-windows-10.md) ### [Windows Defender AV in the Windows Defender Security Center app](windows-defender-antivirus\windows-defender-security-center-antivirus.md) diff --git a/windows/security/threat-protection/change-history-for-threat-protection.md b/windows/security/threat-protection/change-history-for-threat-protection.md index 9c6c3d0c31..4fd99aa471 100644 --- a/windows/security/threat-protection/change-history-for-threat-protection.md +++ b/windows/security/threat-protection/change-history-for-threat-protection.md @@ -12,6 +12,12 @@ ms.date: 10/31/2017 # Change history for threat protection This topic lists new and updated topics in the [Threat protection](index.md) documentation. +## February 2018 + +New or changed topic | Description +---------------------|------------ +[Security Compliance Toolkit](security-compliance-toolkit-10.md) | Added Office 2016 Security Baseline. + ## January 2018 |New or changed topic |Description | |---------------------|------------| diff --git a/windows/security/threat-protection/security-compliance-toolkit-10.md b/windows/security/threat-protection/security-compliance-toolkit-10.md index 06f04138ac..28676d4b1b 100644 --- a/windows/security/threat-protection/security-compliance-toolkit-10.md +++ b/windows/security/threat-protection/security-compliance-toolkit-10.md @@ -7,7 +7,7 @@ ms.mktglfcycl: deploy ms.localizationpriority: high ms.author: sagaudre author: brianlic-msft -ms.date: 10/16/2017 +ms.date: 02/16/2018 --- # Microsoft Security Compliance Toolkit 1.0 @@ -32,6 +32,9 @@ The Security Compliance Toolkit consists of: - Windows Server 2016 - Windows Server 2012 R2 +- Microsoft Office Security Baselines + - Office 2016 + - Tools - Policy Analyzer tool - Local Group Policy Object (LGPO) tool diff --git a/windows/security/threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md b/windows/security/threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md index 6ab49143bd..75dda71497 100644 --- a/windows/security/threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md +++ b/windows/security/threat-protection/use-windows-event-forwarding-to-assist-in-intrusion-detection.md @@ -7,7 +7,7 @@ ms.mktglfcycl: deploy ms.sitesec: library ms.pagetype: security author: tedhardyMSFT -ms.date: 10/27/2017 +ms.date: 02/16/2018 --- # Use Windows Event Forwarding to help with intrusion detection @@ -636,9 +636,9 @@ Here are the minimum steps for WEF to operate: - + - + ```