Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into mysqlsupport

Author: markingmyname

.openpublishing.redirection.json

@@ -40182,6 +40182,11 @@
       "redirect_url": "/azure/private-link/create-private-endpoint-powershell",
       "redirect_document_id": true
     },
+    {
+      "source_path_from_root": "/articles/app-service/how-to-zone-redundancy.md",
+      "redirect_url": "/azure/availability-zones/migrate-app-service",
+      "redirect_document_id": true
+    },
     {
       "source_path_from_root": "/articles/azure-monitor/insights/sql-insights-alerts.md",
       "redirect_url": "/azure/azure-sql/database/sql-insights-alerts",

articles/active-directory/fundamentals/concept-fundamentals-security-defaults.md

@@ -137,18 +137,9 @@ This policy applies to all users who are accessing Azure Resource Manager servic
 
 ### Authentication methods
 
-Security defaults allow registration and use of Azure AD Multi-Factor Authentication **using only the Microsoft Authenticator app using notifications**. Conditional Access allows the use of any authentication method the administrator chooses to enable.
+Security defaults users are required to register for and use Azure AD Multi-Factor Authentication **using the Microsoft Authenticator app using notifications**. Users may use verification codes from the Microsoft Authenticator app but can only register using the notification option. 
 
-| Method | Security defaults | Conditional Access |
-| --- | --- | --- |
-| Notification through mobile app | X | X |
-| Verification code from mobile app or hardware token | X** | X |
-| Text message to phone |   | X |
-| Call to phone |   | X |
-| App passwords |   | X*** |
-
-- ** Users may use verification codes from the Microsoft Authenticator app but can only register using the notification option.
-- *** App passwords are only available in per-user MFA with legacy authentication scenarios only if enabled by administrators.
+Starting in July 2022, anyone with the global administrator role assigned to them will be required to register a phone-based method like call or text as a backup method.
 
 > [!WARNING]
 > Do not disable methods for your organization if you are using security defaults. Disabling methods may lead to locking yourself out of your tenant. Leave all **Methods available to users** enabled in the [MFA service settings portal](../authentication/howto-mfa-getstarted.md#choose-authentication-methods-for-mfa).
@@ -157,11 +148,11 @@ Security defaults allow registration and use of Azure AD Multi-Factor Authentica
 
 Every organization should have at least two backup administrator accounts configured. We call these emergency access accounts.
 
-These accounts may be used in scenarios where your normal administrator accounts can't be used. For example: The person with the most recent Global Administrator access has left the organization. Azure AD prevents the last Global Administrator account from being deleted, but it doesn't prevent the account from being deleted or disabled on-premises. Either situation might make the organization unable to recover the account.
+These accounts may be used in scenarios where your normal administrator accounts can't be used. For example: The person with the most recent global administrator access has left the organization. Azure AD prevents the last global administrator account from being deleted, but it doesn't prevent the account from being deleted or disabled on-premises. Either situation might make the organization unable to recover the account.
 
 Emergency access accounts are:
 
-- Assigned Global Administrator rights in Azure AD.
+- Assigned global administrator rights in Azure AD.
 - Aren't used on a daily basis.
 - Are protected with a long complex password.
 
@@ -190,7 +181,7 @@ If your organization is a previous user of per-user based Azure AD Multi-Factor
 
 ### Conditional Access
 
-You can use Conditional Access to configure policies similar to security defaults, but with more granularity including user exclusions, which aren't available in security defaults. If you're using Conditional Access in your environment today, security defaults won't be available to you. 
+You can use Conditional Access to configure policies similar to security defaults, but with more granularity including selecting other authentication methods and the ability to exclude users, which aren't available in security defaults. If you're using Conditional Access in your environment today, security defaults won't be available to you. 
 
 ![Warning message that you can have security defaults or Conditional Access not both](./media/concept-fundamentals-security-defaults/security-defaults-conditional-access.png)
 

articles/app-service/configure-language-java.md

@@ -1135,7 +1135,7 @@ App Service supports clustering for JBoss EAP versions 7.4.1 and greater. To ena
 
 When clustering is enabled, the JBoss EAP instances use the FILE_PING JGroups discovery protocol to discover new instances and persist the cluster information like the cluster members, their identifiers, and their IP addresses. On App Service, these files are under `/home/clusterinfo/`. The first EAP instance to start will obtain read/write permissions on the cluster membership file. Other instances will read the file, find the primary node, and coordinate with that node to be included in the cluster and added to the file.
 
-The Premium V3 and Isolated V2 App Service Plan types can optionally be distributed across Availability Zones to improve resiliency and reliability for your business-critical workloads. This architecture is also known as [zone redundancy](how-to-zone-redundancy.md). The JBoss EAP clustering feature is compatabile with the zone redundancy feature. 
+The Premium V3 and Isolated V2 App Service Plan types can optionally be distributed across Availability Zones to improve resiliency and reliability for your business-critical workloads. This architecture is also known as [zone redundancy](../availability-zones/migrate-app-service.md). The JBoss EAP clustering feature is compatabile with the zone redundancy feature. 
 
 ### JBoss EAP App Service Plans
 

articles/app-service/how-to-zone-redundancy.md

@@ -206,6 +206,12 @@
       href: overview-arc-integration.md
     - name: Monitoring overview
       href: overview-monitoring.md      
+    - name: Resiliency
+      items:
+      - name: Migrate to availability zone support
+        href: ../availability-zones/migrate-app-service.md
+      - name: Restore from downed region
+        href: manage-disaster-recovery.md
     - name: Security
       items:
         - name: Recommendations
@@ -383,11 +389,8 @@
           href: app-service-web-app-cloning.md
         - name: Restore deleted App Service
           href: app-service-undelete.md
-        - name: Restore from downed region
-          href: manage-disaster-recovery.md
         - name: Enable on Azure Arc
           href: manage-create-arc-environment.md
-
     - name: Networking
       items:
         - name: Enable VNet integration
@@ -396,7 +399,6 @@
           href: configure-vnet-integration-routing.md
         - name: Control outbound traffic with Azure Firewall
           href: network-secure-outbound-traffic-azure-firewall.md
-
     - name: Move app
       items:
         - name: Move between regions
@@ -413,10 +415,6 @@
           href: webjobs-sdk-get-started.md
         - name: Use WebJobs SDK
           href: webjobs-sdk-how-to.md
-    - name: Zone redundancy
-      items:
-        - name: Configuring zone redundancy
-          href: how-to-zone-redundancy.md
     - name: Automate provisioning
       items:
       - name: Bicep

articles/app-service/toc.yml

@@ -16,7 +16,9 @@
     href: az-region.md
   - name: Migration Guidance
     items:
-    - name: Virtual Machines and Virtual Machine Scale Sets
+    - name: App service
+      href: migrate-app-service.md
+    - name: Virtual machines and virtual machine scale sets
       href: migrate-vm.md
     - name: Storage accounts
       href: migrate-storage.md

articles/availability-zones/TOC.yml

@@ -4,7 +4,7 @@ description: Learn about regions and availability zones and how they work to hel
 author: awysza
 ms.service: azure
 ms.topic: conceptual
-ms.date: 05/30/2022
+ms.date: 06/21/2022
 ms.author: rarco
 ms.reviewer: cynthn
 ms.custom: references_regions

articles/availability-zones/az-overview.md

@@ -4,7 +4,7 @@ description: Learn what services are supported by availability zones and underst
 author: awysza
 ms.service: azure
 ms.topic: conceptual
-ms.date: 05/30/2022
+ms.date: 06/21/2022
 ms.author: rarco
 ms.reviewer: cynthn
 ms.custom: references_regions
@@ -95,7 +95,7 @@ In the Product Catalog, always-available services are listed as "non-regional" s
 | [Azure Active Directory Domain Services](../active-directory-domain-services/overview.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
 | [Azure API Management](../api-management/zone-redundancy.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
 | [Azure App Configuration](../azure-app-configuration/faq.yml#how-does-app-configuration-ensure-high-data-availability) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
-| [Azure App Service](../app-service/how-to-zone-redundancy.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
+| [Azure App Service](migrate-app-service.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
 | [Azure App Service: App Service Environments](../app-service/environment/zone-redundancy.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) ![An icon that signifies this service is zonal](media/icon-zonal.svg) |
 | [Azure Bastion](../bastion/bastion-overview.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |
 | [Azure Batch](../batch/create-pool-availability-zones.md) | ![An icon that signifies this service is zone redundant.](media/icon-zone-redundant.svg) |