Merge pull request #272275 from MicrosoftDocs/main

Publish to live, Tuesday 4 AM PST, 4/16

Author: ttorble

.openpublishing.redirection.json

@@ -1712,12 +1712,22 @@
         },
         {
             "source_path_from_root": "/articles/guides/developer/index.md",
-            "redirect_url": "/azure/guides/developer/azure-developer-guide",
+            "redirect_url": "/azure/developer/",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/guides/developer/azure-developer-guide.md",
+            "redirect_url": "/azure/developer/",
             "redirect_document_id": false
         },
         {
             "source_path_from_root": "/articles/guides/operations/index.md",
-            "redirect_url": "/azure/guides/operations/azure-operations-guide",
+            "redirect_url": "/azure/developer/intro/azure-developer-key-concepts",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/guides/operations/azure-operations-guide.md",
+            "redirect_url": "/azure/developer/intro/azure-developer-key-concepts",
             "redirect_document_id": false
         },
         {

articles/aks/ai-toolchain-operator.md

@@ -196,7 +196,7 @@ The following sections describe how to create an AKS cluster with the AI toolcha
 1. Deploy the Falcon 7B-instruct model from the KAITO model repository using the `kubectl apply` command.
 
     ```azurecli-interactive
-    kubectl apply -f https://raw.githubusercontent.com/Azure/kaito/main/examples/kaito_workspace_falcon_7b-instruct.yaml
+    kubectl apply -f https://raw.githubusercontent.com/Azure/kaito/main/examples/inference/kaito_workspace_falcon_7b-instruct.yaml
     ```
 
 2. Track the live resource changes in your workspace using the `kubectl get` command.

articles/app-service/language-support-policy.md

@@ -140,7 +140,7 @@ Tomcat 8.5 reached [End of Life as of March 31, 2024](https://tomcat.apache.org/
 
 While the runtimes are still available on Azure App Service, Azure won't apply security updates to Tomcat 8.5 or 10.0.
 
-When possible, migrate your applications to Tomcat 9.5 or Tomcat 10.1. Tomcat 9.5 and Tomcat 10.1 are available on Azure App Service. For more information, see the [official Tomcat site](https://tomcat.apache.org/whichversion.html).
+When possible, migrate your applications to Tomcat 9.0 or Tomcat 10.1. Tomcat 9.0 and Tomcat 10.1 are available on Azure App Service. For more information, see the [official Tomcat site](https://tomcat.apache.org/whichversion.html).
 
 Community support for Java 7 ended on July 29, 2022 and [Java 7 was retired from App Service](https://azure.microsoft.com/updates/transition-to-java-11-or-8-by-29-july-2022/). If you have a web app running on Java 7, upgrade to Java 8 or 11 immediately.
 

articles/communication-services/concepts/includes/sms-shortcode-pricing.md

@@ -19,25 +19,30 @@ The Short Code service requires provisioning a short code through the Azure port
 
 ## Short Codes Pricing
 
-### Provisioning Fee
-There are 2 types of fees for short code provisioning.
+### Setup Fee
+When applying for a short code, there are two potential charges to consider:
 
-**Setup fee:**
+- Pre-paid Monthly Fee: This fee covers the period from the day of application until the short code is delivered. Currently, this fee is temporarily waived and will not be charged.
+- Setup Fee: This is a one-time charge applied at the time the short code is delivered.
+
+#### Pre-paid fee
 
 |Country|Fee type   | Description |Fee|
 |---------|-----------|-------------|---|
-|Canada|Setup Fee |Charged at the time the Short Code is delivered |$3000|
-|United States|Setup Fee |Charged at the time the Short Code is delivered |$650|
+|Canada| Short Code Fee |Charged before short code delivery.|$1000/mo|
+|United Kingdom| Short Code Fee |Charged before short code delivery.|$1600/mo|
+|United States|Random Short Code Fee |Charged before short code delivery.|$1000/mo*|
+
+*Extra $500/mo would be charged for Vanity short codes"
+>[!Note] 
+>The pre-paid monthly fee is currently waived and will not be charged. Please be aware that this is a temporary measure and subject to change.
 
-**Short code fee:**
+#### Setup fee
 
 |Country|Fee type   | Description |Fee|
 |---------|-----------|-------------|---|
-|Canada| Short Code Fee |Charged before short code delivery. Waived for a limited period|$1000/mo|
-|United Kingdom| Short Code Fee |Charged before short code delivery. Waived for a limited period|$1600/mo|
-|United States|Random Short Code Fee |Charged before short code delivery. Waived for a limited period|$1000/mo*|
-
-*Extra $500/mo would be charged for Vanity short codes
+|Canada|Setup Fee |Charged at the time the Short Code is delivered |$3000|
+|United States|Setup Fee |Charged at the time the Short Code is delivered |$650|
 
 >[!Note] 
 >Short Codes provisioning typically takes on average 8-12 weeks.
@@ -64,11 +69,10 @@ The following prices are exclusive of the required communications taxes and fees
 |United Kingdom| $0.04 | $0.0075|
 |United States| $0.0075 | $0.0075|
 
-
 *See our guide on [SMS character limits](../sms/sms-faq.md#what-is-the-sms-character-limit) to learn more about message segments.
 
-## Carrier surcharge
-A standard carrier surcharge is applicable to messages exchanged via toll-free numbers. A carrier surcharge is a per-message segment* charge and is subject to change. Carrier surcharge is calculated based on the destination of the message for sent messages and based on the sender of the message for received messages.  See our guide on [Carrier surcharges]
+### Carrier surcharge
+A standard carrier surcharge is applicable to messages exchanged via short-codes. A carrier surcharge is a per-message segment* charge and is subject to change. Carrier surcharge is calculated based on the destination of the message for sent messages and based on the sender of the message for received messages.  See our guide on [Carrier surcharges]
 
 |Country| Send Message | Receive Message|
 |-----------|---------|--------------|

articles/communication-services/concepts/includes/sms-tollfree-pricing.md

@@ -15,7 +15,7 @@ ms.author: prakulka
 >[!Important] 
 >In most cases, customers with Azure subscriptions locations that match the country/region of the Number offer will be able to buy the Number. However, US and Canada numbers may be purchased by customers with Azure subscription locations in other countries/regions. Please see [here](../numbers/sub-eligibility-number-capability.md) for details on in-country and cross-country purchases.
 
-The Toll-free SMS service requires provisioning a toll-free number through the Azure portal. Once a toll-free number is provisioned, pay-as-you-go pricing applies to the leasing fee, and the usage fee. The leasing fee, and the usage fee is determined by the short code type, location of the short code, and the destination.
+The Toll-free SMS service requires provisioning a toll-free number through the Azure portal. Once a toll-free number is provisioned, pay-as-you-go pricing applies to the leasing fee, and the usage fee. The leasing fee, and the usage fee is determined by the location of the toll-free, and the destination.
 
 ## Toll Free Pricing
 

articles/communication-services/concepts/sms/concepts.md

@@ -38,15 +38,15 @@ Key features of Azure Communication Services SMS SDKs include:
 
 Sending SMS to any recipient requires getting a phone number. Choosing the right number type is critical to the success of your messaging campaign. Some factors to consider when choosing a number type include destination(s) of the message, throughput requirement of your messaging campaign, and the timeline when you want to start sending messages. Azure Communication Services enables you to send SMS using a variety of sender types - toll-free number (1-8XX), short codes (12345), and alphanumeric sender ID (CONTOSO). The following table walks you through the features of each number type:
 
-|Factors              | Toll-Free| Short Code | Dynamic Alphanumeric Sender ID| Preregistered Alphanumeric Sender ID|
-|---------------------|----------|------------|-----------------------|-----------------------|
+|Factors              | Toll-Free| Short Code | Dynamic Alphanumeric Sender ID| Preregistered Alphanumeric Sender ID| 
+|---------------------|----------|------------|-----------------------|-----------------------|-----------------------|
 |**Description**|Toll free numbers are telephone numbers with distinct three-digit codes that can be used for business to consumer communication without any charge to the consumer| Short codes are 5-6 digit numbers used for business to consumer messaging such as alerts, notifications, and marketing |  Alphanumeric Sender IDs are displayed as a custom alphanumeric phrase like the company’s name (CONTOSO, MyCompany) on the recipient handset. Alphanumeric sender IDs can be used for a variety of use cases like one-time passcodes, marketing alerts, and flight status notifications. Dynamic alphanumeric sender ID is supported in countries that do not require registration for use.| Alphanumeric Sender IDs are displayed as a custom alphanumeric phrase like the company’s name (CONTOSO, MyCompany) on the recipient handset. Alphanumeric sender IDs can be used for a variety of use cases like one-time passcodes, marketing alerts, and flight status notifications. Pre-registered alphanumeric sender ID is supported in countries that require registration for use. |
 |**Format**|+1 (8XX) XYZ PQRS| 12345  | CONTOSO*       |CONTOSO*       |
 |**SMS support**|Two-way SMS| Two-way SMS  | One-way outbound SMS  |One-way outbound SMS  |
 |**Calling support**|Yes| No | No |No |
-|**Provisioning time**| 5-6 weeks| 6-8 weeks  | Instant       | 4-5 weeks|
+|**Provisioning time**| 5-6 weeks| 6-8 weeks  | Instant       | 4-5 weeks| 
 |**Throughput**       | 200 messages/min (can be increased upon request)| 6000 messages/ min (can be increased upon request) | 600 messages/ min (can be increased upon request)|600 messages/ min (can be increased upon request)|
-|**Supported Destinations**| United States, Canada, Puerto Rico| United States, Canada, United Kingdom   |  Austria, Denmark, Estonia, France, Germany, Ireland, Latvia, Lithuania, Netherlands, Poland, Portugal, Spain, Sweden, Switzerland, United Kingdom| Australia, Czech Republic, Finland, Italy, Norway, Slovakia, Slovenia|
+|**Supported Destinations**| United States, Canada, Puerto Rico| United States, Canada, United Kingdom   |  Austria, Denmark, Estonia, France, Germany, Ireland, Latvia, Lithuania, Netherlands, Poland, Portugal, Spain, Sweden, Switzerland, United Kingdom| Australia, Czech Republic, Finland, Italy, Norway, Slovakia, Slovenia| 
 |**Get started**|[Get a toll-free number](../../quickstarts/telephony/get-phone-number.md)|[Get a short code](../../quickstarts/sms/apply-for-short-code.md) | [Enable dynamic alphanumeric sender ID](../../quickstarts/sms/enable-alphanumeric-sender-id.md#enable-dynamic-alphanumeric-sender-id) |[Enable preregistered alphanumeric sender ID](../../quickstarts/sms/enable-alphanumeric-sender-id.md#enable-preregistered-alphanumeric-sender-id) |
 
 \* See [Alphanumeric sender ID FAQ](./sms-faq.md#alphanumeric-sender-id) for detailed formatting requirements.

articles/cost-management-billing/toc.yml

@@ -249,6 +249,8 @@
       href: ../azure-portal/supportability/how-to-create-azure-support-request.md
     - name: Create EA support request
       href: troubleshoot-billing/how-to-create-azure-support-request-ea.md
+    - name: Can't create VM - Contact reseller
+      href: troubleshoot-billing/cannot-create-vm.md
   - name: Troubleshoot subscriptions
     items:
     - name: No subscriptions found
@@ -261,6 +263,8 @@
       href: troubleshoot-subscription/create-subscriptions-deploy-resources.md
     - name: Not available due to conflict error
       href: troubleshoot-subscription/troubleshoot-not-available-conflict.md
+    - name: Can't sign up for an Azure subscription
+      href: troubleshoot-subscription/cannot-sign-up-subscription.md
 - name: Reference
   items:
   - name: Billing Automation Scenarios

articles/cost-management-billing/troubleshoot-billing/cannot-create-vm.md

@@ -0,0 +1,73 @@
+---
+title: Error when creating a VM as an Azure Enterprise user
+description: Provides several solutions to an issue in which you can't create a VM as an Enterprise Agreement (EA) user in portal.
+ms.topic: troubleshooting
+ms.date: 04/15/2024
+ms.author: banders
+author: bandersmsft
+ms.reviewer: jarrettr
+ms.service: cost-management-billing
+ms.subservice: billing
+---
+# Error when creating a VM as an Azure Enterprise user: Contact your reseller for accurate pricing
+
+This article provides several solutions to an issue in which you can't create a VM as an Azure Enterprise Agreement (EA) user in portal.
+
+_Original product version:_ Billing
+_Original KB number:_ 4091792
+
+## Symptoms
+
+When you create a VM as an EA user in the [Azure portal](https://portal.azure.com/), you receive the following message:
+
+`Retail prices displayed here. Contact your reseller for accurate pricing.`
+
+:::image type="content" source="./media/cannot-create-vm/price-error.png" alt-text="Screenshot of the price error message.":::
+
+## Cause
+
+This issue occurs in one of the following scenarios:
+
+- You're a direct EA user, and **AO view charges** or **DA view charges**  is disabled.
+- You're an indirect EA user who has **release markup** enabled and **AO view charges** or **DA view charges** disabled.
+- You're an indirect EA user who has **release markup** not enabled.
+- You use an EA dev/test subscription under an account that isn't marked as dev/test in the Azure portal.
+
+## Resolution
+
+Follow these steps to resolve the issue based on your scenario.
+
+### Scenario 1
+
+When you're a direct or indirect EA user who has **release markup** enabled and **AO view charges** or **DA view charges** disabled, you can use the following workaround:
+
+1. Sign in to the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_GTM/ModernBillingMenuBlade/AllBillingScopes).
+1. Navigate to **Cost Management + Billing**.
+1. In the left menu, select **Billing scopes** and then select a billing account scope.
+1. In the left navigation menu, select **Policies**.
+1. Enable **Department Admins can view charges** and **Account Owners view charges**.
+
+### Scenario 2
+
+When you're an indirect EA user who has **release markup** disabled, you can contact the reseller for accurate pricing.
+
+### Scenario 3
+
+When you use an EA dev/test subscription under an account that isn't marked as dev/test in the Azure portal, you can use the following workaround:
+
+1. Sign in to the [Azure portal](https://portal.azure.com/#blade/Microsoft_Azure_GTM/ModernBillingMenuBlade/AllBillingScopes).
+1. Navigate to **Cost Management + Billing**.
+1. In the left menu, select **Billing scopes** and then select a billing account scope.
+1. In the left menu, select **Accounts**.
+1. Find the account that has the issue and in the right side of the window, select the ellipsis symbol (**...**) and then select **Edit**.
+1. In the Edit account window, select **Dev/Test** and then select **Save**.
+
+## Next steps
+
+For other assistance, follow these links:
+
+* [How to manage an Azure support request](../../azure-portal/supportability/how-to-manage-azure-support-request.md)
+* [Azure support ticket REST API](/rest/api/support)
+* Engage with us on [Twitter](https://twitter.com/azuresupport)
+* Get help from your peers in the [Microsoft question and answer](/answers/products/azure)
+* Learn more in [Azure Support FAQ](https://azure.microsoft.com/support/faq)

articles/cost-management-billing/troubleshoot-billing/media/cannot-create-vm/price-error.png

@@ -0,0 +1,43 @@
+---
+title: Can't sign up for an Azure subscription
+description: Discusses that you receive an error message when signing up for an Azure subscription.
+ms.topic: troubleshooting
+ms.date: 04/15/2024
+ms.author: banders
+author: bandersmsft
+ms.reviewer: jarrettr
+ms.service: cost-management-billing
+ms.subservice: billing
+---
+
+# Can't sign up for a Microsoft Azure subscription
+
+This article provides a resolution to an issue in which you aren't able to sign up for a Microsoft Azure subscription with error: `Account belongs to a directory that cannot be associated with an Azure subscription. Please sign in with a different account.`
+
+_Original product version:_ Subscription management
+_Original KB number:_ 4052156
+
+## Symptoms
+
+When you try to sign up for a Microsoft Azure subscription, you receive the following error message:
+
+`Account belongs to a directory that cannot be associated with an Azure subscription. Please sign in with a different account.`
+
+## Cause
+
+The email address that is used to sign up for the Azure subscription already exists in an unmanaged Microsoft Entra directory. Unmanaged Microsoft Entra directories can't be associated with an Azure subscription.
+
+## Resolution
+
+To fix the problem, perform an *IT Admin Takeover* process for Power BI and Office 365 on the unmanaged directory.
+
+The process transforms the unmanaged directory into a managed directory by assigning the Global Administrator role to your account. When completed, you can sign up for an Azure subscription by using your email address.
+
+## References
+
+- [How to perform an IT Admin Takeover with Office 365](https://powerbi.microsoft.com/blog/how-to-perform-an-it-admin-takeover-with-o365/)
+- [Take over an unmanaged directory in Microsoft Entra ID](/azure/active-directory/domains-admin-takeover)
+
+## Need help? Contact us.
+
+If you have questions or need help,  [create a support request](https://go.microsoft.com/fwlink/?linkid=2083458).