Address merge conflict

Author: pauljewellmsft

.openpublishing.redirection.json

@@ -20,6 +20,11 @@
             "redirect_url": "/azure/storage/blobs/storage-quickstart-blobs-dotnet",
             "redirect_document_id": false
         },
+        {
+            "source_path":  "articles/site-recovery/deploy-vmware-azure-replication-appliance-preview.md",
+            "redirect_url":  "/azure/site-recovery/deploy-vmware-azure-replication-appliance-modernized",
+            "redirect_document_id":  false
+        },
         {
             "source_path": "articles/iot-hub/iot-hub-rm-template.md",
             "redirect_url": "/azure/iot-hub/iot-hub-rm-template-powershell",
@@ -31,14 +36,39 @@
             "redirect_document_id": false
         },
         {
-            "source_path": "articles/visual-studio/vs-storage-cloud-services-getting-started-queues.md",
-            "redirect_url": "/previous-versions/azure/visual-studio/vs-storage-cloud-services-getting-started-queues",
-            "redirect_document_id": false
+            "source_path":  "articles/site-recovery/failover-failback-overview-preview.md",
+            "redirect_url":  "/azure/site-recovery/failover-failback-overview-modernized",
+            "redirect_document_id":  false
         },
         {
-            "source_path": "articles/visual-studio/vs-storage-cloud-services-getting-started-tables.md",
-            "redirect_url": "/previous-versions/azure/visual-studio/vs-storage-cloud-services-getting-started-tables",
-            "redirect_document_id": false
+            "source_path":  "articles/site-recovery/switch-replication-appliance-preview.md",
+            "redirect_url":  "/azure/site-recovery/switch-replication-appliance-modernized",
+            "redirect_document_id":  false 
+        },
+        {
+            "source_path":  "articles/site-recovery/upgrade-mobility-service-preview.md",
+            "redirect_url":  "/azure/site-recovery/upgrade-mobility-service-modernized",
+            "redirect_document_id":  false   
+        },
+        {
+            "source_path":  "articles/site-recovery/vmware-azure-set-up-replication-tutorial-preview.md",
+            "redirect_url":  "/azure/site-recovery/vmware-azure-set-up-replication-tutorial-modernized",
+            "redirect_document_id":  false   
+        },
+        {
+            "source_path":  "articles/site-recovery/vmware-azure-architecture-preview.md",
+            "redirect_url":  "/azure/site-recovery/vmware-azure-architecture-modernized",
+            "redirect_document_id":  false   
+        },
+        {
+            "source_path":  "articles/physical-server-azure-architecture-preview.md",
+            "redirect_url":  "/azure/physical-server-azure-architecture-modernized",
+            "redirect_document_id":  false   
+        },
+        {
+            "source_path":  "articles/vmware-azure-tutorial-failover-failback-preview.md",
+            "redirect_url":  "/azure/vmware-azure-tutorial-failover-failback-modernized",
+            "redirect_document_id":  false   
         },
         {
             "source_path": "articles/automanage/automanage-virtual-machines.md",
@@ -28861,3 +28891,4 @@
         }
     ]
 }
+

articles/active-directory/fundamentals/automate-provisioning-to-applications-introduction.md

@@ -34,7 +34,7 @@ Thousands of organizations are running Azure AD cloud-hosted services, with its
 | What | From | To | Read |
 | - | - | - | - |
 | Employees and contractors| HR systems| AD and Azure AD| [Connect identities with your system of record](automate-provisioning-to-applications-solutions.md) |
-| Existing AD users and groups| AD| Azure AD| [Synchronize identities between Azure AD and Active Directory](automate-provisioning-to-applications-solutions.md) |
+| Existing AD users and groups| AD DS| Azure AD| [Synchronize identities between Azure AD and Active Directory](automate-provisioning-to-applications-solutions.md) |
 | Users, groups| Azure AD| SaaS and on-prem apps| [Automate provisioning to non-Microsoft applications](../governance/entitlement-management-organization.md) |
 | Access rights| Azure AD Identity Governance| SaaS and on-prem apps| [Entitlement management](../governance/entitlement-management-overview.md) |
 | Existing users and groups| AD, SaaS and on-prem apps| Identity governance (so I can review them)| [Azure AD Access reviews](../governance/access-reviews-overview.md) |

