Merge branch 'release-ga-apim-workspaces' of https://github.com/MicrosoftDocs/azure-docs-pr into wkspclim

Author: dlepow

.openpublishing.publish.config.json

@@ -896,6 +896,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "storage-mgmt-devguide-dotnet",
+      "url": "https://github.com/Azure-Samples/storage-mgmt-devguide-dotnet",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "azure-sdk-for-net",
       "url": "https://github.com/Azure/azure-sdk-for-net/",
@@ -986,6 +992,12 @@
       "branch": "main",
       "branch_mapping": {}
     },
+    {
+      "path_to_root": "msdocs-fastapi-postgresql-sample-app",
+      "url": "https://github.com/Azure-Samples/msdocs-fastapi-postgresql-sample-app",
+      "branch": "main",
+      "branch_mapping": {}
+    },
     {
       "path_to_root": "msdocs-quarkus-postgresql-sample-app",
       "url": "https://github.com/Azure-Samples/msdocs-quarkus-postgresql-sample-app",

.openpublishing.redirection.azure-monitor.json

@@ -1515,6 +1515,46 @@
             "redirect_url": "/azure/azure-monitor/app/usage-workbooks",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/usage-overview.md",
+            "redirect_url": "/azure/azure-monitor/app/usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/usage-segmentation.md",
+            "redirect_url": "/azure/azure-monitor/app/usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/usage-funnels.md",
+            "redirect_url": "/azure/azure-monitor/app/usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/usage-cohorts.md",
+            "redirect_url": "/azure/azure-monitor/app/usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/usage-impact.md",
+            "redirect_url": "/azure/azure-monitor/app/usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/usage-retention.md",
+            "redirect_url": "/azure/azure-monitor/app/usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/usage-flows.md",
+            "redirect_url": "/azure/azure-monitor/app/usage",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-monitor/app/usage-heart.md",
+            "redirect_url": "/azure/azure-monitor/app/usage",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/application-insights/app-insights-visual-studio.md",
             "redirect_url": "/azure/azure-monitor/app/visual-studio",

.openpublishing.redirection.container-registry.json

@@ -109,7 +109,7 @@
         },
         {
             "source_path": "articles/container-registry/container-registry-diagnostics-audit-logs.md",
-            "redirect_url": "/azure/container-registry/monitor-service"
+            "redirect_url": "/azure/container-registry/monitor-container-registry"
         },
         {
             "source_path_from_root": "/articles/container-registry/container-registry-managed-get-started-azure-cli.md",
@@ -155,6 +155,16 @@
             "source_path_from_root": "/articles/container-registry/github-action-scan.md",
             "redirect_url": "/azure/developer/github/",
             "redirect_document_id": false
+        },
+        {
+            "source_path": "articles/container-registry/monitor-service.md",
+            "redirect_url": "/azure/container-registry/monitor-container-registry",
+            "redirect_document_id": true
+        },
+        {
+            "source_path": "articles/container-registry/monitor-service-reference.md",
+            "redirect_url": "/azure/container-registry/monitor-container-registry-reference",
+            "redirect_document_id": true
         }
     ]
 }

.openpublishing.redirection.json

