Merge pull request #295696 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/app-service/app-service-undelete.md

@@ -7,10 +7,25 @@ ms.date: 10/4/2023
 ms.topic: article 
 ms.custom: devx-track-azurepowershell
 ---
+# Restore deleted App Service app
 
-# Restore Deleted App Service App Using PowerShell
+If you happened to accidentally delete your app in Azure App Service, you can now restore it by using the Azure portal or PowerShell.
 
-If you happened to accidentally delete your app in Azure App Service, you can restore it using the commands from the [Az PowerShell module](/powershell/azure/).
+## Restore deleted App Service app by using the portal
+
+If you deleted your app in Azure App Service, you can now restore it from the portal by using following steps:
+
+1. Navigate to App Services in the portal.
+1. Click on **Manage Deleted Apps**.
+1. Select **Subscription**.
+1. From the dropdown, select the deleted app. Apps deleted in last 30 days will show up in the drop down list.
+1. Select destination app from the dropdown where you want to restore your app. 
+1. If you would like to restore the deleted app to a slot of destination app, check the slot checkbox and select available slots from the dropdown.
+1. By default only app content is restored. If you want app configuration also to be restored, check **Restore App configuration**.
+
+## Restore deleted App Service app by using PowerShell
+
+If you deleted your app in Azure App Service, you can restore it using the commands from the [Az PowerShell module](/powershell/azure/).
 
 > [!NOTE]
 > - Deleted apps are purged from the system 30 days after the initial deletion. After an app is purged, it can't be recovered.

articles/azure-signalr/signalr-howto-troubleshoot-guide.md

@@ -119,7 +119,7 @@ Check if your client request has multiple `hub` query strings. The `hub` is pres
 
 ### Root cause
 
-Currently the default value of JWT token's lifetime is one (1) hour.
+Currently the default value of JWT's lifetime is one (1) hour.
 
 For ASP.NET Core SignalR, when it's using WebSocket transport type, it's OK.
 
@@ -129,7 +129,7 @@ For ASP.NET SignalR, the client sends a `/ping` "keep alive" request to the serv
 
 ### Solution
 
