Merge pull request #297505 from MicrosoftDocs/main

Publish to live, Wednesday 4AM PST, 4/2

Author: PMEds28

articles/azure-web-pubsub/reference-client-sdk-python.md

@@ -48,7 +48,7 @@ As shown in the diagram, the client has the permissions to send messages to and
 ```python
 from azure.messaging.webpubsubclient import WebPubSubClient
 
-client = WebPubSubClient("<<client-access-url>>")
+client = WebPubSubClient("<client-access-url>")
 with client:
     # The client can join/leave groups, send/receive messages to and from those groups all in real-time
     ...
@@ -59,11 +59,13 @@ with client:
 A client can only receive messages from groups that it has joined and you need to add a callback to specify the logic when receiving messages.
 
 ```python
+from azure.messaging.webpubsubclient.models import CallbackType
+
 # ...continues the code snippet from above
 
 # Registers a listener for the event 'group-message' early before joining a group to not miss messages
 group_name = "group1";
-client.on("group-message", lambda e: print(f"Received message: {e.data}"));
+client.subscribe(CallbackType.GROUP_MESSAGE, lambda e: print(f"Received message: {e.data}"));
 
 # A client needs to join the group it wishes to receive messages from
 client.join_group(groupName);
@@ -85,31 +87,39 @@ client.send_to_group(group_name, "hello world", "text");
 1. When a client is successfully connected to your Web PubSub resource, the `connected` event is triggered.
 
     ```python
-    client.on("connected", lambda e: print(f"Connection {e.connection_id} is connected"))
+    from azure.messaging.webpubsubclient.models import CallbackType
+
+    client.subscribe(CallbackType.CONNECTED, lambda e: print(f"Connection {e.connection_id} is connected"))
     ```
 
 2. When a client is disconnected and fails to recover the connection, the `disconnected` event is triggered.
 
     ```python
-    client.on("disconnected", lambda e: print(f"Connection disconnected: {e.message}"))
+    from azure.messaging.webpubsubclient.models import CallbackType
+
+    client.subscribe(CallbackType.DISCONNECTED, lambda e: print(f"Connection disconnected: {e.message}"))
     ```
 
 3. The `stopped` event is triggered when the client is disconnected **and** the client stops trying to reconnect. This usually happens after the `client.stop()` is called, or `auto_reconnect` is disabled or a specified limit to trying to reconnect has reached. If you want to restart the client, you can call `client.start()` in the stopped event.
 
     ```python
-    client.on("stopped", lambda : print("Client has stopped"))
+    from azure.messaging.webpubsubclient.models import CallbackType
+
+    client.subscribe(CallbackType.STOPPED, lambda : print("Client has stopped"))
     ```
 
 ### A client consumes messages from the application server or joined groups
 
 A client can add callbacks to consume messages from your application server or groups. Note, for `group-message` event the client can _only_ receive group messages that it has joined.
 
   ```python
+  from azure.messaging.webpubsubclient.models import CallbackType
+
   # Registers a listener for the "server-message". The callback is invoked when your application server sends message to the connectionID, to or broadcast to all connections.
-  client.on("server-message", lambda e: print(f"Received message {e.data}"))
+  client.subscribe(CallbackType.CONNECTED, lambda e: print(f"Received message {e.data}"))
 
   # Registers a listener for the "group-message". The callback is invoked when the client receives a message from the groups it has joined.
-  client.on("group-message", lambda e: print(f"Received message from {e.group}: {e.data}"))
+  client.subscribe(CallbackType.GROUP_MESSAGE, lambda e: print(f"Received message from {e.group}: {e.data}"))
   ```
 ---
 ### Handle rejoin failure
@@ -120,11 +130,13 @@ However, you should be aware of `auto_rejoin_groups`'s limitations.
 - "rejoin group" operations may fail due to various reasons, for example, the client doesn't have permission to join the groups. In such cases, you need to add a callback to handle this failure.
 
 ```python
+from azure.messaging.webpubsubclient.models import CallbackType
+
 # By default auto_rejoin_groups=True. You can disable it by setting to False.
 client = WebPubSubClient("<client-access-url>", auto_rejoin_groups=True);
 
 # Registers a listener to handle "rejoin-group-failed" event
-client.on("rejoin-group-failed", lambda e: print(f"Rejoin group {e.group} failed: {e.error}"))
+client.subscribe(CallbackType.REJOIN_GROUP_FAILED, lambda e: print(f"Rejoin group {e.group} failed: {e.error}"))
 ```
 
 ### Operation and retry