articles/active-directory/fundamentals/automate-provisioning-to-applications-solutions.md

@@ -35,7 +35,7 @@ The Azure AD provisioning service enables organizations to [bring identities fro
 
 ### On-premises HR + joining multiple data sources
 
-To create a full user profile for an employee identity, organizations often merge information from multiple HR systems, databases, and other user data stores. MIM provides a rich set of [connectors](https://learn.microsoft.com/microsoft-identity-manager/supported-management-agents) and integration solutions interoperating with heterogeneous platforms.
+To create a full user profile for an employee identity, organizations often merge information from multiple HR systems, databases, and other user data stores. MIM provides a rich set of [connectors](https://learn.microsoft.com/microsoft-identity-manager/supported-management-agents) and integration solutions interoperating with heterogeneous platforms both on-premises and in the cloud.
 
 MIM offers [rule extension](/previous-versions/windows/desktop/forefront-2010/ms698810(v=vs.100)?redirectedfrom=MSDN) and [workflow capabilities](https://microsoft.github.io/MIMWAL/) features for advanced scenarios requiring data transformation and consolidation from multiple sources. These connectors, rule extensions, and workflow capabilities enable organizations to aggregate user data in the MIM metaverse to form a single identity for each user. The identity can be [provisioned into downstream systems](/microsoft-identity-manager/microsoft-identity-manager-2016-supported-platforms) such as AD DS.
 
@@ -49,13 +49,13 @@ The scenarios are divided by the direction of synchronization needed, and are li
 
 Use the numbered sections in the next two section to cross reference the following table.
 
-**Synchronize identities from AD into Azure AD**
+**Synchronize identities from AD DS into Azure AD**
 
 1. For users in AD that need access to Office 365 or other applications that are connected to Azure AD, Azure AD Connect cloud sync is the first solution to explore. It provides a lightweight solution to create users in Azure AD, manage password rests, and synchronize groups. Configuration and management are primarily done in the cloud, minimizing your on-premises footprint. It provides high-availability and automatic failover, ensuring password resets and synchronization continue, even if there's an issue with on-premises servers.
 
 1. For complex, large-scale AD to Azure AD sync needs such as synchronizing groups over 50,000 and device sync, customers can use Azure AD Connect sync to meet their needs.
 
-**Synchronize identities from Azure AD into AD**
+**Synchronize identities from Azure AD into AD DS**
 
 As customers transition identity management to the cloud, more users and groups are created directly in Azure AD. However, they still need a presence on-premises in AD DS to access various resources.
 
@@ -134,7 +134,7 @@ After users are provisioned into Azure AD, use Lifecycle Workflows (LCW) to auto
 
 ### Reconcile changes made directly in the target system
 
-Organizations often need a complete audit trail of what users have access to applications containing data subject to regulation. To provide an audit trail, any access provided to a user directly must be traceable through the system of record. MIM provides the [reconciliation capabilities](/microsoft-identity-manager/mim-how-provision-users-adds) to detect changes made directly in a target system and roll back the changes. In addition to detecting changes in target applications, MIM can import identities from third party applications to Azure AD. These applications often augment the set of user records that originated in the HR system.
+Organizations often need a complete audit trail of what users have access to applications containing data subject to regulation. To provide an audit trail, any access provided to a user directly must be traceable through the system of record. MIM provides the reconciliation capabilities to detect changes made directly in a target system and roll back the changes. In addition to detecting changes in target applications, MIM can import identities from third party applications to Azure AD. These applications often augment the set of user records that originated in the HR system.
 
 ### Next steps
 

articles/automation/TOC.yml

@@ -58,6 +58,10 @@
           href: automation-secure-asset-encryption.md
         - name: Management of Azure Automation data
           href: automation-managing-data.md
+    - name: High availability
+      items:
+        - name: Availability zones
+          href: automation-availability-zones.md        
 - name: How-to guides
   items:
     - name: Automation Account

articles/automation/automation-availability-zones.md

@@ -0,0 +1,73 @@
+---
+title: Availability zones support for Azure Automation
+description: This article provides an overview of Azure availability zones and regions for Azure Automation
+keywords: automation availability zones.
+services: automation
+ms.subservice: process-automation
+ms.date: 06/29/2022
+ms.topic: conceptual
+ms.custom: references_regions 
+---
+
+# Availability zones support for Azure Automation
+
+Azure Automation uses [Azure availability zones](../availability-zones/az-overview.md#availability-zones) to provide improved resiliency and high availability to a service instance in a specific Azure region.
+ 
+[Azure availability zones](../availability-zones/az-overview.md#availability-zones) is a 
+high-availability offering that protects your applications and data from data center failures.
+Availability zones are unique physical locations within an Azure region and each region comprises of one or more data center(s) equipped with independent power, cooling, and networking. To ensure resiliency, there needs to be a minimum of three separate zones in all enabled regions.
+
+A zone redundant Automation account automatically distributes traffic to the Automation account through various management operations and runbook jobs amongst the availability zones in the supported region. The replication is handled at the service level to these physically separate zones, making the service resilient to a zone failure with no impact on the availability of the Automation accounts in the same region.
+
+In the event when a zone is down, there's no action required by you to recover from a zone failure and the service would be accessible through the other available zones. The service detects that the zone is down and automatically distributes the traffic to the available zones as needed.
+
+## Availability zone considerations
+
+- In all Availability zone supported regions, the zone redundancy for Automation accounts is enabled by default and it can't be disabled. It requires no action from your end as it's enabled and managed by the service.
+- All new Automation accounts with basic SKU are created with zone redundancy natively.
+- All existing Automation accounts would become zone redundant automatically. It requires no action from your end.
+- In a zone-down scenario, you might expect a brief performance degradation until the service self-healing rebalances the underlying capacity to adjust to healthy zones. This isn't dependent on zone restoration; the service self-healing state will compensate for a lost zone, using the capacity from other zones.
+- In a zone-wide failure scenario, you must follow the guidance provided to set up a disaster recovery for Automation accounts in a secondary region.   
+- Availability zone support for Automation accounts supports only [Process Automation](/azure/automation/overview#process-automation) feature to provide an improved resiliency for runbook automation.   
+
+## Supported regions with availability zones
+
+See [Regions and Availability Zones in Azure](/global-infrastructure/geographies/#geographies) for the Azure regions that have availability zones. 
+Automation accounts currently support the following regions in preview: 
+ 
+- China North 3
+- Qatar Central
+- West US 2
+- East US 2
+- East US
+- North Europe
+- West Europe
+- France Central
+- Japan East
+- UK South
+- Southeast Asia
+- Australia East
+- Central US
+- Brazil South
+- Germany West Central
+- West US 3
+
+## Create a zone redundant Automation account
+You can create a zone redundant Automation account using:
+- [Azure portal](/azure/automation/automation-create-standalone-account?tabs=azureportal)
+- [Azure Resource Manager (ARM) template](/azure/automation/quickstart-create-automation-account-template)
+
+> [!Note]
+> There is no option to select or see Availability zone in the creation flow of the Automation Accounts. It’s a default setting enabled and managed at the service level.  
+
+## Pricing
+
+There's no additional cost associated  to enable the zone redundancy feature in Automation account.  
+
+## Service Level Agreement
+
+There is no change to the [Service Level Agreement](https://azure.microsoft.com/support/legal/sla/automation/v1_1/) with the support of Availability zones in Automation Account. The SLA depends on job start time with a guarantee that at least 99.9% of runbook jobs will start within 30 minutes of their planned start times. 
+
+## Next steps
+
+- Learn more about [regions that support availability zones](/azure/availability-zones/az-region.md).

articles/automation/learn/automation-tutorial-runbook-textual.md

@@ -299,8 +299,8 @@ You can use the `ForEach -Parallel` construct to process commands for each item
     ```
 
 1. If you want the runbook to execute with the system-assigned managed identity, leave the code as-is. If you prefer to use a user-assigned managed identity, then:
-    1. From line 9, remove `(Connect-AzAccount -Identity)`,
-    1. Replace it with `(Connect-AzAccount -Identity -AccountId <ClientId>)`, and
+    1. From line 9, remove `Connect-AzAccount -Identity`,
+    1. Replace it with `Connect-AzAccount -Identity -AccountId <ClientId>`, and
     1. Enter the Client ID you obtained earlier.
 
 1. Select **Save**, then **Publish**, and then **Yes** when prompted.

articles/azure-resource-manager/bicep/media/visual-studio-code/visual-studio-code-azure-resources-extension.png

@@ -2,7 +2,7 @@
 title: Create Bicep files by using Visual Studio Code
 description: Describes how to create Bicep files by using Visual Studio Code
 ms.topic: conceptual
-ms.date: 09/14/2022
+ms.date: 09/29/2022
 ---
 
 # Create Bicep files by using Visual Studio Code
@@ -56,21 +56,28 @@ This command creates a parameter file in the same folder as the Bicep file. The
 
 The `insert resource` command adds a resource declaration in the Bicep file by providing the resource ID of an existing resource. After you select **Insert Resource**, enter the resource ID in the command palette. It takes a few moments to insert the resource.
 
-You can find the resource ID from the Azure portal, or by using:
+You can find the resource ID by using one of these methods:
 
-# [CLI](#tab/CLI)
+- Use [Azure Resource extension for VSCode](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azureresourcegroups).
 
-```azurecli
-az resource list
-```
+    :::image type="content" source="./media/visual-studio-code/visual-studio-code-azure-resources-extension.png" alt-text="Screenshot of Visual Studio Code Azure Resources extension.":::
 
-# [PowerShell](#tab/PowerShell)
+- Use the [Azure portal](https://portal.azure.com).
+- Use Azure CLI or Azure PowerShell:
 
-```azurepowershell
-Get-AzResource
-```
+  # [CLI](#tab/CLI)
 
----
+  ```azurecli
+  az resource list
+  ```
+
+  # [PowerShell](#tab/PowerShell)
+
+  ```azurepowershell
+  Get-AzResource
+  ```
+
+  ---
 
 Similar to exporting templates, the process tries to create a usable resource. However, most of the inserted resources require some modification before they can be used to deploy Azure resources.
 

articles/azure-resource-manager/bicep/visual-studio-code.md

@@ -5,6 +5,23 @@ ms.topic: include
 ms.date: 01/24/2022
 ms.author: eur
 ---
+
+### 2022-September release
+
+#### Prebuilt Neural TTS Voice
+
+* All the prebuilt neural voices have been upgraded to high-fidelity voices with 48kHz sample rate. 
+
+### 2022-August release
+
+#### Prebuilt Neural TTS Voice
+
+Released new voices in public preview:
+* Voices for English (United States): `en-US-AIGenerate1Neural` and `en-US-AIGenerate2Neural`.
+* Voices for Chinese dialects: `zh-CN-henan-YundengNeural`, `zh-CN-shaanxi-XiaoniNeural`, and `zh-CN-shandong-YunxiangNeural`. 
+
+For more information, see the [language and voice list](../../language-support.md?tabs=stt-tts).
+
 ### 2022-July release
 
 #### Prebuilt Neural TTS Voice

articles/cognitive-services/Speech-Service/includes/release-notes/release-notes-tts.md

@@ -42,7 +42,7 @@ Each prebuilt neural voice supports a specific language and dialect, identified
 > [!IMPORTANT]
 > Pricing varies for Prebuilt Neural Voice (see *Neural* on the pricing page) and Custom Neural Voice (see *Custom Neural* on the pricing page). For more information, see the [Pricing](https://azure.microsoft.com/pricing/details/cognitive-services/speech-services/) page.
 
-Prebuilt neural voices are created from samples that use a 24-khz sample rate. All voices can upsample or downsample to other sample rates when synthesizing.
+Each prebuilt neural voice model is available at 24kHz and high-fidelity 48kHz. Other sample rates can be obtained through upsampling or downsampling when synthesizing.
 
 Please note that the following neural voices are retired.