Merge branch 'master' into Tp-updateTinaMcNaboe

windows/deployment/deploy-windows-mdt/build-a-distributed-environment-for-windows-10-deployment.md

@@ -33,8 +33,8 @@ Figure 1. The machines used in this topic.
 
 Replicating the content between MDT01 (New York) and MDT02 (Stockholm) can be done in a number of different ways. The most common content replication solutions with Microsoft Deployment Toolkit (MDT) use either the Linked Deployment Shares (LDS) feature or Distributed File System Replication (DFS-R). Some organizations have used a simple robocopy script for replication of the content.
 
-**Note**  
-Robocopy has options that allow for synchronization between folders. It has a simple reporting function; it supports transmission retry; and, by default, it will only copy/remove files from the source that are newer than files on the target.
+> [!NOTE]
+> Robocopy has options that allow for synchronization between folders. It has a simple reporting function; it supports transmission retry; and, by default, it will only copy/remove files from the source that are newer than files on the target.
  
 ### Linked deployment shares in MDT
 
@@ -49,6 +49,7 @@ DFS-R is not only very fast and reliable, but it also offers central monitoring,
 Setting up DFS-R for replication is a quick and straightforward process. You prepare the deployment servers and then create a replication group. To complete the setup, you configure some replication settings.
 
 ### Prepare MDT01 for replication
+
 1.  On MDT01, using Server Manager, click **Add roles and features**.
 2.  On the **Select installation type** page, select **Role-based or feature-based installation**.
 3.  On the **Select destination server** page, select **MDT01.contoso.com** and click **Next**.
@@ -88,23 +89,30 @@ Setting up DFS-R for replication is a quick and straightforward process. You pre
 When you have multiple deployment servers sharing the same content, you need to configure the Bootstrap.ini file with information about which server to connect to based on where the client is located. In MDT, that can be done by using the DefaultGateway property.
 1. On MDT01, using Notepad, navigate to the **E:\\MDTProduction\\Control** folder and modify the Boostrap.ini file to look like this:
 
-   ``` 
+   ```ini
    [Settings]
    Priority=DefaultGateway, Default
+
    [DefaultGateway]
    192.168.1.1=NewYork
    192.168.2.1=Stockholm
+
    [NewYork]
    DeployRoot=\\MDT01\MDTProduction$
+
    [Stockholm]
    DeployRoot=\\MDT02\MDTProduction$
