Merge pull request #206458 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: huypub

articles/azure-resource-manager/templates/child-resource-name-type.md

@@ -92,7 +92,7 @@ The following example shows the child resource outside of the parent resource. Y
 ]
 ```
 
-When defined outside of the parent resource, you format the type and with slashes to include the parent type and name.
+When defined outside of the parent resource, you format the type and name values with slashes to include the parent type and name.
 
 ```json
 "type": "{resource-provider-namespace}/{parent-resource-type}/{child-resource-type}",

articles/virtual-machines/linux/azure-hybrid-benefit-byos-linux.md

@@ -75,9 +75,9 @@ To start using AHB for SLES Virtual Machines:
 
     | License Type  | Software Updates  | Allowed Virtual Machines|  
     |---|---|---|
-    | SLES  | Installs SLES standard repositories into your virtual machine. | SLES BYOS Virtual Machines, SLES custom image Virtual Machines|
-    | SLES_SAP | Installs SLES SAP repositories into your virtual machine. | SLES SAP BYOS Virtual Machines, SLES custom image Virtual Machines|
-    | SLES_HPC  | Installs SLES High Performance Compute related repositories  into your virtual machine. | SLES HPC BYOS Virtual Machines, SLES custom image Virtual Machines|
+    | SLES | Installs SLES repositories into your virtual machine. | SLES BYOS Virtual Machines, SLES custom image Virtual Machines|
+    | SLES_SAP | Installs SLES for SAP repositories into your virtual machine. | SLES for SAP BYOS Virtual Machines, SLES for SAP custom image Virtual Machines|
+    | SLES_HPC | Installs SLE High Performance Computing related repositories into your virtual machine. | SLE HPC BYOS Virtual Machines, SLE HPC custom image Virtual Machines|
 
 1. Wait for 5 minutes for the extension to read the license type value and install the repositories.
 
@@ -137,7 +137,7 @@ You can install the `AHBForRHEL` extension. After successfully installing the ex
 ## How to enable and disable AHB for SLES
 
 You can install the `AHBForSLES` extension. After successfully installing the extension,
-you can use the `az vm update` command to update existing license type on running Virtual Machines. For SLES Virtual Machines, run the command and set `--license-type` parameter to one of the following license types: `SLES_STANDARD`, `SLES_SAP` or `SLES_HPC`.
+you can use the `az vm update` command to update existing license type on running Virtual Machines. For SLES Virtual Machines, run the command and set `--license-type` parameter to one of the following license types: `SLES`, `SLES_SAP` or `SLES_HPC`.
 
 ### How to enable AHB for SLES using a CLI
 1. Install the AHB extension on a Virtual Machine that is up and running, with the portal, or via Azure CLI using the command below:
@@ -147,13 +147,13 @@ you can use the `az vm update` command to update existing license type on runnin
 1. Once, the extension is installed successfully, change the license type based on what you require:
 
     ```azurecli
-    # This will enable AHB to fetch software updates for SLES STANDARD repositories
+    # This will enable AHB to fetch software updates for SLES repositories
     az vm update -g myResourceGroup -n myVmName --license-type SLES
 
-    # This will enable AHB to fetch software updates for SLES SAP repositories
+    # This will enable AHB to fetch software updates for SLES for SAP repositories
     az vm update -g myResourceGroup -n myVmName --license-type SLES_SAP
 
-    # This will enable AHB to fetch software updates for SLES HPC repositories
+    # This will enable AHB to fetch software updates for SLE HPC repositories
     az vm update -g myResourceGroup -n myVmName --license-type SLES_HPC
 
     ```