@@ -1,5 +1,70 @@
 {
     "redirections": [
+    {
+      "source_path": "articles/application-gateway/resource-manager-template-samples.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/resource-manager-template-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/cli-samples.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/cli-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/scripts/create-vmss-cli.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-cli",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/scripts/create-vmss-powershell.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/scripts/create-vmss-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/application-gateway/scripts/waf-custom-rules-powershell.md",
+      "redirect_url": "/previous-versions/azure/application-gateway/scripts/waf-custom-rules-powershell",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/dns/scripts/dns-cli-create-dns-zone-record.md",
+      "redirect_url": "/previous-versions/azure/dns/scripts/dns-cli-create-dns-zone-record",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/dns/scripts/find-unhealthy-dns-records.md",
+      "redirect_url": "/previous-versions/azure/dns/scripts/find-unhealthy-dns-records",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/dns/cli-samples.md",
+      "redirect_url": "/previous-versions/azure/dns/cli-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/traffic-manager/scripts/traffic-manager-powershell-websites-high-availability.md",
+      "redirect_url": "/previous-versions/azure/traffic-manager/scripts/traffic-manager-powershell-websites-high-availability",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/traffic-manager/cli-samples.md",
+      "redirect_url": "/previous-versions/azure/traffic-manager/cli-samples",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/expressroute/about-public-peering.md",
+      "redirect_url": "/previous-versions/azure/expressroute/about-public-peering",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/expressroute/how-to-npm.md",
+      "redirect_url": "/previous-versions/azure/expressroute/how-to-npm",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/expressroute/how-to-move-peering.md",
+      "redirect_url": "/previous-versions/azure/expressroute/how-to-move-peering",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/networking/connectivity-interoperability-configuration.md",
       "redirect_url": "/previous-versions/azure/networking/connectivity-interoperability-configuration",
@@ -13,6 +78,7 @@
     {
       "source_path": "articles/expressroute/expressroute-howto-set-global-reach-cli.md",
       "redirect_url": "/previous-versions/azure/expressroute/expressroute-howto-set-global-reach-cli",
+      "redirect_document_id": false
     },
     {
       "source_path": "articles/digital-twins/how-to-integrate-maps.md",
@@ -4337,6 +4403,11 @@
             "redirect_url": "/azure/azure-functions",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/azure-functions/durable/durable-functions-create-first-csharp.md",
+            "redirect_url": "/azure/azure-functions/durable/durable-functions-isolated-create-first-csharp.md",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/twilio-dotnet-how-to-use-for-voice-sms.md",
             "redirect_url": "https://www.twilio.com/docs/usage/tutorials/serverless-webhooks-azure-functions-and-csharp",
@@ -4803,6 +4874,11 @@
             "redirect_document_id": false
         },
         {
+            "source_path_from_root": "/articles/azure-resource-manager/management/control-plane-metrics.md",
+             "redirect_url": "/azure/azure-resource-manager/management/monitor-resource-manager",
+             "redirect_document_id": false
+        },
+	{
            "source_path_from_root": "/articles/expressroute/expressroute-monitoring-metrics-alerts.md",
             "redirect_url": "/azure/expressroute/monitor-expressroute-reference",
             "redirect_document_id": false
@@ -4813,6 +4889,13 @@
             "redirect_document_id": false
         },
         {
+
+            "source_path_from_root": "/articles/backup/azure-backup-move-vaults-across-regions.md",
+            "redirect_url": "/azure/operational-excellence/relocation-backup",
+            "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
@@ -4827,6 +4910,11 @@
             "redirect_url": "/azure/defender-for-iot/organizations/integrate-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/app-service/manage-move-across-regions.md",
+            "redirect_url": "/azure/operational-excellence/relocation-app-service",
+            "redirect_document_id": false
+        },
         {
             "source_path_from_root": "/articles/event-grid/high-availability-disaster-recovery.md",
             "redirect_url": "/azure/reliability/reliability-event-grid",
@@ -4841,11 +4929,62 @@
             "source_path_from_root": "/articles/event-grid/availability-zones-disaster-recovery.md",
             "redirect_url": "/azure/reliability/reliability-event-grid",
             "redirect_document_id": false
-        }
-
-
-
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-powershell.md",
+            "redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/add-dual-stack-ipv6-vm-cli.md",
+            "redirect_url": "/azure/virtual-network/ip-services/add-dual-stack-ipv6-vm-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-cli.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
+            "redirect_document_id": true
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-vm-dual-stack-ipv6-powershell.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-vm-dual-stack-ipv6-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-cli.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-powershell.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-powershell.md",
+            "redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/routing-preference-cli.md",
+            "redirect_url": "/azure/virtual-network/ip-services/routing-preference-portal",
+            "redirect_document_id": false
+        },
+        {
+          "source_path_from_root":"/articles/container-registry/manual-regional-move.md",
+          "redirect_url":"/azure/operational-excellence/relocation-container-registry",
+          "redirect_document_id":false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-powershell.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6-cli.md",
+            "redirect_url": "/azure/virtual-network/ip-services/create-custom-ip-address-prefix-ipv6--portal",
+            "redirect_document_id": false
+        }  
 
-
     ]
 }

.openpublishing.redirection.sentinel.json

@@ -1635,5 +1635,11 @@
             "redirect_url": "/azure/sentinel/data-connectors-reference",
             "redirect_document_id": false
         }
+,
+        {
+            "source_path_from_root": "/articles/sentinel/data-connectors/tenable-io-vulnerability-management.md",
+            "redirect_url": "/azure/sentinel/data-connectors/tenable-vulnerability-management",
+            "redirect_document_id": false
+        }
     ]
 }

articles/active-directory-b2c/TOC.yml

@@ -378,12 +378,12 @@
       - name: SwissID
         href:  identity-provider-swissid.md
         displayName: Swiss ID      
-      - name: Twitter
-        href: identity-provider-twitter.md
       - name: WeChat
         href: identity-provider-wechat.md
       - name: Weibo
         href: identity-provider-weibo.md
+      - name: X
+        href: identity-provider-twitter.md
       - name: Pass through identity provider token
         href: idp-pass-through-user-flow.md
     - name: Manage tokens and session 

articles/active-directory-b2c/add-identity-provider.md

@@ -17,7 +17,7 @@ ms.subservice: B2C
 
 # Add an identity provider to your Azure Active Directory B2C tenant
 