+
    [Default]
    UserDomain=CONTOSO
    UserID=MDT_BA
    SkipBDDWelcome=YES
    ```
-   **Note**  
-   The DeployRoot value needs to go into the Bootstrap.ini file, but you can use the same logic in the CustomSettings.ini file. For example, you can redirect the logs to the local deployment server (SLSHARE), or have the User State Migration Tool (USMT) migration store (UDDIR) local. To learn more about USMT, see [Refresh a Windows 7 computer with Windows 10](refresh-a-windows-7-computer-with-windows-10.md) and [Replace a Windows 7 computer with a Windows 10 computer](replace-a-windows-7-computer-with-a-windows-10-computer.md).
+
+   > [!NOTE]
+   > The DeployRoot value needs to go into the Bootstrap.ini file, but you can use the same logic in the CustomSettings.ini file. For example, you can redirect the logs to the local deployment server (SLSHARE), or have the User State Migration Tool (USMT) migration store (UDDIR) local. 
+   > 
+   > To learn more about USMT, see [Refresh a Windows 7 computer with Windows 10](refresh-a-windows-7-computer-with-windows-10.md) and [Replace a Windows 7 computer with a Windows 10 computer](replace-a-windows-7-computer-with-a-windows-10-computer.md).
      
 2. Save the Bootstrap.ini file.
 3. Using the Deployment Workbench, right-click the **MDT Production** deployment share and select **Update Deployment Share**.
@@ -121,9 +129,12 @@ When you have multiple deployment servers sharing the same content, you need to
    Figure 5. Replacing the updated boot image in WDS.
 
 6. Browse and select the **E:\\MDTProduction\\Boot\\LiteTouchPE\_x64.wim** boot image, and then complete Replace Boot Image Wizard using the default settings.
+
    ## <a href="" id="sec03"></a>Replicate the content
    Once the MDT01 and MDT02 servers are prepared, you are ready to configure the actual replication.
+
    ### Create the replication group
+
 7. On MDT01, using DFS Management, right-click **Replication**, and select **New Replication Group**.
 8. On the **Replication Group Type** page, select **Multipurpose replication group**, and click **Next**.
 9. On the **Name and Domain** page, assign the **MDTProduction** name, and click **Next**.
@@ -146,7 +157,9 @@ When you have multiple deployment servers sharing the same content, you need to
 
 17. On the **Review Settings and Create Replication Group** page, click **Create**.
 18. On the **Confirmation** page, click **Close**.
+
     ### Configure replicated folders
+
 19. On MDT01, using DFS Management, expand **Replication** and then select **MDTProduction**.
 20. In the middle pane, right-click the **MDT01** member and select **Properties**.
 21. On the **MDT01 (MDTProduction) Properties** page, configure the following and then click **OK**:
@@ -167,8 +180,8 @@ When you have multiple deployment servers sharing the same content, you need to
     1.  In the **Staging** tab, set the quota to **20480 MB**.
     2.  In the **Advanced** tab, set the quota to **8192 MB**.
 
-**Note**  
-It will take some time for the replication configuration to be picked up by the replication members (MDT01 and MDT02). The time for the initial sync will depend on the WAN link speed between the sites. After that, delta changes are replicated quickly.
+    > [!NOTE]
+    > It will take some time for the replication configuration to be picked up by the replication members (MDT01 and MDT02). The time for the initial sync will depend on the WAN link speed between the sites. After that, delta changes are replicated quickly.
  
 ### Verify replication
 1.  On MDT02, wait until you start to see content appear in the **E:\\MDTProduction** folder.

windows/deployment/update/windows-analytics-privacy.md

@@ -8,8 +8,10 @@ ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: deploy
-audience: itpro
-author: greg-lindsay
+audience: itpro
+author: greg-lindsay
+ms.audience: itpro
+author: greg-lindsay
 ms.localizationpriority: high
 ms.collection: M365-analytics
 ms.topic: article
@@ -43,6 +45,7 @@ See these topics for additional background information about related privacy iss
 - [Windows 10 and the GDPR for IT Decision Makers](https://docs.microsoft.com/windows/privacy/gdpr-it-guidance)
 - [Configure Windows diagnostic data in your organization](https://docs.microsoft.com/windows/configuration/configure-windows-diagnostic-data-in-your-organization)
 - [Windows 7, Windows 8, and Windows 8.1 Appraiser Telemetry Events, and Fields](https://go.microsoft.com/fwlink/?LinkID=822965)
+- [Windows 10, version 1903 basic level Windows diagnostic events and fields](https://docs.microsoft.com/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1903)
 - [Windows 10, version 1809 basic level Windows diagnostic events and fields](https://docs.microsoft.com/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1809)
 - [Windows 10, version 1803 basic level Windows diagnostic events and fields](https://docs.microsoft.com/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1803)
 - [Windows 10, version 1709 basic level Windows diagnostic events and fields](https://docs.microsoft.com/windows/privacy/basic-level-windows-diagnostic-events-and-fields-1709)

windows/deployment/volume-activation/volume-activation-windows-10.md

@@ -1,5 +1,5 @@
 ---
-title: Volume Activation for Windows 10 (Windows 10)
+title: Volume Activation for Windows 10
 description: This guide is designed to help organizations that are planning to use volume activation to deploy and activate Windows 10, including organizations that have used volume activation for earlier versions of Windows.
 ms.assetid: 6e8cffae-7322-4fd3-882a-cde68187aef2
 ms.reviewer: 
@@ -10,7 +10,8 @@ ms.prod: w10
 ms.mktglfcycl: deploy
 ms.sitesec: library
 ms.pagetype: activation
-audience: itpro
+audience: itpro
+author: greg-lindsay
 ms.localizationpriority: medium
 ms.date: 07/27/2017
 ms.topic: article
@@ -18,52 +19,54 @@ ms.topic: article
 
 # Volume Activation for Windows 10
 
-
-**Applies to**
--   Windows 10
--   Windows 8.1
--   Windows 8
--   Windows 7
--   Windows Server 2012 R2
--   Windows Server 2012
+> Applies to
+>
+>- Windows 10
+>- Windows Server 2012 R2
+>- Windows Server 2012
+>- Windows Server 2016
+>- Windows Server 2019
 
 **Looking for volume licensing information?**
-**Looking for volume licensing information?**
+
+- [Download the Volume Licensing Reference Guide for Windows 10 Desktop Operating System](https://go.microsoft.com/fwlink/p/?LinkId=620104)
 
 **Looking for retail activation?**
-**Looking for retail activation?**
+
+- [Get Help Activating Microsoft Windows](https://support.microsoft.com/help/12440/windows-10-activate)
 
 This guide is designed to help organizations that are planning to use volume activation to deploy and activate Windows 10, including organizations that have used volume activation for earlier versions of Windows.
-This guide is designed to help organizations that are planning to use volume activation to deploy and activate Windows 10, including organizations that have used volume activation for earlier versions of Windows.
+
+*Volume activation* is the process that Microsoft volume licensing customers use to automate and manage the activation of Windows operating systems, Microsoft Office, and other Microsoft products across large organizations. Volume licensing is available to customers who purchase software under various volume programs (such as [Open](https://www.microsoft.com/Licensing/licensing-programs/open-license) and [Select](https://www.microsoft.com/Licensing/licensing-programs/select)) and to participants in programs such as the [Microsoft Partner Program](https://partner.microsoft.com/) and [MSDN Subscriptions](https://visualstudio.microsoft.com/msdn-platforms/).
 
 Volume activation is a configurable solution that helps automate and manage the product activation process on computers running Windows operating systems that have been licensed under a volume licensing program. Volume activation is also used with other software from Microsoft (most notably the Office suites) that are sold under volume licensing agreements and that support volume activation.
 
-
+This guide provides information and step-by-step guidance to help you choose a volume activation method that suits your environment, and then to configure that solution successfully. This guide describes the volume activation features and the tools to manage volume activation.
 
-
-Because most organizations will not immediately switch all computers to Windows 10, practical volume activation strategies must also take in to account how to work with the Windows 8, Windows 7, Windows Server 2012, and Windows Server 2008 R2Windows Server 2008 R2 operating systems. This guide 
+Because most organizations will not immediately switch all computers to Windows 10, practical volume activation strategies must also take in to account how to work with the Windows 8.1, Windows 7, Windows Server 2012, and Windows Server 2008 R2 operating systems. This guide discusses how the new volume activation tools can support earlier operating systems, but it does not discuss the tools that are provided with earlier operating system versions.
 
-
+Volume activation -and the need for activation itself- is not new, and this guide does not review all of its concepts and history. You can find additional background in the appendices of this guide. For more information, see [Volume Activation Overview](https://docs.microsoft.com/previous-versions/windows/it-pro/windows-server-2012-R2-and-2012/hh831612(v=ws.11)).
 
 If you would like additional information about planning a volume activation deployment specifically for Windows 7 and Windows Server 2008 R2, please see the [Volume Activation Planning Guide for Windows 7](https://go.microsoft.com/fwlink/p/?LinkId=618210).
 
 To successfully plan and implement a volume activation strategy, you must:
-To successfully plan and implement a volume activation strategy, you must:
--   Learn about and understand product activation.
--   Review and evaluate the available activation types or models.
--   Consider the connectivity of the clients to be activated.
--   Choose the method or methods to be used with each type of client.
--   Determine the types and number of product keys you will need.
--   Determine the monitoring and reporting needs in your organization.
+
+- Learn about and understand product activation.
+- Review and evaluate the available activation types or models.
+- Consider the connectivity of the clients to be activated.
+- Choose the method or methods to be used with each type of client.
+- Determine the types and number of product keys you will need.
+- Determine the monitoring and reporting needs in your organization.
+- Install and configure the tools required to support the methods selected.
 
 Keep in mind that the method of activation does not change an organization’s responsibility to the licensing requirements. You must ensure that all software used in your organization is properly licensed and activated in accordance with the terms of the licensing agreements in place.
 
-
-**In this guide:**
--   [Plan for volume activation](plan-for-volume-activation-client.md)
--   [Activate using Key Management Service](activate-using-key-management-service-vamt.md)
--   [Activate using Active Directory-based activation](activate-using-active-directory-based-activation-client.md)
--   [Activate clients running Windows 10](activate-windows-10-clients-vamt.md)
--   [Monitor activation](monitor-activation-client.md)
--   [Use the Volume Activation Management Tool](use-the-volume-activation-management-tool-client.md)
--   [Appendix: Information sent to Microsoft during activation](appendix-information-sent-to-microsoft-during-activation-client.md)
+## Additional information
+
+- [Plan for volume activation](plan-for-volume-activation-client.md)
+- [Activate using Key Management Service](activate-using-key-management-service-vamt.md)
+- [Activate using Active Directory-based activation](activate-using-active-directory-based-activation-client.md)
+- [Activate clients running Windows 10](activate-windows-10-clients-vamt.md)
+- [Monitor activation](monitor-activation-client.md)
+- [Use the Volume Activation Management Tool](use-the-volume-activation-management-tool-client.md)
+- [Appendix: Information sent to Microsoft during activation](appendix-information-sent-to-microsoft-during-activation-client.md)

windows/deployment/windows-autopilot/windows-autopilot-requirements.md

@@ -78,6 +78,10 @@ If the Microsoft Store is not accessible, the AutoPilot process will still conti
 <tr><td><b>Office 365<b><td>As part of the Intune device configuration, installation of Office 365 ProPlus may be required. For more information, see <a href="https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2">Office 365 URLs and IP address ranges</a> (includes all Office services, DNS names, IP addresses; includes Azure AD and other services that may overlap with those listed above).
 <tr><td><b>Certificate revocation lists (CRLs)<b><td>Some of these services will also need to check certificate revocation lists (CRLs) for certificates used in the services.  A full list of these is documented at <a href="https://support.office.com/article/Office-365-URLs-and-IP-address-ranges-8548a211-3fe7-47cb-abb1-355ea5aa88a2#bkmk_crl">Office 365 URLs and IP address ranges</a> and <a href="https://aka.ms/o365chains">Office 365 Certificate Chains</a>.
 <tr><td><b>Hybrid AAD join<b><td>The device can be hybrid AAD joined. The computer should be on corporate network for hybrid AAD join to work. See details at <a href="https://docs.microsoft.com/windows/deployment/windows-autopilot/user-driven-hybrid">Windows Autopilot user-driven mode</a>
+<tr><td><b>Autopilot Self-Deploying mode and Autopilot White Glove<b><td>Firmware TPM devices, which are only provided by Intel, AMD, or Qualcomm, do not include all needed certificates at boot time and must be able to retrieve them from the manufacturer on first use. Devices with discrete TPM chips(including ones from any other manufacturer) come with these certificates preinstalled. Make sure that these URLs are accessible for each firmware TPM provider so that certificates can be successfully requested: 
+  <br>Intel- https://ekop.intel.com/ekcertservice 
+  <br>Qualcomm- https://ekcert.spserv.microsoft.com/EKCertificate/GetEKCertificate/v1
+  <br>AMD- https://ftpm.amd.com/pki/aia
 </table>
 
 ## Licensing requirements