Merge branch 'securitymysql' of https://github.com/markingmyname/azure-docs-pr into securitymysql

Author: markingmyname

articles/ai-studio/how-to/deploy-models-serverless-availability.md

@@ -6,17 +6,17 @@ manager: scottpolly
 ms.service: azure-ai-studio
 ms.topic: how-to
 ms.date: 5/21/2024
-ms.reviewer: mopeakande
-reviewer: msakande
-ms.author: fasantia
-author: santiagxf
+ms.author: mopeakande
+author: msakande
+ms.reviewer: fasantia
+reviewer: santiagxf
 ms.custom: 
  - build-2024
  - serverless
  - references_regions
 ---
 
-# Region availability for models in Serverless API endpoints | Azure AI Studio
+# Region availability for models in serverless API endpoints | Azure AI Studio
 
 [!INCLUDE [Feature preview](../includes/feature-preview.md)]
 
@@ -26,18 +26,7 @@ Certain models in the model catalog can be deployed as a serverless API with pay
 
 ## Region availability
 
-Serverless API endpoints are available in the following regions for the indicated models:
-
-| Model             | East US 2   | West US 3      | Sweden Central | France Central |
-| ----------------- | ----------- | -------------- | -------------- | -------------- |
-| Mistral-Small     | **✓** |                | **✓**    |                |
-| Mistral-Large     | **✓** |                | **✓**    | **✓**    |
-| Cohere Command R  | **✓** |                | **✓**    |                |
-| Cohere Command R+ | **✓** |                | **✓**    |                |
-| Cohere Embed v3   | **✓** |                | **✓**    |                |
-| Meta Llama 2      | **✓** | **✓**    |                |                |
-| Meta Llama 3      | **✓** |                |                |                |
-| Phi-3             | **✓** |                | **✓**    |                |
+[!INCLUDE [region-availabilitity-serverless-api](../includes/region-availabilitity-serverless-api.md)]
 
 ## Alternatives to region availability
 

articles/ai-studio/how-to/deploy-models-timegen-1.md

