Merge pull request #272447 from MicrosoftDocs/main

Merge main to live, 4 AM

Author: v-ccolin

articles/ai-services/speech-service/text-to-speech-avatar/custom-avatar-endpoint.md

@@ -0,0 +1,59 @@
+---
+title: Deploy your custom text to speech avatar model as an endpoint - Speech service
+titleSuffix: Azure AI services
+description: Learn about how to deploy your custom text to speech avatar model as an endpoint. 
+author: sally-baolian
+manager: nitinme
+ms.service: azure-ai-speech
+ms.topic: how-to
+ms.date: 4/15/2024
+ms.author: v-baolianzou
+---
+
+# Deploy your custom text to speech avatar model as an endpoint
+
+You must deploy the custom avatar to an endpoint before you can use it. Once your custom text to speech avatar model is successfully trained through our manual process, we will notify you. Then you can deploy it to a custom avatar endpoint. You can create up to 10 custom avatar endpoints for each standard (S0) Speech resource.
+
+After you deploy your custom avatar, it's available to use in Speech Studio or through API:
+
+- The avatar appears in the avatar list of text to speech avatar on [Speech Studio](https://speech.microsoft.com/portal/talkingavatar).
+- The avatar appears in the avatar list of live chat avatar on [Speech Studio](https://speech.microsoft.com/portal/livechat).
+- You can call the avatar from the API by specifying the avatar model name.
+
+## Add a deployment endpoint
+
+To create a custom avatar endpoint, follow these steps:
+
+1. Sign in to [Speech Studio](https://speech.microsoft.com/portal).
+1. Navigate to **Custom Avatar** > Your project name > **Train model**.
+1. All available models are listed on the **Train model** page. Select a model link to view more information, such as the created date and a preview image of the custom avatar.
+1. Select a model that you would like to deploy, then select the **Deploy model** button above the list.
+1. Confirm the deployment to create your endpoint.
+
+Once your model is successfully deployed as an endpoint, you can select the endpoint link on the **Deploy model** page. There, you'll find a link to the text to speech avatar portal on Speech Studio, where you can try and create videos with your custom avatar using text input.
+
+## Remove a deployment endpoint
+
+To remove a deployment endpoint, follow these steps:
+
+1. Sign in to [Speech Studio](https://speech.microsoft.com/portal).
+1. Navigate to **Custom Avatar** > Your project name > **Train model**.
+1. All available models are listed on the **Train model** page. Select a model link to view more information, such as the created date and a preview image of the custom avatar.
+1. Select a model on the **Train model** page. If it's in "Succeeded" status, it means it's in hosting status. You can select the **Delete** button and confirm the deletion to remove the hosting.
+
+## Use your custom neural voice
+
+If you're also creating a custom neural voice for the actor, the avatar can be highly realistic. For more information, see [What is custom text to speech avatar](./what-is-custom-text-to-speech-avatar.md).
+
+[Custom neural voice](../custom-neural-voice.md) and [custom text to speech avatar](what-is-custom-text-to-speech-avatar.md) are separate features. You can use them independently or together. 
+
+If you've built a custom neural voice (CNV) and would like to use it together with the custom avatar, pay attention to the following points:
+
+- Ensure that the CNV endpoint is created in the same Speech resource as the custom avatar endpoint. You can see the CNV voice option in the voices list of the [avatar content generation page](https://speech.microsoft.com/portal/talkingavatar) and [live chat voice settings](https://speech.microsoft.com/portal/livechat).
+- If you're using the batch synthesis for avatar API, add the "customVoices" property to associate the deployment ID of the CNV model with the voice name in the request. For more information, refer to the [Text to speech properties](batch-synthesis-avatar-properties.md#text-to-speech-properties).
+- If you're using real-time synthesis for avatar API, refer to our sample code on [GitHub](https://github.com/Azure-Samples/cognitive-services-speech-sdk/tree/master/samples/js/browser/avatar) to set the custom neural voice.
+- If your custom neural voice endpoint is in a different Speech resource from the custom avatar endpoint, refer to [Train your professional voice model](../professional-voice-train-voice.md#copy-your-voice-model-to-another-project) to copy the CNV model to the same Speech resource as the custom avatar endpoint. 
+
+## Next steps
+
+- Learn more about custom text to speech avatar in the [overview](what-is-custom-text-to-speech-avatar.md).

articles/ai-services/speech-service/toc.yml

@@ -224,6 +224,9 @@ items:
         - name: How to record video samples
           href: text-to-speech-avatar/custom-avatar-record-video-samples.md
           displayName: avatar
+        - name: Deploy your custom text to speech avatar model as an endpoint
+          href: text-to-speech-avatar/custom-avatar-endpoint.md
+          displayName: avatar
     - name: Audio Content Creation
       href: how-to-audio-content-creation.md
       displayName: acc

articles/app-service/overview-vnet-integration.md

@@ -28,7 +28,7 @@ The virtual network integration feature:
 
 * Requires a [supported Basic or Standard](./overview-vnet-integration.md#limitations), Premium, Premium v2, Premium v3, or Elastic Premium App Service pricing tier.
 * Supports TCP and UDP.
-* Works with App Service apps, function apps and Logic apps.
+* Works with App Service apps, function apps, and Logic apps.
 
 There are some things that virtual network integration doesn't support, like:
 
@@ -72,17 +72,17 @@ When you scale up/down in instance size, the amount of IP addresses used by the
 
 Because subnet size can't be changed after assignment, use a subnet that's large enough to accommodate whatever scale your app might reach. You should also reserve IP addresses for platform upgrades. To avoid any issues with subnet capacity, use a `/26` with 64 addresses. When you're creating subnets in Azure portal as part of integrating with the virtual network, a minimum size of `/27` is required. If the subnet already exists before integrating through the portal, you can use a `/28` subnet.
 
-With multi plan subnet join (MPSJ) you can join multiple App Service plans in to the same subnet. All App Service plans must be in the same subscription but the virtual network/subnet can be in a different subscription. Each instance from each App Service plan requires an IP address from the subnet and to use MPSJ a minimum size of `/26` subnet is required. If you plan to join many and/or large scale plans, you should plan for larger subnet ranges.
+With multi plan subnet join (MPSJ), you can join multiple App Service plans in to the same subnet. All App Service plans must be in the same subscription but the virtual network/subnet can be in a different subscription. Each instance from each App Service plan requires an IP address from the subnet and to use MPSJ a minimum size of `/26` subnet is required. If you plan to join many and/or large scale plans, you should plan for larger subnet ranges.
 
 >[!NOTE]
 > Multi plan subnet join is currently in public preview. During preview the following known limitations should be observed:
 > 
-> * The minimum requirement for subnet size of `/26` is currently not enforced, but will be enforced at GA.
+> * The minimum requirement for subnet size of `/26` is currently not enforced, but will be enforced at GA. If you have joined multiple plans to a smaller subnet during preview they will still work, but you cannot connect additional plans and if you disconnect you will not be able to connect again.
 > * There is currently no validation if the subnet has available IPs, so you might be able to join N+1 plan, but the instances will not get an IP. You can view available IPs in the Virtual network integration page in Azure portal in apps that are already connected to the subnet.
 
 ### Windows Containers specific limits
 
-Windows Containers uses an additional IP address per app for each App Service plan instance, and you need to size the subnet accordingly. If you have for example 10 Windows Container App Service plan instances with 4 apps running, you will need 50 IP addresses and additional addresses to support horizontal (in/out) scale.
+Windows Containers uses an extra IP address per app for each App Service plan instance, and you need to size the subnet accordingly. If you have, for example, 10 Windows Container App Service plan instances with four apps running, you need 50 IP addresses and extra addresses to support horizontal (in/out) scale.
 
 Sample calculation:
 
@@ -96,13 +96,13 @@ For 10 instances:
 
 Since you have 1 App Service plan, 1 x 50 = 50 IP addresses.
 
-You are in addition limited by the number of cores available in the worker SKU used. Each core adds three "networking units". The worker itself uses one unit and each virtual network connection uses one unit. The remaining units can be used for apps.
+You are in addition limited by the number of cores available in the worker tier used. Each core adds three networking units. The worker itself uses one unit and each virtual network connection uses one unit. The remaining units can be used for apps.
 
 Sample calculation:
 
-App Service plan instance with 4 apps running and using virtual network integration. The Apps are connected to two different subnets (virtual network connections). This will require 7 networking units (1 worker + 2 connections + 4 apps). The minimum size for running this configuration would be I2v2 (4 cores x 3 units = 12 units).
+App Service plan instance with four apps running and using virtual network integration. The Apps are connected to two different subnets (virtual network connections). This configuration requires seven networking units (1 worker + 2 connections + 4 apps). The minimum size for running this configuration would be I2v2 (four cores x 3 units = 12 units).
 
-With I1v2 you can run a maximum of 4 apps using the same (1) connection or 3 apps using 2 connections.
+With I1v2, you can run a maximum of four apps using the same (1) connection or 3 apps using 2 connections.
 
 ## Permissions
 

articles/azure-monitor/logs/basic-logs-configure.md

@@ -222,7 +222,7 @@ All custom tables created with or migrated to the [data collection rule (DCR)-ba
 | Redis cache | [ACRConnectedClientList](/azure/azure-monitor/reference/tables/ACRConnectedClientList) |
 | Redis Cache Enterprise | [REDConnectionEvents](/azure/azure-monitor/reference/tables/REDConnectionEvents) |
 | Relays | [AZMSHybridConnectionsEvents](/azure/azure-monitor/reference/tables/AZMSHybridConnectionsEvents) |
-| Security | [SecurityAttackPathData](/azure/azure-monitor/reference/tables/SecurityAttackPathData) |
+| Security | [SecurityAttackPathData](/azure/azure-monitor/reference/tables/SecurityAttackPathData)<br> [MDCFileIntegrityMonitoringEvents](/azure/azure-monitor/reference/tables/mdcfileintegritymonitoringevents) |
 | Service Bus | [AZMSApplicationMetricLogs](/azure/azure-monitor/reference/tables/AZMSApplicationMetricLogs)<br>[AZMSOperationalLogs](/azure/azure-monitor/reference/tables/AZMSOperationalLogs)<br>[AZMSRunTimeAuditLogs](/azure/azure-monitor/reference/tables/AZMSRunTimeAuditLogs)<br>[AZMSVNetConnectionEvents](/azure/azure-monitor/reference/tables/AZMSVNetConnectionEvents) |
 | Sphere | [ASCAuditLogs](/azure/azure-monitor/reference/tables/ASCAuditLogs)<br>[ASCDeviceEvents](/azure/azure-monitor/reference/tables/ASCDeviceEvents) |
 | Storage | [StorageBlobLogs](/azure/azure-monitor/reference/tables/StorageBlobLogs)<br>[StorageFileLogs](/azure/azure-monitor/reference/tables/StorageFileLogs)<br>[StorageQueueLogs](/azure/azure-monitor/reference/tables/StorageQueueLogs)<br>[StorageTableLogs](/azure/azure-monitor/reference/tables/StorageTableLogs) |

articles/cosmos-db/how-to-always-encrypted.md

@@ -149,6 +149,8 @@ Creating a new data encryption key is done by calling the `CreateClientEncryptio
   - The `type` defines the type of key resolver (for example, Azure Key Vault).
   - The `name` can be any friendly name you want.
   - The `value` must be the key identifier.
+  > [!IMPORTANT]
+  > Once the key is created, browse to its current version, and copy its full key identifier: `https://<my-key-vault>.vault.azure.net/keys/<key>/<version>`. If you omit the key version at the end of the key identifier, the latest version of the key is used.
   - The `algorithm` defines which algorithm shall be used to wrap the key encryption key with the customer-managed key.
 
 ```csharp
@@ -173,6 +175,8 @@ Creating a new data encryption key is done by calling the `createClientEncryptio
   - The `type` defines the type of key resolver (for example, Azure Key Vault).
   - The `name` can be any friendly name you want.
   - The `value` must be the key identifier.
+  > [!IMPORTANT]
+  > Once the key is created, browse to its current version, and copy its full key identifier: `https://<my-key-vault>.vault.azure.net/keys/<key>/<version>`. If you omit the key version at the end of the key identifier, the latest version of the key is used.
   - The `algorithm` defines which algorithm shall be used to wrap the key encryption key with the customer-managed key.
 
 ```java

articles/cosmos-db/mongodb/vcore/TOC.yml

@@ -64,6 +64,8 @@
       items:
         - name: Create transactions
           href: how-to-transactions.md
+        - name: Connect using Spark connector from Azure Databricks
+          href: connect-from-databricks.md
     - name: Scale cluster
       href: how-to-scale-cluster.md
     - name: Restore cluster