Merge pull request #269999 from MicrosoftDocs/repo_sync_working_branch

Confirm merge from repo_sync_working_branch to main to sync with https://github.com/MicrosoftDocs/azure-docs (branch main)

Author: Taojunshen

articles/ai-services/openai/concepts/models.md

@@ -73,7 +73,7 @@ The DALL-E models generate images from text prompts that the user provides. DALL
 
 ## Whisper
 
-The Whisper models, can be used for speech to text.
+The Whisper models can be used for speech to text.
 
 You can also use the Whisper model via Azure AI Speech [batch transcription](../../speech-service/batch-transcription-create.md) API. Check out [What is the Whisper model?](../../speech-service/whisper-overview.md) to learn more about when to use Azure AI Speech vs. Azure OpenAI Service.
 
@@ -254,7 +254,7 @@ The following Embeddings models are available with [Azure Government](/azure/azu
 
 ### Assistants (Preview)
 
-For Assistants you need a combination of a supported model, and a supported region. Certain tools and capabilities require the latest models. For example [parallel function](../how-to/assistant-functions.md) calling requires the latest 1106 models.
+For Assistants you need a combination of a supported model and a supported region. Certain tools and capabilities require the latest models. For example, [parallel function calling](../how-to/assistant-functions.md) requires the latest 1106 models.
 
 | Region | `gpt-35-turbo (0613)` | `gpt-35-turbo (1106)` | `gpt-4 (0613)` | `gpt-4 (1106)` | `gpt-4 (0125)` | 
 |-----|---|---|---|---|---|

articles/communication-services/concepts/service-limits.md

@@ -80,17 +80,28 @@ If you have requirements that exceed the rate-limits, submit [a request to Azure
 For more information on the SMS SDK and service, see the [SMS SDK overview](./sms/sdk-features.md) page or the [SMS FAQ](./sms/sms-faq.md) page.
 
 ## Email
-Sending a high volume of messages has a set of limitations on the number of email messages you can send. If you hit these limits, your messages won't be queued to be sent. You can submit these requests again, once the Retry-After time expires.
+There is a limit on the number of email messages you can send. If you exceed the below limits on your subscription, your requests will be rejected. You can attempt these requests again, after the Retry-After time has passed. Please take necessary action and request to raise the sending volume limits if needed.
 
 ### Rate Limits 
 
-|Operation|Scope|Timeframe (minutes)| Limit (number of emails) |
+[Custom Domains](../quickstarts/email/add-custom-verified-domains.md)
+
+| Operation | Scope | Timeframe (minutes) | Limit (number of emails) |
 |---------|-----|-------------|-------------------|
 |Send Email|Per Subscription|1|30|
 |Send Email|Per Subscription|60|100|
 |Get Email Status|Per Subscription|1|60|
 |Get Email Status|Per Subscription|60|200|
 
+[Azure Managed Domains](../quickstarts/email/add-azure-managed-domains.md)
+
+| Operation | Scope | Timeframe (minutes) | Limit (number of emails) |
+|---------|-----|-------------|-------------------|
+|Send Email|Per Subscription|1|5|
+|Send Email|Per Subscription|60|10|
+|Get Email Status|Per Subscription|1|10|
+|Get Email Status|Per Subscription|60|20|
+
 ### Size Limits
 
 | **Name**         | Limit  |
@@ -102,7 +113,7 @@ Sending a high volume of messages has a set of limitations on the number of emai
 This sandbox setup is to help developers start building the application. Once you have established a sender reputation by sending mails, you can request to increase the sending volume limits. Submit a [support request](https://azure.microsoft.com/support/create-ticket/) to raise your desired email sending limit if you require sending a volume of messages exceeding the rate limits. Email quota increase requests are not automatically approved. The reviewing team will consider your overall sender reputation, which includes factors such as your email delivery failure rates, your domain reputation, and reports of spam and abuse when determining approval status.
 
 > [!NOTE]
-> Email quota increase requests may take up to 72 hours to be evaluated and approved, especially for requests that come in on Friday afernoon.
+> Email quota increase requests may take up to 72 hours to be evaluated and approved, especially for requests that come in on Friday afternoon.
 
 ## Chat
 

articles/communication-services/quickstarts/email/add-azure-managed-domains.md

@@ -27,7 +27,7 @@ Before provisioning an Azure Managed Domain, review the following table to deter
 | | [Azure Managed Domains](./add-azure-managed-domains.md) | [Custom Domains](./add-custom-verified-domains.md) | 
 |---|---|---|
 |**Pros:** | - Setup is quick & easy<br/>- No domain verification required<br /> | - Emails are sent from your own domain |
-|**Cons:** | - Sender domain is not personalized and cannot be changed<br/>- High volume sending is limited. <br /> | - Requires verification of domain records <br /> - Longer setup for verification |
+|**Cons:** | - Sender domain is not personalized and cannot be changed<br/>- Sender usernames cannot be personalized<br/>- Very limited sending volume<br />- User Engagement Tracking cannot be enabled <br /> | - Requires verification of domain records <br /> - Longer setup for verification |
 
 
 ## Provision Azure Managed Domain
@@ -59,13 +59,6 @@ Before provisioning an Azure Managed Domain, review the following table to deter
 ## Sender authentication for Azure Managed Domain
 Azure communication Services Email automatically configures the required email authentication protocols to set proper authentication for the email as detailed in [Email Authentication best practices](../../concepts/email/email-authentication-best-practice.md). 
 
-## Changing MailFrom and FROM display name for Azure Managed Domain
-
-You can optionally configure your MailFrom address to be something other than the default DoNotReply, and also add more than one sender username to your domain. To understand how to configure your sender address, see how to [add multiple sender addresses](add-multiple-senders.md).
-
-> [!NOTE]
-> Azure Managed Domains facilitate developers in rapidly initiating application development. Once your application is prepared for deployment, you can seamlessly integrate your custom domain. It's crucial to note that if you continue to rely on Azure Managed Domains, the MailFrom Address displayed in the recipient's mailbox will differ from what you observe in the Portal. This address is dynamically generated, dependent on the data location. As an illustration, if the data location is set to the US, the received email address will transform into 'donotreply@xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx.US1.azurecomm.net'. If you would like to send high volume of messages, you have to switch to custom domain as Azure Managed Domain has the limitations on the number of email messages you can send as defined in the [Email Service Limits](../../concepts/service-limits.md). 
-
 **Your email domain is now ready to send emails.**
 
 ## Next steps

articles/communication-services/quickstarts/email/add-custom-verified-domains.md

@@ -26,7 +26,7 @@ Before provisioning a Custom Domain, review the following table to determine whi
 | | [Azure Managed Domains](./add-azure-managed-domains.md) | [Custom Domains](./add-custom-verified-domains.md) | 
 |---|---|---|
 |**Pros:** | - Setup is quick & easy<br/>- No domain verification required<br /> | - Emails are sent from your own domain |
-|**Cons:** | - Sender domain is not personalized and cannot be changed | - Requires verification of domain records <br /> - Longer setup for verification |
+|**Cons:** | - Sender domain is not personalized and cannot be changed<br/>- Sender usernames cannot be personalized<br/>- Very limited sending volume<br />- User Engagement Tracking cannot be enabled <br /> | - Requires verification of domain records <br /> - Longer setup for verification |
 
 ## Provision custom domain
 To provision a custom domain, you need to:

articles/communication-services/quickstarts/email/enable-user-engagement-tracking.md

@@ -37,6 +37,9 @@ In this quick start, you'll learn about how to enable user engagement tracking f
 **Your email domain is now ready to send emails with user engagement tracking. Please be aware that user engagement tracking is applicable to HTML content and will not function if you submit the payload in plaintext.**
 
 You can now subscribe to Email User Engagement operational logs - provides information related to 'open' and 'click' user engagement metrics for messages sent from the Email service.
+> [!NOTE]
+> User Engagement Tracking cannot be enabled for Azure Managed Domains or Custom Domains with default sending limits. For more information, see [Service limits for Azure Communication Services](../../concepts/service-limits.md#rate-limits).
+
 > [!IMPORTANT]
 > If you plan to enable open/click tracking for your email links, ensure that you are formatting the email content in HTML correctly. Specifically, make sure your tracking content is properly encapsulated within the payload, as demonstrated below:
 ```html

articles/cost-management-billing/savings-plan/buy-savings-plan.md

@@ -61,7 +61,7 @@ After you buy a savings plan, you can [change the savings plan scope](manage-sav
 ### Buy a savings plan in the Azure portal
 
 1. Sign in to the Azure portal.
-2. Select **All services** > **Savings plans**.
+2. In the Search area, enter **Savings plans** and then select **Savings plans**.
 3. Select **Add** to purchase a new savings plan.
 4. Complete all required fields:
     - **Name** – Friendly name for the new savings plan.

articles/security/fundamentals/customer-lockbox-overview.md

@@ -107,7 +107,7 @@ The following steps outline a typical workflow for a Customer Lockbox for Micros
 1. The designated approver reviews the request and selects **Approve** or **Deny**:
     :::image type="content" source="./media/customer-lockbox-overview/customer-lockbox-approval.png" lightbox="./media/customer-lockbox-overview/customer-lockbox-approval.png" alt-text="A screenshot of the Approve or Deny UI.":::
     As a result of the selection:
-    - **Approve**:  Access is granted to the Microsoft engineer for the duration specified in the request details, which is shown in the email notification and in the Azure portal
+    - **Approve**:  Access is granted to the Microsoft engineer for the duration specified in the request details, which is shown in the email notification and in the Azure portal.
     - **Deny**: The elevated access request by the Microsoft engineer is rejected and no further action is taken.
 
     For auditing purposes, the actions taken in this workflow are logged in [Customer Lockbox request logs](#auditing-logs).