diff --git a/.openpublishing.publish.config.json b/.openpublishing.publish.config.json index 4b026cfdc9..006a4bbd17 100644 --- a/.openpublishing.publish.config.json +++ b/.openpublishing.publish.config.json @@ -2,7 +2,6 @@ "build_entry_point": "", "need_generate_pdf": false, "need_generate_intellisense": false, - "enable_incremental_build": true, "docsets_to_publish": [ { "docset_name": "education", @@ -387,7 +386,14 @@ "git_repository_branch_open_to_public_contributors": "master", "skip_source_output_uploading": false, "need_preview_pull_request": true, + "enable_incremental_build": true, "dependent_repositories": [ + { + "path_to_root": "_themes.pdf", + "url": "https://github.com/Microsoft/templates.docs.msft.pdf", + "branch": "master", + "branch_mapping": {} + }, { "path_to_root": "_themes", "url": "https://github.com/Microsoft/templates.docs.msft", @@ -395,5 +401,14 @@ "branch_mapping": {} } ], - "need_generate_pdf_url_template": false + "branch_target_mapping": { + "live": ["Publish","Pdf"], + "master": ["Publish", "Pdf"] + }, + "need_generate_pdf_url_template": true, + "Targets": { + "Pdf": { + "template_folder": "_themes.pdf" + } + } } \ No newline at end of file diff --git a/.openpublishing.redirection.json b/.openpublishing.redirection.json index cdd94c4cbb..e5b91868f9 100644 --- a/.openpublishing.redirection.json +++ b/.openpublishing.redirection.json @@ -1471,6 +1471,11 @@ "redirect_document_id": true }, { +"source_path": "windows/manage/windows-spotlight.md", +"redirect_url": "/windows/configuration/windows-spotlight", +"redirect_document_id": true +}, +{ "source_path": "windows/deploy/activate-forest-by-proxy-vamt.md", "redirect_url": "/windows/deployment/volume-activation/activate-forest-by-proxy-vamt", "redirect_document_id": true @@ -8214,6 +8219,21 @@ "source_path": "education/get-started/index.md", "redirect_url": "/education/get-started/get-started-with-microsoft-education", "redirect_document_id": true +}, +{ +"source_path": "windows/keep-secure/windows-10-enterprise-security-guides.md", +"redirect_url": "/windows/windows-10/index", +"redirect_document_id": true +}, +{ +"source_path": "windows/keep-secure/change-history-for-keep-windows-10-secure.md", +"redirect_url": "/windows/windows-10/index", +"redirect_document_id": true +}, +{ +"source_path": "windows/manage/change-history-for-manage-and-update-windows-10.md", +"redirect_url": "/windows/windows-10/index", +"redirect_document_id": true } ] } \ No newline at end of file diff --git a/browsers/edge/available-policies.md b/browsers/edge/available-policies.md index 8c8984005a..c62e0d7b6a 100644 --- a/browsers/edge/available-policies.md +++ b/browsers/edge/available-policies.md @@ -226,9 +226,6 @@ Microsoft Edge works with these Group Policy settings (`Computer Configuration\A - **Description:** This policy setting lets you decide whether employees must take an action, such as clicking the content or a Click-to-Run button, before seeing content in Adobe Flash. - >[!Important] - >Sites are put on the auto-allowed list based on how frequently employees load and run the content. - - If you enable or don’t configure the Adobe Flash Click-to-Run setting, an employee must click the content, click a Click-to-Run button, or have the site appear on an auto-allow list before Microsoft Edge loads and runs Adobe Flash content. - If you disable this setting, Adobe Flash content is automatically loaded and run by Microsoft Edge. @@ -357,7 +354,7 @@ Microsoft Edge works with these Group Policy settings (`Computer Configuration\A https://fabrikam.com/opensearch.xml - - If you disable this setting, the policy-set default search engine is removed. If this is also the current in-use default, the engine changes to the Microsoft Edge specified engine for the market.

If you don't configure this setting, the default search engine is set to the one specified in App settings. + - If you disable this setting, the policy-set default search engine is removed. If this is also the current in-use default, the engine changes to the Microsoft Edge specified engine for the market. - If you don't configure this setting (default), the default search engine is set to the one specified in App settings. diff --git a/devices/hololens/hololens-enroll-mdm.md b/devices/hololens/hololens-enroll-mdm.md index 87a2cfa705..cfc6dc0467 100644 --- a/devices/hololens/hololens-enroll-mdm.md +++ b/devices/hololens/hololens-enroll-mdm.md @@ -11,7 +11,7 @@ localizationpriority: medium # Enroll HoloLens in MDM -You can manage multiple Microsoft HoloLens devices simultaneously using solutions like Microsoft InTune. You will be able to manage settings, select apps to install and set security configurations tailored to your organization's need. +You can manage multiple Microsoft HoloLens devices simultaneously using solutions like Microsoft Intune. You will be able to manage settings, select apps to install and set security configurations tailored to your organization's need. >[!NOTE] >Mobile device management (MDM) for the Development edition of HoloLens does not include VPN, BitLocker, or kiosk mode. Those features are only available when you [upgrade to Windows Holographic for Business](hololens-upgrade-enterprise.md). @@ -22,7 +22,7 @@ You can manage multiple Microsoft HoloLens devices simultaneously using solution ## Auto-enrollment in MDM -If your organization uses Azure Active Directory (Azure AD) and an MDM solution that accepts an AAD token for authentication (currently, only supported in Microsoft Intune and Airwatch), your IT admin can configure Azure AD to automatically allow MDM enrollment after the user signs in with their Azure AD account. [Learn how to configure Azure AD enrollment.](https://docs.microsoft.com/intune/deploy-use/set-up-windows-device-management-with-microsoft-intune#azure-active-directory-enrollment) +If your organization uses Azure Active Directory (Azure AD) and an MDM solution that accepts an AAD token for authentication (currently, only supported in Microsoft Intune and AirWatch), your IT admin can configure Azure AD to automatically allow MDM enrollment after the user signs in with their Azure AD account. [Learn how to configure Azure AD enrollment.](https://docs.microsoft.com/intune/deploy-use/set-up-windows-device-management-with-microsoft-intune#azure-active-directory-enrollment) When auto-enrollment is enabled, no additional manual enrollment is needed. When the user signs in with an Azure AD account, the device is enrolled in MDM after completing the first-run experience. @@ -36,4 +36,4 @@ When auto-enrollment is enabled, no additional manual enrollment is needed. When 4. Upon successful authentication to the MDM server, a success message is shown. -Your device is now enrolled with your MDM server. The device will need to restart to acquire policies, certificates, and apps. The Settings app will now reflect that the device is enrolled in device management. \ No newline at end of file +Your device is now enrolled with your MDM server. The device will need to restart to acquire policies, certificates, and apps. The Settings app will now reflect that the device is enrolled in device management. diff --git a/devices/hololens/index.md b/devices/hololens/index.md index 9593ca5aeb..15d7cafd87 100644 --- a/devices/hololens/index.md +++ b/devices/hololens/index.md @@ -23,7 +23,7 @@ localizationpriority: medium | [HoloLens in the enterprise: requirements](hololens-requirements.md) | Lists requirements for general use, Wi-Fi, and device management | | [Set up HoloLens](hololens-setup.md) | How to set up HoloLens for the first time | | [Unlock Windows Holographic for Business features](hololens-upgrade-enterprise.md) | How to upgrade your Development Edition HoloLens to Windows Holographic for Business| -| [Enroll HoloLens in MDM](hololens-enroll-mdm.md) | Manage multiple HoloLens devices simultaneously using solutions like Microsoft InTune | +| [Enroll HoloLens in MDM](hololens-enroll-mdm.md) | Manage multiple HoloLens devices simultaneously using solutions like Microsoft Intune | | [Set up HoloLens in kiosk mode](hololens-kiosk.md) | Enable kiosk mode for HoloLens, which limits the user's ability to launch new apps or change the running app | | [Configure HoloLens using a provisioning package](hololens-provisioning.md) | Provisioning packages make it easy for IT administrators to configure HoloLens devices without imaging | | [Install apps on HoloLens](hololens-install-apps.md) | Use Microsoft Store for Business, mobile device management (MDM), or the Windows Device Portal to install apps on HoloLens| @@ -37,4 +37,4 @@ localizationpriority: medium - [HoloLens Commercial Suite](https://www.microsoft.com/microsoft-hololens/hololens-commercial) -- [HoloLens release notes](https://developer.microsoft.com/en-us/windows/mixed-reality/release_notes) \ No newline at end of file +- [HoloLens release notes](https://developer.microsoft.com/en-us/windows/mixed-reality/release_notes) diff --git a/devices/surface/considerations-for-surface-and-system-center-configuration-manager.md b/devices/surface/considerations-for-surface-and-system-center-configuration-manager.md index 8d241210d7..e118798d48 100644 --- a/devices/surface/considerations-for-surface-and-system-center-configuration-manager.md +++ b/devices/surface/considerations-for-surface-and-system-center-configuration-manager.md @@ -13,7 +13,7 @@ author: Scottmca Fundamentally, management and deployment of Surface devices with System Center Configuration Manager is the same as the management and deployment of any other PC. Like any other PC, a deployment to Surface devices includes importing drivers, importing a Windows image, preparing a deployment task sequence, and then deploying the task sequence to a collection. After deployment, Surface devices are like any other Windows client – to publish apps, settings, and policies, you use the same process that you would use for any other device. -You can find more information about how to use Configuration Manager to deploy and manage devices in the [Documentation for System Center Configuration Manager](https://docs.microsoft.com/sccm/index) article in the TechNet Library. +You can find more information about how to use Configuration Manager to deploy and manage devices in the [Documentation for System Center Configuration Manager](https://docs.microsoft.com/sccm/index). Although the deployment and management of Surface devices is fundamentally the same as any other PC, there are some scenarios that may require additional considerations or steps. This article provides descriptions and guidance for these scenarios; the solutions documented in this article may apply to other devices and manufacturers as well. diff --git a/education/index.md b/education/index.md index 22515e4120..0bb10155b3 100644 --- a/education/index.md +++ b/education/index.md @@ -1,8 +1,9 @@ --- layout: HubPage hide_bc: true -title: Microsoft Education Documentation | Microsoft Docs -description: TK from Celeste Guzman +title: Microsoft Education documentation and resources | Microsoft Docs +description: Learn about product documentation and resources available for school IT administrators, teachers, students, and education app developers. +author: CelesteDG ---

@@ -14,7 +15,7 @@ description: TK from Celeste Guzman
- + Learn more about Microsoft Education products.
@@ -32,7 +33,7 @@ description: TK from Celeste Guzman
- + For IT Pros: Get started with Microsoft Education
@@ -61,7 +62,7 @@ description: TK from Celeste Guzman
- + For IT Pros: Get started with Microsoft Education
@@ -80,7 +81,7 @@ description: TK from Celeste Guzman
- + Office 365 for Education
@@ -99,7 +100,7 @@ description: TK from Celeste Guzman
- + Microsoft Intune for Education
@@ -118,7 +119,7 @@ description: TK from Celeste Guzman
- + Windows 10 for Education
@@ -137,7 +138,7 @@ description: TK from Celeste Guzman
- + School Data Sync
@@ -156,7 +157,7 @@ description: TK from Celeste Guzman
- + Azure Active Directory
@@ -175,7 +176,7 @@ description: TK from Celeste Guzman
- + Microsoft Store for Education
@@ -194,7 +195,7 @@ description: TK from Celeste Guzman
- + Minecraft: Educaton Edition
@@ -223,7 +224,7 @@ description: TK from Celeste Guzman
- + Get started for educators
@@ -242,7 +243,7 @@ description: TK from Celeste Guzman
- + Office help and training
@@ -261,7 +262,7 @@ description: TK from Celeste Guzman
- + Windows help
@@ -280,7 +281,7 @@ description: TK from Celeste Guzman
- + Microsoft Store for Education
@@ -299,7 +300,7 @@ description: TK from Celeste Guzman
- + Minecraft: Education Edition
@@ -318,7 +319,7 @@ description: TK from Celeste Guzman
- + Microsoft Educator Community
@@ -347,7 +348,7 @@ description: TK from Celeste Guzman
- + Get started for students
@@ -366,7 +367,7 @@ description: TK from Celeste Guzman
- + Office help and training
@@ -385,7 +386,7 @@ description: TK from Celeste Guzman
- + Windows help
@@ -404,7 +405,7 @@ description: TK from Celeste Guzman
- + Microsoft Imagine
@@ -433,12 +434,12 @@ description: TK from Celeste Guzman
- + UWP apps for education

UWP apps for education

-

Learn how to write Universal Windows apps for education

+

Learn how to write Universal Windows apps for education.

@@ -452,7 +453,7 @@ description: TK from Celeste Guzman
- + Take a Test API
@@ -471,7 +472,7 @@ description: TK from Celeste Guzman
- + Office Education Dev Center
diff --git a/education/windows/windows-editions-for-education-customers.md b/education/windows/windows-editions-for-education-customers.md index 99a438e0b9..db3fb46f6a 100644 --- a/education/windows/windows-editions-for-education-customers.md +++ b/education/windows/windows-editions-for-education-customers.md @@ -1,6 +1,6 @@ --- title: Windows 10 editions for education customers -description: Provides an overview of the two editions in Windows 10, version 1607 that's designed for the needs of K-12 institutions. +description: Provides an overview of the two Windows 10 editions that are designed for the needs of K-12 institutions. keywords: Windows 10 Pro Education, Windows 10 Education, Windows 10 editions, education customers ms.prod: w10 ms.mktglfcycl: plan @@ -16,39 +16,45 @@ author: CelesteDG - Windows 10 -Windows 10 Anniversary Update (Windows 10, version 1607) continues our commitment to productivity, security, and privacy for all customers. Windows 10 Pro and Windows 10 Enterprise offer the functionality and safety features demanded by business and education customers around the globe. Windows 10 is the most secure Windows we’ve ever built. All of our Windows commercial editions can be configured to support the needs of schools, through group policies, domain join, and more. To learn more about Microsoft’s commitment to security and privacy in Windows 10, see more on both [security](https://go.microsoft.com/fwlink/?LinkId=822619) and [privacy](https://go.microsoft.com/fwlink/?LinkId=822620). +Windows 10, version 1607 (Anniversary Update) continues our commitment to productivity, security, and privacy for all customers. Windows 10 Pro and Windows 10 Enterprise offer the functionality and safety features demanded by business and education customers around the globe. Windows 10 is the most secure Windows we’ve ever built. All of our Windows commercial editions can be configured to support the needs of schools, through group policies, domain join, and more. To learn more about Microsoft’s commitment to security and privacy in Windows 10, see more on both [security](https://go.microsoft.com/fwlink/?LinkId=822619) and [privacy](https://go.microsoft.com/fwlink/?LinkId=822620). -Windows 10, version 1607 offers a variety of new features and functionality, such as simplified provisioning with the [Set up School PCs app](https://go.microsoft.com/fwlink/?LinkID=821951) or [Windows Configuration Designer](https://go.microsoft.com/fwlink/?LinkId=822623), easier delivery of digital assessments with [Take a Test](https://go.microsoft.com/fwlink/?LinkID=821956), and faster log in performance for shared devices than ever before. These features work with all Windows for desktop editions, excluding Windows 10 Home. You can find more information about Windows 10, version 1607 on [windows.com](http://www.windows.com/). +Beginning with version 1607, Windows 10 offers a variety of new features and functionality, such as simplified provisioning with the [Set up School PCs app](https://go.microsoft.com/fwlink/?LinkID=821951) or [Windows Configuration Designer](https://go.microsoft.com/fwlink/?LinkId=822623), easier delivery of digital assessments with [Take a Test](https://go.microsoft.com/fwlink/?LinkID=821956), and faster log in performance for shared devices than ever before. These features work with all Windows for desktop editions, excluding Windows 10 Home. You can find more information on [windows.com](http://www.windows.com/). Windows 10, version 1607 introduces two editions designed for the unique needs of K-12 institutions: [Windows 10 Pro Education](#windows-10-pro-education) and [Windows 10 Education](#windows-10-education). These editions provide education-specific default settings for the evolving landscape in K-12 education IT environments. ## Windows 10 Pro Education -Windows 10 Pro Education builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools. Windows 10 Pro Education is effectively a variant of Windows 10 Pro that provides education-specific default settings, including the removal of Cortana1. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). +Windows 10 Pro Education builds on the commercial version of Windows 10 Pro and provides important management controls needed in schools. Windows 10 Pro Education is effectively a variant of Windows 10 Pro that provides education-specific default settings. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). -> [!NOTE] -> If using Windows 10 Pro Education or Windows 10 Education, upgrading from Windows 10, version 1607 (Anniversary Update) to Windows 10, version 1703 (Creators Update) will enable Cortana. You can use the **AllowCortana** policy to turn it off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md). +For Cortana1, +- If you're using version 1607, Cortana is removed. +- If you're using new devices with version 1703, Cortana is turned on by default. +- If you're upgrading from version 1607 to version 1703, Cortana will be enabled. +You can use the **AllowCortana** policy to turn Cortana off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md). Windows 10 Pro Education is available on new devices pre-installed with Windows 10, version 1607 or newer versions that are purchased with discounted K-12 academic licenses through OEM partners (these discounted licenses are sometimes referred to as National Academic or Shape the Future). Existing devices running Windows 10 Pro, currently activated with the original OEM digital product key and purchased with discounted K-12 academic licenses through OEM partners (these discounted licenses are sometimes referred to as National Academic or Shape the Future), will upgrade automatically to Windows 10 Pro Education as part of the Windows 10, version 1607 installation. -Customers with Academic Volume Licensing agreements with rights for Windows can get Windows 10 Pro Education through the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx), available at a later date. +Customers with Academic Volume Licensing agreements with rights for Windows can get Windows 10 Pro Education through the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). -Customers that deploy Windows 10 Pro are able to configure the product to have similar feature settings to Windows 10 Pro Education using policies. More detailed information on these policies and the configuration steps required is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Pro read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment. +Customers who deploy Windows 10 Pro are able to configure the product to have similar feature settings to Windows 10 Pro Education using policies. More detailed information on these policies and the configuration steps required is available in Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Pro read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment. ## Windows 10 Education -Windows 10 Education builds on Windows 10 Enterprise and provides the enterprise-grade manageability and security desired by many schools. Windows 10 Education is effectively a variant of Windows 10 Enterprise that provides education-specific default settings, including the removal of Cortana1. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). +Windows 10 Education builds on Windows 10 Enterprise and provides the enterprise-grade manageability and security desired by many schools. Windows 10 Education is effectively a variant of Windows 10 Enterprise that provides education-specific default settings. These default settings disable tips, tricks and suggestions & Windows Store suggestions. More detailed information on these default settings is available in [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). -> [!NOTE] -> If using Windows 10 Pro Education or Windows 10 Education, upgrading from Windows 10, version 1607 (Anniversary Update) to Windows 10, version 1703 (Creators Update) will enable Cortana. You can use the **AllowCortana** policy to turn it off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md). +For Cortana1, +- If you're using version 1607, Cortana1 is removed. +- If you're using new devices with version 1703, Cortana is turned on by default. +- If you're upgrading from version 1607 to version 1703, Cortana will be enabled. +You can use the **AllowCortana** policy to turn Cortana off. For more information, see [Windows 10 configuration recommendations for education customers](configure-windows-for-education.md). Windows 10 Education is available through Microsoft Volume Licensing. Customers who are already running Windows 10 Education can upgrade to Windows 10, version 1607 or newer versions through Windows Update or from the [Volume Licensing Service Center](https://www.microsoft.com/Licensing/servicecenter/default.aspx). We recommend Windows 10 Education to all K-12 customers as it provides the most complete and secure edition for education environments. If you do not have access to Windows 10 Education, contact your Microsoft representative or see more information [here](https://go.microsoft.com/fwlink/?LinkId=822628). -Customers that deploy Windows 10 Enterprise are able to configure the product to have similar feature settings to Windows 10 Education using policies. More detailed information on these policies and the configuration steps required is available in [Manage Windows 10 and Windows Store tips, tricks and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Enterprise read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment. +Customers who deploy Windows 10 Enterprise are able to configure the product to have similar feature settings to Windows 10 Education using policies. More detailed information on these policies and the configuration steps required is available in [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](https://go.microsoft.com/fwlink/?LinkId=822627). We recommend that K-12 customers using commercial Windows 10 Enterprise read the [document](https://go.microsoft.com/fwlink/?LinkId=822627) and apply desired settings for your environment. For any other questions, contact [Microsoft Customer Service and Support](https://support.microsoft.com/en-us). @@ -62,4 +68,4 @@ For any other questions, contact [Microsoft Customer Service and Support](https: -1 Cortana available in select markets; experience may vary by region and device. Cortana is disabled in the Windows 10 Pro Education and Windows 10 Education editions. +1 Cortana available in select markets; experience may vary by region and device. diff --git a/store-for-business/distribute-apps-with-management-tool.md b/store-for-business/distribute-apps-with-management-tool.md index 391e5173f4..befde0855e 100644 --- a/store-for-business/distribute-apps-with-management-tool.md +++ b/store-for-business/distribute-apps-with-management-tool.md @@ -59,7 +59,7 @@ This diagram shows how you can use a management tool to distribute an online-lic ## Related topics [Configure MDM Provider](configure-mdm-provider-windows-store-for-business.md) -[Manage apps you purchased from the Microsoft Store for Business and Education with Microsoft InTune](https://technet.microsoft.com/library/mt676514.aspx) +[Manage apps you purchased from the Microsoft Store for Business and Education with Microsoft Intune](https://technet.microsoft.com/library/mt676514.aspx)   diff --git a/windows/configuration/TOC.md b/windows/configuration/TOC.md index 4d7de0a870..e91e9f7bda 100644 --- a/windows/configuration/TOC.md +++ b/windows/configuration/TOC.md @@ -19,6 +19,7 @@ ### [Settings and quick actions that can be locked down in Windows 10 Mobile](mobile-devices/settings-that-can-be-locked-down.md) ### [Product IDs in Windows 10 Mobile](mobile-devices/product-ids-in-windows-10-mobile.md) ### [Start layout XML for mobile editions of Windows 10 (reference)](mobile-devices/start-layout-xml-mobile.md) +## [Configure cellular settings for tablets and PCs](provisioning-apn.md) ## [Configure Start, taskbar, and lock screen](start-taskbar-lockscreen.md) ### [Configure Windows Spotlight on the lock screen](windows-spotlight.md) ### [Manage Windows 10 and Microsoft Store tips, tricks, and suggestions](manage-tips-and-suggestions.md) diff --git a/windows/configuration/change-history-for-configure-windows-10.md b/windows/configuration/change-history-for-configure-windows-10.md index 07cebcf161..4236b5e7da 100644 --- a/windows/configuration/change-history-for-configure-windows-10.md +++ b/windows/configuration/change-history-for-configure-windows-10.md @@ -18,7 +18,8 @@ This topic lists new and updated topics in the [Configure Windows 10](index.md) | New or changed topic | Description | | --- | --- | -| [ Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Added MDM policies for privacy settings. | +| [Configure cellular settings for tablets and PCs](provisioning-apn.md) | New | +| [ Manage connections from Windows operating system components to Microsoft services](manage-connections-from-windows-operating-system-components-to-microsoft-services.md) | Added MDM policies for privacy settings | ## April 2017 diff --git a/windows/configuration/images/apn-add-details.PNG b/windows/configuration/images/apn-add-details.PNG new file mode 100644 index 0000000000..caee3d6429 Binary files /dev/null and b/windows/configuration/images/apn-add-details.PNG differ diff --git a/windows/configuration/images/apn-add.PNG b/windows/configuration/images/apn-add.PNG new file mode 100644 index 0000000000..0e25e5c0e9 Binary files /dev/null and b/windows/configuration/images/apn-add.PNG differ diff --git a/windows/configuration/index.md b/windows/configuration/index.md index c7b9711f5a..28bf0e8e33 100644 --- a/windows/configuration/index.md +++ b/windows/configuration/index.md @@ -25,6 +25,7 @@ Enterprises often need to apply custom configurations to devices for their users | [Manage Wi-Fi Sense in your company](manage-wifi-sense-in-enterprise.md) | Wi-Fi Sense automatically connects you to Wi-Fi, so you can get online quickly in more places. It can connect you to open Wi-Fi hotspots it knows about through crowdsourcing, or to Wi-Fi networks your contacts have shared with you by using Wi-Fi Sense. The initial settings for Wi-Fi Sense are determined by the options you chose when you first set up your PC with Windows 10. | | [Configure kiosk and shared devices running Windows 10 desktop editions](kiosk-shared-pc.md) | These topics help you configure Windows 10 devices to be shared by multiple users or to run as a kiosk device that runs a single app. | | [Configure Windows 10 Mobile devices](mobile-devices/configure-mobile.md) | These topics help you configure the features and apps and Start screen for a device running Windows 10 Mobile, as well as how to configure a kiosk device that runs a single app. | +| [Configure cellular settings for tablets and PCs](provisioning-apn.md) | Enterprises can provision cellular settings for tablets and PC with built-in cellular modems or plug-in USB modem dongles. | | [Configure Start, taskbar, and lock screen](start-taskbar-lockscreen.md) | A standard, customized Start layout can be useful on devices that are common to multiple users and devices that are locked down for specialized purposes. Configuring the taskbar allows the organization to pin useful apps for their employees and to remove apps that are pinned by default. | | [Cortana integration in your business or enterprise](cortana-at-work/cortana-at-work-overview.md) | The world’s first personal digital assistant helps users get things done, even at work. Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments. | | [Configure access to Microsoft Store](stop-employees-from-using-the-windows-store.md) | IT Pros can configure access to Microsoft Store for client computers in their organization. For some organizations, business policies require blocking access to Microsoft Store. | 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 b5b9ec5163..03a95580ef 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 @@ -287,7 +287,7 @@ You can prevent Windows from setting the time automatically. -or- -- Disable the Group Policy: **Computer Configuration** > **Administrative Templates** > **System** > **Enable Windows NTP Server** > **Windows Time Service** > **Enable Windows NTP Client** +- Disable the Group Policy: **Computer Configuration** > **Administrative Templates** > **System** > **Enable Windows NTP Server** > **Windows Time Service** > **Configure Windows NTP Client** -or - @@ -511,6 +511,7 @@ Find the Microsoft Edge Group Policy objects under **Computer Configuration** &g | Configure Windows Defender SmartScreen Filter (Windows 10, version 1703)
Configure SmartScreen Filter (Windows Server 2016) | Choose whether Windows Defender SmartScreen is turned on or off.
Default: Enabled | | Allow web content on New Tab page | Choose whether a new tab page appears.
Default: Enabled | | Configure Start pages | Choose the Start page for domain-joined devices.
Set this to **about:blank** | +| Prevent the First Run webpage from opening pages | Choose whether employees see the First Run webpage.
Default: Enabled | The Windows 10, version 1511 Microsoft Edge Group Policy names are: @@ -1824,7 +1825,7 @@ You can turn off Windows Update by setting the following registry entries: -and- -- Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **System** > **Intenet Communication Management** > **Internet Communication Settings** > **Turn off access to all Windows Update features**. +- Apply the Group Policy: **Computer Configuration** > **Administrative Templates** > **System** > **Internet Communication Management** > **Internet Communication Settings** > **Turn off access to all Windows Update features**. -and- diff --git a/windows/configuration/provisioning-apn.md b/windows/configuration/provisioning-apn.md new file mode 100644 index 0000000000..f1aeed6ade --- /dev/null +++ b/windows/configuration/provisioning-apn.md @@ -0,0 +1,79 @@ +--- +title: Configure cellular settings for tablets and PCs (Windows 10) +description: Enterprises can provision cellular settings for tablets and PC with built-in cellular modems or plug-in USB modem dongles. +ms.assetid: 287706E5-063F-4AB5-902C-A0DF6D0730BC +ms.prod: w10 +ms.mktglfcycl: deploy +ms.sitesec: library +author: jdeckerMS +localizationpriority: high +--- + +# Configure cellular settings for tablets and PCs + + +**Applies to** + +- Windows 10 + +>**Looking for consumer information?** See [Cellular settings in Windows 10](https://support.microsoft.com/help/10739/windows-10-cellular-settings) + +Enterprises can configure cellular settings for tablets and PC that have built-in cellular modems or plug-in USB modem dongles and apply the settings in a [provisioning package](provisioning-packages/provisioning-packages.md). After the devices are configured, users are automatically connected using the access point name (APN) defined by the enterprise without needing to manually connect. + +For users who work in different locations, you can configure one APN to connect when the users are at work and a different APN when the users are traveling. + + +## Prerequisites + +- Windows 10, version 1703, desktop editions (Home, Pro, Enterprise, Education) + +- Tablet or PC with built-in cellular modem or plug-in USB modem dongle + +- [Windows Configuration Designer](provisioning-packages/provisioning-install-icd.md) + +- APN (the address that your PC uses to connect to the Internet when using the cellular data connection) + + >[!NOTE] + >You can get the APN from your mobile operator. + +## How to configure cellular settings in a provisioning package + +1. In Windows Configuration Designer, [start a new project](provisioning-packages/provisioning-create-package.md) using the **Advanced provisioning** option. + +2. Enter a name for your project, and then click **Next**. + +3. Select **All Windows desktop editions**, click **Next**, and then click **Finish**. + +4. Go to **Runtime settings > Connections > EnterpriseAPN**. + +5. Enter a name for the connection, and then click **Add**. + + ![Example of APN connection name](images/apn-add.png) + +6. The connection appears in the **Available customizations** pane. Select it to view the settings that you can configure for the connection. + + ![settings for new connection](images/apn-add-details.png) + +7. The following table describes the settings available for the connection. + + | Setting | Description | + | --- | --- | + | AlwaysOn | By default, the Connection Manager will automatically attempt to connect to the APN when a connection is available. You can disable this setting. | + | APNName | Enter the name of the APN. | + | AuthType | You can select **None** (the default), or specify **Auto**, **PAP**, **CHAP**, or **MSCHAPv2** authentication. If you select PAP, CHAP, or MSCHAPv2 authentication, you must also enter a user name and password. | + | ClassId | This is a GUID that defines the APN class to the modem. This is only required when **IsAttachAPN** is **true** and the attach APN is not only used as the Internet APN. | + | Enabled | By default, the connection is enabled. You can change this setting. | + | IccId | This is the Integrated Circuit Card ID (ICCID) associated with the cellular connection profile. | + | IPType | By default, the connection can use IPv4 and IPv6 concurrently. You can change this setting to only IPv4, only IPv6, or IPv6 with IPv4 provided by 46xlat. | + | IsAttachAPN | Specify whether this APN should be requested as part of an LTE Attach. | + | Password | If you select PAP, CHAP, or MSCHAPv2 authentication, enter a password that corresponds to the user name. | + | Roaming | Select the behavior that you want when the device is roaming. The options are:

-Disallowed
-Allowed (default)
-DomesticRoaming
-Use OnlyForDomesticRoaming
-UseOnlyForNonDomesticRoaming
-UseOnlyForRoaming | + | UserName | If you select PAP, CHAP, or MSCHAPv2 authentication, enter a user name. | + +8. After you configure the connection settings, [build the provisioning package](provisioning-packages/provisioning-create-package.md#build-package). + +9. [Apply the package to devices.](provisioning-packages/provisioning-apply-package.md) + + + + diff --git a/windows/configure/images/apn-add-details.PNG b/windows/configure/images/apn-add-details.PNG new file mode 100644 index 0000000000..caee3d6429 Binary files /dev/null and b/windows/configure/images/apn-add-details.PNG differ diff --git a/windows/configure/images/apn-add.PNG b/windows/configure/images/apn-add.PNG new file mode 100644 index 0000000000..0e25e5c0e9 Binary files /dev/null and b/windows/configure/images/apn-add.PNG differ diff --git a/windows/deployment/update/waas-manage-updates-wufb.md b/windows/deployment/update/waas-manage-updates-wufb.md index 91ec6739f4..d7207457f6 100644 --- a/windows/deployment/update/waas-manage-updates-wufb.md +++ b/windows/deployment/update/waas-manage-updates-wufb.md @@ -36,7 +36,7 @@ Windows Update for Business is a free service that is available for Windows Pro, Windows Update for Business provides three types of updates to Windows 10 devices: -- **Feature Updates**: previously referred to as *upgrades*, Feature Updates contain not only security and quality revisions, but also significant feature additions and changes; they are released semi-anually. +- **Feature Updates**: previously referred to as *upgrades*, Feature Updates contain not only security and quality revisions, but also significant feature additions and changes; they are released semi-annually. - **Quality Updates**: these are traditional operating system updates, typically released the second Tuesday of each month (though they can be released at any time). These include security, critical, and driver updates. Windows Update for Business also treats non-Windows updates (such as those for Microsoft Office or Visual Studio) as Quality Updates. These non-Windows Updates are known as *Microsoft Updates* and devices can be optionally configured to receive such updates along with their Windows Updates. - **Non-deferrable updates**: Currently, antimalware and antispyware Definition Updates from Windows Update cannot be deferred. diff --git a/windows/deployment/windows-10-poc-sc-config-mgr.md b/windows/deployment/windows-10-poc-sc-config-mgr.md index 0ce8558c9c..4e36256cae 100644 --- a/windows/deployment/windows-10-poc-sc-config-mgr.md +++ b/windows/deployment/windows-10-poc-sc-config-mgr.md @@ -4,8 +4,7 @@ description: Deploy Windows 10 in a test lab using System Center Configuration M ms.prod: w10 ms.mktglfcycl: deploy ms.sitesec: library -ms.pagetype: deploy -keywords: deployment, automate, tools, configure, sccm, configuration manager +ms.pagetype: deploykeywords: deployment, automate, tools, configure, sccm, configuration manager localizationpriority: high author: greg-lindsay --- @@ -15,7 +14,6 @@ author: greg-lindsay **Applies to** - Windows 10 - **Important**: This guide leverages the proof of concept (PoC) environment, and some settings that are configured in the following guides: - [Step by step guide: Deploy Windows 10 in a test lab](windows-10-poc.md) - [Deploy Windows 10 in a test lab using Microsoft Deployment Toolkit](windows-10-poc-mdt.md) @@ -26,7 +24,6 @@ The PoC environment is a virtual network running on Hyper-V with three virtual m - **DC1**: A contoso.com domain controller, DNS server, and DHCP server. - **SRV1**: A dual-homed contoso.com domain member server, DNS server, and default gateway providing NAT service for the PoC network. - **PC1**: A contoso.com member computer running Windows 7, Windows 8, or Windows 8.1 that has been cloned from a physical computer on your corporate network for testing purposes. - This guide leverages the Hyper-V server role to perform procedures. If you do not complete all steps in a single session, consider using [checkpoints](https://technet.microsoft.com/library/dn818483.aspx) and [saved states](https://technet.microsoft.com/library/ee247418.aspx) to pause, resume, or restart your work. >Multiple features and services are installed on SRV1 in this guide. This is not a typical installation, and is only done to set up a lab environment with a bare minimum of resources. However, if less than 4 GB of RAM is allocated to SRV1 in the Hyper-V console, some procedures will be extremely slow to complete. If resources are limited on the Hyper-V host, consider reducing RAM allocation on DC1 and PC1, and then increasing the RAM allocation on SRV1. You can adjust RAM allocation for a VM by right-clicking the VM in the Hyper-V Manager console, clicking **Settings**, clicking **Memory**, and modifying the value next to **Maximum RAM**. @@ -38,7 +35,6 @@ This guide provides end-to-end instructions to install and configure System Cent Topics and procedures in this guide are summarized in the following table. An estimate of the time required to complete each procedure is also provided. Time required to complete procedures will vary depending on the resources available to the Hyper-V host and assigned to VMs, such as processor speed, memory allocation, disk speed, and network speed.
-
TopicDescriptionTime @@ -48,8 +44,7 @@ Topics and procedures in this guide are summarized in the following table. An es
[Prepare for Zero Touch installation](#prepare-for-zero-touch-installation)Prerequisite procedures to support Zero Touch installation.60 minutes
[Create a boot image for Configuration Manager](#create-a-boot-image-for-configuration-manager)Use the MDT wizard to create the boot image in Configuration Manager.20 minutes
[Create a Windows 10 reference image](#create-a-windows-10-reference-image)This procedure can be skipped if it was done previously, otherwise instructions are provided to create a reference image.0-60 minutes -
[Add a Windows 10 operating system image](#add-a-windows-10-operating-system-image)Add a Windows 10 operating system image and distribute it.10 minutes -
[Create a task sequence](#create-a-task-sequence)Create a Configuration Manager task sequence with MDT integration using the MDT wizard15 minutes +
[Add a Windows 10 operating system image](#add-a-windows-10-operating-system-image)Add a Windows 10 operating system image and distribute it.10 minutes
[Create a task sequence](#create-a-task-sequence)Create a Configuration Manager task sequence with MDT integration using the MDT wizard15 minutes
[Finalize the operating system configuration](#finalize-the-operating-system-configuration)Enable monitoring, configure rules, and distribute content.30 minutes
[Deploy Windows 10 using PXE and Configuration Manager](#deploy-windows-10-using-pxe-and-configuration-manager)Deploy Windows 10 using Configuration Manager deployment packages and task sequences.60 minutes
[Replace a client with Windows 10 using Configuration Manager](#replace-a-client-with-windows-10-using-configuration-manager)Replace a client computer with Windows 10 using Configuration Manager.90 minutes @@ -60,7 +55,6 @@ Topics and procedures in this guide are summarized in the following table. An es ## Install prerequisites - 1. Before installing System Center Configuration Manager, we must install prerequisite services and features. Type the following command at an elevated Windows PowerShell prompt on SRV1: ``` @@ -78,7 +72,7 @@ Topics and procedures in this guide are summarized in the following table. An es This command mounts the .ISO file to drive D on SRV1. -4. Type the following command at an elevated Windows PowerShell prompt on SRV1 to install SQL Server 2012 SP2: +4. Type the following command at an elevated Windows PowerShell prompt on SRV1 to install SQL Server: ``` D:\setup.exe /q /ACTION=Install /ERRORREPORTING="False" /FEATURES=SQLENGINE,RS,IS,SSMS,TOOLS,ADV_SSMS,CONN /INSTANCENAME=MSSQLSERVER /INSTANCEDIR="C:\Program Files\Microsoft SQL Server" /SQLSVCACCOUNT="NT AUTHORITY\System" /SQLSYSADMINACCOUNTS="BUILTIN\ADMINISTRATORS" /SQLSVCSTARTUPTYPE=Automatic /AGTSVCACCOUNT="NT AUTHORITY\SYSTEM" /AGTSVCSTARTUPTYPE=Automatic /RSSVCACCOUNT="NT AUTHORITY\System" /RSSVCSTARTUPTYPE=Automatic /ISSVCACCOUNT="NT AUTHORITY\System" /ISSVCSTARTUPTYPE=Disabled /ASCOLLATION="Latin1_General_CI_AS" /SQLCOLLATION="SQL_Latin1_General_CP1_CI_AS" /TCPENABLED="1" /NPENABLED="1" /IAcceptSQLServerLicenseTerms diff --git a/windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md b/windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md index 3f71267756..c801b3feab 100644 --- a/windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md +++ b/windows/threat-protection/windows-defender-atp/custom-ti-api-windows-defender-advanced-threat-protection.md @@ -27,7 +27,7 @@ You can define custom alert definitions and indicators of compromise (IOC) using Before creating custom alerts, you'll need to enable the threat intelligence application in Azure Active Directory and generate access tokens. For more information, see [Enable the custom threat intelligence application](enable-custom-ti-windows-defender-advanced-threat-protection.md). ### Use the threat intelligence REST API to create custom threat intelligence alerts -You can call and specify the resource URLs using one of the following operations to access and manipulate a threat intelligence resource, you call and specify the resource URLs using one of the following operations: +You can call and specify the resource URLs using one of the following operations to access and manipulate a threat intelligence resource: - GET - POST