@@ -133,9 +145,9 @@ By default, the operation such as `client.join_group()`, `client.leave_group()`,
 
 ```python
 try:
-  client.join_group(group_name)
+    client.join_group(group_name)
 except SendMessageError as e:
-  client.join_group(group_name, ack_id=e.ack_id)
+    client.join_group(group_name, ack_id=e.ack_id)
 ```
 
 ## Troubleshooting

articles/cost-management-billing/manage/direct-ea-billing-invoice-documents.md

@@ -1,13 +1,13 @@
 ---
 title: Direct EA billing invoice documents
 description: Learn how to understand the invoice files associated with your direct enterprise agreement.
-author: bandersmsft
+author: sahilkhurana
 ms.reviewer: sahilkhurana
 ms.service: cost-management-billing
 ms.subservice: enterprise
 ms.topic: conceptual
-ms.date: 01/22/2025
-ms.author: banders
+ms.date: 04/02/2025
+ms.author: sahilkhurana
 ---
 
 # Direct EA billing invoice documents

articles/cost-management-billing/manage/ea-azure-marketplace.md

@@ -1,13 +1,13 @@
 ---
 title: Azure Marketplace
 description: Describes how EA customers can use Azure Marketplace.
-author: bandersmsft
-ms.reviewer: sapnakeshari
+author: sahilkhurana
+ms.reviewer: sahilkhurana
 ms.service: cost-management-billing
 ms.subservice: enterprise
 ms.topic: conceptual
-ms.date: 01/06/2025
-ms.author: banders
+ms.date: 04/02/2025
+ms.author: sahilkhurana
 ---
 
 # Azure Marketplace

articles/cost-management-billing/manage/ea-billing-administration-partners.md

@@ -3,7 +3,7 @@ title: EA billing administration for partners in the Azure portal
 description: This article explains the common tasks that a partner administrator accomplishes in the Azure portal to manage indirect enterprise agreements.
 author: RaniChegondi
 ms.author: racheg
-ms.date: 01/22/2025
+ms.date: 04/01/2025
 ms.topic: conceptual
 ms.service: cost-management-billing
 ms.subservice: enterprise

articles/cost-management-billing/manage/ea-portal-agreements.md

@@ -3,7 +3,7 @@ title: Azure EA agreements and amendments
 description: The article describes how Azure EA agreements and amendments might affect your access, use, and payments for Azure services.
 author: RaniChegondi
 ms.author: racheg
-ms.date: 01/13/2025
+ms.date: 04/01/2025
 ms.topic: conceptual
 ms.service: cost-management-billing
 ms.subservice: enterprise

articles/cost-management-billing/manage/ea-portal-vm-reservations.md

@@ -1,13 +1,13 @@
 ---
 title: Azure EA VM reserved instances
 description: This article summaries how Azure reservations for VM reserved instances can help you save your money with your enterprise enrollment.
-author: bandersmsft
-ms.author: banders
-ms.date: 01/22/2025
+author: racheg
+ms.author: racheg
+ms.date: 04/02/2025
 ms.topic: conceptual
 ms.service: cost-management-billing
 ms.subservice: enterprise
-ms.reviewer: sapnakeshari
+ms.reviewer: racheg
 ---
 
 # Azure EA VM reserved instances

articles/cost-management-billing/understand/review-enterprise-agreement-bill.md

@@ -1,14 +1,13 @@
 ---
 title: Review your Azure Enterprise Agreement bill
 description: Learn how to read and understand your usage and bill for Azure Enterprise Agreements.
-author: bandersmsft
-ms.reviewer: prsaini
+author: racheg
+ms.reviewer: racheg
 ms.service: cost-management-billing
 ms.subservice: enterprise
 ms.topic: tutorial
-ms.date: 06/28/2024
-ms.author: banders
-
+ms.date: 04/02/2025
+ms.author: racheg
 ---
 # Understand your Azure Enterprise Agreement bill
 

articles/data-factory/connector-mariadb.md

@@ -6,7 +6,7 @@ author: jianleishen
 ms.subservice: data-movement
 ms.custom: synapse
 ms.topic: conceptual
-ms.date: 01/26/2025
+ms.date: 04/02/2025
 ms.author: jianleishen
 ---
 
