Merge branch 'main' into release-blob-backup

Author: v-alje

.openpublishing.redirection.json

@@ -1189,6 +1189,16 @@
             "redirect_url": "/azure/azure-maps/",
             "redirect_document_id": true
         },
+        {
+            "source_path_from_root": "/articles/azure-maps/tutorial-creator-indoor-maps.md",
+            "redirect_url": "/azure/azure-maps/creator-indoor-maps",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/azure-maps/about-creator.md",
+            "redirect_url": "/azure/azure-maps/creator-indoor-maps",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/azure-maps/search-categories.md",
             "redirect_url": "/azure/azure-maps/supported-search-categories",

.openpublishing.redirection.operator-nexus.json

@@ -29,6 +29,11 @@
             "source_path_from_root": "/articles/operator-nexus/template-cloud-native-network-function-deployment.md",
             "redirect_url": "/azure/operator-nexus/quickstarts-kubernetes-cluster-deployment-cli",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/operator-nexus/concepts-nexus-network.md",
+            "redirect_url": "/azure/operator-nexus/concepts-nexus-networking",
+            "redirect_document_id": false
         }
     ]
-}
+}

articles/ai-studio/how-to/model-catalog-overview.md

@@ -47,12 +47,12 @@ Some models in the **Curated by Azure AI** and **Open models from the Hugging Fa
 Model Catalog offers two distinct ways to deploy models from the catalog for your use: managed compute and serverless APIs. The deployment options available for each model vary; learn more about the features of the deployment options, and the options available for specific models, in the following tables. Learn more about [data processing]( concept-data-privacy.md) with the deployment options. 
 <!-- docutune:disable -->
 
-Features | Managed compute | serverless API (pay-as-you-go) 
+Features | Managed compute | Serverless API (pay-as-you-go) 
 --|--|-- 
-Deployment experience and billing |  Model weights are deployed to dedicated Virtual Machines with Managed Online Endpoints. The managed online endpoint, which can have one or more deployments, makes available a REST API for inference. You're billed for the Virtual Machine core hours used by the deployments.  | Access to models is through a deployment that provisions an API to access the model. The API provides access to the model hosted and managed by Microsoft, for inference. This mode of access is referred to as "Models as a Service".   You're billed for inputs and outputs to the APIs, typically in tokens; pricing information is provided before you deploy.  
+Deployment experience and billing |  Model weights are deployed to dedicated Virtual Machines with Managed Online Endpoints. The managed online endpoint, which can have one or more deployments, makes available a REST API for inference. You're billed for the Virtual Machine core hours used by the deployments.  | Access to models is through a deployment that provisions an API to access the model. The API provides access to the model hosted and managed by Microsoft, for inference. You're billed for inputs and outputs to the APIs, typically in tokens; pricing information is provided before you deploy.  
 | API authentication   | Keys and Microsoft Entra ID authentication.| Keys only.  
-Content safety | Use Azure Content Safety service APIs.  | Azure AI Content Safety filters are available integrated with inference APIs. Azure AI Content Safety filters may be billed separately.  
-Network isolation | [Configure managed networks for Azure AI Studio hubs.](configure-managed-network.md)  | MaaS endpoint will follow your hub's public network access (PNA) flag setting. For more information, see the [Network isolation for models deployed via Serverless APIs](#network-isolation-for-models-deployed-via-serverless-apis) section.
+Content safety | Use Azure Content Safety service APIs.  | Azure AI Content Safety filters are available integrated with inference APIs. Azure AI Content Safety filters is billed separately.  
+Network isolation | [Configure managed networks for Azure AI Studio hubs.](configure-managed-network.md)  | Endpoints will follow your hub's public network access (PNA) flag setting. For more information, see the [Network isolation for models deployed via Serverless APIs](#network-isolation-for-models-deployed-via-serverless-apis) section.
 
 Model | Managed compute | Serverless API (pay-as-you-go) 
 --|--|--
@@ -100,25 +100,19 @@ Prompt flow offers a great experience for prototyping. You can use models deploy
 
 ## Serverless APIs with Pay-as-you-go billing
 
-Certain models in the Model Catalog can be deployed as serverless APIs with pay-as-you-go billing; this method of deployment is called Models-as-a Service (MaaS), providing a way to consume them as an API without hosting them on your subscription. Models available through MaaS are hosted in infrastructure managed by Microsoft, which enables API-based access to the model provider's model. API based access can dramatically reduce the cost of accessing a model and significantly simplify the provisioning experience. Most MaaS models come with token-based pricing.   
+Certain models in the Model Catalog can be deployed as serverless APIs with pay-as-you-go billing, providing a way to consume them as an API without hosting them on your subscription. Models are hosted in infrastructure managed by Microsoft, which enables API-based access to the model provider's model. API based access can dramatically reduce the cost of accessing a model and significantly simplify the provisioning experience.
 
