Resolving merge conflict

Author: RoseHJM

articles/azure-vmware/azure-vmware-solution-known-issues.md

@@ -4,7 +4,7 @@ description: This article provides details about the known issues of Azure VMwar
 ms.topic: reference
 ms.custom: "engagement-fy23"
 ms.service: azure-vmware
-ms.date: 4/15/2025
+ms.date: 4/19/2025
 ---
 
 # Known issues: Azure VMware Solution
@@ -30,7 +30,7 @@ Refer to the table to find details about resolution dates or possible workaround
 | AV36P SKU new private cloud deploys with vSphere 7, not vSphere 8. | September 2024 | AV36P SKU Hotfix deployed, issue resolved. | September 2024 |
 | [VMSA-2024-0011](https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/SecurityAdvisories/0/24308) Out-of-bounds read/write vulnerability (CVE-2024-22273) | June 2024 | Microsoft has confirmed the applicability of the CVE-2024-22273 vulnerability and it will be addressed in ESXi 8.0u2b. | July 2024 - Resolved in [ESXi 8.0 U2b](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/release-notes/esxi-update-and-patch-release-notes/vsphere-esxi-80u2b-release-notes.html) |
 | [VMSA-2024-0013 (CVE-2024-37085)](https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/SecurityAdvisories/0/24505) VMware ESXi Active Directory Integration Authentication Bypass | July 2024 | Azure VMware Solution doesn't provide Active Directory integration and isn't vulnerable to this attack. | N/A |
