fix merge conflict

Author: MeeraDi

.openpublishing.redirection.json

@@ -1,5 +1,90 @@
 {
   "redirections": [
+    {
+      "source_path": "articles/fxt-edge-filer/add-nodes.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/add-nodes",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/add-storage.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/add-storage",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/additional-doc.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/additional-doc",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/cluster-create.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/cluster-create",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/configure-network.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/configure-network",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/index.yml",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/index",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/install.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/install",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/monitor.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/monitor",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/mount-clients.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/mount-clients",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/network-power.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/network-power",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/node-password.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/node-password",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/overview.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/overview",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/port-list.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/port-list",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/power-off.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/power-off",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/specs.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/specs",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/support-ticket.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/support-ticket",
+      "redirect_document_id": false
+    },
+    {
+      "source_path": "articles/fxt-edge-filer/supported-ciphers.md",
+      "redirect_url": "/previous-versions/azure/fxt-edge-filer/supported-ciphers",
+      "redirect_document_id": false
+    },
     {
       "source_path": "articles/backup/azure-elastic-storage-area-network-backup-manage.md",
       "redirect_url": "/azure/backup/azure-elastic-san-backup-manage",

articles/api-center/TOC.yml

@@ -24,6 +24,8 @@
             href: set-up-api-center-bicep.md
           - name: Create an API center - ARM template
             href: set-up-api-center-arm-template.md
+          - name: Create an API center - Visual Studio Code
+            href: set-up-api-center-vs-code-extension.md
     - name: Tutorials
       items:
           - name: 1 - Define custom metadata

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

@@ -5,6 +5,7 @@ author: dlepow
 ms.service: azure-api-center
 ms.topic: how-to
 ms.date: 05/28/2025
+ms.update-cycle: 180-days
 ms.author: danlep 
 ms.collection: ce-skilling-ai-copilot
 ms.custom: 
@@ -55,9 +56,6 @@ Learn more about setting up a [GitHub Actions workflow](register-apis-github-act
 
 Use the power of [GitHub Copilot](https://marketplace.visualstudio.com/items?itemName=GitHub.copilot) with the Azure API Center extension for Visual Studio Code to create an OpenAPI specification file from your API code. Right-click on the API code, select **Copilot** from the options, and select **Generate API documentation**. GitHub Copilot creates an OpenAPI specification file.
 
-> [!NOTE]
-> This feature is available in the pre-release version of the API Center extension.
-
 :::image type="content" source="media/build-register-apis-vscode-extension/generate-api-documentation.gif" alt-text="Animation showing how to use GitHub Copilot to generate an OpenAPI spec from code." lightbox="media/build-register-apis-vscode-extension/generate-api-documentation.gif":::
 
 You can also generate an OpenAPI specification from all of the files in your current project. Use the **Azure API Center: Generate OpenAPI Spec from Entire Project** command from the Command Palette. 

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

@@ -5,6 +5,7 @@ author: dlepow
 ms.service: azure-api-center
 ms.topic: how-to
 ms.date: 02/10/2025
+ms.update-cycle: 180-days
 ms.author: danlep 
 ms.collection: ce-skilling-ai-copilot
 ms.custom: 
@@ -15,9 +16,6 @@ ms.custom:
 
 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)
 

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

@@ -28,9 +28,6 @@ This article shows how to provide enterprise developers access to the Azure API
 ### For app developers
 
 * [Azure API Center extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=apidev.azure-api-center)
-
-    > [!NOTE]
-    > Where noted, certain features are available only in the Azure API Center extension's pre-release version. [!INCLUDE [vscode-extension-prerelease-features](includes/vscode-extension-prerelease-features.md)]
 
 The following Visual Studio Code extensions are optional:
 
@@ -95,7 +92,7 @@ The API Center portal view helps enterprise developers discover API details and
 
 ## Use language model tools 
 
-In the pre-release version of the Azure API Center extension, developers with access to the API Center portal view can add API Center language model tools to use in GitHub Copilot's agent mode. [Learn more about using tools in agent mode](https://code.visualstudio.com/docs/copilot/chat/chat-agent-mode#_agent-mode-tools). 
+Developers with access to the API Center portal view can add API Center language model tools to use in GitHub Copilot's agent mode. [Learn more about using tools in agent mode](https://code.visualstudio.com/docs/copilot/chat/chat-agent-mode#_agent-mode-tools). 
 
 The API Center tools can be used in agent mode to help search for APIs and API versions, API definitions and specifications, deployments, and more using natural language prompts.
 

articles/api-center/includes/vscode-extension-basic-prerequisites.md

@@ -6,17 +6,17 @@ author: dlepow
 
 ms.service: azure-api-center
 ms.topic: include
-ms.date: 10/02/2024
+ms.date: 06/25/2025
 ms.author: danlep
 ms.custom: Include file
 ---
 
 ## Prerequisites
 
-* One or more API centers in your Azure subscription. 
-
-    * Currently, you need to be assigned the Azure API Center Service Contributor role or higher permissions on an API center to manage APIs with the extension.
-
 * [Visual Studio Code](https://code.visualstudio.com/)
 
 * [Azure API Center extension for Visual Studio Code](https://marketplace.visualstudio.com/items?itemName=apidev.azure-api-center)
+
+* One or more API centers in your Azure subscription. You can [create an API center using the Azure API Center extension](../set-up-api-center-vs-code-extension.md) or other tools.
+
+    * Currently, you need to be assigned the Azure API Center Service Contributor role or higher permissions on an API center to manage APIs with the extension.

articles/api-center/includes/vscode-extension-setup.md

@@ -6,14 +6,14 @@ author: dlepow
 
 ms.service: azure-api-center
 ms.topic: include
-ms.date: 10/02/2024
+ms.date: 06/24/2025
 ms.author: danlep
 ms.custom: Include file
 ---
 
 ## Extension setup
 
-1. Install the Azure API Center extension for Visual Studio Code from the [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=apidev.azure-api-center). Install other extensions listed in the Prerequisites.
+1. Install the Azure API Center extension for Visual Studio Code from the [Visual Studio Code Marketplace](https://marketplace.visualstudio.com/items?itemName=apidev.azure-api-center). Install other extensions as needed.
 
     > [!NOTE]
     > Where noted, certain features are available only in the Azure API Center extension's pre-release version. [!INCLUDE [vscode-extension-prerelease-features](vscode-extension-prerelease-features.md)]