Merge pull request #292331 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/api-management/graphql-api.md

@@ -128,7 +128,7 @@ If your GraphQL  API supports a subscription, you can test it in the test consol
     :::image type="content" source="media/graphql-api/test-graphql-subscription.png" alt-text="Screenshot of a subscription query in the query editor.":::
 1. Review connection details in the **Subscription** pane. 
 
-    :::image type="content" source="media/graphql-api/graphql-websocket-connection.png" alt-text="Screenshot of Websocket connection in the portal.":::
+    :::image type="content" source="media/graphql-api/graphql-websocket-connection.png" alt-text="Screenshot of WebSocket connection in the portal.":::
 
 1. Subscribed events appear in the **Subscription** pane. The WebSocket connection is maintained until you disconnect it or you connect to a new WebSocket subscription.  
 

articles/api-management/websocket-api.md

@@ -21,7 +21,7 @@ You can secure WebSocket APIs by applying existing access control policies, like
 
 In this article, you will:
 > [!div class="checklist"]
-> * Understand Websocket passthrough flow.
+> * Understand WebSocket passthrough flow.
 > * Add a WebSocket API to your API Management instance.
 > * Test your WebSocket API.
 > * View the metrics and logs for your WebSocket API.

articles/app-service/tutorial-java-jboss-mysql-app.md

@@ -20,7 +20,7 @@ This tutorial shows how to build, configure, and deploy a secure JBoss applicati
 In this tutorial, you learn how to:
 
 > [!div class="checklist"]
-> * Create a secure-by-default architecture for Azure App Service and Azure Database for MySQL flexible server.
+> * Create a secure-by-default architecture for Azure App Service and Azure Database for MySQL Flexible Server.
 > * Secure database connectivity using a passwordless connection string.
 > * Verify JBoss data sources in App Service using JBoss CLI.
 > * Deploy a JBoss sample app to App Service from a GitHub repository.
