resolve conflict

Author: b-ahibbard

.openpublishing.redirection.json

@@ -1,5 +1,75 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/databox-online/azure-stack-edge-gpu-deploy-sample-module-marketplace.md",
+      "redirect_url": "https://azuremarketplace.microsoft.com/marketplace/apps?page=1",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/partner-solutions/logzio/create.md",
+      "redirect_url": "/previous-versions/azure/partner-solutions/logzio/create",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/partner-solutions/logzio/manage.md",
+      "redirect_url": "/previous-versions/azure/partner-solutions/logzio/manage",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/partner-solutions/logzio/overview.md",
+      "redirect_url": "/previous-versions/azure/partner-solutions/logzio/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/partner-solutions/logzio/setup-sso.md",
+      "redirect_url": "/previous-versions/azure/partner-solutions/logzio/setup-sso",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/partner-solutions/logzio/troubleshoot.md",
+      "redirect_url": "/previous-versions/azure/partner-solutions/logzio/troubleshoot",
+       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/index.yml",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/hdinsight-aks/flink/index.md",
+      "redirect_url": "/previous-versions/azure/hdinsight-aks/flink/flink-overview",
+      "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/hdinsight-aks/prerequisites-subscription.md",
+        "redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-subscription",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/hdinsight-aks/release-notes/index.md",
+        "redirect_url": "/previous-versions/azure/hdinsight-aks/release-notes/hdinsight-aks-release-notes",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/hdinsight-aks/prerequisites-resources.md",
+        "redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-prerequisites-resources",
+        "redirect_document_id": false
+    },    
+    {
+        "source_path_from_root": "/articles/hdinsight-aks/spark/index.md",
+        "redirect_url": "/previous-versions/azure/hdinsight-aks/spark/hdinsight-on-aks-spark-overview",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/hdinsight-aks/get-started.md",
+        "redirect_url": "/previous-versions/azure/hdinsight-aks/quickstart-get-started",
+        "redirect_document_id": false
+    },
+    {
+        "source_path_from_root": "/articles/hdinsight-aks/trino/index.md",
+        "redirect_url": "/previous-versions/azure/hdinsight-aks/trino/trino-overview ",
+        "redirect_document_id": false
+    },
     {
       "source_path": "articles/hdinsight-aks/cluster-storage.md",
       "redirect_url": "/previous-versions/azure/hdinsight-aks/cluster-storage",
@@ -1020,6 +1090,11 @@
       "redirect_url": "/azure/migrate/discover-and-assess-using-private-endpoints",
       "redirect_document_id": false
     },
+    {
+      "source_path": "articles/operator-call-protection/index.yml",
+      "redirect_url": "https://learn.microsoft.com",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/operator-5g-core/index.yml",
       "redirect_url": "https://learn.microsoft.com",
@@ -1980,6 +2055,21 @@
       "redirect_url": "./azure-resource-manager/management/deployment-models",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/azure-functions/functions-add-output-binding-storage-queue-java.md",
+      "redirect_url": "/azure/azure-functions/functions-add-output-binding-storage-queue-cli?pivots=programming-language-java",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-functions/create-first-function-arc-custom-container.md",
+      "redirect_url": "/azure/azure-functions/functions-how-to-custom-container?pivots=azure-arc",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/azure-functions/create-first-function-arc-cli.md",
+      "redirect_url": "/azure/azure-functions/functions-how-to-custom-container?pivots=azure-arc",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/azure-functions/create-first-function-vs-code-web.md",
       "redirect_url": "/azure/azure-functions",
@@ -5154,11 +5244,21 @@
       "redirect_url": "/azure/virtual-wan/virtual-wan-about",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-wan/openvpn-azure-ad-client.md",
+      "redirect_url": "/azure/virtual-wan/point-to-site-entra-vpn-client-windows",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/virtual-wan/high-availability-vpn-client.md",
       "redirect_url": "/azure/virtual-wan/global-hub-profile",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-wan/howto-openvpn-clients.md",
+      "redirect_url": "/azure/virtual-wan/point-to-site-vpn-client-certificate-windows-openvpn-client-version-3",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/virtual-wan/logs-metrics.md",
       "redirect_url": "/azure/virtual-wan/monitor-virtual-wan",
@@ -5828,6 +5928,16 @@
       "source_path_from_root": "/articles/reliability/reliability-hdinsight-on-aks.md",
       "redirect_url": "/azure/reliability/overview-reliability-guidance",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/managed-grafana/concept-role-based-access-control.md",
+      "redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
+      "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/managed-grafana/how-to-share-grafana-workspace.md",
+      "redirect_url": "/azure/managed-grafana/how-to-manage-access-permissions-users-identities",
+      "redirect_document_id": false
     }
   ]
 }

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

