resolving merge conflict

Author: schaffererin

.openpublishing.redirection.json

@@ -24117,6 +24117,21 @@
             "source_path_from_root": "/articles/aks/use-multiple-node-pools.md",
             "redirect_url": "/azure/aks/create-node-pools",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/reliability/migrate-app-service.md",
+            "redirect_url": "/azure/reliability/reliability-app-service",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/reliability/migrate-app-service-environment.md",
+            "redirect_url": "/azure/reliability/reliability-app-service",
+            "redirect_document_id": false
         }
+
+
+
+
+       
     ]
 }

articles/active-directory/authentication/howto-mfaserver-deploy.md

@@ -6,7 +6,7 @@ services: multi-factor-authentication
 ms.service: active-directory
 ms.subservice: authentication
 ms.topic: how-to
-ms.date: 10/10/2022
+ms.date: 08/04/2023
 
 ms.author: justinha
 author: justinha
@@ -48,14 +48,16 @@ When a master Azure MFA Server goes offline, the subordinate servers can still p
 
 ### Prepare your environment
 
-Make sure the server  that you're using for Azure Multi-Factor Authentication meets the following requirements:
+Make sure the server that you're using for Azure Multi-Factor Authentication meets the following requirements. 
 
 | Azure Multi-Factor Authentication Server Requirements | Description |
 |:--- |:--- |
 | Hardware |<li>200 MB of hard disk space</li><li>x32 or x64 capable processor</li><li>1 GB or greater RAM</li> |
-| Software |<li>Windows Server 2019</li><li>Windows Server 2016</li><li>Windows Server 2012 R2</li><li>Windows Server 2012</li><li>Windows Server 2008/R2 (with [ESU](/lifecycle/faq/extended-security-updates) only)</li><li>Windows 10</li><li>Windows 8.1, all editions</li><li>Windows 8, all editions</li><li>Windows 7, all editions (with [ESU](/lifecycle/faq/extended-security-updates) only)</li><li>Microsoft .NET 4.0 Framework</li><li>IIS 7.0 or greater if installing the user portal or web service SDK</li> |
+| Software |<li>Windows Server 2019<sup>1</sup></li><li>Windows Server 2016</li><li>Windows Server 2012 R2</li><li>Windows Server 2012</li><li>Windows Server 2008/R2 (with [ESU](/lifecycle/faq/extended-security-updates) only)</li><li>Windows 10</li><li>Windows 8.1, all editions</li><li>Windows 8, all editions</li><li>Windows 7, all editions (with [ESU](/lifecycle/faq/extended-security-updates) only)</li><li>Microsoft .NET 4.0 Framework</li><li>IIS 7.0 or greater if installing the user portal or web service SDK</li> |
 | Permissions | Domain Administrator or Enterprise Administrator account to register with Active Directory |
 
+<sup>1</sup>If Azure MFA Server fails to activate on an Azure VM that runs Windows Server 2019, try using another version of Windows Server.
+
 ### Azure MFA Server Components
 
 There are three web components that make up Azure MFA Server:

articles/active-directory/conditional-access/concept-conditional-access-cloud-apps.md

@@ -155,6 +155,9 @@ When a Conditional Access policy targets the Microsoft Admin Portals cloud app,
 
 Other Microsoft admin portals will be added over time.
 
+> [!IMPORTANT]
+> Microsoft Admin Poratls (preview) is not currently supported in Government clouds.
+
 > [!NOTE]
 > The Microsoft Admin Portals app applies to interactive sign-ins to the listed admin portals only. Sign-ins to the underlying resources or services like Microsoft Graph or Azure Resource Manager APIs are not covered by this application. Those resources are protected by the [Microsoft Azure Management](#microsoft-azure-management) app. This enables customers to move along the MFA adoption journey for admins without impacting automation that relies on APIs and PowerShell. When you are ready, Microsoft recommends using a [policy requiring administrators perform MFA always](howto-conditional-access-policy-admin-mfa.md) for comprehensive protection.
 

articles/active-directory/conditional-access/how-to-policy-mfa-admin-portals.md

@@ -19,6 +19,9 @@ ms.collection: M365-identity-device-management
 
 Microsoft recommends securing access to any Microsoft admin portals like Microsoft Entra, Microsoft 365, Exchange, and Azure. Using the [Microsoft Admin Portals (Preview)](concept-conditional-access-cloud-apps.md#microsoft-admin-portals-preview) app organizations can control interactive access to Microsoft admin portals.
 
+> [!IMPORTANT]
+> Microsoft Admin Poratls (preview) is not currently supported in Government clouds.
+
 ## User exclusions
 [!INCLUDE [active-directory-policy-exclusions](../../../includes/active-directory-policy-exclude-user.md)]
 

articles/ai-services/openai/includes/dall-e-studio.md

@@ -7,7 +7,7 @@ manager: nitinme
 ms.service: cognitive-services
 ms.subservice: openai
 ms.topic: include
-ms.date: 04/04/2023
+ms.date: 08/04/2023
 keywords: 
 ---
 
@@ -27,19 +27,19 @@ Use this guide to get started generating images with Azure OpenAI in your browse
 
 Navigate to Azure OpenAI Studio at <a href="https://oai.azure.com/" target="_blank">https://oai.azure.com/</a> and sign in with the credentials associated with your OpenAI resource. During or after the sign-in workflow, select the appropriate directory, Azure subscription, and Azure OpenAI resource.
 
-From the Azure OpenAI Studio landing page, select **DALL·E 2 playground** to use the image generation APIs.
+From the Azure OpenAI Studio landing page, select **DALL·E (Preview) playground** to use the image generation APIs.
 
 ## Try out image generation
 
-Start exploring Azure OpenAI capabilities with a no-code approach through the DALL-E 2 playground. Enter your image prompt into the text box and select **Generate**. When the AI-generated image is ready, it will appear on the page.
+Start exploring Azure OpenAI capabilities with a no-code approach through the DALL·E (Preview) playground. Enter your image prompt into the text box and select **Generate**. When the AI-generated image is ready, it will appear on the page.
 
 > [!NOTE]
 > The image generation APIs come with a content moderation filter. If the service recognizes your prompt as harmful content, it won't return a generated image. For more information, see the [content filter](../concepts/content-filter.md) guide.
 
 :::image type="content" source="../media/quickstarts/dall-e-studio.png" alt-text="Screenshot of the Azure OpenAI Studio landing page." lightbox="../media/quickstarts/dall-e-studio.png":::
 
 
-In the DALL-E 2 playground, you can also view Python and cURL code samples, which are pre-filled according to your settings. Select **View code** near the top of the page. You can use this code to write an application that completes the same task.
+In the DALL·E (Preview) playground, you can also view Python and cURL code samples, which are pre-filled according to your settings. Select **View code** near the top of the page. You can use this code to write an application that completes the same task.
 
 ## Clean up resources