Address merge issue

Author: dksimpson

articles/api-center/TOC.yml

@@ -36,40 +36,46 @@
     - name: 4 - Link an API Management instance
       href: ../api-management/tutorials/link-api-center.md
   expanded: true
-- name: API inventory
+- name: Asset inventory
   items:
-  - name: Manage inventory - Azure CLI
-    href: manage-apis-azure-cli.md
-  - name: Import APIs from API Management
-    href: import-api-management-apis.md
-  - name: Integrate API sources
-    items:
-    - name: Synchronize APIs from API Management
-      href: synchronize-api-management-apis.md
-    - name: Synchronize APIs from Amazon API Gateway
-      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: Export API from API Center to Copilot Studio
-    href: export-to-copilot-studio.yml
-  - name: Track API dependencies
-    href: track-resource-dependencies.md
-- name: Agent-to-Agent
-  items:
-  - name: Overview
-    href: agent-to-agent-overview.md
-  - name: Register and manage agents 
-    href: register-manage-agents.md
-- name: MCP servers
-  items:
-  - name: Register and discover MCP servers
-    href: register-discover-mcp-server.md
-  - name: Build and register Logic Apps MCP server
-    href: ../logic-apps/create-mcp-server-api-center.md?toc=/azure/api-center/toc.json&bc=/azure/api-center/breadcrumb/toc.json
+    - name: APIs
+      items:
+      - name: Manage APIs - Azure CLI
+        href: manage-apis-azure-cli.md
+      - name: Import APIs from API Management
+        href: import-api-management-apis.md
+      - name: Integrate API sources
+        items:
+        - name: Synchronize APIs from API Management
+          href: synchronize-api-management-apis.md
+        - name: Synchronize APIs from Amazon API Gateway
+          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: Export API from API Center to Copilot Studio
+        href: export-to-copilot-studio.yml
+      - name: Track API dependencies
+        href: track-resource-dependencies.md
+    - name: Agents
+      items:
+      - name: Overview
+        href: agent-to-agent-overview.md
+      - name: Register and manage agents 
+        href: register-manage-agents.md
+    - name: MCP servers
+      items:
+      - name: Register and discover MCP servers
+        href: register-discover-mcp-server.md
+      - name: Build and register Logic Apps MCP server
+        href: ../logic-apps/create-mcp-server-api-center.md?toc=/azure/api-center/toc.json&bc=/azure/api-center/breadcrumb/toc.json
+    - name: Skills
+      items:
+      - name: Register and discover skills
+        href: register-discover-skills.md
 - name: API governance
   items:
   - name: Use metadata for governance

articles/api-center/includes/configure-managed-identity-kv-secret-user.md

@@ -6,17 +6,18 @@ services: api-center
 
 ms.service: azure-api-center
 ms.topic: include
-ms.date: 12/20/2024
+ms.date: 03/09/2026
 
 ms.custom: Include file
+
 ---
 
-To allow import of APIs, assign your API center's managed identity the **Key Vault Secrets User** role in your Azure key vault. You can use the [portal](/azure/role-based-access-control/role-assignments-portal-managed-identity) or the Azure CLI.
+To allow import of the assets, assign your API center's managed identity the **Key Vault Secrets User** role in your Azure key vault. You can use the [portal](/azure/role-based-access-control/role-assignments-portal-managed-identity) or the Azure CLI.
 
 #### [Portal](#tab/portal)
 