-### How are third-party models made available in MaaS?
+Models that are available for deployment as serverless APIs with pay-as-you-go billing are offered by the model provider but hosted in Microsoft-managed Azure infrastructure and accessed via API. Model providers define the license terms and set the price for use of their models, while Azure Machine Learning service manages the hosting infrastructure, makes the inference APIs available, and acts as the data processor for prompts submitted and content output by models deployed via MaaS. Learn more about data processing for MaaS at the [data privacy](concept-data-privacy.md) article. 
 
 :::image type="content" source="../media/explore/model-publisher-cycle.png" alt-text="A diagram showing model publisher service cycle." lightbox="../media/explore/model-publisher-cycle.png":::
 
-Models that are available for deployment as serverless APIs with pay-as-you-go billing are offered by the model provider but hosted in Microsoft-managed Azure infrastructure and accessed via API. Model providers define the license terms and set the price for use of their models, while Azure Machine Learning service manages the hosting infrastructure, makes the inference APIs available, and acts as the data processor for prompts submitted and content output by models deployed via MaaS. Learn more about data processing for MaaS at the [data privacy](concept-data-privacy.md) article. 
-
-### Pay for model usage in MaaS    
+### Billing   
 
 The discovery, subscription, and consumption experience for models deployed via MaaS is in the Azure AI Studio and Azure Machine Learning studio. Users accept license terms for use of the models, and pricing information for consumption is provided during deployment. Models from third party providers are billed through Azure Marketplace, in accordance with the [Commercial Marketplace Terms of Use](/legal/marketplace/marketplace-terms); models from Microsoft are billed using Azure meters as First Party Consumption Services. As described in the [Product Terms](https://www.microsoft.com/licensing/terms/welcome/welcomepage), First Party Consumption Services are purchased using Azure meters but aren't subject to Azure service terms; use of these models is subject to the license terms provided.  
 
-### Deploy models for inference through MaaS 
-
-Deploying a model through MaaS allows users to get access to ready to use inference APIs without the need to configure infrastructure or provision GPUs, saving engineering time and resources. These APIs can be integrated with several LLM tools and usage is billed as described in the previous section. 
-
-### Fine-tune models through MaaS with Pay-as-you-go 
+### Fine-tune models
 
-For models that are available through MaaS and support fine-tuning, users can take advantage of hosted fine-tuning with pay-as-you-go billing to tailor the models using data they provide. For more information, see the [fine-tuning overview](../concepts/fine-tuning-overview.md).
+Certain models support also serverless fine-tuning where users can take advantage of hosted fine-tuning with pay-as-you-go billing to tailor the models using data they provide. For more information, see the [fine-tuning overview](../concepts/fine-tuning-overview.md).
 
 ### RAG with models deployed as serverless APIs 
 

articles/aks/index.yml

@@ -19,163 +19,59 @@ landingContent:
 # Cards and links should be based on top customer tasks or top subjects
 # Start card title with a verb 
   # Card (optional)
-  - title: About Azure Kubernetes Service (AKS)
+  - title: About AKS
     linkLists:
       - linkListType: overview
         links:
           - text: What is AKS?
             url: what-is-aks.md
           - text: What is AKS Automatic?
             url: intro-aks-automatic.md
-          - text: Get started with AKS
-            url: /azure/architecture/reference-architectures/containers/aks-start-here
-      - linkListType: whats-new
+          - text: Supported Kubernetes versions
+            url: supported-kubernetes-versions.md
+      - linkListType: concept
+        links:
+          - text: Core concepts
+            url: core-aks-concepts.md
+      - linkListType: reference
         links:
-          - text: Trusted Launch (preview)
-            url: use-trusted-launch.md
-          - text: Azure Container Storage (preview)
-            url: /azure/storage/container-storage/container-storage-introduction
-          - text: Deploy an AI model on AKS with the AI toolchain operator (Preview)
-            url: ai-toolchain-operator.md
-          - text: Upgrade multiple AKS clusters using Azure Kubernetes Fleet Manager
-            url: /azure/kubernetes-fleet/update-orchestration
-          - text: Reduce image pull time with Artifact Streaming on AKS (Preview)
-            url: artifact-streaming.md
-          - text: Secure your cluster using pod security policies (Deprecated)
-            url: use-pod-security-policies.md
-          - text: Automatically upgrade node images
-            url: auto-upgrade-node-image.md
-          - text: Azure Linux Container Host for AKS
-            url: use-azure-linux.md
-          - text: Vertical Pod Autoscaler
-            url: vertical-pod-autoscaler.md
-          - text: Use Confidential Virtual Machines
-            url: use-cvm.md
+          - text: Azure CLI
+            url: /cli/azure/aks
+          - text: Azure PowerShell
+            url: /powershell/module/az.aks
+          - text: REST
+            url: /rest/api/aks/
 
   # Card (optional)
-  - title: Evaluate Linux-based AKS cluster
+  - title: Get started
     linkLists:
       - linkListType: quickstart
         links:
-          - text: AKS Automatic
-            url: ./learn/quick-kubernetes-automatic-deploy.md
-          - text: Azure CLI
+          - text: Create a Linux cluster
             url: ./learn/quick-kubernetes-deploy-cli.md
-          - text: Azure PowerShell
-            url: ./learn/quick-kubernetes-deploy-powershell.md
-          - text: Azure portal
-            url: ./learn/quick-kubernetes-deploy-portal.md
-          - text: Resource Manager template
-            url: ./learn/quick-kubernetes-deploy-rm-template.md
-          - text: Terraform
-            url: ./learn/quick-kubernetes-deploy-terraform.md
-  
-  # Card (optional)
-  - title: Evaluate application deployment on AKS
-    linkLists:
+          - text: Create a Windows cluster
+            url: ./learn/quick-windows-container-deploy-cli.md
       - linkListType: tutorial
         links:
-          - text: 1. Prepare an application for AKS
+          - text: Prepare an application for AKS
             url: tutorial-kubernetes-prepare-app.md
-          - text: 2. Deploy and use Azure Container Registry
-            url: tutorial-kubernetes-prepare-acr.md
-          - text: 3. Deploy an AKS cluster
-            url: tutorial-kubernetes-deploy-cluster.md
-          - text: 4. Run your application
-            url: tutorial-kubernetes-deploy-application.md
-          - text: 5. Scale applications
-            url: tutorial-kubernetes-scale.md
-          - text: 6. Update an application
-            url: tutorial-kubernetes-app-update.md
-          - text: 7. Upgrade Kubernetes in AKS
-            url: tutorial-kubernetes-upgrade-cluster.md
-
- # Card
-  - title: Evaluate Windows-based AKS cluster
-    linkLists:
-       - linkListType: concept
-         links:
-            - text: Windows Server containers FAQ
-              url: windows-faq.md
-       - linkListType: quickstart
-         links:
-            - text: Create a Windows Server container using the Azure CLI
-              url: learn/quick-windows-container-deploy-cli.md
-            - text: Create a Windows Server container using the Azure PowerShell
-              url: learn/quick-windows-container-deploy-powershell.md
- # Card
-  - title: Evaluate application deployment methods
-    linkLists:
-      - linkListType: tutorial
+      - linkListType: training
         links:
-          - text: Develop with Helm
-            url: quickstart-helm.md
-          - text: Develop with Dapr
-            url: quickstart-dapr.md
-          - text: Use Draft and the DevX extension for Visual Studio Code
-            url: draft-devx-extension-aks.md
-          - text: Use Automated Deployments
-            url: automated-deployments.md
- 
-  # Card
-  - title: Architecture guidance
+          - text: AKS training modules
+            url: /training/browse/?products=azure-kubernetes-service
+  
+  # Card (optional)
+  - title: Plan and design
     linkLists:
       - linkListType: architecture
         links:
-          - text: Baseline architecture
-            url: /azure/architecture/reference-architectures/containers/aks/secure-baseline-aks?WT.mc_id=AKSDOCSPAGE
-          - text: Baseline for microservices
-            url: /azure/architecture/reference-architectures/containers/aks-microservices/aks-microservices-advanced?WT.mc_id=AKSDOCSPAGE            
-          - text: Baseline for PCI-DSS 3.2.1
-            url: /azure/architecture/reference-architectures/containers/aks-pci/aks-pci-intro?WT.mc_id=AKSDOCSPAGE
-          - text: Baseline for multiregion
-            url: /azure/architecture/reference-architectures/containers/aks-multi-region/aks-multi-cluster?WT.mc_id=AKSDOCSPAGE
-
-  # Card
-  - title: Production deployment guidance
-    linkLists:
-      - linkListType: deploy
-        links:
-          - text: AKS Landing Zone accelerator
-            url: /azure/cloud-adoption-framework/scenarios/app-platform/aks/landing-zone-accelerator
-          - text: AKS baseline cluster reference implementation (GitHub)
-            url: https://github.com/mspnp/aks-baseline
-  
-  # Card
-  - title: Extend the capabilities of your cluster
-    linkLists:
+          - text: Architectural best practices
+            url: /azure/well-architected/service-guides/azure-kubernetes-service
+          - text: Baseline infrastructure architecture
+            url: /azure/architecture/reference-architectures/containers/aks/baseline-aks
       - linkListType: concept
         links:
-          - text: Istio add-on
-            url: istio-about.md
-          - text: Dapr cluster extension
-            url: dapr.md
-          - text: Cluster extensions
-            url: cluster-extensions.md
-          - text: GitHub Actions for AKS
-            url: integrations.md#github-actions
-  
-  # Card
-  - title: Operations guidance
-    linkLists:
-      - linkListType: how-to-guide
-        links:
-          - text: Day-2 operations guide
-            url: /azure/architecture/operator-guides/aks/day-2-operations-guide?WT.mc_id=AKSDOCSPAGE
-          - text: Best practices for cluster operators and developers
-            url: best-practices.md
-          - text: Plan how to monitor AKS
-            url: monitor-aks.md
-          - text: Plan how to monitor AKS cluster networks
-            url: network-observability-overview.md 
-  # Card
-  - title: Troubleshooting
-    linkLists:
-      - linkListType: how-to-guide
-        links:
-         - text: Troubleshooting Guides
-           url: /troubleshoot/azure/azure-kubernetes/welcome-azure-kubernetes
-         - text: Troubleshoot create operations
-           url: /troubleshoot/azure/azure-kubernetes//troubleshoot-aks-cluster-creation-issues
-         - text: Troubleshoot common issues 
-           url: /troubleshoot/azure/azure-kubernetes/aks-common-issues-faq
+          - text: Optimize costs
+            url: best-practices-cost.md
+          - text: Windows container considerations
+            url: windows-vs-linux-containers.md

articles/api-center/TOC.yml

@@ -32,8 +32,6 @@
             href: register-apis.md
           - name: 3 - Add environments and deployments
             href: configure-environments-deployments.md
-          - name: 4 - Discover shadow APIs
-            href: discover-shadow-apis-dev-proxy.md
 - name: API inventory
   items:
       - name: Manage inventory - Azure CLI
@@ -48,6 +46,8 @@
         href: metadata.md
       - name: Analyze APIs using linting rules
         href: enable-api-analysis-linting.md
+      - name: Discover shadow APIs with Dev Proxy
+        href: discover-shadow-apis-dev-proxy.md  
 - name: API discovery and consumption
   items:
       - name: Self-host Azure API Center portal

articles/api-center/discover-shadow-apis-dev-proxy.md

@@ -1,14 +1,14 @@
 ---
-title: Tutorial - Discover shadow APIs using Dev Proxy
-description: In this tutorial, you learn how to discover shadow APIs in your apps using Dev Proxy and onboard them to API Center.
+title: Discover shadow APIs using Dev Proxy
+description: Learn how to discover shadow APIs in your apps using Dev Proxy and onboard them to API Center.
 author: waldekmastykarz
 ms.service: api-center
-ms.topic: tutorial
+ms.topic: how-to
 ms.date: 07/15/2024
 ms.author: wmastyka 
 ---
 
-# Tutorial - Discover shadow APIs using Dev Proxy
+# Discover shadow APIs using Dev Proxy
 
 Using Azure API Center you catalog APIs used in your organization. This allows you to tell which APIs you use, where the API is in its lifecycle, and who to contact if there are issues. In short, having an up-to-date catalog of APIs helps you improve the governance-, compliance-, and security posture.
 

articles/api-center/overview.md

@@ -37,7 +37,7 @@ Create and use an API center for the following:
 
 * **Real-world API representation** - Add real-world information about each API including versions and definitions such as OpenAPI definitions. List API deployments and associate them with runtime environments, for example, representing Azure API Management or other API management solutions.
 
-* **API governance** - Organize and filter APIs and related resources using built-in and custom metadata, to help with API governance and discovery by API consumers. Set up linting and analysis to enforce API definition quality.  
+* **API governance** - Organize and filter APIs and related resources using built-in and custom metadata, to help with API governance and discovery by API consumers. Set up [linting and analysis](enable-api-analysis-linting.md) to enforce API definition quality. Integrate with tools such as Dev Proxy to ensure that apps don't use unregistered [shadow APIs](discover-shadow-apis-dev-proxy.md) or APIs that don't meet organizational standards.
 
 * **API discovery and reuse** - Enable developers and API program managers to discover APIs via the Azure portal, an API Center portal, and developer tools including a [Visual Studio Code extension](use-vscode-extension.md)​.