-| [VMSA-2024-0012](https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/SecurityAdvisories/0/24453) Multiple Vulnerabilities in the DCERPC Protocol and Local Privilege Escalations | June 2024 | Microsoft, working with Broadcom, adjudicated the risk of these vulnerabilities at an adjusted Environmental Score of [6.8](https://www.first.org/cvss/calculator/3.1#CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H/MAC:L/MPR:H/MUI:R) or lower. Adjustments from the base score were possible due to the network isolation of the Azure VMware Solution vCenter Server (ports 2012, 2014, and 2020 aren't exposed via any interactive network path) and multiple levels of authentication and authorization necessary to gain interactive access to the vCenter Server network segment. A plan is being put in place to address these vulnerabilities in the future. | N/A |
+| [VMSA-2024-0012](https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/SecurityAdvisories/0/24453) Multiple Vulnerabilities in the DCERPC Protocol and Local Privilege Escalations | June 2024 | Microsoft, working with Broadcom, adjudicated the risk of these vulnerabilities at an adjusted Environmental Score of [6.8](https://www.first.org/cvss/calculator/3.1#CVSS:3.1/AV:N/AC:L/PR:N/UI:N/S:U/C:H/I:H/A:H/MAC:L/MPR:H/MUI:R) or lower. Adjustments from the base score were possible due to the network isolation of the Azure VMware Solution vCenter Server (ports 2012, 2014, and 2020 aren't exposed via any interactive network path) and multiple levels of authentication and authorization necessary to gain interactive access to the vCenter Server network segment. | November 2024 - Resolved in [vCenter Server 8.0_U2d](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/8-0/release-notes/vcenter-server-update-and-patch-release-notes/vsphere-vcenter-server-80u2d-release-notes.html) |
 | [VMSA-2024-0006](https://support.broadcom.com/web/ecx/support-content-notification/-/external/content/SecurityAdvisories/0/24266) ESXi Use-after-free and Out-of-bounds write vulnerability | March 2024 | For ESXi 7.0, Microsoft worked with Broadcom on an AVS specific hotfix as part of the [ESXi 7.0U3o](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/7-0/release-notes/esxi-update-and-patch-release-notes/vsphere-esxi-70u3o-release-notes.html) rollout. For the 8.0 rollout, Azure VMware Solution is deploying [vCenter Server 8.0 U2b & ESXi 8.0 U2b](architecture-private-clouds.md#vmware-software-versions) which isn't vulnerable. | August 2024 - Resolved in [ESXi 7.0U3o](https://techdocs.broadcom.com/us/en/vmware-cis/vsphere/vsphere/7-0/release-notes/esxi-update-and-patch-release-notes/vsphere-esxi-70u3o-release-notes.html) and [vCenter Server 8.0 U2b & ESXi 8.0 U2b](architecture-private-clouds.md#vmware-software-versions) |
 | VMware HCX version 4.8.0 Network Extension (NE) Appliance VMs running in High Availability (HA) mode may experience intermittent Standby to Active failover. For more information, see [HCX - NE appliances in HA mode experience intermittent failover (96352)](https://knowledge.broadcom.com/external/article?legacyId=96352) | Jan 2024 | Avoid upgrading to VMware HCX 4.8.0 if you're using NE appliances in a HA configuration. | Feb 2024 - Resolved in [VMware HCX 4.8.2](https://techdocs.broadcom.com/us/en/vmware-cis/hcx/vmware-hcx/4-8/hcx-48-release-notes/Chunk371499710.html#Chunk371499710) |
 | When I run the VMware HCX Service Mesh Diagnostic wizard, all diagnostic tests will be passed (green check mark), yet failed probes will be reported. See [HCX - Service Mesh diagnostics test returns 2 failed probes](https://knowledge.broadcom.com/external/article?legacyId=96708) | 2024  | Fixed in 4.9+. | Resolved in [HCX 4.9.2](https://docs.vmware.com/en/VMware-HCX/4.9.2/rn/vmware-hcx-492-release-notes/index.html#What's%20New) |

articles/communication-services/concepts/includes/sms-mobile-numbers.md

@@ -0,0 +1,46 @@
+---
+title: Mobile Numbers SMS pricing Includes file
+description: Include file
+services: azure-communication-services
+author: dbasantes
+manager: sundraman
+
+ms.service: azure-communication-services
+ms.subservice: azure-communication-services
+ms.date: 04/17/2025
+ms.topic: include
+ms.custom: Include file
+ms.author: dbasantes
+---
+
+> [!IMPORTANT]
+>- For billing locations in the US and Puerto Rico – Azure Prepayment (previously called Monetary Commitment) funds and Azure prepaid credits are not eligible for purchasing the products. Additionally, customer spend on the products isn't eligible for Microsoft Azure Consumption Commitment drawdown.
+>
+>
+>- For billing locations outside the US and Puerto Rico Azure Prepayment (previously called Monetary Commitment) funds and Azure prepaid credits aren't eligible for purchasing the products.
+
+Mobile Numbers are long-term leased numbers for A2P SMS messaging within select countries, billed on a pay-as-you-go basis.
+
+##  Mobile Numbers Pricing
+
+### Usage Fee
+SMS offers pay-as-you-go pricing. The price is a per-message segment charge based on the destination of the message. Messages can be sent from a Mobile Number to phone numbers located within the destinations mentioned below. 
+
+The following prices are exclusive of the required communications taxes and fees:
+
+|Country| Send Message | Receive Message |
+|-----------|---------|---------
+|Australia| $0.049 | $0.0075 |
+|Belgium| $0.105 | $0.0075 | 
+|Denmark| $0.0499 | $0.0075 | 
+|Finland| $0.082 | $0.0075 |
+|Ireland | $0.070 |$0.0075 |
+|Latvia | $0.065 |$0.0062 |
+|Netherlands | $0.092 | $0.0075 |
+|Poland| $0.041 | $0.0075 |
+|Sweden | $0.055 | $0.0075 |
+|United Kingdom| $0.04 |$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.
+
+

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

@@ -7,7 +7,7 @@ ms.author: prakulka
 ms.date: 11/30/2021
 ms.topic: conceptual
 ms.service: azure-communication-services
-zone_pivot_groups: acs-tollfree-shortcode-alphanumeric-tendlc
+zone_pivot_groups: acs-tollfree-shortcode-alphanumeric-tendlc-mobile
 ---
 # SMS Pricing 
 
@@ -27,6 +27,10 @@ zone_pivot_groups: acs-tollfree-shortcode-alphanumeric-tendlc
 [!INCLUDE [Alphanumeric Sender ID](./includes/sms-alphanumeric-sender-id-pricing.md)]
 ::: zone-end
 
+::: zone pivot="mobile-number"
+[!INCLUDE [Mobile Numbers](./includes/sms-mobile-numbers.md)]
+::: zone-end
+
 ## Next steps
 
 > [!div class="nextstepaction"]

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

@@ -24,11 +24,11 @@ Brand registration is the process of registering your business as a recognized b
 
 ### How do I complete brand registration with ACS?
 
-To register a brand, you’ll need to provide information such as your business’s name, tax ID, address, industry, and other identifying information. This can be done through the ACS portal by following [this quickstart](../../quickstarts/sms/apply-for-ten-digit-long-code.md).
+To register a brand, you need to provide information such as your business’s name, tax ID, address, industry, and other identifying information. This process can be done through the ACS portal by following [this quickstart](../../quickstarts/sms/apply-for-ten-digit-long-code.md).
 
 ### What types of information are required for brand registration?
 
-You’ll need to provide:
+You need to provide:
 - Legal business name
 - Business address
 - Tax ID or Employer Identification Number (EIN)
@@ -158,33 +158,33 @@ To increase the chances of your messages being delivered, the following list sho
 
 Opt-outs for US toll-free numbers are mandated and enforced by US carriers and cannot be overridden.
 
-- **STOP** - If a text message recipient wishes to opt out, they can send `STOP` to the toll-free number. The carrier sends the following default response for STOP: *"NETWORK MSG: You replied with the word STOP, which blocks all texts sent from this number. Text back UNSTOP to receive messages again."*
+- **STOP**/**QUIT**/**END**/**REVOKE**/**OPT OUT**/**CANCEL**/**UNSUBSCRIBE** - If a text message recipient wishes to opt out, they can send `STOP`,`QUIT`,`END`,`REVOKE`,`OPT OUT`,`CANCEL`, or `UNSUBSCRIBE` to the toll-free number. The carrier sends the following default response for STOP: *"NETWORK MSG: You replied with the word STOP, which blocks all texts sent from this number. Text back UNSTOP to receive messages again."*
 - **START/UNSTOP** - If the recipient wishes to resubscribe to text messages from a toll-free number, they can send `START` or `UNSTOP` to the toll-free number. The carrier sends the following default response for START/UNSTOP: *“NETWORK MSG: You have replied UNSTOP and will begin receiving messages again from this number.”*
-- Azure Communication Services detects `STOP` messages and blocks all further messages to the recipient. The delivery report indicates a failed delivery with status message as “Sender blocked for given recipient.”
-- The `STOP`, `UNSTOP`, and `START` messages are relayed back to you. Azure Communication Services encourages you to monitor and implement these opt-outs to ensure that no further message send attempts are made to recipients who opt out of your communications.
+- Azure Communication Services detects `STOP`,`QUIT`,`END`,`REVOKE`,`OPT OUT`,`CANCEL`, or `UNSUBSCRIBE` messages and blocks all further messages to the recipient. The delivery report indicates a failed delivery with status message as “Sender blocked for given recipient.”
+- The `STOP`,`QUIT`,`END`,`REVOKE`,`OPT OUT`,`CANCEL`,`UNSUBSCRIBE`,`UNSTOP`, and `START` messages are relayed back to you. Azure Communication Services encourages you to monitor and implement these opt-outs to ensure that no further message send attempts are made to recipients who opted out of your communications.
 
 ### How does Azure Communication Services handle opt-outs for short codes?
 
-Azure communication service offers an opt-out management service for short codes that allows customers to configure responses to mandatory keywords STOP/START/HELP. Before provisioning your short code, you're asked for your preference to manage opt-outs. If you opt-in, the opt-out management service automatically uses your responses in the program brief for Opt in/ Opt out/ Help keywords in response to STOP/START/HELP keyword.
+Azure communication service offers an opt-out management service for short codes that allows customers to configure responses to mandatory keywords `STOP`,`QUIT`,`END`,`REVOKE`,`OPT OUT`,`CANCEL`,`UNSUBSCRIBE`,`START`, and `HELP`. Before provisioning your short code, you're asked for your preference to manage opt-outs. If you chose the Azure Communication Services to handle it, the opt-out management service automatically uses your responses in the program brief for Opt in/ Opt out/ Help keywords in response to STOP/START/HELP keyword.
 
 ### How does Azure Communication Services handle opt-outs for short codes in United States?
 
-Azure communication service offers an opt-out management service for short codes in US that allows customers to configure responses to mandatory keywords STOP/START/HELP. Before you provision your short code, you're asked for your preference to manage opt-outs. If you opt in, the opt-out management service automatically uses your responses in the program brief for Opt in/ Opt out/ Help keywords in response to STOP/START/HELP keyword. 
+Azure communication service offers an opt-out management service for short codes in US that allows customers to configure responses to mandatory keywords `STOP`,`QUIT`,`END`,`REVOKE`,`OPT OUT`,`CANCEL`,`UNSUBSCRIBE`,`START`, and `HELP`. Before you provision your short code, you're asked for your preference to manage opt-outs. If you chose the Azure Communication Services to handle it, the opt-out management service automatically uses your responses in the program brief for Opt in/ Opt out/ Help keywords in response to `STOP`,`QUIT`,`END`,`REVOKE`,`OPT OUT`,`CANCEL`,`UNSUBSCRIBE`,`START`, and `HELP` keywords. 
 
 *Example:* 
 - **STOP** - If a text message recipient wishes to opt out, they can send `STOP` to the short code. Azure Communication Services sends your configured response for STOP: *"Contoso Alerts: You opted out and will not receive any more messages."*
-- **START** - If the recipient wishes to resubscribe to text messages from a short code, they can send `START` to the short code. Azure Communication Service sends your configured response for START: *“Contoso Promo Alerts: 3 msgs/week. Message & Data Rates May Apply. Reply HELP for help. Reply STOP to opt-out.”*
+- **START** - If the recipient wishes to resubscribe to text messages from a short code, they can send `START` to the short code. Azure Communication Service sends your configured response for START: *“Contoso Promo Alerts: 3 msgs/week. Message & Data Rates May A'/
 - **HELP** - If the recipient wishes to get help with your service, they can send `HELP` to the short code. Azure Communication Service sends the response you configured in the program brief for HELP: *"Thanks for texting Contoso! Call 1-800-800-8000 for support."*
 
-Azure Communication Services detects `STOP` messages and blocks all further messages to the recipient. The delivery report indicates a failed delivery with status message as “Sender blocked for given recipient.” The `STOP`, `UNSTOP`, and `START` messages are relayed back to you. We encourage you to monitor and implement these *opt-outs* to ensure that no further message send attempts are made to recipients who opt out of your communications.
+Azure Communication Services detects `STOP`,`QUIT`,`END`,`REVOKE`,`OPT OUT`,`CANCEL`, or `UNSUBSCRIBE` messages and blocks all further messages to the recipient. The delivery report indicates a failed delivery with status message as “Sender blocked for given recipient.” The `STOP`,`QUIT`,`END`,`REVOKE`,`OPT OUT`,`CANCEL`,`UNSUBSCRIBE`,`UNSTOP`, and `START` messages are relayed back to you. We encourage you to monitor and implement these *opt-outs* to ensure that no further message send attempts are made to recipients who opt out of your communications.
 
 ### How does Azure Communication Services handle opt outs for alphanumeric sender ID?
 
 Alphanumeric sender ID cannot receive inbound messages or `STOP` messages. Azure Communication Services does not enforce or manage opt-out lists for alphanumeric sender ID. You must provide customers with instructions to opt out using other channels such as, calling support, providing an opt-out link in the message, or emailing support. For more information, see [messaging policy guidelines](./messaging-policy.md#how-we-handle-opt-out-requests-for-sms).
 
 ### How does Azure Communication Services handle opt outs for short codes in Canada and United Kingdom?
 
-Azure Communication Services doesn't control or implement opt-out mechanisms for short codes within Canada and the United Kingdom. Recipients of text messages have the option to text ‘STOP’ to unsubscribe or ‘START’ to subscribe to the short code. These requests are relayed as incoming messages to your event grid. It is your responsibility to act on these messages by resubscribing recipients or ceasing message delivery accordingly.
+Azure Communication Services doesn't control or implement opt-out mechanisms for short codes within Canada and the United Kingdom. Recipients of text messages have the option to text ‘STOP’ to unsubscribe or ‘START’ to subscribe to the short code. These requests are relayed as incoming messages to your Event Grid. It is your responsibility to act on these messages by resubscribing recipients or ceasing message delivery accordingly.
 
 ## Short codes
 

articles/cyclecloud/how-to/mount-disk.md

@@ -37,7 +37,7 @@ By defining volumes with a `mountpoint` attribute, the device names will be auto
   Azure.LUN=0
 ```
 
-In Azure, devices are assigned using [Logical Unit Numbers (LUN)](/powershell/module/servicemanagement/azure.service/add-azuredatadisk)
+In Azure, devices are assigned using [Logical Unit Numbers (LUN)](/powershell/module)
 
 In most cases, Azure CycleCloud will automatically assign devices for you. Specifying devices manually is advanced usage, and useful in cases where the image you are using for your node has volumes that will be automatically attached because their attachment was baked into the image. Specifying the devices by hand can also be useful when the ordering of devices has special meaning.
 

articles/cyclecloud/how-to/run-in-container.md

@@ -69,7 +69,7 @@ az container create \
 
 ## Supported Versions
 
-Supported versions of the CycleCloud Container Image can be found in the product [dockerhub page](https://hub.docker.com/r/microsoft/azure-cyclecloud/). The image can be launched as an Azure Container instance (using existing resource group, location, and preferred container and dns names). CycleCloud has SSL certificate generation included, so if you specify the arguments twice (once for az cli and again to set environment variables), then the container is able to establish valid SSL certificates automatically.
+Supported versions of the CycleCloud Container Image can be found in the product [dockerhub page](https://hub.docker.com/r/microsoft/hpc-azure-cyclecloud). The image can be launched as an Azure Container instance (using existing resource group, location, and preferred container and dns names). CycleCloud has SSL certificate generation included, so if you specify the arguments twice (once for az cli and again to set environment variables), then the container is able to establish valid SSL certificates automatically.
 
 ``` sample
 #!/bin/bash

articles/dev-box/.openpublishing.redirection.dev-box.json

@@ -89,6 +89,11 @@
       "source_path_from_root": "/articles/dev-box/how-to-configure-multiple-monitors.md",
       "redirect_url": "https://aka.ms/dev-box/multiple-monitors",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/dev-box/how-to-write-customization-file.md",
+      "redirect_url": "/azure/dev-box/how-to-write-image-definition-file",
+      "redirect_document_id": false
     }
   ]
 }