@@ -208,9 +208,9 @@ A: On using AHB for BYOS Virtual Machines, you'll essentially convert bring-your
 | RHEL_BASESAPAPPS | [RHEL for SAP Business Applications](https://azure.microsoft.com/pricing/details/virtual-machines/rhel-sap-business/) |
 | RHEL_BASESAPHA | [RHEL for SAP with HA](https://azure.microsoft.com/pricing/details/virtual-machines/rhel-sap-ha/) |
 | RHEL_EUS | [Red Hat Enterprise Linux](https://azure.microsoft.com/pricing/details/virtual-machines/red-hat/)  |
-| SLES | [SLES Standard](https://azure.microsoft.com/pricing/details/virtual-machines/sles-standard/) |
-| SLES_SAP | [SLES SAP](https://azure.microsoft.com/pricing/details/virtual-machines/sles-sap/)  |
-| SLES_HPC | [SLES HPC](https://azure.microsoft.com/pricing/details/virtual-machines/sles-hpc-standard/) |
+| SLES | [SLES](https://azure.microsoft.com/pricing/details/virtual-machines/sles-standard/) |
+| SLES_SAP | [SLES for SAP](https://azure.microsoft.com/pricing/details/virtual-machines/sles-sap/)  |
+| SLES_HPC | [SLE HPC](https://azure.microsoft.com/pricing/details/virtual-machines/sles-hpc-standard/) |
 
 *Q: Can I use a license type designated for RHEL (such as `RHEL_BASE`) with a SLES image, or vice versa?*
 

articles/virtual-network/virtual-network-scenario-udr-gw-nva.md

@@ -25,7 +25,7 @@ A common scenario among larger Azure customer is the need to provide a two-tiere
 * All traffic going to the application server must go through a firewall virtual appliance. This virtual appliance will be used for access to the backend end server, and access coming in from the on-premises network via a VPN Gateway.
 * Administrators must be able to manage the firewall virtual appliances from their on-premises computers, by using a third firewall virtual appliance used exclusively for management purposes.
 
-This is a standard perimeter network (also knowns as DMZ) scenario with a DMZ and a protected network. Such scenario can be constructed in Azure by using NSGs,firewall virtual appliances, or a combination of both. The table below shows some of the pros and cons between NSGs and firewall virtual appliances.
+This is a standard perimeter network (also knowns as DMZ) scenario with a DMZ and a protected network. Such scenario can be constructed in Azure by using NSGs, firewall virtual appliances, or a combination of both. The table below shows some of the pros and cons between NSGs and firewall virtual appliances.
 
 |  | Pros | Cons |
 | --- | --- | --- |

includes/service-bus-quotas-table.md

@@ -21,18 +21,18 @@ The following table lists quota information specific to Azure Service Bus messag
 | Number of concurrent receive requests on a queue, topic, or subscription entity |Entity | 5,000 |Subsequent receive requests are rejected, and an exception is received by the calling code. This quota applies to the combined number of concurrent receive operations across all subscriptions on a topic. |
 | Number of topics or queues per namespace |Namespace | 10,000 for the Basic or Standard tier. The total number of topics and queues in a namespace must be less than or equal to 10,000. <br/><br/>For the Premium tier, 1,000 per messaging unit (MU). | Subsequent requests for creation of a new topic or queue on the namespace are rejected. As a result, if configured through the [Azure portal][Azure portal], an error message is generated. If called from the management API, an exception is received by the calling code. |
 | Number of [partitioned topics or queues](../articles/service-bus-messaging/service-bus-partitioning.md) per namespace |Namespace | Basic and Standard tiers: 100.<br/><br/>Partitioned entities aren't supported in the [Premium](../articles/service-bus-messaging/service-bus-premium-messaging.md) tier.<br/><br />Each partitioned queue or topic counts toward the quota of 1,000 entities per namespace. | Subsequent requests for creation of a new partitioned topic or queue in the namespace are rejected. As a result, if configured through the [Azure portal][Azure portal], an error message is generated. If called from the management API, the exception **QuotaExceededException** is received by the calling code. <p>If you want to have more partitioned entities in a basic or a standard tier namespace, create additional namespaces. </p>|
-| Maximum size of any messaging entity path: queue or topic |Entity |- |260 characters. |
-| Maximum size of any messaging entity name: namespace, subscription, or subscription rule |Entity |- |50 characters. |
-| Maximum size of a message ID | Entity |- | 128 |
-| Maximum size of a message session ID | Entity |- | 128 |
-| Message size for a queue, topic, or subscription entity |Entity |Incoming messages that exceed these quotas are rejected, and an exception is received by the calling code. | 256 KB for [Standard tier](../articles/service-bus-messaging/service-bus-premium-messaging.md)<br/> 100 MB for [Premium tier](../articles/service-bus-messaging/service-bus-premium-messaging.md). <br /><br />The message size includes the size of properties (system and user) and the size of payload. The size of system properties varies depending on your scenario. |
-| Message property size for a queue, topic, or subscription entity |Entity | The exception `SerializationException` is generated. | <p>Maximum message property size for each property is 32 KB.</p><p>Cumulative size of all properties can't exceed 64 KB. This limit applies to the entire header of the brokered message, which has both user properties and system properties, such as sequence number, label, and message ID.</p><p>Maximum number of header properties in property bag: **byte/int.MaxValue**.</p> |
-| Number of subscriptions per topic |Entity |Subsequent requests for creating additional subscriptions for the topic are rejected. As a result, if configured through the portal, an error message is shown. If called from the management API, an exception is received by the calling code. |2,000 per-topic for the Standard tier and Premium tier. |
-| Number of SQL filters per topic |Entity |Subsequent requests for creation of additional filters on the topic are rejected, and an exception is received by the calling code. |2,000 |
-| Number of correlation filters per topic |Entity |Subsequent requests for creation of additional filters on the topic are rejected, and an exception is received by the calling code. |100,000 |
-| Size of SQL filters or actions |Namespace |Subsequent requests for creation of additional filters are rejected, and an exception is received by the calling code. |Maximum length of filter condition string: 1,024 (1 K).<br /><br />Maximum length of rule action string: 1,024 (1 K).<br /><br />Maximum number of expressions per rule action: 32. |
-| Number of shared access authorization rules per namespace, queue, or topic |Entity, namespace |Subsequent requests for creation of additional rules are rejected, and an exception is received by the calling code. |Maximum number of rules per entity type: 12. <br /><br /> Rules that are configured on a Service Bus namespace apply to all types: queues, topics. |
-| Number of messages per transaction | Transaction | Additional incoming messages are rejected, and an exception stating "Can't send more than 100 messages in a single transaction" is received by the calling code. | 100 <br /><br /> For both **Send()** and **SendAsync()** operations. |
-| Number of virtual network and IP filter rules | Namespace | &nbsp; | 128 |
+| Maximum size of any messaging entity path: queue or topic |Entity | 260 characters. | &nbsp; |
+| Maximum size of any messaging entity name: namespace, subscription, or subscription rule |Entity | 50 characters. | &nbsp; |
+| Maximum size of a message ID | Entity | 128 | &nbsp; |
+| Maximum size of a message session ID | Entity | 128 | &nbsp; |
+| Message size for a queue, topic, or subscription entity | Entity | 256 KB for [Standard tier](../articles/service-bus-messaging/service-bus-premium-messaging.md)<br/> 100 MB for [Premium tier](../articles/service-bus-messaging/service-bus-premium-messaging.md). <br /><br />The message size includes the size of properties (system and user) and the size of payload. The size of system properties varies depending on your scenario.  |Incoming messages that exceed these quotas are rejected, and an exception is received by the calling code. | 
+| Message property size for a queue, topic, or subscription entity |Entity | <p>Maximum message property size for each property is 32 KB.</p><p>Cumulative size of all properties can't exceed 64 KB. This limit applies to the entire header of the brokered message, which has both user properties and system properties, such as sequence number, label, and message ID.</p><p>Maximum number of header properties in property bag: **byte/int.MaxValue**.</p> | The exception `SerializationException` is generated.| 
+| Number of subscriptions per topic |Entity |2,000 per-topic for the Standard tier and Premium tier. |Subsequent requests for creating additional subscriptions for the topic are rejected. As a result, if configured through the portal, an error message is shown. If called from the management API, an exception is received by the calling code. |
+| Number of SQL filters per topic |Entity |2,000 |Subsequent requests for creation of additional filters on the topic are rejected, and an exception is received by the calling code. |
+| Number of correlation filters per topic	|Entity | 100,000 |	Subsequent requests for creation of additional filters on the topic are rejected, and an exception is received by the calling code.	 |
+| Size of SQL filters or actions |Namespace |Maximum length of filter condition string: 1,024 (1 K).<br /><br />Maximum length of rule action string: 1,024 (1 K).<br /><br />Maximum number of expressions per rule action: 32. |Subsequent requests for creation of additional filters are rejected, and an exception is received by the calling code. |
+| Number of shared access authorization rules per namespace, queue, or topic |Entity, namespace |Maximum number of rules per entity type: 12. <br /><br /> Rules that are configured on a Service Bus namespace apply to all types: queues, topics. |Subsequent requests for creation of additional rules are rejected, and an exception is received by the calling code. |
+| Number of messages per transaction | Transaction | 100 <br /><br /> For both **Send()** and **SendAsync()** operations. | Additional incoming messages are rejected, and an exception stating "Can't send more than 100 messages in a single transaction" is received by the calling code. |
+| Number of virtual network and IP filter rules | Namespace |  128 |&nbsp; |
 
 [Azure portal]: https://portal.azure.com