-1. In the [portal](https://azure.microsoft.com), navigate to your key vault.
-1. In the left menu, select **Access control (IAM)**.
+1. In the [portal](https://azure.microsoft.com), go to your key vault.
+1. In the sidebar menu, select **Access control (IAM)**.
 1. Select **+ Add role assignment**.
 1. On the **Add role assignment** page, set the values as follows: 
     1. On the **Role** tab, select **Key Vault Secrets User**.

articles/api-center/includes/enable-managed-identity.md

@@ -17,8 +17,8 @@ The following examples show how to enable a system-assigned managed identity by
 
 #### [Portal](#tab/portal)
 
-1. In the [portal](https://azure.microsoft.com), navigate to your API center.
-1. In the left menu, under **Security**, select **Managed identities**.
+1. In the [portal](https://azure.microsoft.com), go to your API center.
+1. In the sidebar menu, under **Security**, select **Managed identities**.
 1. Select **System assigned**, and set the status to **On**.
 1. Select **Save**.
 

articles/api-center/media/register-discover-skills/integrate-git-repository-small.png

@@ -0,0 +1,151 @@
+---
+title: Register Skills in Your API Center
+description: Learn how to register skills in Azure API Center to create a centralized skills registry for your organization. 
+ms.service: azure-api-center
+ms.topic: how-to
+ms.date: 03/12/2026
+ai-usage: ai-assisted
+
+
+ms.collection: ce-skilling-ai-copilot
+ms.update-cycle: 180-days
+# Customer intent: As an API program manager, I want to register skills in my API Center inventory so developers can discover and use them.
+ms.custom:
+---
+
+# Register and discover skills in your API inventory
+
+This article describes how to use Azure API Center to register agent [skills](https://agentskills.io/home) as part of your API inventory. Skills are reusable capabilities that AI agents can discover and consume to extend their functionality.
+
+> [!NOTE]
+> Registering skills in API Center is currently in preview.
+
+By registering skills in your API center, you create a centralized registry that helps your organization:
+
+- Discover available skills and their capabilities
+- Access source code and documentation for the skills
+
+## Prerequisites
+
+- An API center. If you don't have an API center yet, see the quickstart to [Create an API center](set-up-api-center.md).
+- One or more skills that you want to register, typically hosted in a source code repository such as GitHub.
+- For integration with a Git repository for continuous synchronization of skill information (optional): 
+    - For non-public repositories, a personal access token (PAT) to access the repository where your skill information is stored. The PAT must have appropriate permissions to read the repository content. To create a PAT for GitHub, see [Create a fine-grained personal access token](https://docs.github.com/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-fine-grained-personal-access-token).
+    - An Azure key vault to store a PAT. If you need to create one, see [Quickstart: Create a key vault using the Azure portal](/azure/key-vault/general/quick-create-portal). To add or manage secrets in the key vault, you need at least the **Key Vault Secrets Officer** role or equivalent permissions.   
+    - For Azure CLI:.
+        [!INCLUDE [include](~/reusable-content/azure-cli/azure-cli-prepare-your-environment-no-header.md)]
+
+        > [!NOTE]
+        > You can run Azure CLI command examples in this article in PowerShell or a bash shell. Where needed because of different variable syntax, separate command examples are provided for the two shells.
+
+## Register a skill
+
+To register a skill in your API center:
+
+1. Sign in to the [Azure portal](https://portal.azure.com) and go to your API center.
+1. In the sidebar menu, under **Inventory**, select **Assets**.
+1. Select **+ Register an asset** > **Skill**.
+
+    :::image type="content" source="media/register-discover-skills/register-skill.png" alt-text="Screenshot of registering a skill in the portal.":::
+1. In the **Register a skill** form, provide the information in the following table:
+
+    | Field | Description |
+    |-------|-------------|
+    | **Title** | Enter a descriptive name for the skill (for example, *Code Review Skill*). |
+    | **Identification** | API Center automatically generates an identifier based on the title (for example, *code-review-skill*). You can edit this if needed. |
+    | **Summary** | Provide a brief one-line description of what the skill does (for example, *Performs automated code reviews using static analysis*). |
+    | **Description** | Enter a more detailed description of the skill's capabilities, use cases, and behavior. |
+    | **Lifecycle stage** | Select the current stage of the skill's lifecycle from the dropdown menu. |
+    | **Source** | |
+    | **Source URL** | Enter the Git repository URL for the skill source code (for example, `https://github.com/<org>/<repo>/tree/main/skills/<skill-name>`). |
+    | **Compatibility** | Describe the requirements, dependencies, and prerequisites for using the skill (for example, required software or tools like git, docker, programming languages; system requirements; network access requirements; API keys or authentication requirements). |
+    | **Allowed tools** | Select **+ Add tool** to specify the APIs or MCP servers from your API inventory that this skill can access. This approach helps ensure proper governance and security by explicitly defining what resources the skill can consume. |
+    | **License** | Select **+ Add** to provide licensing information. Enter the license name (for example, *MIT*, *Apache 2.0*, or *Proprietary*), optionally provide a license URL, and add a description if needed to clarify licensing terms or restrictions. |
+    | **Contact information** | Select **+ Add** to add contact points for support or inquiries. Enter a contact name or role (for example, *API Team* or *John Smith*), provide contact details such as email address, and optionally add a description to clarify when and why to contact this person or team. |
+
+1. Select **Create** to register the skill in your API center.
+
+After registration, the skill appears in your inventory on the **Inventory** > **Assets** page.
+
+## Update a registered skill
+
+You can update skill information at any time:
+
+1. In your API center, go to **Inventory** > **Assets**.
+1. Find and select the skill you want to update.
+1. Select **Edit** to modify the skill's properties.
+1. Make your changes and select **Save**.
+
+## Integrate a Git repository to synchronize skills
+
+To automate skill registration and updates, integrate a Git repository with your API center. By using this integration, you can synchronize information about one or more skills from the repository to your API center inventory. 
+
+When you integrate a Git repository:
+
+* Your API center creates an [environment](key-concepts.md#environment) that represents the repository as a source of skills.
+* API Center regularly synchronizes skill information from the repository to your API center inventory.
+
+### Store PAT in Azure Key Vault
+
+If your Git repository is private, manually upload and securely store a PAT to Azure Key Vault that grants access to the repository. When you integrate the Git repository with your API center, configure the integration to use this secret.  
+
+For more information, see [Quickstart: Set and retrieve a secret from Azure Key Vault using the Azure portal](/azure/key-vault/secrets/quick-create-portal).
+
+If you don't need to configure a PAT, proceed to [integrate the Git repository with your API center](#integrate-a-git-repository).
+
+### Configure a managed identity for your API center
+
+Your API center uses a managed identity to authenticate to Azure Key Vault and retrieve the PAT needed to access the Git repository. The following procedures describe how to manually configure a managed identity for your API center and assign it the necessary permissions to access the Key Vault.
+
+If you don't configure the managed identity, API Center can configure it for you automatically when you integrate the Git repository.
+
+[!INCLUDE [enable-managed-identity](includes/enable-managed-identity.md)]
+
+### Assign the managed identity the Key Vault Secrets User role
+
+[!INCLUDE [configure-managed-identity-kv-secret-user](includes/configure-managed-identity-kv-secret-user.md)]
+
+### Integrate a Git repository
+
+To integrate a Git repository:
+
+1. In the [Azure portal](https://portal.azure.com), go to your API center.
+1. In the sidebar menu, select **Platforms** > **Integrations**.
+1. Select **+ New integration** and choose **From Git repository**.
+1. On **Integrate your Git repository**, provide the following information:
+
+    | Field | Description |
+    |-------|-------------|
+    | **Configure Git repository source** ||
+    | **Repository URL** | Enter the URL to the Git repository containing skill files, optionally specifying branch and subfolder (for example, `https://github.com/<org>/<repo>/tree/main/skills`). |
+    | **Git provider** | Select the provider (for example, **GitHub**). |
+    | **Asset type configuration** | API Center configures a default **skill** asset type with file pattern `**/skill.md.` <br/><br/>Select **+ Add asset type** to add one or more asset types to sync. |
+    | **Personal access token (PAT)** | If you have a PAT stored in Azure Key Vault, click **Select** to browse to the Key Vault secret.<br/><br/>Optionally select **Automatically configure managed identity and assign permissions** if you haven't manually configured a managed identity to access the key vault secret. |
+    | **Integration details** | Accept the generated link identifier or provide a custom ID for the integration link. |
+    | **Environment details** | |
+    | **Environment title** | Enter a friendly name for the repository environment (for example, *Git repository*). |
+    | **Identification** | Enter an environment resource name (for example, *git-repository*). |
+    | **Environment type** | Select the environment type (for example, **Production**). |
+    | **Description** | Optionally add a description for the environment. |
+    | **Asset details** | |
+    | **Lifecycle** | Select the lifecycle stage for assets synced from the repository (for example, **Design**). |
+
+    :::image type="content" source="media/register-discover-skills/integrate-git-repository-small.png" alt-text="Screenshot of integrating a Git repo in an API center in the portal." lightbox="media/register-discover-skills/integrate-git-repository.png":::
+1. Select **Create**.
+
+The portal adds the environment to your API center. The portal adds the skills from the repository to the API center inventory on the **Inventory** > **Assets** page. You can identify linked skills by the link icon in the list.
+
+:::image type="content" source="media/register-discover-skills/linked-skills.png" alt-text="Screenshot of linked skills in API center in the portal.":::
+
+## Discover skills in the API Center portal
+
+Set up your [API Center portal](set-up-api-center-portal.md) so that developers and other stakeholders in your organization can discover skills in your API inventory. From the API Center portal, users can:
+
+* Browse and filter skills in the inventory.
+* View detailed information about each skill.
+
+## Related content
+
+* [Register and discover MCP servers in your API inventory](register-discover-mcp-server.md)
+* [Set up your API Center portal](set-up-api-center-portal.md)
+* [Key concepts in Azure API Center](key-concepts.md)

articles/api-center/media/register-discover-skills/integrate-git-repository.png

@@ -5,7 +5,7 @@ description: Configure the upgrade preference for Azure App Service Environment
 author: seligj95
 ms.author: jordanselig
 ms.topic: how-to
-ms.date: 03/12/2026
+ms.date: 03/17/2026
 ms.service: azure-app-service
 ms.custom:
   - devx-track-azurecli
@@ -35,6 +35,8 @@ When you configure automatic upgrades, the platform upgrades your App Service En
 
 In smaller regions, the Early and Late upgrade preferences might be very close to each other.
 
+When automatic upgrades are enabled for an App Service Environment, upgrades from other Azure dependency services are permitted outside of the regional business hours. When manual upgrades are configured, these other service upgrades are gated with the App Service upgrade deployments.
+
 ## Review manual upgrade options
 
 When you configure manual upgrades, you receive a notification when an upgrade is available. The availability is also visible in the Azure portal. After the upgrade is available, you typically have 15 days to start the upgrade process. If you don't start the upgrade within the 15 days, the upgrade is processed with the remaining automatic upgrades in the region.

articles/api-center/media/register-discover-skills/linked-skills.png

@@ -40,7 +40,7 @@ App Service supports the following TLS versions for incoming requests to your we
 
 - **TLS 1.3**. The latest and most secure version, now fully supported.
 - **TLS 1.2**. The default minimum TLS version for new web apps.
-- **TLS 1.1 and TLS 1.0**. Versions supported for backward compatibility but not recommended.
+- **TLS 1.1 and TLS 1.0**. These are legacy protocols and are no longer considered secure.
 
 You can configure the *minimum TLS version* for incoming requests to your web app and its Source Control Manager (SCM) site. By default, the minimum is set to **TLS 1.2**.
 
@@ -71,12 +71,7 @@ App Service uses a secure set of TLS 1.2 cipher suites to help ensure encrypted
 
 ### TLS 1.1 and TLS 1.0
 
-TLS 1.1 and TLS 1.0 are legacy protocols and are no longer considered secure. These versions are supported on App Service only for backward compatibility and should be avoided when possible. The default minimum TLS version for new apps is TLS 1.2, and we recommend that you migrate apps that use TLS 1.1 or TLS 1.0.
-
-> [!IMPORTANT]
-> Incoming requests to web apps and incoming requests to Azure are handled differently. App Service continues to support TLS 1.1 and TLS 1.0 for incoming requests to web apps.
->
-> For incoming requests made directly to the Azure control plane, for example, through Azure Resource Manager or API calls, we don't recommend that you use TLS 1.1 or TLS 1.0.
+TLS 1.1 and TLS 1.0 are legacy protocols and are no longer considered secure. The default minimum TLS version for new apps is TLS 1.2, and we recommend that you migrate apps that use TLS 1.1 or TLS 1.0 to using TLS 1.2 or higher.
 
 ## Minimum TLS cipher suite