@@ -160,7 +160,7 @@ Sign in to the [Azure portal](https://portal.azure.com/) and follow these steps
         - **App Service plan**: Defines the compute resources for App Service. A Linux plan in the *Basic* tier is created.
         - **App Service**: Represents your app and runs in the App Service plan.
         - **Virtual network**: Integrated with the App Service app and isolates back-end network traffic.
-        - **Azure Database for MySQL flexible server**: Accessible only from the virtual network. A database and a user are created for you on the server.
+        - **Azure Database for MySQL Flexible Server**: Accessible only from the virtual network. A database and a user are created for you on the server.
         - **Private DNS zones**: Enable DNS resolution of the database server in the virtual network.
         - **Private endpoints**: Access endpoints for the database server in the virtual network.
     :::column-end:::
@@ -195,7 +195,7 @@ In this step, you generate a managed identity based service connection, which yo
     :::column span="2":::
         **Step 2: Enable Microsoft Entra authentication in the MySQL server.** 
         1. In the top search bar, type *msdocs-jboss-mysql-server*.
-        1. Select the Azure Database for MySQL flexible server resource called **msdocs-jboss-mysql-server**.
+        1. Select the Azure Database for MySQL Flexible Server resource called **msdocs-jboss-mysql-server**.
         1. From the left menu, select **Security** > **Authentication**.
         1. In **Assign access to**, select **Microsoft Entra authentication only**.
         1. In **User assigned managed identity**, select **Select**.
@@ -205,7 +205,7 @@ In this step, you generate a managed identity based service connection, which yo
         1. Select **Save** and wait for the operation to complete.
     :::column-end:::
     :::column:::
-        :::image type="content" source="./media/tutorial-java-jboss-mysql-app/azure-portal-create-passwordless-connection-2.png" alt-text="A screenshot showing how to configure Microsoft Entra authentication for Azure Database for MySQL flexible server." lightbox="./media/tutorial-java-jboss-mysql-app/azure-portal-create-passwordless-connection-2.png":::
+        :::image type="content" source="./media/tutorial-java-jboss-mysql-app/azure-portal-create-passwordless-connection-2.png" alt-text="A screenshot showing how to configure Microsoft Entra authentication for Azure Database for MySQL Flexible Server." lightbox="./media/tutorial-java-jboss-mysql-app/azure-portal-create-passwordless-connection-2.png":::
     :::column-end:::
 :::row-end:::
 :::row:::
@@ -496,7 +496,7 @@ The dev container already has the [Azure Developer CLI](/azure/developer/azure-d
     - **App Service plan**: Defines the compute resources for App Service. A Linux plan in the *B1* tier is created.
     - **App Service**: Represents your app and runs in the App Service plan.
     - **Virtual network**: Integrated with the App Service app and isolates back-end network traffic.
-    - **Azure Database for MySQL flexible server**: Accessible only from the virtual network. A database is created for you on the server.
+    - **Azure Database for MySQL Flexible Server**: Accessible only from the virtual network. A database is created for you on the server.
     - **Azure Cache for Redis**: Accessible only from within the virtual network.
     - **Private endpoints**: Access endpoints for the key vault and the Redis cache in the virtual network.
     - **Private DNS zones**: Enable DNS resolution of the key vault, the database server, and the Redis cache in the virtual network.

articles/app-service/tutorial-java-tomcat-mysql-app.md

@@ -158,7 +158,7 @@ Sign in to the [Azure portal](https://portal.azure.com/) and follow these steps
         - **App Service plan**: Defines the compute resources for App Service. A Linux plan in the *Basic* tier is created.
         - **App Service**: Represents your app and runs in the App Service plan.
         - **Virtual network**: Integrated with the App Service app and isolates back-end network traffic.
-        - **Azure Database for MySQL flexible server**: Accessible only from the virtual network. A database and a user are created for you on the server.
+        - **Azure Database for MySQL Flexible Server**: Accessible only from the virtual network. A database and a user are created for you on the server.
         - **Private DNS zones**: Enable DNS resolution of the database server in the virtual network.
         <!-- Author note: Azure Database for MySQL's networking is not the same as other databases. It integrates with a private DNS zone, not with a private endpoint. -->
     :::column-end:::
@@ -531,7 +531,7 @@ The dev container already has the [Azure Developer CLI](/azure/developer/azure-d
     - **App Service plan**: Defines the compute resources for App Service. A Linux plan in the *B1* tier is created.
     - **App Service**: Represents your app and runs in the App Service plan.
     - **Virtual network**: Integrated with the App Service app and isolates back-end network traffic.
-    - **Azure Database for MySQL flexible server**: Accessible only from the virtual network through the DNS zone integration. A database is created for you on the server.
+    - **Azure Database for MySQL Flexible Server**: Accessible only from the virtual network through the DNS zone integration. A database is created for you on the server.
     - **Azure Cache for Redis**: Accessible only from within the virtual network.
     - **Private endpoints**: Access endpoints for the key vault and the Redis cache in the virtual network.
     - **Private DNS zones**: Enable DNS resolution of the key vault, the database server, and the Redis cache in the virtual network.

articles/application-gateway/features.md

@@ -94,7 +94,7 @@ The cookie-based session affinity feature is useful when you want to keep a user
 
 For more information, see [How an application gateway works](how-application-gateway-works.md#modifications-to-the-request).
 
-## Websocket and HTTP/2 traffic
+## WebSocket and HTTP/2 traffic
 
 Application Gateway provides native support for the WebSocket and HTTP/2 protocols. There's no user-configurable setting to selectively enable or disable WebSocket support.
 

articles/application-gateway/overview-v2.md

@@ -51,7 +51,7 @@ The following table displays a comparison between Basic and Standard_v2.
 |      Feature             | Capabilities                             | Basic SKU (preview)|   Standard SKU    |
 |     :---:                | :---                                     |     :---:      |     :---:         |
 | Reliability              | SLA                                      | 99.9           | 99.95             |
-| Functionality - basic    | HTTP/HTTP2/HTTPS<br>Websocket<br>Public/Private IP<br>Cookie Affinity<br>Path-based affinity<br>Wildcard<br>Multisite<br>KeyVault<br>Zone<br>Header rewrite | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713; | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;|
+| Functionality - basic    | HTTP/HTTP2/HTTPS<br>WebSocket<br>Public/Private IP<br>Cookie Affinity<br>Path-based affinity<br>Wildcard<br>Multisite<br>KeyVault<br>Zone<br>Header rewrite | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713; | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;|
 | Functionality - advanced | AKS (via AGIC)<br>URL rewrite<br>mTLS<br>Private Link<br>Private-only (preview)<br>TCP/TLS Proxy (preview) |  | &#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713;<br>&#x2713; |
 | Scale                    | Max. connections per second<br>Number of listeners<br>Number of backend pools<br>Number of backend servers per pool<br>Number of rules | 200<sup>1</sup><br>5<br>5<br>5<br>5  | 62500<sup>1</sup><br>100<br>100<br>1200<br>400 |
 | Capacity Unit            | Connections per second per compute unit<br>Throughput<br>Persistent new connections  | 10<br>2.22 Mbps<br>2500 | 50<br>2.22 Mbps<br>2500 |

articles/automation/automation-webhooks.md

@@ -312,7 +312,7 @@ This example uses the PowerShell cmdlet [Invoke-WebRequest](/powershell/module/m
     $body = ConvertTo-Json -InputObject $Names
     ```
 
-1. For larger sets, you may wish to use a file. Create a file named `names.json` and then paste the following code::
+1. For larger sets, you may wish to use a file. Create a file named `names.json` and then paste the following code:
 
     ```json
     [

articles/azure-web-pubsub/concept-service-internals.md

@@ -12,7 +12,7 @@ ms.date: 08/21/2024
 
 Azure Web PubSub Service provides an easy way to publish/subscribe messages using simple [WebSocket](https://tools.ietf.org/html/rfc6455) connections.
 
-- Clients can be written in any language that has Websocket support.
+- Clients can be written in any language that has WebSocket support.
 - Both text and binary messages are supported within one connection.
 - A simple protocol allows clients to publish massages directly to each other.
 - The service manages the WebSocket connections for you.

articles/azure-web-pubsub/howto-develop-reliable-clients.md

@@ -1,16 +1,16 @@
 ---
-title: Create reliable Websocket clients
-description: How to create reliable Websocket clients
+title: Create reliable WebSocket clients
+description: How to create reliable WebSocket clients
 author: chenyl
 ms.author: chenyl
 ms.service: azure-web-pubsub
 ms.topic: reference
 ms.date: 01/12/2023
 ---
 
-# Create reliable Websocket with subprotocol
+# Create reliable WebSocket with subprotocol
 
-When Websocket client connections drop due to intermittent network issues, messages can be lost. In a pub/sub system, publishers are decoupled from subscribers, so publishers may not detect a subscribers' dropped connection or message loss. It's crucial for clients to overcome intermittent network issues and maintain reliable message delivery. To achieve that, you can create a reliable Websocket client with the help of reliable Azure Web PubSub subprotocols.
+When WebSocket client connections drop due to intermittent network issues, messages can be lost. In a pub/sub system, publishers are decoupled from subscribers, so publishers may not detect a subscribers' dropped connection or message loss. It's crucial for clients to overcome intermittent network issues and maintain reliable message delivery. To achieve that, you can create a reliable WebSocket client with the help of reliable Azure Web PubSub subprotocols.
 
 ## Reliable Protocol
 
@@ -26,7 +26,7 @@ The following tutorial walks you through the important part of implementing the
 
 ### Initialization
 
-To use reliable subprotocols, you must set the subprotocol when constructing Websocket connections. In JavaScript, you can use the following code:
+To use reliable subprotocols, you must set the subprotocol when constructing WebSocket connections. In JavaScript, you can use the following code:
 
 - Use Json reliable subprotocol:
 
@@ -50,7 +50,7 @@ To use reliable subprotocols, you must set the subprotocol when constructing Web
 
 Connection recovery is the basis of achieving reliability and must be implemented when using the `json.reliable.webpubsub.azure.v1` and `protobuf.reliable.webpubsub.azure.v1` protocols.
 
-Websocket connections rely on TCP. When the connection doesn't drop, messages are lossless and delivered in order. To prevent message loss over dropped connections, the Web PubSub service retains the connection status information, including group and message information. This information is used to restore the client on connection recovery
+WebSocket connections rely on TCP. When the connection doesn't drop, messages are lossless and delivered in order. To prevent message loss over dropped connections, the Web PubSub service retains the connection status information, including group and message information. This information is used to restore the client on connection recovery
 
 When the client reconnects to the service using reliable subprotocols, the client will receive a `Connected` message containing the `connectionId` and `reconnectionToken`. The `connectionId` identifies the session of the connection in the service.
 
@@ -71,7 +71,7 @@ wss://<service-endpoint>/client/hubs/<hub>?awps_connection_id=<connection_id>&aw
 
 Connection recovery may fail if the network issue hasn't been recovered yet. The client should keep retrying to reconnect until:
 
-1. The Websocket connection is closed with status code 1008. The status code means the connectionId has been removed from the service.
+1. The WebSocket connection is closed with status code 1008. The status code means the connectionId has been removed from the service.
 2. A recovery failure continues to occur for more than 1 minute.
 
 ### Publisher

articles/azure-web-pubsub/index.yml

@@ -102,7 +102,7 @@ landingContent:
             url: concept-performance.md
       - linkListType: how-to-guide
         links:
-          - text: Create reliable Websocket clients
+          - text: Create reliable WebSocket clients
             url: howto-develop-reliable-clients.md
           - text: Troubleshoot with resource logs
             url: howto-troubleshoot-resource-logs.md