Merge branch 'MicrosoftDocs:main' into master

Author: jr-MS

.openpublishing.publish.config.json

@@ -1225,6 +1225,12 @@
       "url": "https://github.com/MicrosoftDocs/SupportArticles-docs",
       "branch": "main",
       "branch_mapping": {}
+    },
+    {
+      "path_to_root": "msdocs-python-fastapi-webapp-quickstart",
+      "url": "https://github.com/Azure-Samples/msdocs-python-fastapi-webapp-quickstart",
+      "branch": "main",
+      "branch_mapping": {}
     }
   ],
   "branch_target_mapping": {

.openpublishing.redirection.applied-ai-services.json

@@ -249,6 +249,11 @@
             "source_path_from_root": "/articles/ai-services/content-safety/how-to/incident-response.md",
             "redirect_url": "/azure/ai-services/content-safety/how-to/custom-categories-rapid",
             "redirect_document_id": true
+          },
+          {
+            "source_path_from_root": "/articles/ai-services/content-safety/concepts/custom-categories-rapid.md",
+            "redirect_url": "/azure/ai-services/content-safety/concepts/custom-categories",
+            "redirect_document_id": true
           }
 	]
 }

.openpublishing.redirection.azure-monitor.json

@@ -10,6 +10,11 @@
             "redirect_url": "/azure/azure-monitor/vm/scom-managed-instance-overview",
             "redirect_document_id": false
          },
+        {
+            "source_path_from_root": "/articles/azure-monitor/scom-manage-instance/monitor-arc-enabled-vm-with-scom-managed-instance.md",
+            "redirect_url": "/azure/azure-monitor/scom-manage-instance/monitor-azure-off-azure-vm-with-scom-managed-instance",
+            "redirect_document_id": false
+         },
         {
             "source_path_from_root": "/articles/azure-monitor/scom-manage-instance/common-questions.md",
             "redirect_url": "/azure/azure-monitor/scom-manage-instance/scom-managed-instance-faq",
@@ -1205,21 +1210,11 @@
             "redirect_url": "/azure/azure-monitor/app/overview-dashboard",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-overview.md",
-            "redirect_url": "/azure/azure-monitor/agents/agents-overview",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/azure-monitor/agents/use-azure-monitor-agent-troubleshooter.md",
             "redirect_url": "/azure/azure-monitor/agents/troubleshooter-ama-windows",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/azure/azure-monitor/agents/agents-overview.md#log-analytics-agent",
-            "redirect_url": "/azure/azure-monitor/agents/log-analytics-agent",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/application-insights/app-insights-platforms.md",
             "redirect_url": "/azure/azure-monitor/app/platforms",
@@ -2530,11 +2525,6 @@
             "redirect_url": "/azure/azure-monitor/agents/agent-manage",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/monitoring/monitoring-overview-azure-agents.md",
-            "redirect_url": "/azure/azure-monitor/platform/agents-overview",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/log-analytics/log-analytics-agent-windows.md",
             "redirect_url": "/azure/azure-monitor/agents/agent-windows",
@@ -3836,7 +3826,7 @@
         },
         {
             "source_path_from_root": "/articles/azure-monitor/platform/agents-overview.md",
-            "redirect_url": "/azure/azure-monitor/agents/agents-overview",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
             "redirect_document_id": false
         },
         {
@@ -5559,6 +5549,41 @@
             "redirect_url": "/azure/azure-monitor/essentials/resource-manager-diagnostic-settings#diagnostic-setting-for-activity-log",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-overview.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-standard-tests.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-azure-functions.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-private-test.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-alerts.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/availability-test-migration.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/sla-report.md",
+            "redirect_url": "/azure/azure-monitor/app/availability",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/azure-monitor/app/tutorial-alert.md",
             "redirect_url": "/azure/azure-monitor/app/availability-standard-tests",
@@ -6753,6 +6778,32 @@
             "source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-migration-tools.md",
             "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-migration",
             "redirect_document_id": false
-        }     
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/agents-overview.md",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/azure-monitor-agent-data-collection-endpoint.md",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-network-configuration",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/data-collection-text-log.md",
+            "redirect_url": "/azure/azure-monitor/agents/data-collection-log-text",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/monitoring/monitoring-overview-azure-agents.md",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-overview",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/agents/data-collection-rule-azure-monitor-agent.md",
+            "redirect_url": "/azure/azure-monitor/agents/azure-monitor-agent-data-collection",
+            "redirect_document_id": false
+        }
     ]
 }
+

.openpublishing.redirection.baremetal-infrastructure.json

@@ -134,6 +134,11 @@
             "source_path_from_root": "/articles/baremetal-infrastructure/workloads/sap/baremetal-overview-architecture.md",
             "redirect_url": "/azure/baremetal-infrastructure/concepts-baremetal-infrastructure-overview",
             "redirect_document_id": false
-        }
+        },
+        {
+            "source_path": "articles/baremetal-infrastructure/workloads/nc2-on-azure/solution-design.md",
+            "redirect_url": "/azure/baremetal-infrastructure/workloads/nc2-on-azure/architecture",
+            "redirect_document_id": false
+        }       
     ]
 }