-You can configure Azure AD B2C to allow users to sign in to your application with credentials from external social or enterprise identity providers (IdP). Azure AD B2C supports external identity providers like Facebook, Microsoft account, Google, Twitter, and any identity provider that supports OAuth 1.0, OAuth 2.0, OpenID Connect, and SAML protocols.
+You can configure Azure AD B2C to allow users to sign in to your application with credentials from external social or enterprise identity providers (IdP). Azure AD B2C supports external identity providers like Facebook, Microsoft account, Google, X, and any identity provider that supports OAuth 1.0, OAuth 2.0, OpenID Connect, and SAML protocols.
 
 With external identity provider federation, you can offer your consumers the ability to sign in with their existing social or enterprise accounts, without having to create a new account just for your application.
 
@@ -51,6 +51,6 @@ You typically use only one identity provider in your applications, but you have
 * [Salesforce](identity-provider-salesforce.md)
 * [Salesforce (SAML protocol)](identity-provider-salesforce-saml.md)
 * [SwissID](identity-provider-swissid.md)
-* [Twitter](identity-provider-twitter.md)
+* [X](identity-provider-twitter.md)
 * [WeChat](identity-provider-wechat.md)
 * [Weibo](identity-provider-weibo.md)

articles/active-directory-b2c/add-ropc-policy.md

@@ -43,7 +43,7 @@ The following flows aren't supported:
 When using the ROPC flow, consider the following limitations:
 
 - ROPC doesn’t work when there's any interruption to the authentication flow that needs user interaction. For example, when a password expires or needs to be changed, [multifactor authentication](multi-factor-authentication.md) is required, or when more information needs to be collected during sign-in (for example, user consent).
-- ROPC supports local accounts only. Users can’t sign in with [federated identity providers](add-identity-provider.md) like Microsoft, Google+, Twitter, AD-FS, or Facebook.
+- ROPC supports local accounts only. Users can’t sign in with [federated identity providers](add-identity-provider.md) like Microsoft, Google+, X, AD-FS, or Facebook.
 - [Session Management](session-behavior.md), including [keep me signed-in (KMSI)](session-behavior.md#enable-keep-me-signed-in-kmsi), isn't applicable.
 
 

articles/active-directory-b2c/best-practices.md

@@ -29,6 +29,7 @@ The following best practices and recommendations cover some of the primary aspec
 | Choose user flows for most scenarios | The Identity Experience Framework of Azure AD B2C is the core strength of the service. Policies fully describe identity experiences such as sign-up, sign-in, or profile editing. To help you set up the most common identity tasks, the Azure AD B2C portal includes predefined, configurable policies called user flows. With user flows, you can create great user experiences in minutes, with just a few clicks. [Learn when to use user flows vs. custom policies](user-flow-overview.md#comparing-user-flows-and-custom-policies).|
 | App registrations | Every application (web, native) and API that is being secured must be registered in Azure AD B2C. If an app has both a web and native version of iOS and Android, you can register them as one application in Azure AD B2C with the same client ID. Learn how to [register OIDC, SAML, web, and native apps](./tutorial-register-applications.md?tabs=applications). Learn more about [application types that can be used in Azure AD B2C](./application-types.md). |
 | Move to monthly active users billing | Azure AD B2C has moved from monthly active authentications to monthly active users (MAU) billing. Most customers will find this model cost-effective. [Learn more about monthly active users billing](https://azure.microsoft.com/updates/mau-billing/). |
+| Follow Security best practices | There are continuous and evolving threats and attacks, and like all owned resources, your Azure AD B2C deployment should follow best practices for security, including guidance on implementing WAFs (defense against threats such as DDOS and Bots) and other defense in depth best guidance [B2C Security Architecture](/azure/active-directory-b2c/security-architecture). |
 
 ## Planning and design
 

articles/active-directory-b2c/custom-email-sendgrid.md

@@ -542,9 +542,9 @@ The Localization element allows you to support multiple locales or languages in
     <LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_send_new_code">Send new code</LocalizedString>
     <LocalizedString ElementType="DisplayControl" ElementId="emailVerificationControl" StringId="but_change_claims">Change e-mail</LocalizedString>
     <!-- Claims-->
-    <LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
-    <LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
-    <LocalizedString ElementType="ClaimType" ElementId="emailVerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
+    <LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="DisplayName">Verification Code</LocalizedString>
+    <LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="UserHelpText">Verification code received in the email.</LocalizedString>
+    <LocalizedString ElementType="ClaimType" ElementId="VerificationCode" StringId="AdminHelpText">Verification code received in the email.</LocalizedString>
     <LocalizedString ElementType="ClaimType" ElementId="email" StringId="DisplayName">Email</LocalizedString>
     <!-- Email validation error messages-->
     <LocalizedString ElementType="ErrorMessage" StringId="UserMessageIfSessionDoesNotExist">You have exceeded the maximum time allowed.</LocalizedString>