-For security concerns, extend TTL isn't encouraged. We suggest adding reconnect logic from the client to restart the connection when such 401 occurs. When the client restarts the connection, it negotiates with app server to get the JWT token again and get a renewed token.
+For security concerns, extend TTL isn't encouraged. We suggest adding reconnect logic from the client to restart the connection when such 401 occurs. When the client restarts the connection, it negotiates with app server to get the JWT again and get a renewed token.
 
 Check [here](#restart_connection) for how to restart client connections.
 

articles/azure-web-pubsub/concept-client-protocols.md

@@ -27,10 +27,10 @@ Here's a general authorization workflow:
 
 1. The client negotiates with your application server. The application server contains the authorization middleware, which handles the client request and signs a JWT for the client to connect to the service.
 1. The application server returns the JWT and the service URL to the client.
-1. The client tries to connect to the Web PubSub service by using the URL and the JWT token returned from the application server.
+1. The client tries to connect to the Web PubSub service by using the URL and the JWT returned from the application server.
 
 ### Supported claims
-You could also configure properties for the client connection when generating the access token by specifying special claims inside the JWT token:
+You could also configure properties for the client connection when generating the access token by specifying special claims inside the JWT:
 
 | Description | Claim type | Claim value | Notes |
 | --- | --- | --- | --- |
@@ -196,9 +196,9 @@ The permission of a client can be granted in several ways:
 
 #### 1. Assign the role to the client when generating the access token
 
-Client can connect to the service using a JWT token. The token payload can carry information such as the `role` of the client. When signing the JWT token to the client, you can grant permissions to the client by giving the client specific roles.
+Client can connect to the service using a JWT. The token payload can carry information such as the `role` of the client. When signing the JWT to the client, you can grant permissions to the client by giving the client specific roles.
 
-For example, let's sign a JWT token that has the permission to send messages to `group1` and `group2`: 
+For example, let's sign a JWT that has the permission to send messages to `group1` and `group2`: 
 
 ```js
 let token = await serviceClient.getClientAccessToken({

articles/azure-web-pubsub/reference-rest-api-data-plane.md

@@ -28,11 +28,11 @@ In each HTTP request, an authorization header with a [JSON Web Token (JWT)](http
 
 `HS256`, namely HMAC-SHA256, is used as the signing algorithm.
 
-You should use the `AccessKey` in Azure Web PubSub Service instance's connection string to sign the generated JWT token.
+You should use the `AccessKey` in Azure Web PubSub Service instance's connection string to sign the generated JWT.
 
 #### Claims
 
-Below claims are required to be included in the JWT token.
+Below claims are required to be included in the JWT.
 
 | Claim Type | Is Required | Description                                                                                                                                                                                 |
 | ---------- | ----------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
@@ -55,7 +55,7 @@ const bearerToken = jwt.sign({}, connectionString.accessKey, {
 
 Like using `AccessKey`, a [JSON Web Token (JWT)](https://en.wikipedia.org/wiki/JSON_Web_Token) is also required to authenticate the HTTP request.
 
-**The difference is**, in this scenario, JWT Token is generated by Microsoft Entra ID.
+**The difference is**, in this scenario, JWT is generated by Microsoft Entra ID.
 
 [Learn how to generate Microsoft Entra tokens](../active-directory/develop/reference-v2-libraries.md)
 

articles/azure-web-pubsub/tutorial-pub-sub-messages.md

@@ -101,7 +101,7 @@ Clients connect to the Azure Web PubSub service through the standard WebSocket p
 1. First, create a project directory named `subscriber` for this project and install required dependencies:
 
     * The package [Websocket.Client](https://github.com/Marfusios/websocket-client) is a third-party package supporting WebSocket connections. You can use any API/library that supports WebSocket.
-    * The SDK package `Azure.Messaging.WebPubSub` helps to generate the JWT token. 
+    * The SDK package `Azure.Messaging.WebPubSub` helps to generate the JWT. 
 
     ```bash
     mkdir subscriber

articles/event-hubs/event-hubs-features.md

@@ -22,7 +22,7 @@ An Event Hubs namespace is a management container for event hubs (or topics, in
 
 ## Event publishers
 
-Any entity that sends data to an event hub is an *event publisher* (synonymously used with *event producer*). Event publishers can publish events using HTTPS or AMQP 1.0 or the Kafka protocol. Event publishers use Microsoft Entra ID based authorization with OAuth2-issued JWT tokens or an Event Hub-specific Shared Access Signature (SAS) token to gain publishing access.
+Any entity that sends data to an event hub is an *event publisher* (synonymously used with *event producer*). Event publishers can publish events using HTTPS or AMQP 1.0 or the Kafka protocol. Event publishers use Microsoft Entra ID based authorization with OAuth2-issued JWTs or an Event Hub-specific Shared Access Signature (SAS) token to gain publishing access.
 
 You can publish an event via AMQP 1.0, the Kafka protocol, or HTTPS. The Event Hubs service provides [REST API](/rest/api/eventhub/) and [.NET](event-hubs-dotnet-standard-getstarted-send.md), [Java](event-hubs-java-get-started-send.md), [Python](event-hubs-python-get-started-send.md), [JavaScript](event-hubs-node-get-started-send.md), and [Go](event-hubs-go-get-started-send.md) client libraries for publishing events to an event hub. For other runtimes and platforms, you can use any AMQP 1.0 client, such as [Apache Qpid](https://qpid.apache.org/). 
 

articles/managed-grafana/quickstart-managed-grafana-cli.md

@@ -38,7 +38,10 @@ az login
 
 This command prompts your web browser to launch and load an Azure sign-in page.
 
-The CLI experience for Azure Managed Grafana is part of the `amg` extension for the Azure CLI (version 2.30.0 or higher). The extension automatically installs the first time you run the `az grafana` command.
+The CLI experience for Azure Managed Grafana is part of the `amg` extension for the Azure CLI (version 2.30.0 or higher). The extension automatically installs the first time you run the `az grafana` command. If this doesn't work, run:
+```azurecli
+az extension add --name amg
+```
 
 ## Create a resource group