Changes reverted as evalcenter is up again

Author: Paasin

memdocs/configmgr/core/get-started/set-up-your-lab.md

@@ -26,14 +26,12 @@ Following the guidance in this topic will enable you to set up a lab for evaluat
 
 -   **The lab environment uses Windows Server 2012 R2**, into which we will install Configuration Manager.  
 
-<<<<<<< HEAD
      You can download an evaluation version of Windows Server 2012 R2 from the [Evaluation Center](https://www.microsoft.com/evalcenter/evaluate-windows-server-2012-r2).  
-=======
-    You can download an evaluation version of Windows Server.
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
 
+<!--
     > [!NOTE]
-    > The Microsoft Evaluation Center is temporarily unavailable. To access this download, see [Accessing trials and kits for Windows (Eval Center workaround)](https://techcommunity.microsoft.com/t5/windows-11/accessing-trials-and-kits-for-windows-eval-center-workaround/m-p/3361125).<!-- MAXADO-6049663, CMADO-14437681 -->
+    > The Microsoft Evaluation Center is temporarily unavailable. To access this download, see [Accessing trials and kits for Windows (Eval Center workaround)](https://techcommunity.microsoft.com/t5/windows-11/accessing-trials-and-kits-for-windows-eval-center-workaround/m-p/3361125).<!-- MAXADO-6049663, CMADO-14437681 
+-->
 
     Consider modifying or disabling Internet Explorer Enhanced Security Configuration in order to more easily access some of the downloads referenced throughout the course of these exercises. For more information, see [Internet Explorer: Enhanced Security Configuration](/previous-versions/windows/it-pro/windows-server-2008-R2-and-2008/dd883248(v=ws.10)).  
 
@@ -340,19 +338,12 @@ Before you begin the installation, launch the  [Prerequisite Checker](../servers
 
 #### To download and install Configuration Manager:  
 
-<<<<<<< HEAD
-1.  Navigate to the [Evaluation Center](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager) page to download the newest evaluation version of Configuration Manager.  
+1. Navigate to the [Evaluation Center](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager) page to download the newest evaluation version of Configuration Manager.  
 
 <!--
 > [!NOTE]
 > The Evaluation Center is currently unavailable. As a workaround you can download the ConfigMgr 2203 Current Branch Eval exe here : ( https://aka.ms/MECM2203CB-Eval).
 -->
-=======
-1. Download the latest evaluation version of Configuration Manager.
-
-    > [!NOTE]
-    > The Evaluation Center is currently unavailable. As a workaround you can download the current branch evaluation from [aka.ms/MECM2203CB-Eval](https://aka.ms/MECM2203CB-Eval).<!-- 14437681 -->
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
 
 2.  Decompress the download media into your predefined location.  
 

memdocs/configmgr/core/get-started/technical-preview.md

@@ -97,15 +97,13 @@ Install a baseline version for up to one year after its release. When you instal
 
 - **Technical preview version 2206**
 
-<<<<<<< HEAD
 Download a baseline version from the [Evaluation Center](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager-technical-preview).
 
 <!--
 > [!NOTE]
 > The Evaluation Center is currently unavailable. As a workaround you can download the ConfigMgr TP 2202 Baseline here : ( https://aka.ms/MECM2202TP-Baseline).
 -->
-=======
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
+
 
 ## <a name="BKMK_TPFeedback"></a> Providing feedback
 

memdocs/configmgr/core/servers/deploy/install/get-install-media.md

@@ -19,19 +19,13 @@ If you have Configuration Manager volume licenses with Software Assurance, or if
 
 If you have a Configuration Manager license from EMS, Microsoft 365, or a Cloud Solution Provider (CSP), please see the [Product and Licensing FAQ](../../../understand/product-and-licensing-faq.yml#i-have-purchased-ems-or-microsoft-365-through-a-cloud-solution-provider--csp---do-i-have-rights-to-use-configuration-manager-).
 
-<<<<<<< HEAD
+
 If you would like to purchase volume licenses for Configuration Manager, contact your preferred Microsoft Reseller or see [How to purchase through Volume Licensing](https://www.microsoft.com/Licensing/how-to-buy/how-to-buy.aspx). You can also download media to install an evaluation edition of Configuration Manager from the [Evaluation Center](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager) website.
-=======
-If you would like to purchase volume licenses for Configuration Manager, contact your preferred Microsoft Reseller or see [How to purchase through Volume Licensing](https://www.microsoft.com/Licensing/how-to-buy/how-to-buy.aspx). You can also download media to install an evaluation edition of Configuration Manager.
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
+
 
 <!--
 > [!NOTE]
-<<<<<<< HEAD
 > The Evaluation Center is currently unavailable. As a workaround you can download the ConfigMgr 2203 Current Branch Eval exe here : ( https://aka.ms/MECM2203CB-Eval).
 -->
-=======
-> The Evaluation Center is currently unavailable. As a workaround you can download the current branch evaluation from [aka.ms/MECM2203CB-Eval](https://aka.ms/MECM2203CB-Eval).<!-- 14437681 -->
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
 
 To learn about baseline media for Configuration Manager, see [Baseline and update versions](../../manage/updates.md#bkmk_Baselines).

memdocs/configmgr/core/understand/learn-more-editions.md

@@ -52,41 +52,26 @@ Critical security updates for Configuration Manager are made available to this b
 
 ### Evaluation installation of the current branch
 
-<<<<<<< HEAD
 The evaluation version doesn't require a Software Assurance agreement with Microsoft. [Evaluation installs](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager) are always the current branch, and you can use them for 180 days.
-=======
-The evaluation version doesn't require a Software Assurance agreement with Microsoft. Evaluation installs are always the current branch, and you can use them for 180 days.
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
+
 
 <!--
 > [!NOTE]
-<<<<<<< HEAD
 > The Evaluation Center is currently unavailable. As a workaround you can download the ConfigMgr 2203 Current Branch Eval exe here : ( https://aka.ms/MECM2203CB-Eval).
 -->
-=======
-> The Evaluation Center is currently unavailable. As a workaround you can download the current branch evaluation from [aka.ms/MECM2203CB-Eval](https://aka.ms/MECM2203CB-Eval).<!-- 14437681 -->
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
 
 You can upgrade the evaluation installation to a full installation of the current branch. You can't upgrade an evaluation installation to the long-term servicing branch.
 
 ### Technical preview branch
 
-<<<<<<< HEAD
 The [technical preview branch](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager-technical-preview) is also available. This branch is a limited build of Configuration Manager that lets you try out new features. You install the technical preview using different media than the licensed versions. For more information, see [Technical Preview](../get-started/technical-preview.md).
-=======
-The technical preview branch is also available. This branch is a limited build of Configuration Manager that lets you try out new features. You install the technical preview using different media than the licensed versions. For more information, see [Technical Preview](../get-started/technical-preview.md).
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
+
 
 <!--
 > [!NOTE]
-<<<<<<< HEAD
 > The Evaluation Center is currently unavailable. As a workaround you can download the ConfigMgr TP 2202 Baseline here : ( https://aka.ms/MECM2202TP-Baseline).
 -->
 
-=======
-> The Evaluation Center is currently unavailable. As a workaround you can download the latest technical preview branch baseline build from [aka.ms/MECM2202TP-Baseline](https://aka.ms/MECM2202TP-Baseline).<!-- 14437681 -->
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
-
 ## Software Assurance agreements
 
 The status of Software Assurance on your Configuration Manager licenses, or equivalent subscription rights, on or after October 1, 2016, determines the branch you can install and use.

memdocs/configmgr/core/understand/product-and-licensing-faq.yml

@@ -155,15 +155,12 @@ sections:
           
           - Some developer programs like MSDN offer products like Configuration Manager for development and test, but not production use.
           
-<<<<<<< HEAD
+
           - For a temporary environment, you can use the [evaluation version](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager) for 180 days.
-=======
-          - For a temporary environment, you can use the evaluation version for 180 days.
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
-          
-              > [!NOTE]
-              > The Evaluation Center is currently unavailable. As a workaround you can download the current branch evaluation from [aka.ms/MECM2203CB-Eval](https://aka.ms/MECM2203CB-Eval).<!-- 14437681 -->
 
+          
+              
+              
           - For a lab environment, you can use the [technical preview branch](../get-started/technical-preview.md). Technical preview has the same functionality as current branch, but has some limitations in terms of scale and supported platforms.
           
       - question: |
@@ -176,15 +173,11 @@ sections:
       - question: |
           I have purchased EMS or Microsoft 365 through a Cloud Solution Provider (CSP), do I have rights to use Configuration Manager?
         answer: |
-<<<<<<< HEAD
+
           Yes, you have rights to use Configuration Manager to manage clients covered by the EMS license. First download and install the [evaluation software](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager). Then contact your CSP partner to obtain the license key from the Microsoft Partner Center support team, specifically CSP.<!--SCCMDocs#472,OSGS 33035978--> When your CSP partner talks with Microsoft Support, they should ask them to reference the internal article ID 4033838.<!--SCCMDocs#493-->
-=======
-          Yes, you have rights to use Configuration Manager to manage clients covered by the EMS license. First download and install the evaluation software. Then contact your CSP partner to obtain the license key from the Microsoft Partner Center support team, specifically CSP.<!--SCCMDocs#472,OSGS 33035978--> When your CSP partner talks with Microsoft Support, they should ask them to reference the internal article ID 4033838.<!--SCCMDocs#493-->
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
-          
-          > [!NOTE]
-          > The Evaluation Center is currently unavailable. As a workaround you can download the current branch evaluation from [aka.ms/MECM2203CB-Eval](https://aka.ms/MECM2203CB-Eval).<!-- 14437681 -->
 
+          
+          
       - question: |
           Is my subscription end-date the same as an SA expiration date?
         answer: |

memdocs/configmgr/core/understand/which-branch-should-i-use.md

@@ -42,20 +42,14 @@ Microsoft plans to release updates for Configuration Manager current branch a fe
 
 To install the current branch as a new site, use [baseline media](../servers/manage/updates.md#bkmk_Baselines). Also use baseline media to upgrade from System Center 2012 Configuration Manager with Service Pack 2 or System Center 2012 R2 Configuration Manager with Service Pack 1. Access to this media depends on how your organization licenses Configuration Manager.
 
-<<<<<<< HEAD
 You can also use the baseline media to install a new site that is an evaluation edition of the current branch. The evaluation edition doesn't require a license. You can use the evaluation edition for 180 days. It supports upgrade to a licensed edition of the current branch. To install only an evaluation edition, get it from the [Evaluation Center](https://www.microsoft.com/evalcenter/download-microsoft-endpoint-configuration-manager).
-=======
-You can also use the baseline media to install a new site that is an evaluation edition of the current branch. The evaluation edition doesn't require a license. You can use the evaluation edition for 180 days. It supports upgrade to a licensed edition of the current branch.
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
+
 
 <!--
 > [!NOTE]
 <<<<<<< HEAD
 > The Evaluation Center is currently unavailable. As a workaround you can download the ConfigMgr 2203 Current Branch Eval exe here : ( https://aka.ms/MECM2203CB-Eval).
 -->
-=======
-> The Evaluation Center is currently unavailable. As a workaround you can download the current branch evaluation from [aka.ms/MECM2203CB-Eval](https://aka.ms/MECM2203CB-Eval).<!-- 14437681 -->
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
 >
 > Use baseline media to install sites for a new Configuration Manager hierarchy. If you previously installed a baseline version, use in-console updates to update your sites to a new version.  
 >
@@ -95,16 +89,14 @@ To install the LTSB as a new site or as an upgrade from a supported System Cente
 > To learn about System Center 2016, see [System Center 2016 documentation](/system-center/index). This documentation also identifies how to get System Center 2016, which requires a Microsoft license agreement or similar rights.  
 >  
 > To find Configuration Manager version 1606 in the Volume Licensing Service Center (VLSC), go to the **Downloads and Keys** tab of the [VLSC](https://www.microsoft.com/Licensing/servicecenter/Downloads/DownloadsAndKeys.aspx), search for `System Center 2016`, and then select either **System Center 2016 Datacenter** or **System Center 2016 Standard**.  
-<<<<<<< HEAD
+
 >  
 > You can also get an evaluation edition of System Center 2019 from the [Evaluation Center](https://www.microsoft.com/evalcenter/download-system-center-2019).  
 
 <!--
 > [!NOTE]
 > The Evaluation Center is currently unavailable. As a workaround you can download the ConfigMgr TP 2202 Baseline here : ( https://aka.ms/MECM2202TP-Baseline).
 -->
-=======
->>>>>>> 8b4ccbb418343ae2ae27bbaf01cf7fda148b00c2
 
 ### Features of the LTSB