@@ -210,10 +210,12 @@ Next, specify that the application should be treated as a public client:
 1. In the left menu, under **Manage**, select **Authentication**.
 1. Under **Advanced settings**, in the **Allow public client flows** section, set **Enable the following mobile and desktop flows** to **Yes**. 
 1. Select **Save**.
-1. Ensure that **"allowPublicClient": true** is set in the application manifest:
+1. Ensure that **"isFallbackPublicClient": true** is set in the application manifest:
     1. In the left menu, under **Manage**, select **Manifest** to open application manifest.
+    1. Switch from the **Microsoft Graph App Manifest (New)** tab to the **AAD Graph App Manifest (Deprecating Soon)** tab.
     1. Find **allowPublicClient** key and ensure its value is set to **true**.
 
+
 Now, grant permissions to the API scope you exposed earlier in the *IdentityExperienceFramework* registration:
 
 1. In the left menu, under **Manage**, select **API permissions**.

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: 01/10/2025
+ms.date: 02/04/2025
 ms.service: azure-active-directory
 ms.subservice: b2c
 ms.topic: whats-new
@@ -17,6 +17,12 @@ 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).
 
+## January 2025
+
+### Updated articles
+
+- [Azure Active Directory B2C service limits and restrictions](service-limits.md) - Updated limits
+
 ## December 2024
 
 ### Updated articles
@@ -29,12 +35,3 @@ Welcome to what's new in Azure Active Directory B2C documentation. This article
 
 - [Azure Active Directory B2C: Region availability & data residency](data-residency.md) - Updated data residency location
 
-## October 2024
-
-### Updated articles
-
-- [Secure APIs used for API connectors in Azure AD B2C](secure-rest-api.md) - Flow updates
-- [Application types that can be used in Active Directory B2C](application-types.md) - Implicit grant flow updates
-- [Configure authentication in a sample single-page application by using Azure AD B2C](configure-authentication-sample-spa-app.md) - Implicit grant flow updates
-- [Single-page application sign-in using the OAuth 2.0 implicit flow in Azure Active Directory B2C](implicit-flow-single-page-application.md) - Implicit grant flow updates
-- [Register a single-page application in Azure Active Directory B2C](tutorial-register-spa.md) - Implicit grant flow updates

articles/api-center/TOC.yml

@@ -46,6 +46,8 @@
           href: synchronize-aws-gateway-apis.md
       - name: Build and register APIs - VS Code extension
         href: build-register-apis-vscode-extension.md
+      - name: Design and develop  APIs - GitHub Copilot for Azure
+        href: design-api-github-copilot-azure.md
       - name: Register APIs - GitHub Actions
         href: register-apis-github-actions.md
 - name: API governance

articles/api-center/build-register-apis-vscode-extension.md

@@ -17,7 +17,6 @@ API producer developers in your organization can build and register APIs in your
 
 * Add an existing API to an API center as a one-time operation, or integrate a development pipeline to register APIs as part of a CI/CD workflow.
 * Use GitHub Copilot to generate new OpenAPI specs from API code.
-* Use natural language prompts with the API Center plugin for GitHub Copilot for Azure to create new OpenAPI specs.
 
 API consumer developers can also take advantage of features in the extension to [discover and consume APIs](discover-apis-vscode-extension.md) in the API center and ensure [API governance](govern-apis-vscode-extension.md).
 
