resolve merge conflicts

Author: mumian

.openpublishing.redirection.json

@@ -6471,27 +6471,27 @@
     },
     {
       "source_path": "articles/cloud-services/cloud-services-guestos-family-2-3-4-retirement.md",
-      "redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-family-2-3-4-retirement",
+      "redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-family-2-3-4-retirement",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/cloud-services/cloud-services-guestos-family1-retirement.md",
-      "redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-family1-retirement",
+      "redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-family-1-retirement",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/cloud-services/cloud-services-guestos-msrc-releases.md",
-      "redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-msrc-releases",
+      "redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-microsoft-security-response-center-releases",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/cloud-services/cloud-services-guestos-retirement-policy.md",
-      "redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-retirement-policy",
+      "redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-retirement-policy",
       "redirect_document_id": false
     },
     {
       "source_path": "articles/cloud-services/cloud-services-guestos-update-matrix.md",
-      "redirect_url": "/previous-versions/azure/cloud-services/cloud-services-guestos-update-matrix",
+      "redirect_url": "/azure/cloud-services-extended-support/cloud-services-guestos-update-matrix",
       "redirect_document_id": false
     },
     {
@@ -6739,10 +6739,50 @@
       "redirect_url": "/dotnet/maui/data-cloud/push-notifications",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/sentinel/work-with-styx-objects-and-indicators.md",
+      "redirect_url": "/azure/sentinel/work-with-styx-objects-indicators",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/storage/files/geo-redundant-storage-for-large-file-shares.md",
       "redirect_url": "/azure/storage/files/files-redundancy",
       "redirect_document_id": false
-    }
+    },
+    {
+      "source_path": "articles/defender-for-iot/organizations/extra-deploy-enterprise-iot.md",
+      "redirect_url": "/azure/defender-for-iot/organizations/eiot-defender-for-endpoint",
+           "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/sentinel/work-with-styx-objects-indicators.md",
+      "redirect_url": "/azure/sentinel/work-with-stix-objects-indicators",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-functions/migration.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads-overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/lambda-functions-migration-assess.md",
+      "redirect_url": "/azure/azure-functions/migration/assess-lambda-workloads",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/lambda-functions-migration-discover.md",
+      "redirect_url": "/azure/azure-functions/migration/discover-lambda-workloads",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/lambda-functions-migration-migrate.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/azure-functions/migration/lambda-functions-migration-overview.md",
+      "redirect_url": "/azure/azure-functions/migration/migrate-lambda-workloads-overview",
+      "redirect_document_id": false
+    },
   ]
 }

articles/active-directory-b2c/custom-policies-series-call-rest-api.md

@@ -93,7 +93,7 @@ You need to deploy an app, which serves as your external app. Your custom policy
                     "requestId": "requestId",
                     "userMessage" : "The access code you entered is incorrect. Please try again.",
                     "developerMessage" : `The provided code ${req.body.accessCode} does not match the expected code for user.`,
-                    "moreInfo" :"https://docs.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
+                    "moreInfo" :"https://learn.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
                 };
                 res.status(409).send(errorResponse);                
             }
@@ -138,7 +138,7 @@ You need to deploy an app, which serves as your external app. Your custom policy
             "requestId": "requestId",
             "userMessage": "The access code you entered is incorrect. Please try again.",
             "developerMessage": "The provided code 54321 does not match the expected code for user.",
