Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into patricka-create-dataflow-fixes

Author: PatAltimore

.openpublishing.redirection.json

@@ -3729,6 +3729,21 @@
       "source_path_from_root": "/articles/virtual-network/tutorial-create-route-table-cli.md",
       "redirect_url": "/azure/virtual-network/tutorial-create-route-table",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-portal.md",
+      "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-powershell.md",
+      "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/virtual-network/tutorial-connect-virtual-networks-cli.md",
+      "redirect_url": "/azure/virtual-network/tutorial-connect-virtual-networks",
+      "redirect_document_id": false
     }
   ]
 }

articles/api-management/api-management-howto-ip-addresses.md

@@ -39,7 +39,7 @@ Public IP addresses will be part of the response:
   "properties": {
     ...
     "publicIPAddresses": [
-      "13.77.143.53"
+      "172.31.0.1"
     ],
     ...
   }
@@ -70,7 +70,7 @@ GET https://management.azure.com/subscriptions/<subscription-id>/resourceGroups/
   "properties": {
     ...
     "publicIPAddresses": [
-      "13.85.20.170"
+      "172.31.0.1"
     ],
     "privateIPAddresses": [
       "192.168.1.5"

articles/api-management/media/api-management-howto-ip-addresses/public-ip.png

@@ -16,7 +16,11 @@ App Service Environment is a single-tenant deployment of Azure App Service that
 
 ## Subnet requirements
 
-You must delegate the subnet to `Microsoft.Web/hostingEnvironments`, and the subnet must be empty.
+The following are the minimum set of requirements for the subnet your App Service Environment is in.
+
+- The subnet must be delegated to `Microsoft.Web/hostingEnvironments`.
+- The subnet must be empty.
+- The subnet's `addressPrefix` property must be formatted as a string, not an array. 
 
 The size of the subnet can affect the scaling limits of the App Service plan instances within the App Service Environment. For production scale, we recommend a `/24` address space (256 addresses) for your subnet. If you plan to scale near max capacity of 200 instances in our App Service Environment and you plan frequent up/down scale operations, we recommend a `/23` address space (512 addresses) for your subnet.
 

articles/api-management/media/api-management-howto-ip-addresses/vnet-ip.png

@@ -25,7 +25,7 @@ The v2 SKU includes the following enhancements:
 - **Autoscaling**: Application Gateway or WAF deployments under the autoscaling SKU can scale out or in based on changing traffic load patterns. Autoscaling also removes the requirement to choose a deployment size or instance count during provisioning. This SKU offers true elasticity. In the Standard_v2 and WAF_v2 SKU, Application Gateway can operate both in fixed capacity (autoscaling disabled) and in autoscaling enabled mode. Fixed capacity mode is useful for scenarios with consistent and predictable workloads. Autoscaling mode is beneficial in applications that see variance in application traffic.
 - **Zone redundancy**: An Application Gateway or WAF deployment can span multiple Availability Zones, removing the need to provision separate Application Gateway instances in each zone with a Traffic Manager. You can choose a single zone or multiple zones where Application Gateway instances are deployed, which makes it more resilient to zone failure. The backend pool for applications can be similarly distributed across availability zones.
 
-  Zone redundancy is available only where Azure Zones are available. In other regions, all other features are supported. For more information, see [Regions and Availability Zones in Azure](../reliability/availability-zones-service-support.md)
+  Zone redundancy is available only where Azure availability zones are available. In other regions, all other features are supported. For more information, see [Azure regions with availability zone support](../reliability/availability-zones-region-support.md).
 - **Static VIP**: Application Gateway v2 SKU supports the static VIP type exclusively. Static VIP ensures that the VIP associated with the application gateway doesn't change for the lifecycle of the deployment, even after a restart. You must use the application gateway URL for domain name routing to App Services via the application gateway, as v1 doesn't have a static VIP.
 - **Header Rewrite**: Application Gateway allows you to add, remove, or update HTTP request and response headers with v2 SKU. For more information, see [Rewrite HTTP headers with Application Gateway](./rewrite-http-headers-url.md)
 - **Key Vault Integration**: Application Gateway v2 supports integration with Key Vault for server certificates that are attached to HTTPS enabled listeners. For more information, see [TLS termination with Key Vault certificates](key-vault-certs.md).

articles/api-management/media/api-management-using-with-vnet/verify-network-connectivity-status.png

@@ -252,46 +252,42 @@
               href: automation-dsc-extension-history.md
             - name: Troubleshoot State Configuration issues
               href: troubleshoot/desired-state-configuration.md
-    - name: Change tracking and inventory 
+    - name: Change Tracking and Inventory using AMA
       items:
-        - name: Use Azure Monitoring Agent (AMA)
-          items:
-            - name: Overview
-              items:
-                - name: About Change tracking and inventory
-                  href: change-tracking/overview-monitoring-agent.md
-                - name: Change tracking extension version
-                  href: change-tracking/extension-version-details.md
-            - name: Supported regions
-              href: change-tracking/region-mappings-monitoring-agent.md
-            - name: Enable change tracking and inventory
-              href: change-tracking/enable-vms-monitoring-agent.md
-            - name: Manage change tracking and inventory
-              href: change-tracking/manage-change-tracking-monitoring-agent.md
-            - name: Configure alerts
-              href: change-tracking/configure-alerts.md
-        - name: Migration guidance
-          items:
-            - name: Migration from Log Analytics to Azure Monitoring Agent version
-              href: change-tracking/guidance-migration-log-analytics-monitoring-agent.md
-        - name: Use Log Analytics (Retired)
+        - name: About Change tracking and inventory
+          href: change-tracking/overview-monitoring-agent.md
+        - name: Change tracking extension version
+          href: change-tracking/extension-version-details.md
+        - name: Supported regions
+          href: change-tracking/region-mappings-monitoring-agent.md
+        - name: Enable change tracking and inventory
+          href: change-tracking/enable-vms-monitoring-agent.md
+        - name: Manage change tracking and inventory
+          href: change-tracking/manage-change-tracking-monitoring-agent.md
+        - name: Configure alerts
+          href: change-tracking/configure-alerts.md
+    - name: Migration from Change Tracking and Inventory using AMA to Change Tracking using LA (Retired)
+      items:
+        - name: Migration from Log Analytics to Azure Monitoring Agent version
+          href: change-tracking/guidance-migration-log-analytics-monitoring-agent.md
+    - name: Change Tracking and Inventory using Log Analytics (Retired)
+      items:
+        - name: Overview
+          href: change-tracking/overview.md
+        - name: Support regions for linked Log Analytics workspace
+          href: how-to/region-mappings.md
+        - name: Discover the software installed on your VMs
+          href: automation-tutorial-installed-software.md
+        - name: Enable
           items:
-            - name: Overview
-              href: change-tracking/overview.md
-            - name: Support regions for linked Log Analytics workspace
-              href: how-to/region-mappings.md
-            - name: Discover the software installed on your VMs
-              href: automation-tutorial-installed-software.md
-            - name: Enable
-              items:
-                - name: Enable from the Azure portal
-                  href: change-tracking/enable-from-portal.md
-                - name: Enable from an Azure VM
-                  href: change-tracking/enable-from-vm.md
-                - name: Enable from an Automation account
-                  href: change-tracking/enable-from-automation-account.md
-                - name: Enable from a runbook
-                  href: change-tracking/enable-from-runbook.md
+            - name: Enable from the Azure portal
+              href: change-tracking/enable-from-portal.md
+            - name: Enable from an Azure VM
+              href: change-tracking/enable-from-vm.md
+            - name: Enable from an Automation account
+              href: change-tracking/enable-from-automation-account.md
+            - name: Enable from a runbook
+              href: change-tracking/enable-from-runbook.md
             - name: Manage change tracking and inventory
               href: change-tracking/manage-change-tracking.md
             - name: Manage inventory collection from VMs
@@ -300,18 +296,18 @@
               href: change-tracking/manage-scope-configurations.md
             - name: Configure alerts
               href: change-tracking/configure-alerts.md
-            - name: Disable
-              items:
-                - name: Remove Change Tracking and Inventory
-                  href: change-tracking/remove-feature.md
-                - name: Remove machines
-                  href: change-tracking/remove-vms-from-change-tracking.md
-            - name: Troubleshoot
-              items:
-                - name: Troubleshoot feature deployment issues
-                  href: troubleshoot/onboarding.md
-                - name: Troubleshoot Change Tracking and Inventory issues
-                  href: troubleshoot/change-tracking.md      
+        - name: Disable
+          items:
+            - name: Remove Change Tracking and Inventory
+              href: change-tracking/remove-feature.md
+            - name: Remove machines
+              href: change-tracking/remove-vms-from-change-tracking.md
+        - name: Troubleshoot
+          items:
+            - name: Troubleshoot feature deployment issues
+              href: troubleshoot/onboarding.md
+            - name: Troubleshoot Change Tracking and Inventory issues
+              href: troubleshoot/change-tracking.md      
     - name: Update Management (Retired)
       items:
         - name: Overview

articles/api-management/media/get-started-create-service-instance/get-started-create-service-instance-created-1.png

@@ -31,7 +31,7 @@ In the event when a zone is down, there's no action required by you to recover f
 
 ## Supported regions with availability zones
 
-See [Regions and Availability Zones in Azure](../reliability/availability-zones-service-support.md) for the Azure regions that have availability zones. 
+See [Azure regions with availability zone support](../reliability/availability-zones-region-support.md) for the Azure regions that have availability zones. 
 Automation accounts currently support the following regions: 
 
 - Australia East
@@ -82,4 +82,4 @@ There is no change to the [Service Level Agreement](https://azure.microsoft.com/
 
 ## Next steps
 
-- Learn more about [regions that support availability zones](../reliability/availability-zones-service-support.md).
+- Learn more about [regions that support availability zones](../reliability/availability-zones-region-support.md).