@@ -28,7 +27,6 @@ The following Visual Studio Code extensions are needed for the specified scenari
 * [GitHub Actions](https://marketplace.visualstudio.com/items?itemName=GitHub.vscode-github-actions) - to register APIs using a CI/CD pipeline with GitHub Actions
 * [Azure Pipelines](https://marketplace.visualstudio.com/items?itemName=ms-azure-devops.azure-pipelines) - to register APIs using a CI/CD pipeline with Azure Pipelines
 * [GitHub Copilot](https://marketplace.visualstudio.com/items?itemName=GitHub.copilot) - to generate OpenAPI specification files from API code
-* [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) - to generate OpenAPI specification files using the Azure API Center Plugin for [GitHub Copilot for Azure](/azure/developer/github-copilot-azure/introduction) (preview)
 
 [!INCLUDE [vscode-extension-setup](includes/vscode-extension-setup.md)]  
 
@@ -64,33 +62,8 @@ Use the power of [GitHub Copilot](https://marketplace.visualstudio.com/items?ite
 
 After generating the OpenAPI specification file and checking for accuracy, you can register the API with your API center using the **Azure API Center: Register API** command.
 
-## Generate OpenAPI spec using natural language prompts
-
-The API Center plugin for [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) (preview) helps you design new APIs starting from natural language prompts. With AI assistance, quickly generate an OpenAPI spec for API development that complies with your organization's standards.
-
-> [!NOTE]
-> This feature is available in the pre-release version of the API Center extension.
-
-1. If desired, set an active API style guide. Use the **Ctrl+Shift+P** keyboard shortcut to open the Command Palette. Type **Azure API Center: Set API Style Guide**, make a selection, and hit **Enter**. 
-
-    If no style guide is set, the default `spectral:oas` ruleset is used.
-1. In the chat panel, make a request in natural language to the `@azure` agent to describe what the API does. Example:
-
-    ```vscode
-    @azure Generate OpenAPI spec: An API that allows customers to pay for an order using various payment methods such as cash, checks, credit cards, and debit cards.
-    ```  
-
-    The agent responds with an OpenAPI specification document.
-
-    :::image type="content" source="media/build-register-apis-vscode-extension/generate-api-specification.png" alt-text="Screenshot showing how to use @azure extension to generate an OpenAPI spec from a prompt.":::
-
-
-1. Review the generated output for accuracy and compliance with your API style guide. Refine the prompt if needed to regenerate.
-
-    > [!TIP]
-    > Effective prompts focus on an API's business requirements rather than implementation details. Shorter prompts sometimes work better than longer ones.
-1. When it meets your requirements, save the generated OpenAPI specification to a file. 
-1. Register the API with your API center. Select **Register your API in API Center** button in the chat panel, or select **Azure API Center: Register API** from the Command Palette, and follow the prompts.
+> [!TIP]
+> API developers can also generate new OpenAPI specs using natural language prompts with the API Center plugin for GitHub Copilot for Azure. [Learn more](design-api-github-copilot-azure.md).
 
 ## Related content
 

articles/api-center/design-api-github-copilot-azure.md

@@ -0,0 +1,83 @@
+---
+title: Develop APIs with GitHub Copilot for Azure - API Center plugin
+description: With AI assistance, API developers can use the Azure API Center plugin for GitHub Copilot for Azure to design and develop compliant APIs.
+author: dlepow
+ms.service: azure-api-center
+ms.topic: how-to
+ms.date: 02/10/2025
+ms.author: danlep 
+ms.collection: ce-skilling-ai-copilot
+ms.custom: 
+# Customer intent: As an API developer, I want to use my Visual Studio Code environment and GitHub Copilot for Azure to generate Open API specs from natural language prompts.
+---
+
+# Design and develop APIs using API Center plugin for GitHub Copilot for Azure
+
+The API Center plugin for [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) (preview) accelerates design and development of new APIs starting from natural language prompts. With AI assistance available through the API Center plugin combined with the API Center VS Code extension, simply describe your API and quickly generate an OpenAPI spec for API development that complies with your organization's standards. After you generate a compliant spec, you can register the API with your [API center](overview.md).
+
+> [!NOTE]
+> This feature is available in the pre-release version of the API Center extension.
+
+[!INCLUDE [vscode-extension-basic-prerequisites](includes/vscode-extension-basic-prerequisites.md)]  
+* [GitHub Copilot for Azure](https://marketplace.visualstudio.com/items?itemName=ms-azuretools.vscode-azure-github-copilot) - to generate OpenAPI specification files using the Azure API Center Plugin for [GitHub Copilot for Azure](/azure/developer/github-copilot-azure/introduction) (preview)
+   
+[!INCLUDE [vscode-extension-setup](includes/vscode-extension-setup.md)] 
+
+## Make request to the @azure agent
+
+Follow these steps to generate an OpenAPI specification using natural language prompts with GitHub Copilot for Azure:
+
+1. If desired, set an active API style guide in the Azure API Center extension. Use the **Ctrl+Shift+P** keyboard shortcut to open the Command Palette. Type **Azure API Center: Set API Style Guide**, make a selection, and hit **Enter**. 
+
+    If no style guide is set, the default `spectral:oas` ruleset is used. Learn more about [API specification linting](govern-apis-vscode-extension.md#api-design-conformance) using the API Center extension.
+1. In the chat panel, make a request in natural language to the `@azure` agent to describe what the API does. Example:
+
+    ```copilot-prompt
+    @azure Generate an OpenAPI spec: An API that allows customers to pay for an order using various payment methods such as cash, checks, credit cards, and debit cards. Check that there are no duplicate keys.
+    ```  
+
+    Copilot is powered by AI, so surprises and mistakes are possible. For more information, see Copilot FAQs.
+
+    The agent responds with an OpenAPI specification document.
+
+    :::image type="content" source="media/design-api-github-copilot-azure/generate-api-specification.png" alt-text="Screenshot showing how to use @azure extension to generate an OpenAPI spec from a prompt.":::
+
+1. Review the generated output for accuracy, completeness, and compliance with your API style guide. 
+
+    Refine the prompt if needed to regenerate the spec, or repeat the process using a different style guide that you set in the Azure API Center extension.
+
+    > [!TIP]
+    > Effective prompts focus on an API's business requirements rather than implementation details. Shorter prompts sometimes work better than longer ones.
+
+1. When it meets your requirements, save the generated OpenAPI specification to a file.
+
+## Register the API in your API center
+
+Use the Azure API Center extension for VS Code to register the API in your API center from the generated specification file. After registering the API, you can use the extension to view the API documentation, generate an HTTP client, perform further linting and analysis, and more.
+
+
+1. In VS Code, select **Register your API in API Center** button in the chat panel, or select **Azure API Center: Register API** from the Command Palette.
+
+1. Select **Manual**.
+
+1. Select the API center to register APIs with.
+
+1. Answer prompts with information including API title, type, version title, version lifecycle, definition title, specification name, and definition (specification) file to complete API registration.
+
+After the API is registered, you can perform various tasks using the extension. For example, [view API documentation](discover-apis-vscode-extension.md#view-api-documentation) in the Swagger UI:
+
+1. Expand the API Center tree view to select the definition for the API version that you registered.
+
+1. Right-click on the definition, and select **Open API Documentation**. A new tab appears with the Swagger UI for the API definition.
+
+:::image type="content" source="media/design-api-github-copilot-azure/view-definition-swagger-ui.png" alt-text="Screenshot of the Swagger UI in the VS Code extension.":::    
+
+## Related content
+
+* [Azure API Center - key concepts](key-concepts.md)
+* [Build and register APIs with the Azure API Center extension for Visual Studio Code](build-register-apis-vscode-extension.md)
+* [Discover and consume APIs with the Azure API Center extension for Visual Studio Code](discover-apis-vscode-extension.md)
+* [Govern APIs with the Azure API Center extension for Visual Studio Code](govern-apis-vscode-extension.md)
+* [Enable and view platform API catalog in Visual Studio Code](enable-platform-api-catalog-vscode-extension.md)
+* [Overview of GitHub Copilot for Azure](/azure/developer/github-copilot-azure/introduction)
+