-            "moreInfo": "https://docs.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
+            "moreInfo": "https://learn.microsoft.com/en-us/azure/active-directory-b2c/string-transformations"
         }
     ```
 Your REST service can return HTTP 4xx status code, but the value of `status` in the JSON response must be `409`.

articles/active-directory-b2c/service-limits.md

@@ -183,48 +183,63 @@ As a protection for our customers, Microsoft places some restrictions on telepho
 
 | Region Code | Region Name                                    | Limit per tenant per 60 minutes | Limit per tenant per 24 hours            |                         
 |:----------- |:---------------------------------------------- |:------------------------------- | :----------------------------------------|
-| 228         |  Togo                                          | 10                              |  30                                      |
-| 257         |  Uzbek                                         | 10                              |  30                                      |
-| 970         |  State of Plaestine                            | 10                              |  30                                      |
-| 249         |  Sudan                                         | 10                              |  30                                      |
-| 226         |  Burina Faso                                   | 10                              |  30                                      |
-| 252         |  Somalia                                       | 10                              |  30                                      |  
-| 501         |  Belize                                        | 10                              |  30                                      |
-| 855         |  Cambodia                                      | 50                              |  200                                     |
-| 84         |  Vietnam                                       | 150                              |  500                                     |
-| 94         |  Sri Lanka                                     | 100                              |  500                                     |
-| 63         |  Philippines                                   | 50                              |  200                                     |
-| 62         |  Indonesia                                     | 50                              |  200                                     |
-| 7         |  Russia                                        | 100                              |  1000                                     |
-| 258         |  Mozambique                                    | 50                              |  200                                     |
-| 92         |  Pakistan                                    | 100                              |  1000                                     |
-| 994 | Azerbaijan | 50 | 200 | 
-| 880 | Bangladesh | 50 | 200 | 
 | 20  | Egypt | 50 | 200 | 
-| 260 | Zambia | 50 | 200 | 
-| 502 | Guatemala | 10 | 50 
-| 255 | Tanzania | 10 | 50 
-| 261 | Madagascar | 10 | 30 
-| 998 | Uzbekistan | 10 | 30 
-| 223 | Mali | 20 | 100 
-| 52 | Mexico | 100 | 500 
-| 60 | Malaysia | 50 | 200 |
-| 221 | Senegal | 10 | 30 |
+| 211 |	South Sudan |	10	| 30 |
+| 212 | Morocco | 20 | 100 |
 | 216 | Tunisia | 20 | 100 |
-| 503 | El Salvador | 10 | 30 |
+| 221 | Senegal | 10 | 30 |
+| 223 | Mali | 20 | 100 |
+| 224 | Guinea | 20 | 100 |
+| 225 |	Ivory Coast|	10	| 30 |
+| 226 |  Burina Faso   | 10  |  30  |
+| 228 |  Togo  | 10  |  30  |
+| 233 |	Ghana|	10	| 30 |
 | 234 | Nigeria | 20 | 100 |
+| 236 |	Central African Republic  |	10	| 30 |
+| 238 | Cabo Verde | 10 | 30 |
+| 249 |  Sudan | 10  |  30  |
+| 251 |	Ethiopia  |	10	| 30 |
+| 252 |  Somalia   | 10  |  30  |  
+| 255 | Tanzania | 10 | 50 |
+| 256 | Uganda | 20 | 100 |
+| 257 |  Uzbek | 10  |  30  |
+| 258 |  Mozambique| 50  |  200 | 
+| 260 | Zambia | 50 | 200 | 
+| 261 | Madagascar | 10 | 30 |
+| 263 | Zimbabwe | 10 | 30 |
+| 265 |	Malawi  |	10	| 30 |
+| 375 |	Belarus   |	10	| 30 |
 | 386 | Slovenia | 10 | 50 |
+| 501 |  Belize| 10  |  30  |
+| 502 | Guatemala | 10 | 50 
+| 503 | El Salvador | 10 | 30 |
+| 52 | Mexico | 100 | 500 
+| 58 |	Venezuela|	10	| 30 |
 | 591 | Bolivia | 10 | 30 |
-| 263 | Zimbabwe | 10 | 30 |
-| 261 | Madagascar | 10 | 30 |
-| 995 | Georgia | 10 | 30 |
-| 993 | Turkmenistan | 10 | 30 |
-| 256 | Uganda | 20 | 100 |
-| 212 | Moroccoa | 20 | 100 |
+| 60 | Malaysia | 50 | 200 |
+| 62 |  Indonesia | 50  |  200 |
+| 63 |  Philippines   | 50  |  200 |
+| 670 |	East Timor (Timor-Leste)  |	10	| 30 |
+| 7 |  Russia | 100  |  1000 |
+| 84 |  Vietnam   | 150  |  500 |
+| 855 |  Cambodia  | 50  |  200 |
 | 856 | Laos | 50 | 200 |
-| 224 | Guinea | 20 | 100 |
+| 880 | Bangladesh | 50 | 200 | 
+| 92 |  Pakistan| 100  |  1000 |
+| 93 |	Afghanistan  |	10	| 30 |
+| 94 |  Sri Lanka | 100  |  500 |
+| 95 |	Myanmar (Burma) | 10	| 30 |
+| 961 |	Lebanon  |	10	| 30 |
+| 967 |	Yemen	|10	| 30 |
+| 970 |  State of Palestine| 10  |  30  |
+| 972 |	Israel  |	50	| 200 |
+| 976 |	Mongolia  |	10	| 30 |
 | 992 | Tajikistan | 10 | 30 |
-| 238 | Cape Verde | 10 | 30 |
+| 993 | Turkmenistan | 10 | 30 |
+| 994 | Azerbaijan | 50 | 200 | 
+| 995 | Georgia | 10 | 30 |
+| 996 |	Kyrgyzstan  |	10	| 30 |
+| 998 | Uzbekistan | 10 | 30 
 
 ## Next steps
 

articles/active-directory-b2c/tutorial-create-user-flows.md

@@ -58,7 +58,7 @@ The sign-up and sign-in user flow handles both experiences with a single configu
 1. Sign in to the [Azure portal](https://portal.azure.com).
 1. If you have access to multiple tenants, select the **Settings** icon in the top menu to switch to your Azure AD B2C tenant from the **Directories + subscriptions** menu.
 1. In the Azure portal, search for and select **Azure AD B2C**.
-1. Under **Policies**, select **User flows**, and then select **New user flow**.
+1. <a name="new_user_flow"></a>Under **Policies**, select **User flows**, and then select **New user flow**.
 
     ![Screenshot of the User flows page from the Azure portal with New user flow button highlighted.](./media/tutorial-create-user-flows/sign-up-sign-in-user-flow.png)
 

articles/active-directory-b2c/whats-new-docs.md

@@ -1,7 +1,7 @@
 ---
 title: "What's new in Azure Active Directory business-to-customer (B2C)"
 description: "New and updated documentation for the Azure Active Directory business-to-customer (B2C)."
-ms.date: 02/04/2025
+ms.date: 04/01/2025
 ms.service: azure-active-directory
 ms.subservice: b2c
 ms.topic: whats-new
@@ -17,6 +17,11 @@ manager: CelesteDG
 
 Welcome to what's new in Azure Active Directory B2C documentation. This article lists new and significantly updated docs from the past three months. To learn what's new with the B2C service, see [What's new in Microsoft Entra ID](../active-directory/fundamentals/whats-new.md), [Azure AD B2C developer release notes](custom-policy-developer-notes.md) and [What's new in Microsoft Entra External ID](/entra/external-id/whats-new-docs).
 
+## March 2025
+
+### Updated articles
+- [Error codes: Azure Active Directory B2C](error-codes.md) - Updated error messages
+
 ## February 2025
 
 ### Updated articles
@@ -32,9 +37,3 @@ Welcome to what's new in Azure Active Directory B2C documentation. This article
 
 - [Azure Active Directory B2C service limits and restrictions](service-limits.md) - Updated limits
 
-## December 2024
-
-### Updated articles
-
-- [Tutorial: Configure Nok Nok S3 Authentication Suite with Azure AD B2C for FIDO passkey authentication](partner-nok-nok.md) - Updated scenarios
-

articles/api-center/enable-api-center-portal-vs-code-extension.md

@@ -46,7 +46,6 @@ Enterprise developers must sign in with a Microsoft account to see the API Cente
 
 [!INCLUDE [api-center-portal-user-sign-in](includes/api-center-portal-user-sign-in.md)]
 
-### For API center administrators
 ## Steps for enterprise developers to access the API Center portal 
 
 Developers can follow these steps to connect and sign in to view an API Center portal using the Visual Studio Code extension. Settings to connect to the API center need to be provided by the API center administrator.