@@ -86,6 +86,9 @@ If you use version 2.0, the following properties are supported for MariaDB linke
 | useSystemTrustStore | This option specifies whether to use a CA certificate from the system trust store, or from a specified PEM file. E.g. `UseSystemTrustStore=<0/1>`;<br/>Options: Enabled (1) / Disabled (0) **(Default)** | No |
 | connectVia | The [Integration Runtime](concepts-integration-runtime.md) to be used to connect to the data store. Learn more from [Prerequisites](#prerequisites) section. If not specified, it uses the default Azure Integration Runtime. |No |
 
+> [!NOTE]
+> The MariaDB connector version 2.0 defaults to the highest TLS encryption and verification with sslMode=VERIFY_IDENTITY (4). Based on your server’s TLS configuration, please adjust the sslMode as needed.
+
 **Example:**
 
 ```json

articles/data-factory/how-to-expression-language-functions.md

@@ -76,7 +76,7 @@ Dynamic content editor automatically escapes characters in your content when you
 }
 ```
 
-Dynamic content editor converts above content to expression `"{ \n  \"type\": \"@{if(equals(1, 2), 'Blob', 'Table' )}\",\n  \"name\": \"@{toUpper('myData')}\"\n}"`. The result of this expression is a JSON format string showed below.
+Dynamic content editor converts above content to expression `"{ \n  \"type\": \"@{if(equals(1, 2), 'Blob', 'Table' )}\",\n  \"name\": \"@{toUpper('myData')}\"\n}"`. The result of this expression is a JSON format string shown below.
 
 ```json
 {

articles/defender-for-iot/organizations/alert-engine-messages.md

@@ -108,7 +108,6 @@ The policy engine alerts table contains the **Aggregated** item to indicate that
 | **New Activity Detected - EtherNet/IP Protocol Command** | New traffic parameters were detected. This parameter combination isn't authorized as learned traffic on your network. The following combination is unauthorized. | Medium | Unauthorized Communication Behavior | **Tactics:** <br> - Inhibit Response Function <br><br> **Techniques:** <br> - T0836: Modify Parameter | Learnable | Yes |
 | **New Activity Detected - GSM Message Code** | New traffic parameters were detected. This parameter combination isn't authorized as learned traffic on your network. The following combination is unauthorized. | Medium | Unauthorized Communication Behavior | **Tactics:** <br> - CommandAndControl <br><br> **Techniques:** <br> - T0869: Standard Application Layer Protocol | Learnable | Yes |
 | **New Activity Detected - LonTalk Command Codes** | New traffic parameters were detected. This parameter combination isn't authorized as learned traffic on your network. The following combination is unauthorized. | Medium | Unauthorized Communication Behavior | **Tactics:** <br> - Collection <br> - Impair Process Control <br><br> **Techniques:** <br> - T0861 - Point & Tag Identification <br> - T0855: Unauthorized Command Message | Learnable | Yes |
-| **New Port Discovery** | New traffic parameters were detected. This parameter combination isn't authorized as learned traffic on your network. The following combination is unauthorized. | Low | Discovery | **Tactics:** <br> - Lateral Movement <br><br> **Techniques:** <br> - T0867: Lateral Tool Transfer | Learnable| No |
 | **New Activity Detected - LonTalk Network Variable** | New traffic parameters were detected. This parameter combination isn't authorized as learned traffic on your network. The following combination is unauthorized. | Medium | Unauthorized Communication Behavior | **Tactics:** <br> - Impair Process Control <br><br> **Techniques:** <br> - T0855: Unauthorized Command Message | Learnable| Yes |
 | **New Activity Detected - Ovation Data Request** | New traffic parameters were detected. This parameter combination isn't authorized as learned traffic on your network. The following combination is unauthorized. | Medium | Unauthorized Communication Behavior | **Tactics:** <br> - Collection <br> - Discovery <br><br> **Techniques:** <br> - T0801: Monitor Process State <br> - T0888: Remote System Information Discovery | Learnable | Yes |
 | **New Activity Detected - Read/Write Command (AMS Index Group)** | New traffic parameters were detected. This parameter combination isn't authorized as learned traffic on your network. The following combination is unauthorized. | Medium | Configuration Changes | **Tactics:** <br> - Impair Process Control <br> - Inhibit Response Function <br><br> **Techniques:** <br> - T0855: Unauthorized Command Message <br> - T0836: Modify Parameter | Learnable | Yes |