From 7cc15c51226349591872d90020a0d336fdf567ec Mon Sep 17 00:00:00 2001 From: mflemingwa <33759581+mflemingwa@users.noreply.github.com> Date: Tue, 20 Feb 2018 10:18:10 -0800 Subject: [PATCH 1/3] Update olympia-enrollment-guidelines.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Changes to sections: Keep your current Windows 10 edition // this gets replaced with below 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). -and- Upgrade your Windows 10 edition from Pro to Enterprise // this gets replaced with below 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). --- .../update/olympia/olympia-enrollment-guidelines.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) 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)). From 4922fc4dfe824d5f398c913e1806d94aa3e8d858 Mon Sep 17 00:00:00 2001 From: Zach Dvorak Date: Tue, 20 Feb 2018 14:19:35 -0800 Subject: [PATCH 2/3] Update upgrade-readiness-additional-insights.md Removed a line due to policy change. --- .../deployment/upgrade/upgrade-readiness-additional-insights.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/deployment/upgrade/upgrade-readiness-additional-insights.md b/windows/deployment/upgrade/upgrade-readiness-additional-insights.md index 5c45338c1d..858aed34fc 100644 --- a/windows/deployment/upgrade/upgrade-readiness-additional-insights.md +++ b/windows/deployment/upgrade/upgrade-readiness-additional-insights.md @@ -18,7 +18,7 @@ This topic provides information on additional features that are available in Upg The site discovery feature in Upgrade Readiness provides an inventory of web sites that are accessed by client computers using Internet Explorer on Windows 7, Windows 8.1, and Windows 10. Site discovery does not include sites that are accessed using other Web browsers, such as Microsoft Edge. Site inventory information is provided as optional data related to upgrading to Windows 10 and Internet Explorer 11, and is meant to help prioritize compatibility testing for web applications. You can make more informed decisions about testing based on usage data. > [!NOTE] -> Site discovery data is disabled by default; you can find documentation on what is collected in the [Windows 7, Windows 8, and Windows 8.1 appraiser diagnostic data events and fields](https://go.microsoft.com/fwlink/?LinkID=822965). After you turn on this feature, data is collected on all sites visited by Internet Explorer, except during InPrivate sessions. In addition, data will be collected on all sites visited by Microsoft Edge on computers running Windows 10 version 1803 (including Insider Preview builds) or newer. The data collection process is silent, without notification to the employee. You are responsible for ensuring that your use of this feature complies with all applicable local laws and regulatory requirements, including any requirements to provide notice to employees. +> Site discovery data is disabled by default; you can find documentation on what is collected in the [Windows 7, Windows 8, and Windows 8.1 appraiser diagnostic data events and fields](https://go.microsoft.com/fwlink/?LinkID=822965). After you turn on this feature, data is collected on all sites visited by Internet Explorer, except during InPrivate sessions. The data collection process is silent, without notification to the employee. You are responsible for ensuring that your use of this feature complies with all applicable local laws and regulatory requirements, including any requirements to provide notice to employees. ### Install prerequisite security update for Internet Explorer From ea8569bf2862cd826e5823c10727c70845336c66 Mon Sep 17 00:00:00 2001 From: Brian Lich Date: Tue, 20 Feb 2018 22:26:50 +0000 Subject: [PATCH 3/3] Merge endpoints-typo to master --- windows/configuration/manage-windows-endpoints-version-1709.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/windows/configuration/manage-windows-endpoints-version-1709.md b/windows/configuration/manage-windows-endpoints-version-1709.md index 1c52da910b..1ce981a341 100644 --- a/windows/configuration/manage-windows-endpoints-version-1709.md +++ b/windows/configuration/manage-windows-endpoints-version-1709.md @@ -7,7 +7,7 @@ ms.mktglfcycl: manage ms.sitesec: library ms.localizationpriority: high author: brianlic-msft -ms.author: brianlic-msft +ms.author: brianlic ms.date: 11/21/2017 --- # Manage Windows 10 connection endpoints @@ -318,7 +318,6 @@ If you turn off traffic for these endpoints, users won't be able to save documen | system32\Auth.Host.exe | HTTPS | outlook.office365.com | The following endpoint is OfficeHub traffic used to get the metadata of Office apps. To turn off traffic for this endpoint, either uninstall the app or [disable the Microsoft Store](manage-connections-from-windows-operating-system-components-to-microsoft-services.md#bkmk-windowsstore). If you disable the Microsoft store, other Microsoft Store apps cannot be installed or updated. Additionally, the Microsoft Store won't be able to revoke malicious apps and users will still be able to open them. -ently used documents. | Source process | Protocol | Destination | |----------------|----------|------------|