From bdb42cc6f4b7aa8d6da6f759133e9604e9b96ad7 Mon Sep 17 00:00:00 2001 From: lizgt2000 <104389055+lizgt2000@users.noreply.github.com> Date: Tue, 31 May 2022 15:07:12 -0400 Subject: [PATCH] add reviewed changes --- windows/deployment/deploy-m365.md | 2 +- windows/deployment/do/mcc-enterprise.md | 4 ++-- windows/deployment/do/mcc-isp.md | 2 +- .../update/olympia/olympia-enrollment-guidelines.md | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/windows/deployment/deploy-m365.md b/windows/deployment/deploy-m365.md index fc8de8fd2c..fefe88f605 100644 --- a/windows/deployment/deploy-m365.md +++ b/windows/deployment/deploy-m365.md @@ -50,7 +50,7 @@ You can check out the Microsoft 365 deployment advisor and other resources for f >[!NOTE] >If you have not run a setup guide before, you will see the **Prepare your environment** guide first. This is to make sure you have basics covered like domain verification and a method for adding users. At the end of the "Prepare your environment" guide, there will be a **Ready to continue** button that sends you to the original guide that was selected. -1. [Try Microsoft 365 for free](/microsoft-365/try). +1. [Explore Microsoft 365](https://www.microsoft.com/microsoft-365/business/). 2. Check out the [Microsoft 365 deployment advisor](https://aka.ms/microsoft365setupguide). 3. Also check out the [Windows Analytics deployment advisor](/mem/configmgr/desktop-analytics/overview). This advisor will walk you through deploying [Desktop Analytics](/mem/configmgr/desktop-analytics/overview). diff --git a/windows/deployment/do/mcc-enterprise.md b/windows/deployment/do/mcc-enterprise.md index 8316d27ab3..01d1a0bc3a 100644 --- a/windows/deployment/do/mcc-enterprise.md +++ b/windows/deployment/do/mcc-enterprise.md @@ -25,7 +25,7 @@ ms.topic: article > [!IMPORTANT] > Microsoft Connected Cache is currently a private preview feature. During this phase we invite customers to take part in early access for testing purposes. This phase does not include formal support, and should not be used for production workloads. For more information, see [Supplemental Terms of Use for Microsoft Azure Previews](https://azure.microsoft.com/support/legal/preview-supplemental-terms/). -Microsoft Connected Cache (MCC) preview is a software-only caching solution that delivers Microsoft content within Enterprise networks. MCC can be deployed to as many physical servers or VMs as needed, and is managed from a cloud portal. Cache nodes are created in the cloud portal and are configured by applying a client policy using your management tool, such as Intune. +Microsoft Connected Cache (MCC) preview is a software-only caching solution that delivers Microsoft content within Enterprise networks. MCC can be deployed to as many physical servers or VMs as needed, and is managed from a cloud portal. Cache nodes are created in the cloud portal and are configured by applying a client policy using your management tool, such as [Intune](/mem/intune/). MCC is a hybrid (a mix of on-prem and cloud resources) SaaS solution built as an Azure IoT Edge module; it's a Docker compatible Linux container that is deployed to your Windows devices. IoT Edge for Linux on Windows (EFLOW) was chosen because it's a secure, reliable container management infrastructure. EFLOW is a Linux virtual machine, based on Microsoft's first party CBL-Mariner operating system. It’s built with the IoT Edge runtime and validated as a tier 1 supported environment for IoT Edge workloads. MCC will be a Linux IoT Edge module running on the Windows Host OS. @@ -62,7 +62,7 @@ If an MCC node is unavailable, the client will pull content from CDN to ensure u ## Enterprise requirements for MCC -1. **Azure subscription**: MCC management portal is hosted within Azure and is used to create the Connected Cache [Azure resource](/azure.microsoft.com/free) and IoT Hub resource – both are free services. +1. **Azure subscription**: MCC management portal is hosted within Azure and is used to create the Connected Cache [Azure resource](/azure/cloud-adoption-framework/govern/resource-consistency/resource-access-management) and IoT Hub resource. Both are free services. Your Azure subscription ID is first used to provision MCC services, and enable access to the preview. The MCC server requirement for an Azure subscription will cost you nothing. If you do not have an Azure subscription already, you can create an Azure [Pay-As-You-Go](https://azure.microsoft.com/offers/ms-azr-0003p/) account which requires a credit card for verification purposes. For more information, see the [Azure Free Account FAQ](https://azure.microsoft.com/free/free-account-faq/). diff --git a/windows/deployment/do/mcc-isp.md b/windows/deployment/do/mcc-isp.md index 458c5af1b4..1e1933c2aa 100644 --- a/windows/deployment/do/mcc-isp.md +++ b/windows/deployment/do/mcc-isp.md @@ -627,7 +627,7 @@ You can use hardware that will natively run Ubuntu 20.04 LTS, or you can run an 1. Download the ISO. You can use either Ubuntu Desktop or Ubuntu Server. - [Download Ubuntu Desktop](https://ubuntu.com/download/desktop) - - [Download Ubuntu Server](https://mirror.cs.jmu.edu/pub/ubuntu-iso/20.04.2/ubuntu-20.04.2-live-server-amd64.iso) + - [Download Ubuntu Server](https://ubuntu.com/download/server) 1. Start the **New Virtual Machine Wizard** in Hyper-V. diff --git a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md index 5879a8ce30..213c9ef506 100644 --- a/windows/deployment/update/olympia/olympia-enrollment-guidelines.md +++ b/windows/deployment/update/olympia/olympia-enrollment-guidelines.md @@ -55,7 +55,7 @@ Choose one of the following two enrollment options: ### Set up an Azure Active Directory-REGISTERED Windows client 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. See [Azure Active Directory device management FAQ](/azure/active-directory/devices/faq) for additional information. +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. See [Azure Active Directory device management FAQ](/azure/active-directory/devices/faq#azure-ad-register-faq) for additional information. 1. Go to **Start > Settings > Accounts > Access work or school**. To see this setting, you need to have administrator rights to your device (see [local administrator](https://support.microsoft.com/windows/create-a-local-user-or-administrator-account-in-windows-20de74e0-ac7f-3502-a866-32915af2a34d)).