@@ -31,10 +31,18 @@ You can deploy TimeGEN-1 as a serverless API with pay-as-you-go billing. Nixtla
 ### Prerequisites
 
 - An Azure subscription with a valid payment method. Free or trial Azure subscriptions don't work. If you don't have an Azure subscription, create a [paid Azure account](https://azure.microsoft.com/pricing/purchase-options/pay-as-you-go) to begin.
-- An [AI Studio hub](../how-to/create-azure-ai-resource.md).
+- An [AI Studio hub](../how-to/create-azure-ai-resource.md). The serverless API model deployment offering for TimeGEN-1 is only available with hubs created in these regions:
 
-  > [!IMPORTANT]
-  > The serverless API model deployment offering for TimeGEN-1 is only available with hubs created in the **East US 2** or **Sweden Central** regions.
+    > [!div class="checklist"]
+    > * East US
+    > * East US 2
+    > * North Central US
+    > * South Central US
+    > * West US
+    > * West US 3
+    > * Sweden Central
+
+    For a list of  regions that are available for each of the models supporting serverless API endpoint deployments, see [Region availability for models in serverless API endpoints](deploy-models-serverless-availability.md).
 
 - An [Azure AI Studio project](../how-to/create-projects.md).
 - Azure role-based access controls (Azure RBAC) are used to grant access to operations in Azure AI Studio. To perform the steps in this article, your user account must be assigned the __Azure AI Developer role__ on the resource group. For more information on permissions, visit [Role-based access control in Azure AI Studio](../concepts/rbac-ai-studio.md).
@@ -52,7 +60,7 @@ These steps demonstrate the deployment of TimeGEN-1. To create a deployment:
     1. Select **+ Create deployment**.
     1. Search for and select **TimeGEN-1**. to open the Model's Details page.
     1. Select **Confirm** to open a serverless API deployment window for the model.
-1. Select the project in which you want to deploy your model. To deploy the TimeGEN-1 model, your project must be in the **East US 2** or **Sweden Central**  region.
+1. Select the project in which you want to deploy your model. To deploy the TimeGEN-1 model, your project must be in one of the regions listed in the [Prerequisites](#prerequisites) section.
 1. In the deployment wizard, select the link to **Azure Marketplace Terms**, to learn more about the terms of use.
 1. Select the **Pricing and terms** tab to learn about pricing for the selected model.
 1. Select the **Subscribe and Deploy** button. If this is your first time deploying the model in the project, you have to subscribe your project for the particular offering. This step requires that your account has the **Azure AI Developer role** permissions on the resource group, as listed in the prerequisites. Each project has its own subscription to the particular Azure Marketplace offering of the model, which allows you to control and monitor spending. Currently, you can have only one deployment for each model within a project.

articles/ai-studio/includes/region-availabilitity-serverless-api.md

@@ -0,0 +1,71 @@
+---
+title: include file
+description: include file
+ms.service: azure-ai-studio
+ms.topic: include
+ms.date: 05/21/2024
+ms.author: mopeakande
+author: msakande
+ms.reviewer: fasantia
+reviewer: santiagxf
+ms.custom: include file
+
+# Also used in Azure Machine Learning documentation
+---
+
+Availability of serverless API endpoints for select models are listed in the following tables:
+
+<!-- | Model             | East US     | East US 2   | North Central US | South Central US | West US     | West US 3   | France Central | Sweden Central |
+|:-----------------:|:-----------:|:-----------:|:----------------:|:----------------:|:-----------:|:-----------:|:--------------:|:--------------:|
+| Mistral-Small     |             | **&check;** |                  |                  |             |             |                | **&check;**    |
+| Mistral-Large     |             | **&check;** |                  |                  |             |             | **&check;**    | **&check;**    |
+| Cohere Command R  |             | **&check;** |                  |                  |             |             |                | **&check;**    |
+| Cohere Command R+ |             | **&check;** |                  |                  |             |             |                | **&check;**    |
+| Cohere Embed v3   |             | **&check;** |                  |                  |             |             |                | **&check;**    |
+| Meta Llama 2      |             | **&check;** |                  |                  |             | **&check;** |                |                |
+| Meta Llama 3      |             | **&check;** |                  |                  |             |             |                |                |
+| Phi-3             |             | **&check;** |                  |                  |             |             |                | **&check;**    |
+| Nixtla TimeGEN-1  | **&check;** | **&check;** | **&check;**      | **&check;**      | **&check;** | **&check;** |                | **&check;**    | -->
+
+
+#### Cohere models
+
+| Region           | Cohere Command R | Cohere Command R+ | Cohere Embed v3 |
+|----------------|:----------------:|:-----------------:|:---------------:|
+| East US 2        | **&check;**      | **&check;**       | **&check;**     |
+| Sweden Central   | **&check;**      | **&check;**       | **&check;**     |
+
+#### Mistral models
+
+|   Region         | Mistral-Small | Mistral-Large |
+|----------------|:-------------:|:-------------:|
+| East US 2        | **&check;**   | **&check;**   |
+| France Central   | unavailable   | **&check;**   |
+| Sweden Central   | **&check;**   | **&check;**   |
+
+#### Meta Llama models
+
+| Region    | Llama-2     | Llama-3     |
+|-----------|:-----------:|:-----------:|
+| East US 2 | **&check;** | **&check;** |
+| West US 3 | **&check;** | unavailable |
+
+#### Nixtla TimeGEN-1 model
+
+| Region           | Nixtla TimeGEN-1 |
+|------------------|:----------------:|
+| East US          | **&check;**      |
+| East US 2        | **&check;**      |
+| North Central US | **&check;**      |
+| South Central US | **&check;**      |
+| West US          | **&check;**      |
+| West US 3        | **&check;**      |
+| France Central   | unavailable      |
+| Sweden Central   | **&check;**      |
+
+#### Phi 3 models
+
+| Region         | Phi 3       |
+|----------------|:-----------:|
+| East US 2      | **&check;** |
+| Sweden Central | **&check;** |

articles/api-management/azure-openai-token-limit-policy.md

@@ -46,8 +46,7 @@ For more information, see [Azure OpenAI Service models](../ai-services/openai/co
         remaining-tokens-header-name="header name"  
         remaining-tokens-variable-name="policy expression variable name"
         consumed-tokens-header-name="header name"
-        consumed-tokens-variable-name="policy expression variable name">
-</azure-openai-token-limit>
+        consumed-tokens-variable-name="policy expression variable name" />
 ```
 ## Attributes
 
@@ -82,10 +81,9 @@ In the following example, the token limit of 5000 per minute is keyed by the cal
 <policies>
     <inbound>
         <base />
-        <azure-openai-token-limit>
+        <azure-openai-token-limit
             counter-key="@(context.Request.IpAddress)"
-            tokens-per-minute="5000" estimate-prompt-tokens="false" "remaining-tokens-variable-name="remainingTokens"
-        </azure-openai-token-limit>
+            tokens-per-minute="5000" estimate-prompt-tokens="false" "remaining-tokens-variable-name="remainingTokens" />
     </inbound>
     <outbound>
         <base />

articles/app-service/configure-authentication-provider-aad.md

@@ -97,7 +97,7 @@ After creation, modify the app registration:
 
 # [External configuration](#tab/external-configuration)
 
-[Create and use a new app registration](#express_external) or [use an existing registration created separately](#advanced).
+[Create and use a new app registration](#express_external) or [use an existing registration created separately](#advanced_external).
 
 ### <a name="express_external"></a> Option 1: Create and use a new app registration
 
@@ -107,24 +107,28 @@ Select **Create new app registration** to create a new app registration.
 
 1. Select an existing tenant to use from the drop-down, or select **Create new** to create a new [external tenant](/entra/external-id/customers/quickstart-tenant-setup).
 
-#### To create a new external tenant
+#### To create a new external tenant (optional)
 
-1. In the **Create a tenant** page, add the **Tenant Name** and **Domain Name**.  Select a **Location** and select **Review and create** and then select **Create**.  The tenant creation process takes a few minutes.
+In the **Create a tenant** page, add the **Tenant Name** and **Domain Name**.  Select a **Location** and select **Review and create** and then select **Create**.  The tenant creation process takes a few minutes.
+
+#### To setup sign-in
 
 1. Select **Configure** to **configure external authentication** for the new tenant.
 
 1. The browser opens **Configure customer authentication**.  
 
 1. Select a user flow from the drop-down or select **Create new**.  The user flow defines the sign-in methods your external users can use. Each app can only have one user flow, but you can reuse the same user flow for multiple apps.
 
-##### To create a new user flow
+#### To create a new user flow
 
 1. Enter a **Name** for the user flow.
 
 1. Select the sign-in method for your external users.  **Email and password** and **Email and one-time passcode** are already configured in the new tenant.  You can [Configure Google](/entra/external-id/customers/how-to-google-federation-customers) or [Configure Facebook](/entra/external-id/customers/how-to-facebook-federation-customers) as identity providers as well.
 
 1. Select **Create** to create the user flow.
 
+#### To customize branding
+
 1. Select **Next** to customize branding.
 
 1. Add your logo, select a background color, and select a sign-in layout.
@@ -137,9 +141,7 @@ Select **Create new app registration** to create a new app registration.
 
 ### <a name="advanced_external"> </a>Option 2: Use an existing registration created separately
 
-Either:
-- Select **Pick an existing app registration in this directory** and select an app registration from the drop-down
-- Select **Provide the details of an existing app registration** and provide:
+Select **Provide the details of an existing app registration** and provide:
     - Application (client) ID
     - Client secret
     - Issuer URL

articles/app-spaces/how-to-add-components.md

@@ -134,4 +134,4 @@ Follow these steps to add a database component.
 ## Related content
 
 - [App Spaces overview](overview.md)
-- [Deploy an App Spaces template](deploy-app-spaces-template.md)
+- [Deploy an App Spaces starter app](quickstart-deploy-starter-app.md)

articles/app-spaces/overview.md

@@ -27,18 +27,18 @@ Within a few minutes, you can deploy your App Space.
 
 ## Simplified management
 
-App Spaces only requires information that's needed during the development process, like environment management, environment variables, connection strings, and so on. So, developing and managing your app components is straightforward and simplified. For more information, see [Manage components](quickstart-deploy-web-app.md#manage-components).
+App Spaces only requires information that's needed during the development process, like environment management, environment variables, connection strings, and so on. So, developing and managing your app components is straightforward and simplified. For more information, see [Manage components](how-to-manage-components.md).
 
 ## Simplified pricing
 
  App Spaces offers simplified and consistent pricing plans for various scenarios, so you don't have to worry about any accidental charges.
 ## Next steps
 
 > [!div class="nextstepaction"]
-> [Deploy a web app with App Spaces](quickstart-deploy-web-app.md)
+> [Deploy a web app with App Spaces](quickstart-deploy-starter-app.md)
 
 ## Related articles
 
-- [Deploy an App Spaces template](deploy-app-spaces-template.md)
+- [Deploy an App Spaces starter app](quickstart-deploy-starter-app.md)
 - [Compare Container Apps with other Azure contain options](../container-apps/compare-options.md)
 - [About Azure Cosmos DB](../cosmos-db/introduction.md)

articles/app-spaces/quickstart-deploy-your-app.md

@@ -84,4 +84,4 @@ The deployment can take a few minutes to complete. During deployment, App Spaces
 ## Related content
 
 - [App Spaces overview](overview.md)
-- [Deploy an App Spaces template](quickstart-deploy-starter-app.md)
+- [Deploy an App Spaces starter app](quickstart-deploy-starter-app.md)

articles/azure-cache-for-redis/cache-how-to-active-geo-replication.md

@@ -40,7 +40,7 @@ There are a few restrictions when using active geo replication:
 
 ## Create or join an active geo-replication group
 
-1. When creating a new Azure Cache for Redis resource, select the **Advanced** tab. Complete the first part of the form including clustering policy. For more information on choosing **Clustering policy**, see [Clustering Policy](quickstart-create-redis-enterprise.md#clustering-policy).
+1. When creating a new Azure Cache for Redis resource, select the **Advanced** tab. Complete the first part of the form including clustering policy. For more information on choosing **Clustering policy**, see [Clustering on Enterprise](cache-best-practices-enterprise-tiers.md#clustering-on-enterprise).
 
 1. Select **Configure** to set up **Active geo-replication**.
 

articles/azure-cache-for-redis/cache-redis-modules.md

@@ -84,7 +84,7 @@ Additionally, **RediSearch** can function as a secondary index, expanding your c
 You can use **RediSearch** is used in a wide variety of use-cases, including real-time inventory, enterprise search, and in indexing external databases. [For more information, see the RediSearch documentation page](https://redis.io/search/).
 
 >[!IMPORTANT]
-> The RediSearch module requires use of the `Enterprise` clustering policy and the `NoEviction` eviction policy. For more information, see [Clustering Policy](quickstart-create-redis-enterprise.md#clustering-policy) and [Memory Policies](cache-configure.md#memory-policies)
+> The RediSearch module requires use of the `Enterprise` clustering policy and the `NoEviction` eviction policy. For more information, see [Clustering on Enterprise](cache-best-practices-enterprise-tiers.md#clustering-on-enterprise) and [Memory Policies](cache-configure.md#memory-policies)
 >
 
 ### RedisBloom