.openpublishing.redirection.json

@@ -1,5 +1,24 @@
 {
     "redirections": [
+    {
+      "source_path": "articles/networking/connectivity-interoperability-configuration.md",
+      "redirect_url": "/previous-versions/azure/networking/connectivity-interoperability-configuration",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/expressroute/expressroute-howto-add-gateway-classic.md",
+      "redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-add-gateway-classic",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/expressroute/expressroute-howto-set-global-reach-cli.md",
+      "redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-set-global-reach-cli",
+    },
+    {
+      "source_path": "articles/digital-twins/how-to-integrate-maps.md",
+      "redirect_url": "/previous-versions/azure/digital-twins/how-to-integrate-maps",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/mysql/single-server/azure-pipelines-mysql-deploy.md",
       "redirect_url": "/previous-versions/azure/mysql/single-server/azure-pipelines-mysql-deploy",
@@ -1170,6 +1189,16 @@
             "redirect_url": "/azure/azure-maps/",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/azure-maps/tutorial-creator-indoor-maps.md",
+            "redirect_url": "/azure/azure-maps/creator-indoor-maps",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-maps/about-creator.md",
+            "redirect_url": "/azure/azure-maps/creator-indoor-maps",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/azure-maps/search-categories.md",
             "redirect_url": "/azure/azure-maps/supported-search-categories",
@@ -3683,6 +3712,16 @@
             "redirect_url": "/sql/sql-server/stretch-database/stretch-database-databases-and-tables-stretch-database-advisor",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/stream-analytics/stream-analytics-job-metrics.md",
+            "redirect_url": "/azure/stream-analytics/monitor-azure-stream-analytics-reference#metrics",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/stream-analytics/stream-analytics-job-metrics-dimensions.md",
+            "redirect_url": "/azure/stream-analytics/monitor-azure-stream-analytics-reference#metric-dimensions",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/dms/tutorial-azure-postgresql-to-azure-postgresql-online-portal.md",
             "redirect_url": "/azure/postgresql/migrate/migration-service/tutorial-migration-service-single-to-flexible",
@@ -4749,11 +4788,9 @@
             "redirect_document_id": false
         },
         {
-
            "source_path_from_root": "/articles/cosmos-db/how-to-move-regions.md",
            "redirect_url": "/azure/operational-excellence/relocation-cosmos-db",
            "redirect_document_id": false
-
         },
         {
            "source_path_from_root": "/articles/site-recovery/move-vaults-across-regions.md",
@@ -4764,7 +4801,21 @@
             "source_path_from_root": "/articles/defender-for-iot/organizations/tutorial-clearpass.md",
             "redirect_url": "/azure/defender-for-iot/organizations/integrate-overview",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/event-grid/high-availability-disaster-recovery.md",
+            "redirect_url": "/azure/reliability/reliability-event-grid",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/event-grid/availability-zones-disaster-recovery.md",
+            "redirect_url": "/azure/reliability/reliability-event-grid",
+            "redirect_document_id": false
         }
 
+
+
+        
+
     ]
 }

.openpublishing.redirection.operator-nexus.json

@@ -29,6 +29,11 @@
             "source_path_from_root": "/articles/operator-nexus/template-cloud-native-network-function-deployment.md",
             "redirect_url": "/azure/operator-nexus/quickstarts-kubernetes-cluster-deployment-cli",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/operator-nexus/concepts-nexus-network.md",
+            "redirect_url": "/azure/operator-nexus/concepts-nexus-networking",
+            "redirect_document_id": false
         }
     ]
-}
+}

articles/active-directory-b2c/claimsschema.md

@@ -395,7 +395,7 @@ The **Readonly** user input type is used to provide a readonly field to display
 
 #### Paragraph
 
-The **Paragraph** user input type is used to provide a field that shows text only in a paragraph tag.  For example, <p>text</p>. A **Paragraph** user input type `OutputClaim` of self-asserted technical profile, must set the `Required` attribute `false` (default).
+The **Paragraph** user input type is used to provide a field that shows text only in a paragraph tag.  For example, <p>text</p>. A **Paragraph** user input type `OutputClaim` of self-asserted technical profile, must set the `Required` attribute `false` (default). This user input type is only supported in self-asserted page layouts. Unified sign-in and sign-up pages (unifiedssp) might not display this properly.
 
 ![Using claim type with paragraph](./media/claimsschema/paragraph.png)
 

articles/active-directory-b2c/relyingparty.md

@@ -283,7 +283,7 @@ The **OutputClaim** element contains the following attributes:
 
 ### SubjectNamingInfo
 
-With the **SubjectNameingInfo** element, you control the value of the token subject:
+With the **SubjectNamingInfo** element, you control the value of the token subject:
 
 - **JWT token** - the `sub` claim. This is a principal about which the token asserts information, such as the user of an application. This value is immutable and cannot be reassigned or reused. It can be used to perform safe authorization checks, such as when the token is used to access a resource. By default, the subject claim is populated with the object ID of the user in the directory. For more information, see [Token, session and single sign-on configuration](session-behavior.md).
 - **SAML token** - the `<Subject><NameID>` element, which identifies the subject element. The NameId format can be modified.