Date: Thu, 19 Aug 2021 09:55:15 -0600
Subject: [PATCH 004/671] dh-editpass-demonstrate-deployment-on-vm
---
.../demonstrate-deployment-on-vm.md | 144 +++++++++---------
1 file changed, 75 insertions(+), 69 deletions(-)
diff --git a/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md b/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
index d132aa99a6..effa84ef83 100644
--- a/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
+++ b/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
@@ -32,7 +32,7 @@ In this topic you'll learn how to set-up a Windows Autopilot deployment for a VM
> [!NOTE]
> Although there are [multiple platforms](/mem/autopilot/add-devices#registering-devices) available to enable Autopilot, this lab primarily uses Intune.
>
-> Hyper-V and a VM are not required for this lab. You can also use a physical device. However, the instructions assume that you are using a VM. To use a physical device, skip the instructions to install Hyper-V and create a VM. All references to 'device' in the guide refer to the client device, either physical or virtual.
+> Hyper-V and a VM are not required for this lab. You can also use a physical device. However, the instructions assume that you're using a VM. To use a physical device, skip the instructions to install Hyper-V and create a VM. All references to 'device' in the guide refer to the client device, either physical or virtual.
The following video provides an overview of the process:
@@ -45,13 +45,13 @@ The following video provides an overview of the process:
These are the things you'll need to complete this lab:
| Windows 10 installation media | Windows 10 Professional or Enterprise (ISO file) for a supported version of Windows 10, semi-annual channel. If you do not already have an ISO to use, a link is provided to download an evaluation version of Windows 10 Enterprise. |
-| Internet access | If you are behind a firewall, see the detailed networking requirements. Otherwise, just ensure that you have a connection to the Internet. |
+| Internet access | If you're behind a firewall, see the detailed networking requirements. Otherwise, just ensure that you have a connection to the Internet. |
| Hyper-V or a physical device running Windows 10 | The guide assumes that you will use a Hyper-V VM, and provides instructions to install and configure Hyper-V if needed. To use a physical device, skip the steps to install and configure Hyper-V. |
| An account with Azure AD Premium license | This guide will describe how to obtain a free 30-day trial Azure AD Premium subscription that can be used to complete the lab. |
## Procedures
-A summary of the sections and procedures in the lab is provided below. Follow each section in the order it is presented, skipping the sections that do not apply to you. Optional procedures are provided in the appendix.
+A summary of the sections and procedures in the lab is provided below. Follow each section in the order it's presented, skipping the sections that do not apply to you. Optional procedures are provided in the appendix.
If you already have Hyper-V and a Windows 10 VM, you can skip directly to the [Capture the hardware ID](#capture-the-hardware-id) step. The VM must be running Windows 10, version 1903 or a later version.
@@ -91,11 +91,9 @@ If you already have Hyper-V and a Windows 10 VM, you can skip directly to the [C
## Verify support for Hyper-V
-If you don't already have Hyper-V, we must first enable this on a computer running Windows 10 or Windows Server (2012 R2 or later).
-
-> If you already have Hyper-V enabled, skip to the [create a demo VM](#create-a-demo-vm) step. If you are using a physical device instead of a VM, skip to [Install Windows 10](#install-windows-10).
-
-If you are not sure that your device supports Hyper-V, or you have problems installing Hyper-V, see [appendix A](#appendix-a-verify-support-for-hyper-v) below for details on verifying that Hyper-V can be successfully installed.
+- If you don't already have Hyper-V enabled, enable it on a computer running Windows 10 or Windows Server (2012 R2 or later).
+- If you already have Hyper-V enabled, skip to the [create a demo VM](#create-a-demo-vm) step. If you're using a physical device instead of a VM, skip to [Install Windows 10](#install-windows-10).
+- If you're not sure that your device supports Hyper-V, or you have problems installing Hyper-V, see [appendix A](#appendix-a-verify-support-for-hyper-v) in this article for details on verifying that Hyper-V can be successfully installed.
## Enable Hyper-V
@@ -111,7 +109,7 @@ This command works on all operating systems that support Hyper-V, but on Windows
Install-WindowsFeature -Name Hyper-V -IncludeManagementTools
```
-When you are prompted to restart the computer, choose **Yes**. The computer might restart more than once.
+When you're prompted to restart the computer, choose **Yes**. The computer might restart more than once.
Alternatively, you can install Hyper-V using the Control Panel in Windows under **Turn Windows features on or off** for a client operating system, or using Server Manager's **Add Roles and Features Wizard** on a server operating system, as shown below:
@@ -119,7 +117,7 @@ Alternatively, you can install Hyper-V using the Control Panel in Windows under
-If you choose to install Hyper-V using Server Manager, accept all default selections. Also be sure to install both items under Role Administration Tools\Hyper-V Management Tools.
+If you choose to install Hyper-V using Server Manager, accept all default selections. Also be sure to install both items under **Role Administration Tools\Hyper-V Management Tools**.
After installation is complete, open Hyper-V Manager by typing **virtmgmt.msc** at an elevated command prompt, or by typing **Hyper-V** in the Start menu search box.
@@ -127,15 +125,15 @@ To read more about Hyper-V, see [Introduction to Hyper-V on Windows 10](/virtual
## Create a demo VM
-Now that Hyper-V is enabled, we need to create a VM running Windows 10. We can [create a VM](/virtualization/hyper-v-on-windows/quick-start/create-virtual-machine) and [virtual network](/virtualization/hyper-v-on-windows/quick-start/connect-to-network) using Hyper-V Manager, but it is simpler to use Windows PowerShell.
+Now that Hyper-V is enabled, we need to create a VM running Windows 10. We can [create a VM](/virtualization/hyper-v-on-windows/quick-start/create-virtual-machine) and [virtual network](/virtualization/hyper-v-on-windows/quick-start/connect-to-network) using Hyper-V Manager, but it's simpler to use Windows PowerShell.
-To use Windows PowerShell, we just need to know two things:
+To use Windows PowerShell, you need to know two things:
1. The location of the Windows 10 ISO file.
In the example, we assume the location is **c:\iso\win10-eval.iso**.
-2. The name of the network interface that connects to the Internet.
+2. The name of the network interface that connects to the internet.
In the example, we use a Windows PowerShell command to determine this automatically.
@@ -149,7 +147,7 @@ When asked to select a platform, choose **64 bit**.
After you download this file, the name will be extremely long (ex: 19042.508.200927-1902.20h2_release_svc_refresh_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso).
-1. So that it is easier to type and remember, rename the file to **win10-eval.iso**.
+1. So that it's easier to type and remember, rename the file to **win10-eval.iso**.
2. Create a directory on your computer named **c:\iso** and move the **win10-eval.iso** file there, so the path to the file is **c:\iso\win10-eval.iso**.
@@ -157,13 +155,13 @@ After you download this file, the name will be extremely long (ex: 19042.508.200
### Determine network adapter name
-The Get-NetAdaper cmdlet is used below to automatically find the network adapter that is most likely to be the one you use to connect to the Internet. You should test this command first by running the following at an elevated Windows PowerShell prompt:
+The Get-NetAdaper cmdlet is used to automatically find the network adapter that's most likely to be the one you use to connect to the internet. You should test this command first by running the following at an elevated Windows PowerShell prompt:
```powershell
(Get-NetAdapter |?{$_.Status -eq "Up" -and !$_.Virtual}).Name
```
-The output of this command should be the name of the network interface you use to connect to the Internet. Verify that this is the correct interface name. If it is not the correct interface name, you'll need to edit the first command below to use your network interface name.
+The output of this command should be the name of the network interface you use to connect to the internet. Verify that this is the correct interface name. If it isn't the correct interface name, you'll need to edit the first command below to use your network interface name.
For example, if the command above displays Ethernet but you wish to use Ethernet2, then the first command below would be New-VMSwitch -Name AutopilotExternal -AllowManagementOS $true -NetAdapterName **Ethernet2**.
@@ -172,7 +170,10 @@ For example, if the command above displays Ethernet but you wish to use Ethernet
All VM data will be created under the current path in your PowerShell prompt. Consider navigating into a new folder before running the following commands.
> [!IMPORTANT]
-> **VM switch**: a VM switch is how Hyper-V connects VMs to a network.
If you have previously enabled Hyper-V and your Internet-connected network interface is already bound to a VM switch, then the PowerShell commands below will fail. In this case, you can either delete the existing VM switch (so that the commands below can create one), or you can reuse this VM switch by skipping the first command below and either modifying the second command to replace the switch name **AutopilotExternal** with the name of your switch, or by renaming your existing switch to "AutopilotExternal."
If you have never created an external VM switch before, then just run the commands below.
If you are not sure if you already have an External VM switch, enter **get-vmswitch** at a Windows PowerShell prompt to display a currently list of the VM switches that are provisioned in Hyper-V. If one of them is of SwitchType **External**, then you already have a VM switch configured on the server that is used to connect to the Internet. In this case, you need to skip the first command below and modify the others to use the name of your VM switch instead of the name "AutopilotExternal" (or change the name of your switch).
+> **VM switch**: a VM switch is how Hyper-V connects VMs to a network.
+>- If you have previously enabled Hyper-V and your Internet-connected network interface is already bound to a VM switch, then the PowerShell commands below will fail. In this case, you can either delete the existing VM switch (so that the commands below can create one), or you can reuse this VM switch by skipping the first command below and either modifying the second command to replace the switch name **AutopilotExternal** with the name of your switch, or by renaming your existing switch to "AutopilotExternal."
+>- If you have never created an external VM switch before, then just run the commands below.
+>- If you're not sure if you already have an External VM switch, enter **get-vmswitch** at a Windows PowerShell prompt to display a currently list of the VM switches that are provisioned in Hyper-V. If one of them is of SwitchType **External**, then you already have a VM switch configured on the server that is used to connect to the Internet. In this case, you need to skip the first command below and modify the others to use the name of your VM switch instead of the name "AutopilotExternal" (or change the name of your switch).
```powershell
New-VMSwitch -Name AutopilotExternal -AllowManagementOS $true -NetAdapterName (Get-NetAdapter |?{$_.Status -eq "Up" -and !$_.Virtual}).Name
@@ -228,22 +229,27 @@ PS C:\autopilot>
### Install Windows 10
> [!NOTE]
-> The VM will be booted to gather a hardware ID, then it will be reset. The goal in the next few steps is to get to the desktop quickly so don't worry about how it is configured at this stage. The VM only needs to be connected to the Internet.
+> The VM will be booted to gather a hardware ID, then it will be reset. The goal in the next few steps is to get to the desktop quickly so don't worry about how it's configured at this stage. The VM only needs to be connected to the Internet.
-Ensure the VM booted from the installation ISO, click **Next** then click **Install now** and complete the Windows installation process. See the following examples:
+Ensure the VM booted from the installation ISO, select **Next** then select **Install now** and complete the Windows installation process. See the following examples:
+
+
+
+
+
After the VM restarts, during OOBE, it's fine to select **Set up for personal use** or **Domain join instead** and then choose an offline account on the **Sign in** screen. This will offer the fastest way to the desktop. For example:
-Once the installation is complete, sign in and verify that you are at the Windows 10 desktop, then create your first Hyper-V checkpoint. Checkpoints are used to restore the VM to a previous state.
+Once the installation is complete, sign in and verify that you're at the Windows 10 desktop, then create your first Hyper-V checkpoint. Checkpoints are used to restore the VM to a previous state.
> [!div class="mx-imgBorder"]
> 
@@ -254,16 +260,16 @@ To create a checkpoint, open an elevated Windows PowerShell prompt on the comput
Checkpoint-VM -Name WindowsAutopilot -SnapshotName "Finished Windows install"
```
-Click on the **WindowsAutopilot** VM in Hyper-V Manager and verify that you see **Finished Windows Install** listed in the Checkpoints pane.
+Select the **WindowsAutopilot** VM in Hyper-V Manager and verify that you see **Finished Windows Install** listed in the Checkpoints pane.
## Capture the hardware ID
> [!NOTE]
-> Normally, the Device ID is captured by the OEM as they run the OA3 Tool on each device in the factory. The OEM then submits the 4K HH created by the OA3 Tool to Microsoft by submitting it with a Computer Build Report (CBR). For purposes of this lab, you are acting as the OEM (capturing the 4K HH), but you're not going to use the OA3 Tool to capture the full 4K HH for various reasons (you'd have to install the OA3 tool, your device couldn't have a volume license version of Windows, it's a more complicated process than using a PowerShell script, etc.). Instead, you'll simulate running the OA3 tool by running a PowerShell script, which captures the device 4K HH just like the OA3 tool.
+> Normally, the Device ID is captured by the OEM as they run the OA3 Tool on each device in the factory. The OEM then submits the 4K HH created by the OA3 Tool to Microsoft by submitting it with a Computer Build Report (CBR). For purposes of this lab, you're acting as the OEM (capturing the 4K HH), but you're not going to use the OA3 Tool to capture the full 4K HH for various reasons (you'd have to install the OA3 tool, your device couldn't have a volume license version of Windows, it's a more complicated process than using a PowerShell script, etc.). Instead, you'll simulate running the OA3 tool by running a PowerShell script, which captures the device 4K HH just like the OA3 tool.
Follow these steps to run the PowerShell script:
-1. **On the client VM**: Open an elevated Windows PowerShell prompt and run the following commands. These commands are the same regardless of whether you are using a VM or a physical device:
+1. **On the client VM**: Open an elevated Windows PowerShell prompt and run the following commands. These commands are the same regardless of whether you're using a VM or a physical device:
```powershell
md c:\HWID
@@ -274,7 +280,7 @@ Follow these steps to run the PowerShell script:
Get-WindowsAutopilotInfo.ps1 -OutputFile AutopilotHWID.csv
```
-1. When you are prompted to install the NuGet package, choose **Yes**.
+1. When you're prompted to install the NuGet package, choose **Yes**.
See the sample output below. A **dir** command is issued at the end to show the file that was created.
@@ -320,11 +326,11 @@ Follow these steps to run the PowerShell script:
1. Verify that there is an **AutopilotHWID.csv** file in the **c:\HWID** directory that is about 8 KB in size. This file contains the complete 4K HH.
> [!NOTE]
- > Although the .csv extension might be associated with Microsoft Excel, you cannot view the file properly by double-clicking it. To correctly parse the comma delimiters and view the file in Excel, you must use the **Data** > **From Text/CSV** function in Excel to import the appropriate data columns. You don't need to view the file in Excel unless you are curious. The file format will be validated when it is imported into Autopilot. An example of the data in this file is shown below.
+ > Although the .csv extension might be associated with Microsoft Excel, you cannot view the file properly by double-clicking it. To correctly parse the comma delimiters and view the file in Excel, you must use the **Data** > **From Text/CSV** function in Excel to import the appropriate data columns. You don't need to view the file in Excel unless you're curious. The file format will be validated when it's imported into Autopilot. An example of the data in this file is shown below.
- You will need to upload this data into Intune to register your device for Autopilot, so the next step is to transfer this file to the computer you will use to access the Azure portal. If you are using a physical device instead of a VM, you can copy the file to a USB stick. If you’re using a VM, you can right-click the AutopilotHWID.csv file and copy it, then right-click and paste the file to your desktop (outside the VM).
+ You will need to upload this data into Intune to register your device for Autopilot, so the next step is to transfer this file to the computer you will use to access the Azure portal. If you're using a physical device instead of a VM, you can copy the file to a USB stick. If you’re using a VM, you can right-click the AutopilotHWID.csv file and copy it, then right-click and paste the file to your desktop (outside the VM).
If you have trouble copying and pasting the file, just view the contents in Notepad on the VM and copy the text into Notepad outside the VM. Do not use another text editor to do this.
@@ -335,8 +341,8 @@ Follow these steps to run the PowerShell script:
With the hardware ID captured in a file, prepare your Virtual Machine for Windows Autopilot deployment by resetting it back to OOBE.
-On the Virtual Machine, go to **Settings > Update & Security > Recovery** and click on **Get started** under **Reset this PC**.
-Select **Remove everything** and **Just remove my files**. If you are asked **How would you like to reinstall Windows**, select Local reinstall. Finally, click on **Reset**.
+On the Virtual Machine, go to **Settings > Update & Security > Recovery** and select **Get started** under **Reset this PC**.
+Select **Remove everything** and **Just remove my files**. If you're asked **How would you like to reinstall Windows**, select Local reinstall. Finally, select **Reset**.
@@ -365,11 +371,11 @@ If you already have company branding configured in Azure Active Directory, you c
> [!IMPORTANT]
> Make sure to sign-in with a Global Administrator account.
-Navigate to [Company branding in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/LoginTenantBranding), click on **Configure** and configure any type of company branding you'd like to see during the OOBE.
+Navigate to [Company branding in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/LoginTenantBranding), select **Configure** and configure any type of company branding you'd like to see during the OOBE.
-When you are finished, click **Save**.
+When you're finished, select **Save**.
> [!NOTE]
> Changes to company branding can take up to 30 minutes to apply.
@@ -378,9 +384,9 @@ When you are finished, click **Save**.
If you already have MDM auto-enrollment configured in Azure Active Directory, you can skip this step.
-Open [Mobility (MDM and MAM) in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Mobility) and select **Microsoft Intune**. If you do not see Microsoft Intune, click **Add application** and choose **Intune**.
+Open [Mobility (MDM and MAM) in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/Mobility) and select **Microsoft Intune**. If you do not see Microsoft Intune, select **Add application** and choose **Intune**.
-For the purposes of this demo, select **All** under the **MDM user scope** and click **Save**.
+For the purposes of this demo, select **All** under the **MDM user scope** and select **Save**.
@@ -403,9 +409,9 @@ Your VM (or device) can be registered either via Intune or Microsoft Store for B
You should receive confirmation that the file is formatted correctly before uploading it, as shown above.
-3. Click **Import** and wait until the import process completes. This can take up to 15 minutes.
+3. Select **Import** and wait until the import process completes. This can take up to 15 minutes.
-4. Click **Refresh** to verify your VM or device has been added. See the following example.
+4. Select **Refresh** to verify your VM or device has been added. See the following example.
@@ -428,7 +434,7 @@ Select **Manage** from the top menu, then click the **Windows Autopilot Deployme
-Click the **Add devices** link to upload your CSV file. A message will appear indicating your request is being processed. Wait a few moments before refreshing to see your new device has been added.
+Select the **Add devices** link to upload your CSV file. A message will appear indicating your request is being processed. Wait a few moments before refreshing to see your new device has been added.
@@ -460,21 +466,21 @@ The Autopilot deployment profile wizard will ask for a device group, so we must
3. Azure AD roles can be assigned to the group: **No**
4. For **Membership type**, choose **Assigned**.
-3. Click **Members** and add the Autopilot VM to the group. See the following example:
+3. Select **Members** and add the Autopilot VM to the group. See the following example:
> [!div class="mx-imgBorder"]
> 
-4. Click **Create**.
+4. Select **Create**.
#### Create the deployment profile
-To create a Windows Autopilot profile, scroll back to the left hand pane and click **Devices**, then under **Enroll devices | Windows enrollment** select **Deployment Profiles**.
+To create a Windows Autopilot profile, scroll back to the left hand pane and select **Devices**, then under **Enroll devices | Windows enrollment** select **Deployment Profiles**.
> [!div class="mx-imgBorder"]
> 
-Click on **Create profile** and then select **Windows PC**.
+Select **Create profile** and then select **Windows PC**.
> [!div class="mx-imgBorder"]
> 
@@ -487,7 +493,7 @@ On the **Create profile** blade, use the following values:
| Description | Lab |
| Convert all targeted devices to Autopilot | No |
-Click **Next** to continue with the **Out-of-box experience (OOBE)** settings:
+Select **Next** to continue with the **Out-of-box experience (OOBE)** settings:
| Setting | Value |
|---|---|
@@ -502,19 +508,19 @@ Click **Next** to continue with the **Out-of-box experience (OOBE)** settings:
| Automatically configure keyboard | Yes |
| Apply device name template | No |
-Click **Next** to continue with the **Assignments** settings:
+Select **Next** to continue with the **Assignments** settings:
| Setting | Value |
|---|---|
| Assign to | Selected groups |
-1. Click **Select groups to include**.
-2. Click the **Autopilot Lab** group, and then click **Select**.
-3. Click **Next** to continue and then click **Create**. See the following example:
+1. Select **Select groups to include**.
+2. Select the **Autopilot Lab** group, and then choose **Select**.
+3. Select **Next** to continue, and then select **Create**. See the following example:
-Click on **OK** and then click on **Create**.
+Select **OK**, and then select **Create**.
> [!NOTE]
> If you want to add an app to your profile via Intune, the OPTIONAL steps for doing so can be found in [Appendix B: Adding apps to your profile](#appendix-b-adding-apps-to-your-profile).
@@ -527,11 +533,11 @@ A [video](https://www.youtube.com/watch?v=IpLIZU_j7Z0) is available that covers
First, sign in to the [Microsoft Store for Business](https://businessstore.microsoft.com/manage/dashboard) using the Intune account you initially created for this lab.
-Click **Manage** from the top menu, then click **Devices** from the left navigation tree.
+Select **Manage** from the top menu, then select **Devices** from the left navigation tree.
-Click the **Windows Autopilot Deployment Program** link in the **Devices** tile.
+Select the **Windows Autopilot Deployment Program** link in the **Devices** tile.
To CREATE the profile:
@@ -545,7 +551,7 @@ On the Autopilot deployment dropdown menu, select **Create new profile**:
> [!div class="mx-imgBorder"]
> 
-Name the profile, choose your desired settings, and then click **Create**:
+Name the profile, choose your desired settings, and then select **Create**:
> [!div class="mx-imgBorder"]
> 
@@ -577,7 +583,7 @@ If you shut down your VM after the last reset, it's time to start it back up aga
Also, make sure to wait at least 30 minutes from the time you've [configured company branding](#configure-company-branding), otherwise these changes might not show up.
> [!TIP]
-> If you reset your device previously after collecting the 4K HH info, and then let it restart back to the first OOBE screen, then you might need to restart the device again to ensure the device is recognized as an Autopilot device and displays the Autopilot OOBE experience you're expecting. If you do not see the Autopilot OOBE experience, then reset the device again (Settings > Update & Security > Recovery and click on Get started. Under Reset this PC, select Remove everything and Just remove my files. Click on Reset).
+> If you reset your device previously after collecting the 4K HH info, and then let it restart back to the first OOBE screen, then you might need to restart the device again to ensure the device is recognized as an Autopilot device and displays the Autopilot OOBE experience you're expecting. If you do not see the Autopilot OOBE experience, then reset the device again (**Settings** > **Update & Security** > **Recovery** and select **Get started**. Under **Reset this PC**, select **Remove everything and Just remove my files**. Select **Reset**).
- Ensure your device has an internet connection.
- Turn on the device
@@ -603,7 +609,7 @@ To use the device (or VM) for other purposes after completion of this lab, you w
### Delete (deregister) Autopilot device
-You need to delete (or retire, or factory reset) the device from Intune before deregistering the device from Autopilot. To delete the device from Intune (not Azure Active Directory), log into the MEM admin center, then navigate to **Intune > Devices > All Devices**. Select the device you want to delete, then click the Delete button along the top menu.
+You need to delete (or retire, or factory reset) the device from Intune before deregistering the device from Autopilot. To delete the device from Intune (not Azure Active Directory), log into the MEM admin center, then navigate to **Intune > Devices > All Devices**. Select the device you want to delete, then select the **Delete** button along the top menu.
> [!div class="mx-imgBorder"]
> 
@@ -615,16 +621,16 @@ The **Intune > Devices > All Devices** list and the **Intune > Device Enrollment
> [!NOTE]
> A device will only appear in the All devices list once it has booted. The latter (**Windows Autopilot Deployment Program** > **Devices**) is the list of devices currently registered from that Intune account into the Autopilot program - which may or may not be enrolled to Intune.
-To remove the device from the Autopilot program, select the device and click **Delete**. You will get a popup dialog box to confirm deletion.
+To remove the device from the Autopilot program, select the device, and then select **Delete**. You will get a popup dialog box to confirm deletion.
> [!div class="mx-imgBorder"]
> 
-At this point, your device has been unenrolled from Intune and also deregistered from Autopilot. After several minutes, click the **Sync** button, followed by the **Refresh** button to confirm the device is no longer listed in the Autopilot program:
+At this point, your device has been unenrolled from Intune and also deregistered from Autopilot. After several minutes, select the **Sync** button, followed by the **Refresh** button to confirm the device is no longer listed in the Autopilot program:
-Once the device no longer appears, you are free to reuse it for other purposes.
+Once the device no longer appears, you're free to reuse it for other purposes.
-If you also (optionally) want to remove your device from AAD, navigate to **Azure Active Directory > Devices > All Devices**, select your device, and click the delete button:
+If you also (optionally) want to remove your device from AAD, navigate to **Azure Active Directory > Devices > All Devices**, select your device, and then select the **Delete** button:
## Appendix A: Verify support for Hyper-V
@@ -702,7 +708,7 @@ Under **App Type**, select **Windows app (Win32)**:
-On the **App package file** blade, browse to the **npp.7.6.3.installer.x64.intunewin** file in your output folder, open it, then click **OK**:
+On the **App package file** blade, browse to the **npp.7.6.3.installer.x64.intunewin** file in your output folder, open it, then select **OK**:
> [!div class="mx-imgBorder"]
> 
@@ -725,7 +731,7 @@ Uninstall: msiexec /x "{F188A506-C3C6-4411-BE3A-DA5BF1EA6737}" /q
Simply using an install command like "notepad++.exe /S" will not actually install Notepad++; it will only launch the app. To actually install the program, we need to use the .msi file instead. Notepad++ doesn't actually have an .msi version of their program, but we got an .msi version from a [third party provider](https://www.hass.de/content/notepad-msi-package-enterprise-deployment-available).
-Click **OK** to save your input and activate the **Requirements** blade.
+Select **OK** to save your input and activate the **Requirements** blade.
On the **Requirements Configuration** blade, specify the **OS architecture** and the **Minimum OS version**:
@@ -737,22 +743,22 @@ Next, configure the **Detection rules**. For our purposes, we will select manua
> [!div class="mx-imgBorder"]
> 
-Click **Add** to define the rule properties. For **Rule type**, select **MSI**, which will automatically import the right MSI product code into the rule:
+Select **Add** to define the rule properties. For **Rule type**, select **MSI**, which will automatically import the right MSI product code into the rule:
-Click **OK** twice to save, as you back out to the main **Add app** blade again for the final configuration.
+Select **OK** twice to save, as you back out to the main **Add app** blade again for the final configuration.
**Return codes**: For our purposes, leave the return codes at their default values:
> [!div class="mx-imgBorder"]
> 
-Click **OK** to exit.
+Select **OK** to exit.
You may skip configuring the final **Scope (Tags)** blade.
-Click the **Add** button to finalize and save your app package.
+Select the **Add** button to finalize and save your app package.
Once the indicator message says the addition has completed.
@@ -769,7 +775,7 @@ You will be able to find your app in your app list:
> [!NOTE]
> The following steps only work if you previously [created a GROUP in Intune and assigned a profile to it](#create-a-device-group). If you have not done that, please return to the main part of the lab and complete those steps before returning here.
-In the **Intune > Client Apps > Apps** pane, select the app package you already created to reveal its properties blade. Then click **Assignments** from the menu:
+In the **Intune > Client Apps > Apps** pane, select the app package you already created to reveal its properties blade. Then select **Assignments** from the menu:
> [!div class="mx-imgBorder"]
> 
@@ -788,7 +794,7 @@ Select **Included Groups** and assign the groups you previously created that wil
> [!div class="mx-imgBorder"]
> 
-In the **Select groups** pane, click the **Select** button.
+In the **Select groups** pane, choose the **Select** button.
In the **Assign group** pane, select **OK**.
@@ -809,7 +815,7 @@ For more information on adding apps to Intune, see [Intune Standalone - Win32 ap
Log into the Azure portal and select **Intune**.
-Navigate to **Intune > Clients apps > Apps**, and then click the **Add** button to create a new app package.
+Navigate to **Intune > Clients apps > Apps**, and then select the **Add** button to create a new app package.
@@ -822,29 +828,29 @@ Under the **Configure App Suite** pane, select the Office apps you want to insta
> [!div class="mx-imgBorder"]
> 
-Click **OK**.
+Select **OK**.
In the **App Suite Information** pane, enter a unique suite name, and a suitable description.
-Enter the name of the app suite as it is displayed in the company portal. Make sure that all suite names that you use are unique. If the same app suite name exists twice, only one of the apps is displayed to users in the company portal.
+Enter the name of the app suite as it's displayed in the company portal. Make sure that all suite names that you use are unique. If the same app suite name exists twice, only one of the apps is displayed to users in the company portal.
> [!div class="mx-imgBorder"]
> 
-Click **OK**.
+Select **OK**.
In the **App Suite Settings** pane, select **Monthly** for the **Update channel** (any selection would be fine for the purposes of this lab). Also select **Yes** for **Automatically accept the app end user license agreement**:
-Click **OK** and then click **Add**.
+Select **OK** and, then select **Add**.
#### Assign the app to your Intune profile
> [!NOTE]
> The following steps only work if you previously [created a GROUP in Intune and assigned a profile to it](#create-a-device-group). If you have not done that, please return to the main part of the lab and complete those steps before returning here.
-In the **Intune > Client Apps > Apps** pane, select the Office package you already created to reveal its properties blade. Then click **Assignments** from the menu:
+In the **Intune > Client Apps > Apps** pane, select the Office package you already created to reveal its properties blade. Then select **Assignments** from the menu:
> [!div class="mx-imgBorder"]
> 
@@ -862,7 +868,7 @@ Select **Included Groups** and assign the groups you previously created that wil
> [!div class="mx-imgBorder"]
> 
-In the **Select groups** pane, click the **Select** button.
+In the **Select groups** pane, choose the **Select** button.
In the **Assign group** pane, select **OK**.
From 5f0645961045c10b9ae45522e566a6e33d73f0f6 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 10:03:12 -0700
Subject: [PATCH 005/671] new landing
---
windows/security/index.yml | 46 +++++++++++++++++++++++++++++---------
1 file changed, 36 insertions(+), 10 deletions(-)
diff --git a/windows/security/index.yml b/windows/security/index.yml
index 83e7dcbb53..29ac6d128a 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -1,38 +1,64 @@
### YamlMime:Hub
title: Windows 10 Enterprise Security # < 60 chars
-summary: Secure corporate data and manage risk. # < 160 chars
+summary: Security from chip to cloud. # < 160 chars
# brand: aspnet | azure | dotnet | dynamics | m365 | ms-graph | office | power-bi | power-platform | sql | sql-server | vs | visual-studio | windows | xamarin
brand: windows
metadata:
title: Windows 10 Enterprise Security # Required; page title displayed in search results. Include the brand. < 60 chars.
- description: Learn about enterprise-grade security features for Windows 10. # Required; article description that is displayed in search results. < 160 chars.
+ description: Learn about enterprise-grade security features in Windows 10 and Windows 11. # Required; article description that is displayed in search results. < 160 chars.
services: windows
ms.product: windows
ms.topic: hub-page # Required
ms.collection: M365-security-compliance # Optional; Remove if no collection is used.
author: dansimp #Required; your GitHub user alias, with correct capitalization.
ms.author: dansimp #Required; microsoft alias of author; optional team alias.
- ms.date: 01/08/2018 #Required; mm/dd/yyyy format.
+ ms.date: 09/30/2021 #Required; mm/dd/yyyy format.
ms.localizationpriority: high
# productDirectory section (optional)
productDirectory:
items:
# Card
- - title: Identity and access management
+ - title: Security foundation
+ imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
+ summary: Security assurances and certifications
+ url: ./information-protection/index.md
+
+ # Card
+ - title: Hardware security
# imageSrc should be square in ratio with no whitespace
imageSrc: https://docs.microsoft.com/media/common/i_identity-protection.svg
- summary: Deploy secure enterprise-grade authentication and access control to protect accounts and data
+ summary: Hardware root of trust and silicon-assisted security
url: ./identity-protection/index.md
# Card
- - title: Threat protection
+ - title: Operating system protection
imageSrc: https://docs.microsoft.com/media/common/i_threat-protection.svg
- summary: Stop cyberthreats and quickly identify and respond to breaches
+ summary: Windows security enhancements
url: ./threat-protection/index.md
# Card
- - title: Information protection
+ - title: Threat protection
imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
- summary: Identify and secure critical data to prevent data loss
- url: ./information-protection/index.md
\ No newline at end of file
+ summary: Protection from external attacks and threats
+ url: ./information-protection/index.md
+ # Card
+ - title: Application protection
+ imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
+ summary: App protections
+ url: ./information-protection/index.md
+ # Card
+ - title: User protection
+ imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
+ summary: Protecting your users
+ url: ./information-protection/index.md
+ # Card
+ - title: Privacy controls
+ imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
+ summary: Manage your privacy settings
+ url: ./information-protection/index.md
+ # Card
+ - title: Cloud security
+ imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
+ summary: Additional cloud-based security and management solutions
+ url: ./information-protection/index.md
From f5cebb67e82a1893f586feaabf0f02709fa48561 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 10:35:09 -0700
Subject: [PATCH 006/671] more
---
windows/security/security-foundation/TOC.yml | 9 +++++
.../security/security-foundation/index.yml | 39 +++++++++++++++++++
2 files changed, 48 insertions(+)
create mode 100644 windows/security/security-foundation/TOC.yml
create mode 100644 windows/security/security-foundation/index.yml
diff --git a/windows/security/security-foundation/TOC.yml b/windows/security/security-foundation/TOC.yml
new file mode 100644
index 0000000000..70e61e303f
--- /dev/null
+++ b/windows/security/security-foundation/TOC.yml
@@ -0,0 +1,9 @@
+- name: Security
+ href: index.yml
+ items:
+ - name: Identity and access management
+ href: identity-protection/index.md
+ - name: Information protection
+ href: information-protection/index.md
+ - name: Threat protection
+ href: threat-protection/index.md
diff --git a/windows/security/security-foundation/index.yml b/windows/security/security-foundation/index.yml
new file mode 100644
index 0000000000..97eae49e18
--- /dev/null
+++ b/windows/security/security-foundation/index.yml
@@ -0,0 +1,39 @@
+### YamlMime:Landing
+
+title: Windows security foundation # < 60 chars
+summary: Learn about Windows security foundations. # < 160 chars
+
+metadata:
+ title: Windows security foundation # Required; page title displayed in search results. Include the brand. < 60 chars.
+ description: Learn about Windows security foundation # Required; article description that is displayed in search results. < 160 chars.
+ ms.topic: landing-page # Required
+ ms.collection: m365-security-compliance
+ author: dansimp #Required; your GitHub user alias, with correct capitalization.
+ ms.author: dansimp #Required; microsoft alias of author; optional team alias.
+ ms.date: 09/30/2021 #Required; mm/dd/yyyy format.
+ localization_priority: Priority
+
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
+
+landingContent:
+# Cards and links should be based on top customer tasks or top subjects
+# Start card title with a verb
+ # Card (optional)
+ - title: Security assurance
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: Microsoft Security Development Lifecycle (SDL)
+ url: /previous-versions/windows/desktop/cc307891(v=msdn.10)
+ - text: Microsoft bounty program
+ url: https://www.microsoft.com/msrc/bounty
+ # Card
+ - title: Certifications
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: Federal Information Processing Standard (FIPS) 140 Validation
+ url: /windows/security/threat-protection/fips-140-validation
+ - text: Common Criteria Certifications
+ url: /windows/security/threat-protection/windows-platform-common-criteria
+
\ No newline at end of file
From 3ee4d7320172bb61dad3da1466c84c5ad5a9160d Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 10:45:48 -0700
Subject: [PATCH 007/671] new toc
---
windows/security/security-foundation/TOC.yml | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/windows/security/security-foundation/TOC.yml b/windows/security/security-foundation/TOC.yml
index 70e61e303f..e52bc796f3 100644
--- a/windows/security/security-foundation/TOC.yml
+++ b/windows/security/security-foundation/TOC.yml
@@ -1,9 +1,8 @@
-- name: Security
+- name: Security foundation
href: index.yml
items:
- - name: Identity and access management
- href: identity-protection/index.md
- - name: Information protection
- href: information-protection/index.md
- - name: Threat protection
- href: threat-protection/index.md
+ - name: FIPS 140-2 Validation
+ href: /windows/security/threat-protection/fips-140-validation.md
+ - name: Common Criteria Certifications
+ href: /windows/security/threat-protection/windows-platform-common-criteria.md
+
From de0651579c191a6482de2d5ff59c35c9b7b8a6b2 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 11:13:41 -0700
Subject: [PATCH 008/671] one big TOC
---
windows/security/TOC.yml | 22 ++++++---
windows/security/index.yml | 94 +++++++++++++++-----------------------
2 files changed, 52 insertions(+), 64 deletions(-)
diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml
index 70e61e303f..818858dece 100644
--- a/windows/security/TOC.yml
+++ b/windows/security/TOC.yml
@@ -1,9 +1,17 @@
-- name: Security
+
+- name: Windows security foundation
href: index.yml
+ expanded: true
items:
- - name: Identity and access management
- href: identity-protection/index.md
- - name: Information protection
- href: information-protection/index.md
- - name: Threat protection
- href: threat-protection/index.md
+ - name: FIPS 140-2 Validation
+ href: /windows/security/threat-protection/fips-140-validation.md
+ - name: Common Criteria Certifications
+ href: /windows/security/threat-protection/windows-platform-common-criteria.md
+- name: Windows hardware Security
+ items:
+ - name: Trusted Platform Module (TPM) overview
+ href: /windows/security/information-protection/tpm/trusted-platform-module-overview.md
+ - name: Protect derived domain credentials with Windows Defender Credential Guard
+ href: /windows/security/identity-protection/credential-guard/credential-guard.md
+ - name: Kernel DMA Protection
+ href: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
\ No newline at end of file
diff --git a/windows/security/index.yml b/windows/security/index.yml
index 29ac6d128a..0e1f888e64 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -1,64 +1,44 @@
-### YamlMime:Hub
+### YamlMime:Landing
-title: Windows 10 Enterprise Security # < 60 chars
-summary: Security from chip to cloud. # < 160 chars
-# brand: aspnet | azure | dotnet | dynamics | m365 | ms-graph | office | power-bi | power-platform | sql | sql-server | vs | visual-studio | windows | xamarin
-brand: windows
+title: Windows security # < 60 chars
+summary: Learn about Windows security from chip to cloud. # < 160 chars
metadata:
- title: Windows 10 Enterprise Security # Required; page title displayed in search results. Include the brand. < 60 chars.
- description: Learn about enterprise-grade security features in Windows 10 and Windows 11. # Required; article description that is displayed in search results. < 160 chars.
- services: windows
- ms.product: windows
- ms.topic: hub-page # Required
- ms.collection: M365-security-compliance # Optional; Remove if no collection is used.
+ title: Windows security # Required; page title displayed in search results. Include the brand. < 60 chars.
+ description: Learn about Windows security # Required; article description that is displayed in search results. < 160 chars.
+ ms.topic: landing-page # Required
+ ms.collection: m365-security-compliance
author: dansimp #Required; your GitHub user alias, with correct capitalization.
ms.author: dansimp #Required; microsoft alias of author; optional team alias.
ms.date: 09/30/2021 #Required; mm/dd/yyyy format.
- ms.localizationpriority: high
+ localization_priority: Priority
+
+# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
-# productDirectory section (optional)
-productDirectory:
- items:
- # Card
- - title: Security foundation
- imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
- summary: Security assurances and certifications
- url: ./information-protection/index.md
-
- # Card
- - title: Hardware security
- # imageSrc should be square in ratio with no whitespace
- imageSrc: https://docs.microsoft.com/media/common/i_identity-protection.svg
- summary: Hardware root of trust and silicon-assisted security
- url: ./identity-protection/index.md
- # Card
- - title: Operating system protection
- imageSrc: https://docs.microsoft.com/media/common/i_threat-protection.svg
- summary: Windows security enhancements
- url: ./threat-protection/index.md
- # Card
- - title: Threat protection
- imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
- summary: Protection from external attacks and threats
- url: ./information-protection/index.md
- # Card
- - title: Application protection
- imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
- summary: App protections
- url: ./information-protection/index.md
- # Card
- - title: User protection
- imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
- summary: Protecting your users
- url: ./information-protection/index.md
- # Card
- - title: Privacy controls
- imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
- summary: Manage your privacy settings
- url: ./information-protection/index.md
- # Card
- - title: Cloud security
- imageSrc: https://docs.microsoft.com/media/common/i_information-protection.svg
- summary: Additional cloud-based security and management solutions
- url: ./information-protection/index.md
+landingContent:
+# Cards and links should be based on top customer tasks or top subjects
+# Start card title with a verb
+ # Card (optional)
+ - title: Security foundations
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: Federal Information Processing Standard (FIPS) 140 Validation
+ url: /windows/security/threat-protection/fips-140-validation
+ - text: Common Criteria Certifications
+ url: /windows/security/threat-protection/windows-platform-common-criteria
+ - text: Microsoft Security Development Lifecycle (SDL)
+ url: /previous-versions/windows/desktop/cc307891(v=msdn.10)
+ - text: Microsoft bounty program
+ url: https://www.microsoft.com/msrc/bounty
+ # Card (optional)
+ - title: Hardware security
+ linkLists:
+ - linkListType: overview
+ links:
+ - name: Trusted Platform Module (TPM) overview
+ href: /windows/security/information-protection/tpm/trusted-platform-module-overview.md
+ - name: Protect derived domain credentials with Windows Defender Credential Guard
+ href: /windows/security/identity-protection/credential-guard/credential-guard.md
+ - name: Kernel DMA Protection
+ href: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.m
\ No newline at end of file
From 49a29668dc3cda2dde74b920317854a71110a8e2 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 11:19:38 -0700
Subject: [PATCH 009/671] fixing build issues
---
windows/security/index.yml | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/windows/security/index.yml b/windows/security/index.yml
index 0e1f888e64..aca0718a29 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -24,9 +24,9 @@ landingContent:
- linkListType: overview
links:
- text: Federal Information Processing Standard (FIPS) 140 Validation
- url: /windows/security/threat-protection/fips-140-validation
+ url: /windows/security/threat-protection/fips-140-validation.md
- text: Common Criteria Certifications
- url: /windows/security/threat-protection/windows-platform-common-criteria
+ url: /windows/security/threat-protection/windows-platform-common-criteria.md
- text: Microsoft Security Development Lifecycle (SDL)
url: /previous-versions/windows/desktop/cc307891(v=msdn.10)
- text: Microsoft bounty program
@@ -41,4 +41,4 @@ landingContent:
- name: Protect derived domain credentials with Windows Defender Credential Guard
href: /windows/security/identity-protection/credential-guard/credential-guard.md
- name: Kernel DMA Protection
- href: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.m
\ No newline at end of file
+ href: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
\ No newline at end of file
From d7b21ad9297c397a5c555bd129dc4b5ca4577b83 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 11:20:13 -0700
Subject: [PATCH 010/671] rm
---
windows/security/security-foundation/TOC.yml | 8 ----
.../security/security-foundation/index.yml | 39 -------------------
2 files changed, 47 deletions(-)
delete mode 100644 windows/security/security-foundation/TOC.yml
delete mode 100644 windows/security/security-foundation/index.yml
diff --git a/windows/security/security-foundation/TOC.yml b/windows/security/security-foundation/TOC.yml
deleted file mode 100644
index e52bc796f3..0000000000
--- a/windows/security/security-foundation/TOC.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-- name: Security foundation
- href: index.yml
- items:
- - name: FIPS 140-2 Validation
- href: /windows/security/threat-protection/fips-140-validation.md
- - name: Common Criteria Certifications
- href: /windows/security/threat-protection/windows-platform-common-criteria.md
-
diff --git a/windows/security/security-foundation/index.yml b/windows/security/security-foundation/index.yml
deleted file mode 100644
index 97eae49e18..0000000000
--- a/windows/security/security-foundation/index.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-### YamlMime:Landing
-
-title: Windows security foundation # < 60 chars
-summary: Learn about Windows security foundations. # < 160 chars
-
-metadata:
- title: Windows security foundation # Required; page title displayed in search results. Include the brand. < 60 chars.
- description: Learn about Windows security foundation # Required; article description that is displayed in search results. < 160 chars.
- ms.topic: landing-page # Required
- ms.collection: m365-security-compliance
- author: dansimp #Required; your GitHub user alias, with correct capitalization.
- ms.author: dansimp #Required; microsoft alias of author; optional team alias.
- ms.date: 09/30/2021 #Required; mm/dd/yyyy format.
- localization_priority: Priority
-
-# linkListType: architecture | concept | deploy | download | get-started | how-to-guide | learn | overview | quickstart | reference | tutorial | video | whats-new
-
-landingContent:
-# Cards and links should be based on top customer tasks or top subjects
-# Start card title with a verb
- # Card (optional)
- - title: Security assurance
- linkLists:
- - linkListType: overview
- links:
- - text: Microsoft Security Development Lifecycle (SDL)
- url: /previous-versions/windows/desktop/cc307891(v=msdn.10)
- - text: Microsoft bounty program
- url: https://www.microsoft.com/msrc/bounty
- # Card
- - title: Certifications
- linkLists:
- - linkListType: overview
- links:
- - text: Federal Information Processing Standard (FIPS) 140 Validation
- url: /windows/security/threat-protection/fips-140-validation
- - text: Common Criteria Certifications
- url: /windows/security/threat-protection/windows-platform-common-criteria
-
\ No newline at end of file
From fb6fc95b75a994efa5a2f8be614909bc7bd58df6 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 11:23:32 -0700
Subject: [PATCH 011/671] url
---
windows/security/index.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/windows/security/index.yml b/windows/security/index.yml
index aca0718a29..ee8986dea8 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -28,7 +28,7 @@ landingContent:
- text: Common Criteria Certifications
url: /windows/security/threat-protection/windows-platform-common-criteria.md
- text: Microsoft Security Development Lifecycle (SDL)
- url: /previous-versions/windows/desktop/cc307891(v=msdn.10)
+ url: /previous-versions/windows/desktop/cc307891(v=msdn.10)
- text: Microsoft bounty program
url: https://www.microsoft.com/msrc/bounty
# Card (optional)
@@ -37,8 +37,8 @@ landingContent:
- linkListType: overview
links:
- name: Trusted Platform Module (TPM) overview
- href: /windows/security/information-protection/tpm/trusted-platform-module-overview.md
+ url: /windows/security/information-protection/tpm/trusted-platform-module-overview.md
- name: Protect derived domain credentials with Windows Defender Credential Guard
- href: /windows/security/identity-protection/credential-guard/credential-guard.md
+ url: /windows/security/identity-protection/credential-guard/credential-guard.md
- name: Kernel DMA Protection
- href: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
\ No newline at end of file
+ url: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
\ No newline at end of file
From b8c9dd3dba72cb7002e3fb1a802ddb427e583ff0 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 11:28:22 -0700
Subject: [PATCH 012/671] t
---
windows/security/index.yml | 13 +------------
1 file changed, 1 insertion(+), 12 deletions(-)
diff --git a/windows/security/index.yml b/windows/security/index.yml
index ee8986dea8..86e84caf8f 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -30,15 +30,4 @@ landingContent:
- text: Microsoft Security Development Lifecycle (SDL)
url: /previous-versions/windows/desktop/cc307891(v=msdn.10)
- text: Microsoft bounty program
- url: https://www.microsoft.com/msrc/bounty
- # Card (optional)
- - title: Hardware security
- linkLists:
- - linkListType: overview
- links:
- - name: Trusted Platform Module (TPM) overview
- url: /windows/security/information-protection/tpm/trusted-platform-module-overview.md
- - name: Protect derived domain credentials with Windows Defender Credential Guard
- url: /windows/security/identity-protection/credential-guard/credential-guard.md
- - name: Kernel DMA Protection
- url: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
\ No newline at end of file
+ url: https://www.microsoft.com/msrc/bounty
\ No newline at end of file
From 326837bfb85dfa32a838f59d9c1f508751347800 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 11:36:47 -0700
Subject: [PATCH 013/671] testing
---
windows/security/index.yml | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/windows/security/index.yml b/windows/security/index.yml
index 86e84caf8f..74890e02e3 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -17,6 +17,21 @@ metadata:
landingContent:
# Cards and links should be based on top customer tasks or top subjects
+# Start card title with a verb
+ # Card (optional)
+ - title: Security foundations
+ linkLists:
+ - linkListType: overview
+ links:
+ - text: Federal Information Processing Standard (FIPS) 140 Validation
+ url: /windows/security/threat-protection/fips-140-validation.md
+ - text: Common Criteria Certifications
+ url: /windows/security/threat-protection/windows-platform-common-criteria.md
+ - text: Microsoft Security Development Lifecycle (SDL)
+ url: /previous-versions/windows/desktop/cc307891(v=msdn.10)
+ - text: Microsoft bounty program
+ url: https://www.microsoft.com/msrc/bounty
+# Cards and links should be based on top customer tasks or top subjects
# Start card title with a verb
# Card (optional)
- title: Security foundations
From c0d3a328ddc11d8d8211321be73d4e3876a237fb Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 11:53:30 -0700
Subject: [PATCH 014/671] adding more toc...
---
windows/security/TOC.yml | 48 ++++++++++++++++++++++++++++++++++----
windows/security/index.yml | 25 +++++++++++++-------
2 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml
index 818858dece..99d00bd691 100644
--- a/windows/security/TOC.yml
+++ b/windows/security/TOC.yml
@@ -1,17 +1,55 @@
-- name: Windows security foundation
+- name: Windows security
href: index.yml
expanded: true
+- name: Windows security foundations
items:
- name: FIPS 140-2 Validation
href: /windows/security/threat-protection/fips-140-validation.md
- name: Common Criteria Certifications
href: /windows/security/threat-protection/windows-platform-common-criteria.md
-- name: Windows hardware Security
+- name: Windows hardware security
items:
- - name: Trusted Platform Module (TPM) overview
- href: /windows/security/information-protection/tpm/trusted-platform-module-overview.md
+ - name: Trusted Platform Module
+ href: tpm/trusted-platform-module-top-node.md
+ items:
+ - name: Trusted Platform Module Overview
+ href: tpm/trusted-platform-module-overview.md
+ - name: TPM fundamentals
+ href: tpm/tpm-fundamentals.md
+ - name: How Windows 10 uses the TPM
+ href: tpm/how-windows-uses-the-tpm.md
+ - name: TPM Group Policy settings
+ href: tpm/trusted-platform-module-services-group-policy-settings.md
+ - name: Back up the TPM recovery information to AD DS
+ href: tpm/backup-tpm-recovery-information-to-ad-ds.md
+ - name: View status, clear, or troubleshoot the TPM
+ href: tpm/initialize-and-configure-ownership-of-the-tpm.md
+ - name: Understanding PCR banks on TPM 2.0 devices
+ href: tpm/switch-pcr-banks-on-tpm-2-0-devices.md
+ - name: TPM recommendations
+ href: tpm/tpm-recommendations.md
- name: Protect derived domain credentials with Windows Defender Credential Guard
href: /windows/security/identity-protection/credential-guard/credential-guard.md
- name: Kernel DMA Protection
- href: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
\ No newline at end of file
+ href: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
+- name: Windows operating system security
+ items:
+ - name: system security
+ items:
+ - name: Secure the Windows 10 boot process
+ href: secure-the-windows-10-boot-process.md
+ - name: Encryption and data protection
+ items:
+ - name: Bitlocker
+ href: information-protection/bitlocker/bitlocker-overview.md
+ - name: Network security
+ items:
+ - name: VPN
+ href: identity-protection/vpn/vpn-guide.md
+ - name: Windows Defender Firewall
+ href: threat-protection/windows-firewall/windows-firewall-with-advanced-security.md
+- name: Windows threat protection
+ items:
+ - name: Microsoft Defender Antivirus
+ href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows.md
\ No newline at end of file
diff --git a/windows/security/index.yml b/windows/security/index.yml
index 74890e02e3..4c3fe7d66c 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -34,15 +34,22 @@ landingContent:
# Cards and links should be based on top customer tasks or top subjects
# Start card title with a verb
# Card (optional)
- - title: Security foundations
+ - title: Hardware security
linkLists:
- linkListType: overview
links:
- - text: Federal Information Processing Standard (FIPS) 140 Validation
- url: /windows/security/threat-protection/fips-140-validation.md
- - text: Common Criteria Certifications
- url: /windows/security/threat-protection/windows-platform-common-criteria.md
- - text: Microsoft Security Development Lifecycle (SDL)
- url: /previous-versions/windows/desktop/cc307891(v=msdn.10)
- - text: Microsoft bounty program
- url: https://www.microsoft.com/msrc/bounty
\ No newline at end of file
+ - name: Trusted Platform Module
+ url: tpm/trusted-platform-module-top-node.md
+ - name: Kernel DMA Protection
+ href: information-protection/kernel-dma-protection-for-thunderbolt.md
+# Cards and links should be based on top customer tasks or top subjects
+# Start card title with a verb
+ # Card (optional)
+ - title: Operating system security
+ linkLists:
+ - linkListType: overview
+ links:
+ - name: Secure the Windows boot process
+ url: information-protection/secure-the-windows-10-boot-process.md
+ - name: Configure S/MIME for Windows 10
+ url: identity-protection/configure-s-mime.md
\ No newline at end of file
From e1f59479bbcefdb167f347e225087986d6fe1deb Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 12:04:14 -0700
Subject: [PATCH 015/671] fixing
---
windows/security/TOC.yml | 22 +++++++++++-----------
windows/security/index.yml | 8 ++++----
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml
index 99d00bd691..f3f4538b86 100644
--- a/windows/security/TOC.yml
+++ b/windows/security/TOC.yml
@@ -11,24 +11,24 @@
- name: Windows hardware security
items:
- name: Trusted Platform Module
- href: tpm/trusted-platform-module-top-node.md
+ href: /windows/security/information-protection/tpm/trusted-platform-module-top-node.md
items:
- name: Trusted Platform Module Overview
- href: tpm/trusted-platform-module-overview.md
+ href: /windows/security/information-protection/tpm/trusted-platform-module-overview.md
- name: TPM fundamentals
- href: tpm/tpm-fundamentals.md
+ href: /windows/security/information-protection/tpm/tpm-fundamentals.md
- name: How Windows 10 uses the TPM
- href: tpm/how-windows-uses-the-tpm.md
+ href: /windows/security/information-protection/tpm/how-windows-uses-the-tpm.md
- name: TPM Group Policy settings
- href: tpm/trusted-platform-module-services-group-policy-settings.md
+ href: /windows/security/information-protection/tpm/trusted-platform-module-services-group-policy-settings.md
- name: Back up the TPM recovery information to AD DS
- href: tpm/backup-tpm-recovery-information-to-ad-ds.md
+ href: /windows/security/information-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md
- name: View status, clear, or troubleshoot the TPM
- href: tpm/initialize-and-configure-ownership-of-the-tpm.md
+ href: /windows/security/information-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md
- name: Understanding PCR banks on TPM 2.0 devices
- href: tpm/switch-pcr-banks-on-tpm-2-0-devices.md
+ href: /windows/security/information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md
- name: TPM recommendations
- href: tpm/tpm-recommendations.md
+ href: /windows/security/information-protection/tpm/tpm-recommendations.md
- name: Protect derived domain credentials with Windows Defender Credential Guard
href: /windows/security/identity-protection/credential-guard/credential-guard.md
- name: Kernel DMA Protection
@@ -38,11 +38,11 @@
- name: system security
items:
- name: Secure the Windows 10 boot process
- href: secure-the-windows-10-boot-process.md
+ href: /windows/security/information-protection/secure-the-windows-10-boot-process.md
- name: Encryption and data protection
items:
- name: Bitlocker
- href: information-protection/bitlocker/bitlocker-overview.md
+ href: /windows/security/information-protection/bitlocker/bitlocker-overview.md
- name: Network security
items:
- name: VPN
diff --git a/windows/security/index.yml b/windows/security/index.yml
index 4c3fe7d66c..3ebfbd536f 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -39,9 +39,9 @@ landingContent:
- linkListType: overview
links:
- name: Trusted Platform Module
- url: tpm/trusted-platform-module-top-node.md
+ url: /windows/security/information-protection/trusted-platform-module-top-node.md
- name: Kernel DMA Protection
- href: information-protection/kernel-dma-protection-for-thunderbolt.md
+ url: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
# Cards and links should be based on top customer tasks or top subjects
# Start card title with a verb
# Card (optional)
@@ -50,6 +50,6 @@ landingContent:
- linkListType: overview
links:
- name: Secure the Windows boot process
- url: information-protection/secure-the-windows-10-boot-process.md
+ url: /windows/security/information-protection/secure-the-windows-10-boot-process.md
- name: Configure S/MIME for Windows 10
- url: identity-protection/configure-s-mime.md
\ No newline at end of file
+ url: /windows/security/identity-protection/configure-s-mime.md
\ No newline at end of file
From bf753cf37da5935e75c69155b36ca0e6066d4009 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 12:10:46 -0700
Subject: [PATCH 016/671] text
---
windows/security/index.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/windows/security/index.yml b/windows/security/index.yml
index 3ebfbd536f..2761ee94c4 100644
--- a/windows/security/index.yml
+++ b/windows/security/index.yml
@@ -38,9 +38,9 @@ landingContent:
linkLists:
- linkListType: overview
links:
- - name: Trusted Platform Module
- url: /windows/security/information-protection/trusted-platform-module-top-node.md
- - name: Kernel DMA Protection
+ - text: Trusted Platform Module
+ url: /windows/security/information-protection/tpm/trusted-platform-module-top-node.md
+ - text: Kernel DMA Protection
url: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
# Cards and links should be based on top customer tasks or top subjects
# Start card title with a verb
@@ -49,7 +49,7 @@ landingContent:
linkLists:
- linkListType: overview
links:
- - name: Secure the Windows boot process
+ - text: Secure the Windows boot process
url: /windows/security/information-protection/secure-the-windows-10-boot-process.md
- - name: Configure S/MIME for Windows 10
+ - text: Configure S/MIME for Windows 10
url: /windows/security/identity-protection/configure-s-mime.md
\ No newline at end of file
From 9cb21a66d89d04a468a7f8e9b1d807a57b806e87 Mon Sep 17 00:00:00 2001
From: v-dihans
Date: Thu, 19 Aug 2021 13:15:58 -0600
Subject: [PATCH 017/671] dh-make-bulleted-list
---
.../demonstrate-deployment-on-vm.md | 77 ++++++++++---------
1 file changed, 40 insertions(+), 37 deletions(-)
diff --git a/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md b/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
index effa84ef83..f41d64d23e 100644
--- a/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
+++ b/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
@@ -44,10 +44,13 @@ The following video provides an overview of the process:
## Prerequisites
These are the things you'll need to complete this lab:
-| Windows 10 installation media | Windows 10 Professional or Enterprise (ISO file) for a supported version of Windows 10, semi-annual channel. If you do not already have an ISO to use, a link is provided to download an evaluation version of Windows 10 Enterprise. |
-| Internet access | If you're behind a firewall, see the detailed networking requirements. Otherwise, just ensure that you have a connection to the Internet. |
-| Hyper-V or a physical device running Windows 10 | The guide assumes that you will use a Hyper-V VM, and provides instructions to install and configure Hyper-V if needed. To use a physical device, skip the steps to install and configure Hyper-V. |
-| An account with Azure AD Premium license | This guide will describe how to obtain a free 30-day trial Azure AD Premium subscription that can be used to complete the lab. |
+
+| | Description |
+|:---|:---|
+|**Windows 10 installation media**|Windows 10 Professional or Enterprise (ISO file) for a supported version of Windows 10, semi-annual channel. If you do not already have an ISO to use, a link is provided to download an evaluation version of Windows 10 Enterprise.|
+|**Internet access**|If you're behind a firewall, see the detailed networking requirements. Otherwise, just ensure that you have a connection to the Internet.|
+|**Hyper-V or a physical device running Windows 10**|The guide assumes that you will use a Hyper-V VM, and provides instructions to install and configure Hyper-V if needed. To use a physical device, skip the steps to install and configure Hyper-V.|
+|**An account with Azure AD Premium license**|This guide will describe how to obtain a free 30-day trial Azure AD Premium subscription that can be used to complete the lab.|
## Procedures
@@ -55,39 +58,39 @@ A summary of the sections and procedures in the lab is provided below. Follow ea
If you already have Hyper-V and a Windows 10 VM, you can skip directly to the [Capture the hardware ID](#capture-the-hardware-id) step. The VM must be running Windows 10, version 1903 or a later version.
-[Verify support for Hyper-V](#verify-support-for-hyper-v)
-
[Enable Hyper-V](#enable-hyper-v)
-
[Create a demo VM](#create-a-demo-vm)
-
[Set ISO file location](#set-iso-file-location)
-
[Determine network adapter name](#determine-network-adapter-name)
-
[Use Windows PowerShell to create the demo VM](#use-windows-powershell-to-create-the-demo-vm)
-
[Install Windows 10](#install-windows-10)
-
[Capture the hardware ID](#capture-the-hardware-id)
-
[Reset the VM back to Out-Of-Box-Experience (OOBE)](#reset-the-vm-back-to-out-of-box-experience-oobe)
-
[Verify subscription level](#verify-subscription-level)
-
[Configure company branding](#configure-company-branding)
-
[Configure Microsoft Intune auto-enrollment](#configure-microsoft-intune-auto-enrollment)
-
[Register your VM](#register-your-vm)
-
[Autopilot registration using Intune](#autopilot-registration-using-intune)
-
[Autopilot registration using MSfB](#autopilot-registration-using-msfb)
-
[Create and assign a Windows Autopilot deployment profile](#create-and-assign-a-windows-autopilot-deployment-profile)
-
[Create a Windows Autopilot deployment profile using Intune](#create-a-windows-autopilot-deployment-profile-using-intune)
-
[Create a device group](#create-a-device-group)
-
[Create the deployment profile](#create-the-deployment-profile)
-
[Create a Windows Autopilot deployment profile using MSfB](#create-a-windows-autopilot-deployment-profile-using-msfb)
-
[See Windows Autopilot in action](#see-windows-autopilot-in-action)
-
[Remove devices from Autopilot](#remove-devices-from-autopilot)
-
[Delete (deregister) Autopilot device](#delete-deregister-autopilot-device)
-
[Appendix A: Verify support for Hyper-V](#appendix-a-verify-support-for-hyper-v)
-
[Appendix B: Adding apps to your profile](#appendix-b-adding-apps-to-your-profile)
-
[Add a Win32 app](#add-a-win32-app)
-
[Prepare the app for Intune](#prepare-the-app-for-intune)
-
[Create app in Intune](#create-app-in-intune)
-
[Assign the app to your Intune profile](#assign-the-app-to-your-intune-profile)
-
[Add Office 365](#add-office-365)
-
[Create app in Intune](#create-app-in-intune)
-
[Assign the app to your Intune profile](#assign-the-app-to-your-intune-profile)
-
[Glossary](#glossary)
+- [Verify support for Hyper-V](#verify-support-for-hyper-v)
+- [Enable Hyper-V](#enable-hyper-v)
+- [Create a demo VM](#create-a-demo-vm)
+ - [Set ISO file location](#set-iso-file-location)
+ - [Determine network adapter name](#determine-network-adapter-name)
+ - [Use Windows PowerShell to create the demo VM](#use-windows-powershell-to-create-the-demo-vm)
+ - [Install Windows 10](#install-windows-10)
+- [Capture the hardware ID](#capture-the-hardware-id)
+- [Reset the VM back to Out-Of-Box-Experience (OOBE)](#reset-the-vm-back-to-out-of-box-experience-oobe)
+- [Verify subscription level](#verify-subscription-level)
+- [Configure company branding](#configure-company-branding)
+- [Configure Microsoft Intune auto-enrollment](#configure-microsoft-intune-auto-enrollment)
+- [Register your VM](#register-your-vm)
+ - [Autopilot registration using Intune](#autopilot-registration-using-intune)
+ - [Autopilot registration using MSfB](#autopilot-registration-using-msfb)
+- [Create and assign a Windows Autopilot deployment profile](#create-and-assign-a-windows-autopilot-deployment-profile)
+ - [Create a Windows Autopilot deployment profile using Intune](#create-a-windows-autopilot-deployment-profile-using-intune)
+ - [Create a device group](#create-a-device-group)
+ - [Create the deployment profile](#create-the-deployment-profile)
+ - [Create a Windows Autopilot deployment profile using MSfB](#create-a-windows-autopilot-deployment-profile-using-msfb)
+- [See Windows Autopilot in action](#see-windows-autopilot-in-action)
+- [Remove devices from Autopilot](#remove-devices-from-autopilot)
+ - [Delete (deregister) Autopilot device](#delete-deregister-autopilot-device)
+- [Appendix A: Verify support for Hyper-V](#appendix-a-verify-support-for-hyper-v)
+- [Appendix B: Adding apps to your profile](#appendix-b-adding-apps-to-your-profile)
+ - [Add a Win32 app](#add-a-win32-app)
+ - [Prepare the app for Intune](#prepare-the-app-for-intune)
+ - [Create app in Intune](#create-app-in-intune)
+ - [Assign the app to your Intune profile](#assign-the-app-to-your-intune-profile)
+ - [Add Office 365](#add-office-365)
+ - [Create app in Intune](#create-app-in-intune)
+ - [Assign the app to your Intune profile](#assign-the-app-to-your-intune-profile)
+- [Glossary](#glossary)
## Verify support for Hyper-V
From 78d73dc75dd270b75b37b012226b13cef5fe73da Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 12:30:47 -0700
Subject: [PATCH 018/671] oops all broken
---
windows/security/TOC.yml | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml
index f3f4538b86..237dfd3ad2 100644
--- a/windows/security/TOC.yml
+++ b/windows/security/TOC.yml
@@ -5,44 +5,44 @@
- name: Windows security foundations
items:
- name: FIPS 140-2 Validation
- href: /windows/security/threat-protection/fips-140-validation.md
+ href: threat-protection/fips-140-validation.md
- name: Common Criteria Certifications
- href: /windows/security/threat-protection/windows-platform-common-criteria.md
+ href: threat-protection/windows-platform-common-criteria.md
- name: Windows hardware security
items:
- name: Trusted Platform Module
- href: /windows/security/information-protection/tpm/trusted-platform-module-top-node.md
+ href: information-protection/tpm/trusted-platform-module-top-node.md
items:
- name: Trusted Platform Module Overview
- href: /windows/security/information-protection/tpm/trusted-platform-module-overview.md
+ href: information-protection/tpm/trusted-platform-module-overview.md
- name: TPM fundamentals
- href: /windows/security/information-protection/tpm/tpm-fundamentals.md
+ href: information-protection/tpm/tpm-fundamentals.md
- name: How Windows 10 uses the TPM
- href: /windows/security/information-protection/tpm/how-windows-uses-the-tpm.md
+ href: information-protection/tpm/how-windows-uses-the-tpm.md
- name: TPM Group Policy settings
- href: /windows/security/information-protection/tpm/trusted-platform-module-services-group-policy-settings.md
+ href: information-protection/tpm/trusted-platform-module-services-group-policy-settings.md
- name: Back up the TPM recovery information to AD DS
- href: /windows/security/information-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md
+ href: information-protection/tpm/backup-tpm-recovery-information-to-ad-ds.md
- name: View status, clear, or troubleshoot the TPM
- href: /windows/security/information-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md
+ href: information-protection/tpm/initialize-and-configure-ownership-of-the-tpm.md
- name: Understanding PCR banks on TPM 2.0 devices
- href: /windows/security/information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md
+ href: information-protection/tpm/switch-pcr-banks-on-tpm-2-0-devices.md
- name: TPM recommendations
- href: /windows/security/information-protection/tpm/tpm-recommendations.md
+ href: information-protection/tpm/tpm-recommendations.md
- name: Protect derived domain credentials with Windows Defender Credential Guard
- href: /windows/security/identity-protection/credential-guard/credential-guard.md
+ href: identity-protection/credential-guard/credential-guard.md
- name: Kernel DMA Protection
- href: /windows/security/information-protection/kernel-dma-protection-for-thunderbolt.md
+ href: information-protection/kernel-dma-protection-for-thunderbolt.md
- name: Windows operating system security
items:
- name: system security
items:
- name: Secure the Windows 10 boot process
- href: /windows/security/information-protection/secure-the-windows-10-boot-process.md
+ href: information-protection/secure-the-windows-10-boot-process.md
- name: Encryption and data protection
items:
- name: Bitlocker
- href: /windows/security/information-protection/bitlocker/bitlocker-overview.md
+ href: information-protection/bitlocker/bitlocker-overview.md
- name: Network security
items:
- name: VPN
From f5909d966ce0745152e4c1702151f99d2d58a82a Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 12:39:26 -0700
Subject: [PATCH 019/671] add
---
windows/security/TOC.yml | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml
index 237dfd3ad2..743bbc0044 100644
--- a/windows/security/TOC.yml
+++ b/windows/security/TOC.yml
@@ -2,13 +2,13 @@
- name: Windows security
href: index.yml
expanded: true
-- name: Windows security foundations
+- name: Security foundations
items:
- name: FIPS 140-2 Validation
href: threat-protection/fips-140-validation.md
- name: Common Criteria Certifications
href: threat-protection/windows-platform-common-criteria.md
-- name: Windows hardware security
+- name: Hardware security
items:
- name: Trusted Platform Module
href: information-protection/tpm/trusted-platform-module-top-node.md
@@ -33,9 +33,9 @@
href: identity-protection/credential-guard/credential-guard.md
- name: Kernel DMA Protection
href: information-protection/kernel-dma-protection-for-thunderbolt.md
-- name: Windows operating system security
+- name: Operating system security
items:
- - name: system security
+ - name: System security
items:
- name: Secure the Windows 10 boot process
href: information-protection/secure-the-windows-10-boot-process.md
@@ -49,7 +49,15 @@
href: identity-protection/vpn/vpn-guide.md
- name: Windows Defender Firewall
href: threat-protection/windows-firewall/windows-firewall-with-advanced-security.md
-- name: Windows threat protection
+- name: Threat protection
items:
- name: Microsoft Defender Antivirus
- href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows.md
\ No newline at end of file
+ href: /microsoft-365/security/defender-endpoint/microsoft-defender-antivirus-windows.md
+- name: Application protection
+ items:
+- name: User protection
+ items:
+- name: Privacy controls
+ items:
+ - name: Windows Privacy controls
+ href: https://docs.microsoft.com/windows/privacy/windows-10-and-privacy-compliance
\ No newline at end of file
From 7c596eaee5dc82515be9f2d6536ef0d2384e7ebe Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 12:56:00 -0700
Subject: [PATCH 020/671] adding in bitlocker
---
windows/security/TOC.yml | 74 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml
index 743bbc0044..91ff61ce6f 100644
--- a/windows/security/TOC.yml
+++ b/windows/security/TOC.yml
@@ -41,8 +41,82 @@
href: information-protection/secure-the-windows-10-boot-process.md
- name: Encryption and data protection
items:
+ - name: Encrypted Hard Drive
+ href: encrypted-hard-drive.md
- name: Bitlocker
href: information-protection/bitlocker/bitlocker-overview.md
+ items:
+ - name: Overview of BitLocker Device Encryption in Windows 10
+ href: information-protection/bitlocker/bitlocker-device-encryption-overview-windows-10.md
+ - name: BitLocker frequently asked questions (FAQ)
+ href: information-protection/bitlocker/bitlocker-frequently-asked-questions.yml
+ items:
+ - name: Overview and requirements
+ href: information-protection/bitlocker/bitlocker-overview-and-requirements-faq.yml
+ - name: Upgrading
+ href: information-protection/bitlocker/bitlocker-upgrading-faq.yml
+ - name: Deployment and administration
+ href: information-protection/bitlocker/bitlocker-deployment-and-administration-faq.yml
+ - name: Key management
+ href: information-protection/bitlocker/bitlocker-key-management-faq.yml
+ - name: BitLocker To Go
+ href: information-protection/bitlocker/bitlocker-to-go-faq.yml
+ - name: Active Directory Domain Services
+ href: information-protection/bitlocker/bitlocker-and-adds-faq.yml
+ - name: Security
+ href: information-protection/bitlocker/bitlocker-security-faq.yml
+ - name: BitLocker Network Unlock
+ href: information-protection/bitlocker/bitlocker-network-unlock-faq.yml
+ - name: General
+ href: information-protection/bitlocker/bitlocker-using-with-other-programs-faq.yml
+ - name: "Prepare your organization for BitLocker: Planning and policies"
+ href: information-protection/bitlocker/prepare-your-organization-for-bitlocker-planning-and-policies.md
+ - name: BitLocker deployment comparison
+ href: information-protection/bitlocker/bitlocker-deployment-comparison.md
+ - name: BitLocker basic deployment
+ href: information-protection/bitlocker/bitlocker-basic-deployment.md
+ - name: Deploy BitLocker on Windows Server 2012 and later
+ href: information-protection/bitlocker/bitlocker-how-to-deploy-on-windows-server.md
+ - name: BitLocker management for enterprises
+ href: information-protection/bitlocker/bitlocker-management-for-enterprises.md
+ - name: Enable Network Unlock with BitLocker
+ href: information-protection/bitlocker/bitlocker-how-to-enable-network-unlock.md
+ - name: Use BitLocker Drive Encryption Tools to manage BitLocker
+ href: information-protection/bitlocker/bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
+ - name: Use BitLocker Recovery Password Viewer
+ href: information-protection/bitlocker/bitlocker-use-bitlocker-recovery-password-viewer.md
+ - name: BitLocker Group Policy settings
+ href: information-protection/bitlocker/bitlocker-group-policy-settings.md
+ - name: BCD settings and BitLocker
+ href: information-protection/bitlocker/bcd-settings-and-bitlocker.md
+ - name: BitLocker Recovery Guide
+ href: information-protection/bitlocker/bitlocker-recovery-guide-plan.md
+ - name: BitLocker Countermeasures
+ href: information-protection/bitlocker/bitlocker-countermeasures.md
+ - name: Protecting cluster shared volumes and storage area networks with BitLocker
+ href: information-protection/bitlocker/protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md
+ - name: Troubleshoot BitLocker
+ items:
+ - name: Troubleshoot BitLocker
+ href: information-protection/bitlocker/troubleshoot-bitlocker.md
+ - name: "BitLocker cannot encrypt a drive: known issues"
+ href: information-protection/bitlocker/ts-bitlocker-cannot-encrypt-issues.md
+ - name: "Enforcing BitLocker policies by using Intune: known issues"
+ href: information-protection/bitlocker/ts-bitlocker-intune-issues.md
+ - name: "BitLocker Network Unlock: known issues"
+ href: information-protection/bitlocker/ts-bitlocker-network-unlock-issues.md
+ - name: "BitLocker recovery: known issues"
+ href: information-protection/bitlocker/ts-bitlocker-recovery-issues.md
+ - name: "BitLocker configuration: known issues"
+ href: information-protection/bitlocker/ts-bitlocker-config-issues.md
+ - name: Troubleshoot BitLocker and TPM issues
+ items:
+ - name: "BitLocker cannot encrypt a drive: known TPM issues"
+ href: information-protection/bitlocker/ts-bitlocker-cannot-encrypt-tpm-issues.md
+ - name: "BitLocker and TPM: other known issues"
+ href: information-protection/bitlocker/ts-bitlocker-tpm-issues.md
+ - name: Decode Measured Boot logs to track PCR changes
+ href: information-protection/bitlocker/ts-bitlocker-decode-measured-boot-logs.md
- name: Network security
items:
- name: VPN
From 5d9ce6746c4edbc594141d686bb734992c89bb34 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 13:00:01 -0700
Subject: [PATCH 021/671] attempting to redirect TOC
---
windows/security/information-protection/{TOC.yml => TOC-BAK.yml} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
rename windows/security/information-protection/{TOC.yml => TOC-BAK.yml} (100%)
diff --git a/windows/security/information-protection/TOC.yml b/windows/security/information-protection/TOC-BAK.yml
similarity index 100%
rename from windows/security/information-protection/TOC.yml
rename to windows/security/information-protection/TOC-BAK.yml
From e47977ed23df6f18a968ec290c7860028090fac8 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 13:04:05 -0700
Subject: [PATCH 022/671] build fail
---
.../information-protection/TOC-BAK.yml | 149 ------------------
1 file changed, 149 deletions(-)
delete mode 100644 windows/security/information-protection/TOC-BAK.yml
diff --git a/windows/security/information-protection/TOC-BAK.yml b/windows/security/information-protection/TOC-BAK.yml
deleted file mode 100644
index bcaa9d74d7..0000000000
--- a/windows/security/information-protection/TOC-BAK.yml
+++ /dev/null
@@ -1,149 +0,0 @@
-- name: Information protection
- href: index.md
- items:
- - name: BitLocker
- href: bitlocker\bitlocker-overview.md
- items:
- - name: Overview of BitLocker Device Encryption in Windows 10
- href: bitlocker\bitlocker-device-encryption-overview-windows-10.md
- - name: BitLocker frequently asked questions (FAQ)
- href: bitlocker\bitlocker-frequently-asked-questions.yml
- items:
- - name: Overview and requirements
- href: bitlocker\bitlocker-overview-and-requirements-faq.yml
- - name: Upgrading
- href: bitlocker\bitlocker-upgrading-faq.yml
- - name: Deployment and administration
- href: bitlocker\bitlocker-deployment-and-administration-faq.yml
- - name: Key management
- href: bitlocker\bitlocker-key-management-faq.yml
- - name: BitLocker To Go
- href: bitlocker\bitlocker-to-go-faq.yml
- - name: Active Directory Domain Services
- href: bitlocker\bitlocker-and-adds-faq.yml
- - name: Security
- href: bitlocker\bitlocker-security-faq.yml
- - name: BitLocker Network Unlock
- href: bitlocker\bitlocker-network-unlock-faq.yml
- - name: General
- href: bitlocker\bitlocker-using-with-other-programs-faq.yml
- - name: "Prepare your organization for BitLocker: Planning and policies"
- href: bitlocker\prepare-your-organization-for-bitlocker-planning-and-policies.md
- - name: BitLocker deployment comparison
- href: bitlocker\bitlocker-deployment-comparison.md
- - name: BitLocker basic deployment
- href: bitlocker\bitlocker-basic-deployment.md
- - name: "BitLocker: How to deploy on Windows Server 2012 and later"
- href: bitlocker\bitlocker-how-to-deploy-on-windows-server.md
- - name: "BitLocker: Management for enterprises"
- href: bitlocker\bitlocker-management-for-enterprises.md
- - name: "BitLocker: How to enable Network Unlock"
- href: bitlocker\bitlocker-how-to-enable-network-unlock.md
- - name: "BitLocker: Use BitLocker Drive Encryption Tools to manage BitLocker"
- href: bitlocker\bitlocker-use-bitlocker-drive-encryption-tools-to-manage-bitlocker.md
- - name: "BitLocker: Use BitLocker Recovery Password Viewer"
- href: bitlocker\bitlocker-use-bitlocker-recovery-password-viewer.md
- - name: BitLocker Group Policy settings
- href: bitlocker\bitlocker-group-policy-settings.md
- - name: BCD settings and BitLocker
- href: bitlocker\bcd-settings-and-bitlocker.md
- - name: BitLocker Recovery Guide
- href: bitlocker\bitlocker-recovery-guide-plan.md
- - name: BitLocker Countermeasures
- href: bitlocker\bitlocker-countermeasures.md
- - name: Protecting cluster shared volumes and storage area networks with BitLocker
- href: bitlocker\protecting-cluster-shared-volumes-and-storage-area-networks-with-bitlocker.md
- - name: Troubleshoot BitLocker
- items:
- - name: Troubleshoot BitLocker
- href: bitlocker\troubleshoot-bitlocker.md
- - name: "BitLocker cannot encrypt a drive: known issues"
- href: bitlocker\ts-bitlocker-cannot-encrypt-issues.md
- - name: "Enforcing BitLocker policies by using Intune: known issues"
- href: bitlocker\ts-bitlocker-intune-issues.md
- - name: "BitLocker Network Unlock: known issues"
- href: bitlocker\ts-bitlocker-network-unlock-issues.md
- - name: "BitLocker recovery: known issues"
- href: bitlocker\ts-bitlocker-recovery-issues.md
- - name: "BitLocker configuration: known issues"
- href: bitlocker\ts-bitlocker-config-issues.md
- - name: Troubleshoot BitLocker and TPM issues
- items:
- - name: "BitLocker cannot encrypt a drive: known TPM issues"
- href: bitlocker\ts-bitlocker-cannot-encrypt-tpm-issues.md
- - name: "BitLocker and TPM: other known issues"
- href: bitlocker\ts-bitlocker-tpm-issues.md
- - name: Decode Measured Boot logs to track PCR changes
- href: bitlocker\ts-bitlocker-decode-measured-boot-logs.md
- - name: Encrypted Hard Drive
- href: encrypted-hard-drive.md
- - name: Kernel DMA Protection
- href: kernel-dma-protection-for-thunderbolt.md
- - name: Protect your enterprise data using Windows Information Protection (WIP)
- href: windows-information-protection\protect-enterprise-data-using-wip.md
- items:
- - name: Create a WIP policy using Microsoft Intune
- href: windows-information-protection\overview-create-wip-policy.md
- items:
- - name: Create a WIP policy with MDM using the Azure portal for Microsoft Intune
- href: windows-information-protection\create-wip-policy-using-intune-azure.md
- items:
- - name: Deploy your WIP policy using the Azure portal for Microsoft Intune
- href: windows-information-protection\deploy-wip-policy-using-intune-azure.md
- - name: Associate and deploy a VPN policy for WIP using the Azure portal for Microsoft Intune
- href: windows-information-protection\create-vpn-and-wip-policy-using-intune-azure.md
- - name: Create and verify an EFS Data Recovery Agent (DRA) certificate
- href: windows-information-protection\create-and-verify-an-efs-dra-certificate.md
- - name: Determine the Enterprise Context of an app running in WIP
- href: windows-information-protection\wip-app-enterprise-context.md
- - name: Create a WIP policy using Microsoft Endpoint Configuration Manager
- href: windows-information-protection\overview-create-wip-policy-configmgr.md
- items:
- - name: Create and deploy a WIP policy using Microsoft Endpoint Configuration Manager
- href: windows-information-protection\create-wip-policy-using-configmgr.md
- - name: Create and verify an EFS Data Recovery Agent (DRA) certificate
- href: windows-information-protection\create-and-verify-an-efs-dra-certificate.md
- - name: Determine the Enterprise Context of an app running in WIP
- href: windows-information-protection\wip-app-enterprise-context.md
- - name: Mandatory tasks and settings required to turn on WIP
- href: windows-information-protection\mandatory-settings-for-wip.md
- - name: Testing scenarios for WIP
- href: windows-information-protection\testing-scenarios-for-wip.md
- - name: Limitations while using WIP
- href: windows-information-protection\limitations-with-wip.md
- - name: How to collect WIP audit event logs
- href: windows-information-protection\collect-wip-audit-event-logs.md
- - name: General guidance and best practices for WIP
- href: windows-information-protection\guidance-and-best-practices-wip.md
- items:
- - name: Enlightened apps for use with WIP
- href: windows-information-protection\enlightened-microsoft-apps-and-wip.md
- - name: Unenlightened and enlightened app behavior while using WIP
- href: windows-information-protection\app-behavior-with-wip.md
- - name: Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP
- href: windows-information-protection\recommended-network-definitions-for-wip.md
- - name: Using Outlook Web Access with WIP
- href: windows-information-protection\using-owa-with-wip.md
- - name: Fine-tune WIP Learning
- href: windows-information-protection\wip-learning.md
- - name: Secure the Windows 10 boot process
- href: secure-the-windows-10-boot-process.md
- - name: Trusted Platform Module
- href: tpm/trusted-platform-module-top-node.md
- items:
- - name: Trusted Platform Module Overview
- href: tpm/trusted-platform-module-overview.md
- - name: TPM fundamentals
- href: tpm/tpm-fundamentals.md
- - name: How Windows 10 uses the TPM
- href: tpm/how-windows-uses-the-tpm.md
- - name: TPM Group Policy settings
- href: tpm/trusted-platform-module-services-group-policy-settings.md
- - name: Back up the TPM recovery information to AD DS
- href: tpm/backup-tpm-recovery-information-to-ad-ds.md
- - name: View status, clear, or troubleshoot the TPM
- href: tpm/initialize-and-configure-ownership-of-the-tpm.md
- - name: Understanding PCR banks on TPM 2.0 devices
- href: tpm/switch-pcr-banks-on-tpm-2-0-devices.md
- - name: TPM recommendations
- href: tpm/tpm-recommendations.md
From 9caab07acfd421dc1f240e5c97105ee4a107dcb5 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 13:17:47 -0700
Subject: [PATCH 023/671] adding wip
---
windows/security/TOC.yml | 49 +++++++++++++++++++++++++++++++++++++++-
1 file changed, 48 insertions(+), 1 deletion(-)
diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml
index 91ff61ce6f..2370e36f4e 100644
--- a/windows/security/TOC.yml
+++ b/windows/security/TOC.yml
@@ -42,7 +42,7 @@
- name: Encryption and data protection
items:
- name: Encrypted Hard Drive
- href: encrypted-hard-drive.md
+ href: information-protection/encrypted-hard-drive.md
- name: Bitlocker
href: information-protection/bitlocker/bitlocker-overview.md
items:
@@ -117,6 +117,53 @@
href: information-protection/bitlocker/ts-bitlocker-tpm-issues.md
- name: Decode Measured Boot logs to track PCR changes
href: information-protection/bitlocker/ts-bitlocker-decode-measured-boot-logs.md
+ - name: Windows Information Protection (WIP)
+ href: information-protection/windows-information-protection/protect-enterprise-data-using-wip.md
+ items:
+ - name: Create a WIP policy using Microsoft Intune
+ href: information-protection/windows-information-protection/overview-create-wip-policy.md
+ items:
+ - name: Create a WIP policy with MDM using the Azure portal for Microsoft Intune
+ href: information-protection/windows-information-protection/create-wip-policy-using-intune-azure.md
+ items:
+ - name: Deploy your WIP policy using the Azure portal for Microsoft Intune
+ href: information-protection/windows-information-protection/deploy-wip-policy-using-intune-azure.md
+ - name: Associate and deploy a VPN policy for WIP using the Azure portal for Microsoft Intune
+ href: information-protection/windows-information-protection/create-vpn-and-wip-policy-using-intune-azure.md
+ - name: Create and verify an EFS Data Recovery Agent (DRA) certificate
+ href: information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md
+ - name: Determine the Enterprise Context of an app running in WIP
+ href: information-protection/windows-information-protection/wip-app-enterprise-context.md
+ - name: Create a WIP policy using Microsoft Endpoint Configuration Manager
+ href: information-protection/windows-information-protection/overview-create-wip-policy-configmgr.md
+ items:
+ - name: Create and deploy a WIP policy using Microsoft Endpoint Configuration Manager
+ href: information-protection/windows-information-protection/create-wip-policy-using-configmgr.md
+ - name: Create and verify an EFS Data Recovery Agent (DRA) certificate
+ href: information-protection/windows-information-protection/create-and-verify-an-efs-dra-certificate.md
+ - name: Determine the Enterprise Context of an app running in WIP
+ href: information-protection/windows-information-protection/wip-app-enterprise-context.md
+ - name: Mandatory tasks and settings required to turn on WIP
+ href: information-protection/windows-information-protection/mandatory-settings-for-wip.md
+ - name: Testing scenarios for WIP
+ href: information-protection/windows-information-protection/testing-scenarios-for-wip.md
+ - name: Limitations while using WIP
+ href: information-protection/windows-information-protection/limitations-with-wip.md
+ - name: How to collect WIP audit event logs
+ href: information-protection/windows-information-protection/collect-wip-audit-event-logs.md
+ - name: General guidance and best practices for WIP
+ href: information-protection/windows-information-protection/guidance-and-best-practices-wip.md
+ items:
+ - name: Enlightened apps for use with WIP
+ href: information-protection/windows-information-protection/enlightened-microsoft-apps-and-wip.md
+ - name: Unenlightened and enlightened app behavior while using WIP
+ href: information-protection/windows-information-protection/app-behavior-with-wip.md
+ - name: Recommended Enterprise Cloud Resources and Neutral Resources network settings with WIP
+ href: information-protection/windows-information-protection/recommended-network-definitions-for-wip.md
+ - name: Using Outlook Web Access with WIP
+ href: information-protection/windows-information-protection/using-owa-with-wip.md
+ - name: Fine-tune WIP Learning
+ href: information-protection/windows-information-protection/wip-learning.md
- name: Network security
items:
- name: VPN
From e794bc48fc50b76664029c2cce9571e35116adba Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 15:11:13 -0700
Subject: [PATCH 024/671] adding identity
---
windows/security/TOC.yml | 129 ++++++++++++++++++++++++++++++++++++++-
1 file changed, 128 insertions(+), 1 deletion(-)
diff --git a/windows/security/TOC.yml b/windows/security/TOC.yml
index 2370e36f4e..51021a5be7 100644
--- a/windows/security/TOC.yml
+++ b/windows/security/TOC.yml
@@ -117,6 +117,8 @@
href: information-protection/bitlocker/ts-bitlocker-tpm-issues.md
- name: Decode Measured Boot logs to track PCR changes
href: information-protection/bitlocker/ts-bitlocker-decode-measured-boot-logs.md
+ - name: Configure S/MIME for Windows 10
+ href: configure-s-mime.md
- name: Windows Information Protection (WIP)
href: information-protection/windows-information-protection/protect-enterprise-data-using-wip.md
items:
@@ -166,8 +168,31 @@
href: information-protection/windows-information-protection/wip-learning.md
- name: Network security
items:
- - name: VPN
+ - name: VPN technical guide
href: identity-protection/vpn/vpn-guide.md
+ items:
+ - name: VPN connection types
+ href: identity-protection/vpn/vpn-connection-type.md
+ - name: VPN routing decisions
+ href: identity-protection/vpn/vpn-routing.md
+ - name: VPN authentication options
+ href: identity-protection/vpn/vpn-authentication.md
+ - name: VPN and conditional access
+ href: identity-protection/vpn/vpn-conditional-access.md
+ - name: VPN name resolution
+ href: identity-protection/vpn/vpn-name-resolution.md
+ - name: VPN auto-triggered profile options
+ href: identity-protection/vpn/vpn-auto-trigger-profile.md
+ - name: VPN security features
+ href: identity-protection/vpn/vpn-security-features.md
+ - name: VPN profile options
+ href: identity-protection/vpn/vpn-profile-options.md
+ - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections
+ href: identity-protection/vpn/how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md
+ - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections
+ href: identity-protection/vpn/how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md
+ - name: Optimizing Office 365 traffic with the Windows 10 VPN client
+ href: identity-protection/vpn/vpn-office-365-optimization.md
- name: Windows Defender Firewall
href: threat-protection/windows-firewall/windows-firewall-with-advanced-security.md
- name: Threat protection
@@ -178,6 +203,108 @@
items:
- name: User protection
items:
+ - name: Technical support policy for lost or forgotten passwords
+ href: identity-protection/password-support-policy.md
+ - name: Access Control Overview
+ href: identity-protection/access-control/access-control.md
+ items:
+ - name: Dynamic Access Control Overview
+ href: identity-protection/access-control/dynamic-access-control.md
+ - name: Security identifiers
+ href: identity-protection/access-control/security-identifiers.md
+ - name: Security Principals
+ href: identity-protection/access-control/security-principals.md
+ - name: Local Accounts
+ href: identity-protection/access-control/local-accounts.md
+ - name: Active Directory Accounts
+ href: identity-protection/access-control/active-directory-accounts.md
+ - name: Microsoft Accounts
+ href: identity-protection/access-control/microsoft-accounts.md
+ - name: Service Accounts
+ href: identity-protection/access-control/service-accounts.md
+ - name: Active Directory Security Groups
+ href: identity-protection/access-control/active-directory-security-groups.md
+ - name: Special Identities
+ href: identity-protection/access-control/special-identities.md
+ - name: User Account Control
+ href: identity-protection/user-account-control/user-account-control-overview.md
+ items:
+ - name: How User Account Control works
+ href: identity-protection/user-account-control/how-user-account-control-works.md
+ - name: User Account Control security policy settings
+ href: identity-protection/user-account-control/user-account-control-security-policy-settings.md
+ - name: User Account Control Group Policy and registry key settings
+ href: identity-protection/user-account-control/user-account-control-group-policy-and-registry-key-settings.md
+ - name: Windows Hello for Business
+ href: identity-protection/hello-for-business/index.yml
+ - name: Windows credential theft mitigation guide
+ href: identity-protection/windows-credential-theft-mitigation-guide-abstract.md
+ - name: Enterprise Certificate Pinning
+ href: identity-protection/enterprise-certificate-pinning.md
+ - name: Protect derived domain credentials with Credential Guard
+ href: identity-protection/credential-guard/credential-guard.md
+ items:
+ - name: How Credential Guard works
+ href: identity-protection/credential-guard/credential-guard-how-it-works.md
+ - name: Credential Guard Requirements
+ href: identity-protection/credential-guard/credential-guard-requirements.md
+ - name: Manage Credential Guard
+ href: identity-protection/credential-guard/credential-guard-manage.md
+ - name: Hardware readiness tool
+ href: identity-protection/credential-guard/dg-readiness-tool.md
+ - name: Credential Guard protection limits
+ href: identity-protection/credential-guard/credential-guard-protection-limits.md
+ - name: Considerations when using Credential Guard
+ href: identity-protection/credential-guard/credential-guard-considerations.md
+ - name: "Credential Guard: Additional mitigations"
+ href: identity-protection/credential-guard/additional-mitigations.md
+ - name: "Credential Guard: Known issues"
+ href: identity-protection/credential-guard/credential-guard-known-issues.md
+ - name: Protect Remote Desktop credentials with Remote Credential Guard
+ href: identity-protection/remote-credential-guard.md
+ - name: Smart Cards
+ href: identity-protection/smart-cards/smart-card-windows-smart-card-technical-reference.md
+ items:
+ - name: How Smart Card Sign-in Works in Windows
+ href: identity-protection/smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md
+ items:
+ - name: Smart Card Architecture
+ href: identity-protection/smart-cards/smart-card-architecture.md
+ - name: Certificate Requirements and Enumeration
+ href: identity-protection/smart-cards/smart-card-certificate-requirements-and-enumeration.md
+ - name: Smart Card and Remote Desktop Services
+ href: identity-protection/smart-cards/smart-card-and-remote-desktop-services.md
+ - name: Smart Cards for Windows Service
+ href: identity-protection/smart-cards/smart-card-smart-cards-for-windows-service.md
+ - name: Certificate Propagation Service
+ href: identity-protection/smart-cards/smart-card-certificate-propagation-service.md
+ - name: Smart Card Removal Policy Service
+ href: identity-protection/smart-cards/smart-card-removal-policy-service.md
+ - name: Smart Card Tools and Settings
+ href: identity-protection/smart-cards/smart-card-tools-and-settings.md
+ items:
+ - name: Smart Cards Debugging Information
+ href: identity-protection/smart-cards/smart-card-debugging-information.md
+ - name: Smart Card Group Policy and Registry Settings
+ href: identity-protection/smart-cards/smart-card-group-policy-and-registry-settings.md
+ - name: Smart Card Events
+ href: identity-protection/smart-cards/smart-card-events.md
+ - name: Virtual Smart Cards
+ href: identity-protection/virtual-smart-cards/virtual-smart-card-overview.md
+ items:
+ - name: Understanding and Evaluating Virtual Smart Cards
+ href: identity-protection/virtual-smart-cards/virtual-smart-card-understanding-and-evaluating.md
+ items:
+ - name: "Get Started with Virtual Smart Cards: Walkthrough Guide"
+ href: identity-protection/virtual-smart-cards/virtual-smart-card-get-started.md
+ - name: Use Virtual Smart Cards
+ href: identity-protection/virtual-smart-cards/virtual-smart-card-use-virtual-smart-cards.md
+ - name: Deploy Virtual Smart Cards
+ href: identity-protection/virtual-smart-cards/virtual-smart-card-deploy-virtual-smart-cards.md
+ - name: Evaluate Virtual Smart Card Security
+ href: identity-protection/virtual-smart-cards/virtual-smart-card-evaluate-security.md
+ - name: Tpmvscmgr
+ href: identity-protection/virtual-smart-cards/virtual-smart-card-tpmvscmgr.md
- name: Privacy controls
items:
- name: Windows Privacy controls
From ef521bf2852e395d97a501d4ec210b69d110f162 Mon Sep 17 00:00:00 2001
From: Daniel Simpson
Date: Thu, 19 Aug 2021 15:19:28 -0700
Subject: [PATCH 025/671] rm identity-protection toc
---
windows/security/identity-protection/TOC.yml | 132 -------------------
1 file changed, 132 deletions(-)
delete mode 100644 windows/security/identity-protection/TOC.yml
diff --git a/windows/security/identity-protection/TOC.yml b/windows/security/identity-protection/TOC.yml
deleted file mode 100644
index 5e4680879e..0000000000
--- a/windows/security/identity-protection/TOC.yml
+++ /dev/null
@@ -1,132 +0,0 @@
-- name: Identity and access management
- href: index.md
- items:
- - name: Technical support policy for lost or forgotten passwords
- href: password-support-policy.md
- - name: Access Control Overview
- href: access-control/access-control.md
- items:
- - name: Dynamic Access Control Overview
- href: access-control/dynamic-access-control.md
- - name: Security identifiers
- href: access-control/security-identifiers.md
- - name: Security Principals
- href: access-control/security-principals.md
- - name: Local Accounts
- href: access-control/local-accounts.md
- - name: Active Directory Accounts
- href: access-control/active-directory-accounts.md
- - name: Microsoft Accounts
- href: access-control/microsoft-accounts.md
- - name: Service Accounts
- href: access-control/service-accounts.md
- - name: Active Directory Security Groups
- href: access-control/active-directory-security-groups.md
- - name: Special Identities
- href: access-control/special-identities.md
- - name: User Account Control
- href: user-account-control\user-account-control-overview.md
- items:
- - name: How User Account Control works
- href: user-account-control\how-user-account-control-works.md
- - name: User Account Control security policy settings
- href: user-account-control\user-account-control-security-policy-settings.md
- - name: User Account Control Group Policy and registry key settings
- href: user-account-control\user-account-control-group-policy-and-registry-key-settings.md
- - name: Windows Hello for Business
- href: hello-for-business/index.yml
- - name: Protect derived domain credentials with Credential Guard
- href: credential-guard/credential-guard.md
- items:
- - name: How Credential Guard works
- href: credential-guard/credential-guard-how-it-works.md
- - name: Credential Guard Requirements
- href: credential-guard/credential-guard-requirements.md
- - name: Manage Credential Guard
- href: credential-guard/credential-guard-manage.md
- - name: Hardware readiness tool
- href: credential-guard/dg-readiness-tool.md
- - name: Credential Guard protection limits
- href: credential-guard/credential-guard-protection-limits.md
- - name: Considerations when using Credential Guard
- href: credential-guard/credential-guard-considerations.md
- - name: "Credential Guard: Additional mitigations"
- href: credential-guard/additional-mitigations.md
- - name: "Credential Guard: Known issues"
- href: credential-guard/credential-guard-known-issues.md
- - name: Protect Remote Desktop credentials with Remote Credential Guard
- href: remote-credential-guard.md
- - name: Smart Cards
- href: smart-cards/smart-card-windows-smart-card-technical-reference.md
- items:
- - name: How Smart Card Sign-in Works in Windows
- href: smart-cards/smart-card-how-smart-card-sign-in-works-in-windows.md
- items:
- - name: Smart Card Architecture
- href: smart-cards/smart-card-architecture.md
- - name: Certificate Requirements and Enumeration
- href: smart-cards/smart-card-certificate-requirements-and-enumeration.md
- - name: Smart Card and Remote Desktop Services
- href: smart-cards/smart-card-and-remote-desktop-services.md
- - name: Smart Cards for Windows Service
- href: smart-cards/smart-card-smart-cards-for-windows-service.md
- - name: Certificate Propagation Service
- href: smart-cards/smart-card-certificate-propagation-service.md
- - name: Smart Card Removal Policy Service
- href: smart-cards/smart-card-removal-policy-service.md
- - name: Smart Card Tools and Settings
- href: smart-cards/smart-card-tools-and-settings.md
- items:
- - name: Smart Cards Debugging Information
- href: smart-cards/smart-card-debugging-information.md
- - name: Smart Card Group Policy and Registry Settings
- href: smart-cards/smart-card-group-policy-and-registry-settings.md
- - name: Smart Card Events
- href: smart-cards/smart-card-events.md
- - name: Virtual Smart Cards
- href: virtual-smart-cards\virtual-smart-card-overview.md
- items:
- - name: Understanding and Evaluating Virtual Smart Cards
- href: virtual-smart-cards\virtual-smart-card-understanding-and-evaluating.md
- items:
- - name: "Get Started with Virtual Smart Cards: Walkthrough Guide"
- href: virtual-smart-cards\virtual-smart-card-get-started.md
- - name: Use Virtual Smart Cards
- href: virtual-smart-cards\virtual-smart-card-use-virtual-smart-cards.md
- - name: Deploy Virtual Smart Cards
- href: virtual-smart-cards\virtual-smart-card-deploy-virtual-smart-cards.md
- - name: Evaluate Virtual Smart Card Security
- href: virtual-smart-cards\virtual-smart-card-evaluate-security.md
- - name: Tpmvscmgr
- href: virtual-smart-cards\virtual-smart-card-tpmvscmgr.md
- - name: Enterprise Certificate Pinning
- href: enterprise-certificate-pinning.md
- - name: Windows 10 credential theft mitigation guide abstract
- href: windows-credential-theft-mitigation-guide-abstract.md
- - name: Configure S/MIME for Windows 10
- href: configure-s-mime.md
- - name: VPN technical guide
- href: vpn\vpn-guide.md
- items:
- - name: VPN connection types
- href: vpn\vpn-connection-type.md
- - name: VPN routing decisions
- href: vpn\vpn-routing.md
- - name: VPN authentication options
- href: vpn\vpn-authentication.md
- - name: VPN and conditional access
- href: vpn\vpn-conditional-access.md
- - name: VPN name resolution
- href: vpn\vpn-name-resolution.md
- - name: VPN auto-triggered profile options
- href: vpn\vpn-auto-trigger-profile.md
- - name: VPN security features
- href: vpn\vpn-security-features.md
- - name: VPN profile options
- href: vpn\vpn-profile-options.md
- - name: How to configure Diffie Hellman protocol over IKEv2 VPN connections
- href: vpn\how-to-configure-diffie-hellman-protocol-over-ikev2-vpn-connections.md
- - name: How to use single sign-on (SSO) over VPN and Wi-Fi connections
- href: vpn\how-to-use-single-sign-on-sso-over-vpn-and-wi-fi-connections.md
- - name: Optimizing Office 365 traffic with the Windows 10 VPN client
- href: vpn\vpn-office-365-optimization.md
From 5ee4bf7891b3ddd8162fd6fb4f8fbd5d0ad49926 Mon Sep 17 00:00:00 2001
From: Alekhya Jupudi
Date: Fri, 20 Aug 2021 13:49:21 +0530
Subject: [PATCH 026/671] Windows 11 Inclusion
I've included and updated the files under (windows-docs-pr\windows\configuration\cortana-at-work) with Windows 11 wherever necessary.
---
.../cortana-at-work/cortana-at-work-crm.md | 2 +-
.../cortana-at-work/cortana-at-work-overview.md | 13 ++++++++-----
.../cortana-at-work-policy-settings.md | 16 ++++++++--------
.../cortana-at-work/cortana-at-work-powerbi.md | 10 +++++-----
.../cortana-at-work-scenario-2.md | 2 +-
.../cortana-at-work-scenario-3.md | 2 +-
.../cortana-at-work-scenario-4.md | 2 +-
.../cortana-at-work-scenario-5.md | 2 +-
.../cortana-at-work-scenario-6.md | 2 +-
.../cortana-at-work-scenario-7.md | 2 +-
.../cortana-at-work-voice-commands.md | 2 +-
.../set-up-and-test-cortana-in-windows-10.md | 2 +-
.../cortana-at-work/test-scenario-4.md | 2 +-
.../cortana-at-work/test-scenario-5.md | 2 +-
14 files changed, 32 insertions(+), 29 deletions(-)
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-crm.md b/windows/configuration/cortana-at-work/cortana-at-work-crm.md
index e8a0cdee55..45deb89f54 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-crm.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-crm.md
@@ -1,5 +1,5 @@
---
-title: Set up and test Cortana with Microsoft Dynamics CRM (Preview feature) in your organization (Windows 10)
+title: Set up and test Cortana with Microsoft Dynamics CRM (Preview feature) in your organization (Windows)
description: How to set up Cortana to give salespeople insights on important CRM activities, including sales leads, accounts, and opportunities.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-overview.md b/windows/configuration/cortana-at-work/cortana-at-work-overview.md
index 5d25f337c9..140f54edf4 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-overview.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-overview.md
@@ -1,5 +1,5 @@
---
-title: Configure Cortana in Windows 10
+title: Configure Cortana in Windows 10 and Windows 11
ms.reviewer:
manager: dansimp
description: Cortana includes powerful configuration options specifically to optimize for unique small to medium-sized business and enterprise environments.
@@ -11,11 +11,11 @@ ms.localizationpriority: medium
ms.author: greglin
---
-# Configure Cortana in Windows 10
+# Configure Cortana in Windows 10 and Windows 11
## Who is Cortana?
-Cortana is a personal productivity assistant in Microsoft 365, helping your users achieve more with less effort and focus on what matters. The Cortana app in Windows 10 helps users quickly get information across Microsoft 365, using typed or spoken queries to connect with people, check calendars, set reminders, add tasks, and more.
+Cortana is a personal productivity assistant in Microsoft 365, helping your users achieve more with less effort and focus on what matters. The Cortana app in Windows 10 and Windows 11 helps users quickly get information across Microsoft 365, using typed or spoken queries to connect with people, check calendars, set reminders, add tasks, and more.
:::image type="content" source="../screenshot1.png" alt-text="Screenshot: Cortana home page example":::
@@ -38,6 +38,9 @@ Cortana requires a PC running Windows 10, version 1703 or later, as well as the
|Azure Active Directory (Azure AD) | While all employees signing into Cortana need an Azure AD account, an Azure AD premium tenant isn't required. |
|Additional policies (Group Policy and Mobile Device Management (MDM)) |There is a rich set of policies that can be used to manage various aspects of Cortana. Most of these policies will limit the abilities of Cortana but won't turn Cortana off. For example, if you turn **Speech** off, your employees won't be able to use the wake word ("Cortana") for hands-free activation or voice commands to easily ask for help. |
+>[!NOTE]
+>For Windows 11, Cortana is no longer pinned to the taskbar by default. You can still pin the Cortana app to the taskbar as you would any other app. In addition, the keyboard shortcut that launched Cortana (Win+C) no longer opens Cortana.
+
## Signing in using Azure AD
Your organization must have an Azure AD tenant and your employees' devices must all be Azure AD-joined for the best Cortana experience. (Users may also sign into Cortana with a Microsoft account, but will not be able to use their enterprise email or calendar.) For info about what an Azure AD tenant is, how to get your devices joined, and other Azure AD maintenance info, see [Azure Active Directory documentation.](/azure/active-directory/)
@@ -46,9 +49,9 @@ Your organization must have an Azure AD tenant and your employees' devices m
Cortana's approach to integration with Microsoft 365 has changed with Windows 10, version 2004 and later.
-### Cortana in Windows 10, version 2004 and later
+### Cortana in Windows 10, version 2004 and later, or Windows 11
-Cortana enterprise services that can be accessed using Azure AD through Cortana in Windows 10, version 2004 and later, meet the same enterprise-level privacy, security, and compliance promises as reflected in the [Online Services Terms (OST)](https://www.microsoft.com/en-us/licensing/product-licensing/products). To learn more, see [Cortana in Microsoft 365](/microsoft-365/admin/misc/cortana-integration?view=o365-worldwide#what-data-is-processed-by-cortana-in-office-365).
+Cortana enterprise services that can be accessed using Azure AD through Cortana in Windows 10, version 2004 and later, or Windows 11, meet the same enterprise-level privacy, security, and compliance promises as reflected in the [Online Services Terms (OST)](https://www.microsoft.com/en-us/licensing/product-licensing/products). To learn more, see [Cortana in Microsoft 365](/microsoft-365/admin/misc/cortana-integration?view=o365-worldwide#what-data-is-processed-by-cortana-in-office-365).
#### How does Microsoft store, retain, process, and use Customer Data in Cortana?
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md b/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
index 2d82042faa..a43fafd84b 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-policy-settings.md
@@ -1,5 +1,5 @@
---
-title: Configure Cortana with Group Policy and MDM settings (Windows 10)
+title: Configure Cortana with Group Policy and MDM settings (Windows)
description: The list of Group Policy and mobile device management (MDM) policy settings that apply to Cortana at work.
ms.prod: w10
ms.mktglfcycl: manage
@@ -25,10 +25,10 @@ manager: dansimp
> Cortana won’t work if this setting is turned off (disabled). However, on Windows 10, version 1809 and below, employees can still perform local searches even with Cortana turned off. |
|Computer Configuration\Administrative Templates\Windows Components\Search\AllowCortanaAboveLock |AboveLock/AllowCortanaAboveLock |Specifies whether an employee can interact with Cortana using voice commands when the system is locked.
> [!NOTE]
-> Cortana in Windows 10, versions 2004 and later do not currently support Above Lock. |
+> Cortana in Windows 10, versions 2004 and later, or Windows 11 do not currently support Above Lock. |
|Computer Configuration\Administrative Templates\Windows Components\App Privacy\LetAppsActivateWithVoice |[Privacy/LetAppsActivateWithVoice](/windows/client-management/mdm/policy-csp-privacy#privacy-letappsactivatewithvoice) |Specifies whether apps (such as Cortana or other voice assistants) can activate using a wake word (e.g. “Hey Cortana”).
> [!NOTE]
-> This setting only applies to Windows 10 versions 2004 and later. To disable wake word activation on Windows 10 versions 1909 and earlier, you will need to disable voice commands using Privacy/AllowInputPersonalization. |
+> This setting only applies to Windows 10 versions 2004 and later, or Windows 11. To disable wake word activation on Windows 10 versions 1909 and earlier, you will need to disable voice commands using Privacy/AllowInputPersonalization. |
|Computer Configuration\Administrative Templates\Windows Components\App Privacy\LetAppsAccessMicrophone |[Privacy/LetAppsAccessMicrophone_ForceDenyTheseApps](/windows/client-management/mdm/policy-csp-privacy#privacy-letappsaccessmicrophone-forcedenytheseapps) | Use this to disable Cortana’s access to the microphone. To do so, specify Cortana’s Package Family Name: Microsoft.549981C3F5F10_8wekyb3d8bbwe
Users will still be able to type queries to Cortana. |
|Computer Configuration\Administrative Templates\Control Panel\Regional and Language Options\Allow users to enable online speech recognition services |Privacy/AllowInputPersonalization |Specifies whether an employee can use voice commands with Cortana in your organization.
@@ -38,15 +38,15 @@ Users will still be able to type queries to Cortana. |
**In Windows 10, version 1607 and later**
Cortana still works if this setting is turned off (disabled).
**In Windows 10, version 2004 and later**
-Cortana still works if this setting is turned off (disabled). Cortana in Windows 10, versions 2004 and later do not currently use the Location service. |
+Cortana still works if this setting is turned off (disabled). Cortana in Windows 10, versions 2004 and later, or Windows 11 do not currently use the Location service. |
|None |Accounts/AllowMicrosoftAccountConnection |Specifies whether to allow employees to sign in using a Microsoft account (MSA) from Windows apps.
Disable this setting if you only want to allow users to sign in with their Azure AD account. |
|Computer Configuration\Administrative Templates\Windows Components\Search\Allow search and Cortana to use location |Search/AllowSearchToUseLocation |Specifies whether Cortana can use your current location during searches and for location reminders.
-**In Windows 10, version 2004 and later**
Cortana still works if this setting is turned off (disabled). Cortana in Windows 10, versions 2004 and later, do not currently use the Location service. |
+**In Windows 10, version 2004 and later**
Cortana still works if this setting is turned off (disabled). Cortana in Windows 10, versions 2004 and later, or Windows 11, do not currently use the Location service. |
|Computer Configuration\Administrative Templates\Windows Components\Search\Don't search the web or display web results |Search/DoNotUseWebResults |Specifies whether search can perform queries on the web and if the web results are displayed in search.
-**In Windows 10 Pro edition**
This setting can’t be managed.
-**In Windows 10 Enterprise edition**
Cortana won't work if this setting is turned off (disabled).
-**In Windows 10, version 2004 and later**
This setting no longer affects Cortana. |
+**In Windows 10 Pro edition**
This setting can’t be managed.
+**In Windows 10 Enterprise edition**
Cortana won't work if this setting is turned off (disabled).
+**In Windows 10, version 2004 and later**
This setting no longer affects Cortana.
|
|Computer Configuration\Administrative Templates\Windows Components\Search\Set the SafeSearch setting for Search |Search/SafeSearchPermissions |Specifies what level of safe search (filtering adult content) is required.
> [!NOTE]
> This setting only applies to Windows 10 Mobile. Other versions of Windows should use Don't search the web or display web results. |
\ No newline at end of file
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md b/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
index 65919eb8e8..1ddfd0c705 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-powerbi.md
@@ -1,5 +1,5 @@
---
-title: Set up and test Cortana for Power BI in your organization (Windows 10)
+title: Set up and test Cortana for Power BI in your organization (Windows)
description: How to integrate Cortana with Power BI to help your employees get answers directly from your key business data.
ms.prod: w10
ms.mktglfcycl: manage
@@ -25,7 +25,7 @@ Integration between Cortana and Power BI shows how Cortana can work with custom
## Before you begin
To use this walkthrough, you’ll need:
-- **Windows 10**. You’ll need to be running at least Windows 10, version 1703.
+- **Windows 10 or Windows 11**. You’ll need your PC to be running at least Windows 10, version 1703 or later, or Windows 11.
- **Cortana**. You need to have Cortana turned on and be logged into your account.
@@ -79,7 +79,7 @@ Before you can start this testing scenario, you must first set up your test envi
>[!NOTE]
- >It can take up to 30 minutes for a new dataset to appear for Power BI and Cortana. Logging in and out of Windows 10, or otherwise restarting Cortana, causes the new content to appear immediately.If you enable a dataset for Cortana, and that dataset is part of a content pack you own, you’ll need to re-publish for your colleagues to also use it with Cortana.
+ >It can take up to 30 minutes for a new dataset to appear for Power BI and Cortana. Logging in and out of Windows, or otherwise restarting Cortana, causes the new content to appear immediately.
If you enable a dataset for Cortana, and that dataset is part of a content pack you own, you’ll need to re-publish for your colleagues to also use it with Cortana.
## Create a custom Answer Page for Cortana
You must create special reports, known as _Answer Pages_, to display the most commonly asked answers in Cortana. For example, if you want Cortana to quickly show sales data to your employees, you can create a 2016 sales data Answer Page that shows sales data, with various pivots, in Cortana.
@@ -87,7 +87,7 @@ You must create special reports, known as _Answer Pages_, to display the most co
After you’ve finished creating your Answer Page, you can continue to the included testing scenarios.
>[!NOTE]
->It can take up to 30 minutes for a custom Answer Page to appear for Power BI and Cortana. Logging in and out of Windows 10, or otherwise restarting Cortana, causes the new content to appear immediately.
+>It can take up to 30 minutes for a custom Answer Page to appear for Power BI and Cortana. Logging in and out of Windows, or otherwise restarting Cortana, causes the new content to appear immediately.
**To create a custom sales data Answer Page for Cortana**
1. In Power BI, click **My Workspace**, click **Create**, and then click **Report**.
@@ -116,7 +116,7 @@ After you’ve finished creating your Answer Page, you can continue to the inclu
6. Click **File**, click **Save as**, and save the report as _Sales data 2016_.
- Because this is part of the Retail Analysis Sample, it will automatically be included as part of the dataset you included for Cortana. However, you will still need to log in and out of Windows 10, or otherwise restart Cortana, before the new content appears.
+ Because this is part of the Retail Analysis Sample, it will automatically be included as part of the dataset you included for Cortana. However, you will still need to log in and out of Windows, or otherwise restart Cortana, before the new content appears.
## Test Scenario: Use Cortana to show info from Power BI in your organization
Now that you’ve set up your device, you can use Cortana to show your info from within Power BI.
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
index 33ac963a8e..dab5bf883a 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-2.md
@@ -1,5 +1,5 @@
---
-title: Perform a quick search with Cortana at work (Windows 10)
+title: Perform a quick search with Cortana at work (Windows)
description: A test scenario about how to perform a quick search with Cortana at work.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
index b3c72fad56..23981c8033 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-3.md
@@ -1,5 +1,5 @@
---
-title: Set a reminder for a location with Cortana at work (Windows 10)
+title: Set a reminder for a location with Cortana at work (Windows)
description: A test scenario about how to set a location-based reminder using Cortana at work.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
index f5377cf7c3..b5784100ce 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-4.md
@@ -1,5 +1,5 @@
---
-title: Use Cortana at work to find your upcoming meetings (Windows 10)
+title: Use Cortana at work to find your upcoming meetings (Windows)
description: A test scenario about how to use Cortana at work to find your upcoming meetings.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
index a434e14f90..a2cefc5ce3 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-5.md
@@ -1,5 +1,5 @@
---
-title: Use Cortana to send email to a co-worker (Windows 10)
+title: Use Cortana to send email to a co-worker (Windows)
description: A test scenario about how to use Cortana at work to send email to a co-worker.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
index 9abb865b58..003caaecc7 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-6.md
@@ -1,5 +1,5 @@
---
-title: Review a reminder suggested by Cortana (Windows 10)
+title: Review a reminder suggested by Cortana (Windows)
description: A test scenario about how to use Cortana with the Suggested reminders feature.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md b/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
index 5b6970f37b..b69ff5bdc1 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-scenario-7.md
@@ -1,5 +1,5 @@
---
-title: Help protect data with Cortana and WIP (Windows 10)
+title: Help protect data with Cortana and WIP (Windows)
description: An optional test scenario about how to use Cortana at work with Windows Information Protection (WIP).
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
index 478aeb7938..89d7c3aa0b 100644
--- a/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
+++ b/windows/configuration/cortana-at-work/cortana-at-work-voice-commands.md
@@ -1,5 +1,5 @@
---
-title: Set up and test custom voice commands in Cortana for your organization (Windows 10)
+title: Set up and test custom voice commands in Cortana for your organization (Windows)
description: How to create voice commands that use Cortana to perform voice-enabled actions in your line-of-business (LOB) Universal Windows Platform (UWP) apps.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md b/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md
index addf307b70..06ff6a75f4 100644
--- a/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md
+++ b/windows/configuration/cortana-at-work/set-up-and-test-cortana-in-windows-10.md
@@ -15,7 +15,7 @@ ms.author: greglin
## Before you begin
-- If your enterprise had previously disabled Cortana for your employees using the **Computer Configuration\Administrative Templates\Windows Components\Search\Allow Cortana** Group Policy or the **Experience\AllowCortana** MDM setting but want to enable it now that Cortana is part of Microsoft 365, you will need to re-enable it at least for Windows 10, version 2004 and later.
+- If your enterprise had previously disabled Cortana for your employees using the **Computer Configuration\Administrative Templates\Windows Components\Search\Allow Cortana** Group Policy or the **Experience\AllowCortana** MDM setting but want to enable it now that Cortana is part of Microsoft 365, you will need to re-enable it at least for Windows 10, version 2004 and later, or Windows 11.
- **Cortana is regularly updated through the Microsoft Store.** Beginning with Windows 10, version 2004, Cortana is an appx preinstalled with Windows and is regularly updated through the Microsoft Store. To receive the latest updates to Cortana, you will need to [enable updates through the Microsoft Store](../stop-employees-from-using-microsoft-store.md).
## Set up and configure the Bing Answers feature
diff --git a/windows/configuration/cortana-at-work/test-scenario-4.md b/windows/configuration/cortana-at-work/test-scenario-4.md
index b15cd265db..74ca02298f 100644
--- a/windows/configuration/cortana-at-work/test-scenario-4.md
+++ b/windows/configuration/cortana-at-work/test-scenario-4.md
@@ -1,5 +1,5 @@
---
-title: Use Cortana at work to find your upcoming meetings (Windows 10)
+title: Use Cortana at work to find your upcoming meetings (Windows)
description: A test scenario about how to use Cortana at work to find your upcoming meetings.
ms.prod: w10
ms.mktglfcycl: manage
diff --git a/windows/configuration/cortana-at-work/test-scenario-5.md b/windows/configuration/cortana-at-work/test-scenario-5.md
index 3dabe7811b..e798d2260a 100644
--- a/windows/configuration/cortana-at-work/test-scenario-5.md
+++ b/windows/configuration/cortana-at-work/test-scenario-5.md
@@ -1,5 +1,5 @@
---
-title: Use Cortana to send email to a co-worker (Windows 10)
+title: Use Cortana to send email to a co-worker (Windows)
description: A test scenario about how to use Cortana at work to send email to a co-worker.
ms.prod: w10
ms.mktglfcycl: manage
From f8d10fdcd5a4c3984b0ef6e46029d83089ab9828 Mon Sep 17 00:00:00 2001
From: v-dihans
Date: Fri, 20 Aug 2021 10:09:27 -0600
Subject: [PATCH 027/671] dh-word-choice
---
.../demonstrate-deployment-on-vm.md | 24 +++++++++----------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md b/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
index f41d64d23e..3f1ace4736 100644
--- a/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
+++ b/windows/deployment/windows-autopilot/demonstrate-deployment-on-vm.md
@@ -2,7 +2,7 @@
title: Demonstrate Autopilot deployment
ms.reviewer:
manager: laurawi
-description: In this article, find step-by-step instructions on how to set-up a Virtual Machine with a Windows Autopilot deployment.
+description: In this article, find step-by-step instructions on how to set up a Virtual Machine with a Windows Autopilot deployment.
keywords: mdm, setup, windows, windows 10, oobe, manage, deploy, autopilot, ztd, zero-touch, partner, msfb, intune, upgrade
ms.prod: w10
ms.mktglfcycl: deploy
@@ -27,7 +27,7 @@ ms.custom:
To get started with Windows Autopilot, you should try it out with a virtual machine (VM) or you can use a physical device that will be wiped and then have a fresh install of Windows 10.
-In this topic you'll learn how to set-up a Windows Autopilot deployment for a VM using Hyper-V.
+In this topic, you'll learn how to set up a Windows Autopilot deployment for a VM using Hyper-V.
> [!NOTE]
> Although there are [multiple platforms](/mem/autopilot/add-devices#registering-devices) available to enable Autopilot, this lab primarily uses Intune.
@@ -248,7 +248,7 @@ Ensure the VM booted from the installation ISO, select **Next** then select **In
-After the VM restarts, during OOBE, it's fine to select **Set up for personal use** or **Domain join instead** and then choose an offline account on the **Sign in** screen. This will offer the fastest way to the desktop. For example:
+After the VM restarts, during OOBE, it's fine to select **Set up for personal use** or **Domain join instead** and then choose an offline account on the **Sign in** screen. This offers the fastest way to the desktop. For example:
@@ -363,7 +363,7 @@ For this lab, you need an AAD Premium subscription. You can tell if you have a
If the configuration blade shown above does not appear, it's likely that you don't have a **Premium** subscription. Auto-enrollment is a feature only available in AAD Premium.
-To convert your Intune trial account to a free Premium trial account, navigate to **Azure Active Directory** > **Licenses** > **All products** > **Try / Buy** and select **Free trial** for Azure AD Premium, or EMS E5.
+To convert your Intune trial account to a free Premium trial account, go to **Azure Active Directory** > **Licenses** > **All products** > **Try / Buy** and select **Free trial** for Azure AD Premium, or EMS E5.
@@ -374,7 +374,7 @@ If you already have company branding configured in Azure Active Directory, you c
> [!IMPORTANT]
> Make sure to sign-in with a Global Administrator account.
-Navigate to [Company branding in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/LoginTenantBranding), select **Configure** and configure any type of company branding you'd like to see during the OOBE.
+Go to [Company branding in Azure Active Directory](https://portal.azure.com/#blade/Microsoft_AAD_IAM/ActiveDirectoryMenuBlade/LoginTenantBranding), select **Configure**, and then configure any type of company branding you'd like to see during the OOBE.
@@ -478,7 +478,7 @@ The Autopilot deployment profile wizard will ask for a device group, so we must
#### Create the deployment profile
-To create a Windows Autopilot profile, scroll back to the left hand pane and select **Devices**, then under **Enroll devices | Windows enrollment** select **Deployment Profiles**.
+To create a Windows Autopilot profile, scroll back to the left-side pane and select **Devices**, then under **Enroll devices | Windows enrollment** select **Deployment Profiles**.
> [!div class="mx-imgBorder"]
> 
@@ -612,7 +612,7 @@ To use the device (or VM) for other purposes after completion of this lab, you w
### Delete (deregister) Autopilot device
-You need to delete (or retire, or factory reset) the device from Intune before deregistering the device from Autopilot. To delete the device from Intune (not Azure Active Directory), log into the MEM admin center, then navigate to **Intune > Devices > All Devices**. Select the device you want to delete, then select the **Delete** button along the top menu.
+You need to delete (or retire, or factory reset) the device from Intune before deregistering the device from Autopilot. To delete the device from Intune (not Azure Active Directory), log into the MEM admin center, then go to **Intune > Devices > All Devices**. Select the device you want to delete, then select the **Delete** button along the top menu.
> [!div class="mx-imgBorder"]
> 
@@ -633,7 +633,7 @@ At this point, your device has been unenrolled from Intune and also deregistered
Once the device no longer appears, you're free to reuse it for other purposes.
-If you also (optionally) want to remove your device from AAD, navigate to **Azure Active Directory > Devices > All Devices**, select your device, and then select the **Delete** button:
+If you also (optionally) want to remove your device from AAD, go to **Azure Active Directory > Devices > All Devices**, select your device, and then select the **Delete** button:
## Appendix A: Verify support for Hyper-V
@@ -703,7 +703,7 @@ After the tool finishes running, you should have an .intunewin file in the Outpu
Log into the Azure portal and select **Intune**.
-Navigate to **Intune > Clients apps > Apps**, and then click the **Add** button to create a new app package.
+Go to **Intune > Clients apps > Apps**, and then click the **Add** button to create a new app package.
@@ -732,7 +732,7 @@ Uninstall: msiexec /x "{F188A506-C3C6-4411-BE3A-DA5BF1EA6737}" /q
-Simply using an install command like "notepad++.exe /S" will not actually install Notepad++; it will only launch the app. To actually install the program, we need to use the .msi file instead. Notepad++ doesn't actually have an .msi version of their program, but we got an .msi version from a [third party provider](https://www.hass.de/content/notepad-msi-package-enterprise-deployment-available).
+Simply using an install command like "notepad++.exe /S" will not actually install Notepad++; it will only launch the app. To actually install the program, we need to use the .msi file instead. Notepad++ doesn't actually have a .msi version of their program, but we got a .msi version from a [third party provider](https://www.hass.de/content/notepad-msi-package-enterprise-deployment-available).
Select **OK** to save your input and activate the **Requirements** blade.
@@ -818,7 +818,7 @@ For more information on adding apps to Intune, see [Intune Standalone - Win32 ap
Log into the Azure portal and select **Intune**.
-Navigate to **Intune > Clients apps > Apps**, and then select the **Add** button to create a new app package.
+Go to **Intune > Clients apps > Apps**, and then select the **Add** button to create a new app package.
@@ -826,7 +826,7 @@ Under **App Type**, select **Office 365 Suite > Windows 10**:
-Under the **Configure App Suite** pane, select the Office apps you want to install. For the purposes of this labe we have only selected Excel:
+Under the **Configure App Suite** pane, select the Office apps you want to install. For the purposes of this lab we have only selected Excel:
> [!div class="mx-imgBorder"]
> 
From 75db81999f8d478c61fc1040c0e89f86f0b557a4 Mon Sep 17 00:00:00 2001
From: greg-lindsay
Date: Fri, 20 Aug 2021 12:39:57 -0700
Subject: [PATCH 028/671] wds info
---
windows/deployment/TOC.yml | 18 ++-
.../deployment/planning/features-lifecycle.md | 16 ++-
.../windows-11-deprecated-features.md | 29 +++++
.../planning/windows-11-removed-features.md | 30 +++++
windows/deployment/wds-boot-support.md | 111 ++++++++++++++++++
5 files changed, 194 insertions(+), 10 deletions(-)
create mode 100644 windows/deployment/planning/windows-11-deprecated-features.md
create mode 100644 windows/deployment/planning/windows-11-removed-features.md
create mode 100644 windows/deployment/wds-boot-support.md
diff --git a/windows/deployment/TOC.yml b/windows/deployment/TOC.yml
index 048a630323..ac5cfe9aac 100644
--- a/windows/deployment/TOC.yml
+++ b/windows/deployment/TOC.yml
@@ -62,12 +62,20 @@
href: volume-activation/plan-for-volume-activation-client.md
- name: Features removed or planned for replacement
items:
- - name: Windows 10 features lifecycle
+ - name: Windows client features lifecycle
href: planning/features-lifecycle.md
- name: Features we're no longer developing
- href: planning/windows-10-deprecated-features.md
+ items:
+ - name: Windows 10 deprecated features
+ href: planning/windows-10-deprecated-features.md
+ - name: Windows 11 deprecated features
+ href: planning/windows-11-deprecated-features.md
- name: Features we removed
- href: planning/windows-10-removed-features.md
+ items:
+ - name: Windows 10 features removed
+ href: planning/windows-10-removed-features.md
+ - name: Windows 11 features removed
+ href: planning/windows-11-removed-features.md
- name: Prepare
items:
@@ -287,8 +295,10 @@
href: windows-10-pro-in-s-mode.md
- name: Windows 10 deployment tools
items:
- - name: Windows 10 deployment scenarios and tools
+ - name: Windows client deployment scenarios and tools
items:
+ - name: Windows Deployment Services (WDS) image deployment
+ href: wds-boot-support.md
- name: Convert MBR partition to GPT
href: mbr-to-gpt.md
- name: Configure a PXE server to load Windows PE
diff --git a/windows/deployment/planning/features-lifecycle.md b/windows/deployment/planning/features-lifecycle.md
index 333be6284a..50c8adb217 100644
--- a/windows/deployment/planning/features-lifecycle.md
+++ b/windows/deployment/planning/features-lifecycle.md
@@ -1,5 +1,5 @@
---
-title: Windows 10 features lifecycle
+title: Windows client features lifecycle
description: Learn about the lifecycle of Windows 10 features, as well as features that are no longer developed, removed features, and terminology assigned to a feature.
ms.prod: w10
ms.mktglfcycl: plan
@@ -14,21 +14,25 @@ ms.custom: seo-marvel-apr2020
---
# Windows 10 features lifecycle
-- Applies to: Windows 10
+Applies to:
+- Windows 10
+- Windows 11
-Each release of Windows 10 contains many new and improved features. Occasionally we also remove features and functionality, usually because there is a better option.
+Each release of Windows 10 and Windows 11 contains many new and improved features. Occasionally we also remove features and functionality, usually because there is a better option.
## Features no longer being developed
The following topic lists features that are no longer being developed. These features might be removed in a future release.
-[Windows 10 features we're no longer developing](windows-10-deprecated-features.md)
+[Windows 10 features we're no longer developing](windows-10-deprecated-features.md)
+[Windows 11 features we're no longer developing](windows-11-deprecated-features.md)
## Features removed
-The following topic has details about features that have been removed from Windows 10.
+The following topic has details about features that have been removed from Windows 10 or Windows 11. This includes features that are present in Windows 10, but are removed in Windows 11.
-[Windows 10 features we removed](windows-10-removed-features.md)
+[Windows 10 features we removed](windows-10-removed-features.md)
+[Windows 11 features we removed](windows-11-removed-features.md)
## Terminology
diff --git a/windows/deployment/planning/windows-11-deprecated-features.md b/windows/deployment/planning/windows-11-deprecated-features.md
new file mode 100644
index 0000000000..ab1098d47a
--- /dev/null
+++ b/windows/deployment/planning/windows-11-deprecated-features.md
@@ -0,0 +1,29 @@
+---
+title: Windows 11 features we’re no longer developing
+description: Review the list of features that are no longer being developed in Windows 11
+ms.prod: w11
+ms.mktglfcycl: plan
+ms.localizationpriority: medium
+ms.sitesec: library
+audience: itpro
+author: greg-lindsay
+ms.author: greglin
+manager: laurawi
+ms.topic: article
+---
+# Windows 10 features we’re no longer developing
+
+> Applies to: Windows 11
+
+Each version of Windows 10 adds new features and functionality; occasionally we also remove features and functionality, often because we've added a better option. Below are the details about the features and functionalities that are no longer being developed in Windows 10. For information about features that have been removed, see [Features we removed](windows-10-removed-features.md).
+
+The features described below are no longer being actively developed, and might be removed in a future update. Some features have been replaced with other features or functionality and some are now available from other sources.
+
+**The following list is subject to change and might not include every affected feature or functionality.**
+
+> [!NOTE]
+> If you have feedback about the proposed replacement of any of these features, you can use the [Feedback Hub app](https://support.microsoft.com/help/4021566/windows-10-send-feedback-to-microsoft-with-feedback-hub-app).
+
+|Feature | Details and mitigation | Announced in version |
+| ----------- | --------------------- | ---- |
+| Internet Explorer (IE) 11 | The IE11 desktop application will end support for certain operating systems starting June 15, 2022. For more information, see [Internet Explorer 11](/lifecycle/products/internet-explorer-11). | 21H1 |
\ No newline at end of file
diff --git a/windows/deployment/planning/windows-11-removed-features.md b/windows/deployment/planning/windows-11-removed-features.md
new file mode 100644
index 0000000000..34cd47b43c
--- /dev/null
+++ b/windows/deployment/planning/windows-11-removed-features.md
@@ -0,0 +1,30 @@
+---
+title: Windows 11 - Features that have been removed
+description: In this article, learn about the features and functionality that has been removed or replaced in Windows 10.
+ms.prod: w11
+ms.mktglfcycl: plan
+ms.localizationpriority: medium
+ms.sitesec: library
+audience: itpro
+author: greg-lindsay
+ms.author: greglin
+manager: laurawi
+ms.topic: article
+ms.custom: seo-marvel-apr2020
+---
+
+# Features and functionality removed in Windows 11
+
+> Applies to: Windows 11
+
+Windows 11 adds new features and functionality; however some features are removed. Below is a summary of features and functionalities that are present in earlier versions of Windows 10/11, but are removed in the specified versions of Windows 11. **The list below is subject to change and might not include every affected feature or functionality.**
+
+> [!NOTE]
+> Join the [Windows Insider program](https://insider.windows.com) to get early access to new Windows 11 builds and test these changes yourself.
+
+The following features and functionalities have been removed from the installed product image for Windows 11. Applications or code that depend on these features won't function in the release when it was removed, or in later releases.
+
+|Feature | Details and mitigation | Removed in version |
+| ----------- | --------------------- | ------ |
+| WDS image deployment | End to end WDS deployment workflows that use boot.wim from installation media are affected. For more information, see [WDS boot image support](wds-boot-support.md) | Windows 11 |
+
diff --git a/windows/deployment/wds-boot-support.md b/windows/deployment/wds-boot-support.md
new file mode 100644
index 0000000000..644071fbfa
--- /dev/null
+++ b/windows/deployment/wds-boot-support.md
@@ -0,0 +1,111 @@
+---
+title: Windows Deployment Services (WDS) boot.wim support
+description: This article provides details on the support capabilities of WDS for end to end operating system deployment.
+ms.prod: w11
+ms.mktglfcycl: plan
+ms.localizationpriority: medium
+ms.sitesec: library
+audience: itpro
+author: greg-lindsay
+ms.author: greglin
+manager: laurawi
+ms.topic: article
+ms.custom: seo-marvel-apr2020
+---
+
+# Windows Deployment Services (WDS) boot.wim support
+
+Applies to:
+- Windows 10
+- Windows 11
+
+The operating system deployment functionality of [Windows Deployment Services](/previous-versions/windows/it-pro/windows-server-2012-r2-and-2012/hh831764(v=ws.11)) (WDS) is being partically deprecated. Starting with Windows 11, workflows that rely on boot.wim from installation media and/or on running Setup.exe in WDS mode will no longer be supported.
+
+When you PXE-boot from a WDS server that uses the **boot.wim** file from installation media as its boot image, Windows Setup automatically launches in WDS mode. This workflow is deprecated for Windows 11 and newer boot images. The following message will be displayed in this scenario:
+
+
+
+## Deployment scenarios impacted
+
+See the following table for a summary of the impacted deployment scenarios.
+
+
+
+
+
+ | |
+ |
+ Windows 10 |
+ Windows Server 2016 |
+ Windows Server 2019 |
+ Windows Server 2022 |
+ Windows Windows 11 |
+
+
+ | Boot image version |
+
+
+ | Windows 10 |
+ Supported, using a boot image from matching or newer version. |
+ Supported, using a boot image from Windows 10, version 1607 or later. |
+ Supported, using a boot image from Windows 10, version 1809 or later. |
+ Not supported. |
+ Not supported. |
+
+
+ | Windows Server 2016 |
+ Supported, using a boot image from Windows 10, version 1607 or later. |
+ Supported. |
+ Not supported. |
+ Not supported. |
+ Not supported. |
+
+
+ | Windows Server 2019 |
+ Supported, using a boot image from Windows 10, version 1809 or later. |
+ Supported. |
+ Supported. |
+ Not supported. |
+ Not supported. |
+
+
+ | Windows Server 2022 |
+ Deprecated, with a warning message. |
+ Deprecated, with a warning message. |
+ Deprecated, with a warning message. |
+ Deprecated, with a warning message. |
+ Not supported. |
+
+
+ | Windows 11 |
+ Not supported, blocked. |
+ Not supported, blocked. |
+ Not supported, blocked. |
+ Not supported, blocked. |
+ Not supported, blocked. |
+
+
+
+## What is not impacted
+
+WDS PXE boot is not affected by this change. You can still use WDS to PXE boot devices with a custom boot images, but you will no longer be able to use boot.wim as the boot image and run Windows Setup in WDS mode.
+
+You can still run Windows Setup from a network share. Workflows that leverage a custom boot.wim, such as MDT or Configuration Manager are also not affected by this change.
+
+## Reason for the change
+
+Alternatives to WDS, such as Configuration Manager and MDT provide a better, more flexible, and feature-rich experince for deploying Windows images.
+
+## Summary
+
+- Windows 11 workflows that rely on boot.wim from installation media will be blocked. You cannot perform an end to end deployment of Windows 11 using only WDS.
+- Windows 10, Windows Server 2019, and previous operating system versions are not affected by this change.
+- Windows Server 2022 workflows that rely on boot.wim from installation media will show a non-blocking deprecation notice that can be dismissed, but the workflow is not blocked.
+- Windows Server workflows after Windows Server 2022 that rely on boot.wim from installation media will be blocked.
+
+If you currently use WDS with boot.wim from installation media for end-to-end operating system deployment, and your OS version is not supported, deprecated, or blocked, you can use other deployment tools, such as Microsoft Deployment Toolkit (MDT), Configuration Manager, or a non-Microsoft solution with a custom boot.wim image.
+
+## Also see
+
+[Create a custom Windows PE boot image with Configuration Manager](deploy-windows-cm/create-a-custom-windows-pe-boot-image-with-configuration-manager.md)
+[Prepare for deployment with MDT](deploy-windows-mdt/prepare-for-windows-deployment-with-mdt.md)
\ No newline at end of file
From fee1a223340b6bbb231df6ff58b2c76028640a89 Mon Sep 17 00:00:00 2001
From: greg-lindsay
Date: Fri, 20 Aug 2021 13:05:53 -0700
Subject: [PATCH 029/671] draft
---
windows/deployment/TOC.yml | 2 +-
windows/deployment/images/wds-deprecation.png | Bin 0 -> 66966 bytes
.../planning/windows-11-deprecated-features.md | 7 ++++---
.../planning/windows-11-removed-features.md | 6 +++---
4 files changed, 8 insertions(+), 7 deletions(-)
create mode 100644 windows/deployment/images/wds-deprecation.png
diff --git a/windows/deployment/TOC.yml b/windows/deployment/TOC.yml
index b62f364080..1923bd541b 100644
--- a/windows/deployment/TOC.yml
+++ b/windows/deployment/TOC.yml
@@ -297,7 +297,7 @@
items:
- name: Windows client deployment scenarios and tools
items:
- - name: Windows Deployment Services (WDS) image deployment
+ - name: WWindows Deployment Services (WDS) boot.wim support
href: wds-boot-support.md
- name: Convert MBR partition to GPT
href: mbr-to-gpt.md
diff --git a/windows/deployment/images/wds-deprecation.png b/windows/deployment/images/wds-deprecation.png
new file mode 100644
index 0000000000000000000000000000000000000000..2c6b02022ef5de54fedd422e3846fc1cb5f09447
GIT binary patch
literal 66966
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