Skip to content

Commit deee95c

Browse files
authored
Merge pull request #294801 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)
2 parents 5930de8 + f3d720c commit deee95c

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

articles/app-service/configure-common.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ Here, you can configure some common settings for the app. Some settings require
443443
> [!NOTE]
444444
> Most modern browsers support HTTP/2 protocol over TLS only, while non-encrypted traffic continues to use HTTP/1.1. To ensure that client browsers connect to your app with HTTP/2, secure your custom DNS name. For more information, see [Secure a custom DNS name with a TLS/SSL binding in Azure App Service](configure-ssl-bindings.md).
445445
- **Web sockets**: For [ASP.NET SignalR] or [socket.io](https://socket.io/), for example.
446-
- **Always On**: Keeps the app loaded even when there's no traffic. When **Always On** isn't turned on (default), the app is unloaded after 20 minutes without any incoming requests. The unloaded app can cause high latency for new requests because of its warm-up time. When **Always On** is turned on, the front-end load balancer sends a GET request to the application root every five minutes. It's important to ensure this request receives a 200 OK response to ensure any re-imaging operations are performed correctly. The continuous ping prevents the app from being unloaded.
446+
- **Always On**: Keeps the app loaded even when there's no traffic. When **Always On** isn't turned on (default), the app is unloaded after 20 minutes without any incoming requests. The unloaded app can cause high latency for new requests because of its warm-up time. When **Always On** is turned on, the front-end load balancer sends a GET request to the application root every five minutes. The continuous ping prevents the app from being unloaded.
447447

448448
Always On is required for continuous WebJobs or for WebJobs that are triggered using a CRON expression.
449449
- **Session affinity**: In a multi-instance deployment, ensure that the client is routed to the same instance for the life of the session. You can set this option to **Off** for stateless applications.

articles/cloud-shell/get-started/classic.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To see all resource providers, and the registration status for your subscription
2020

2121
1. Sign in to the [Azure portal][04].
2222
1. On the Azure portal menu, search for **Subscriptions**. Select it from the available options.
23-
1. On the **Subscriptions** page, select the subscription your subscription.
23+
1. On the **Subscriptions** page, select your subscription.
2424
1. On your subscription page, expand **Settings** in left menu and select **Resource providers**.
2525
1. In the **Filter by name...** box, enter `cloudshell` to search for the resource provider.
2626
1. Select the **Microsoft.CloudShell** resource provider from the provider list.

articles/storage/blobs/secure-file-transfer-protocol-support-authorize-access.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ If you want to authorize access at the file and directory level, you can enable
196196
> [!IMPORTANT]
197197
> The local user must have at least one container permission or ACL permission to the home directory of that container. Otherwise a connection attempt to that container will fail.
198198
199-
2. If you want to authorize access by using the access control lists (ACLs) associated with files and directories in this container, then select the **Allow ACL authorization** checkbox. To learn more about using ACLS to authorize SFTP clients, see [ACLs](secure-file-transfer-protocol-support.md#access-control-lists-acls).
199+
2. If you want to authorize access by using the access control lists (ACLs) associated with files and directories in this container, then select the **Allow ACL authorization** checkbox. To learn more about using ACLs to authorize SFTP clients, see [ACLs](secure-file-transfer-protocol-support.md#access-control-lists-acls).
200200

201201
You can also add this local user to a group by assigning that user to a group ID. That ID can be any number or number scheme that you want. Grouping users allow you to add and remove users without the need to reapply ACLs to an entire directory structure. Instead, you can just add or remove users from the group.
202202

articles/virtual-wan/connect-virtual-network-gateway-vwan.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ In this section, you create a connection between the VPN Gateway local network g
132132
1. On the **Add connection** page, configure the following values for your connection:
133133

134134
* **Name:** Name your connection.
135-
* **Connection type:** Select **Site-to-site(IPSec)**
135+
* **Connection type:** Select **Site-to-site(IPsec)**
136136
* **Virtual network gateway:** The value is fixed because you're connecting from this gateway.
137137
* **Local network gateway:** This connection will connect the virtual network gateway to the local network gateway. Choose one of the local network gateways that you created earlier.
138138
* **Shared Key:** Enter the shared key from earlier.

articles/virtual-wan/monitor-virtual-wan-reference.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ These tables contain more information about some of the metrics in the preceding
5353
| **Tunnel Egress TS Mismatch Packet Drop** | Outgoing packet drop count from traffic selector mismatch of a tunnel.|
5454
| **Tunnel Ingress TS Mismatch Packet Drop** | Incoming packet drop count from traffic selector mismatch of a tunnel.|
5555

56-
#### IPSec metrics
56+
#### IPsec metrics
5757

5858
| Metric | Description |
5959
|:-------|:------------|

includes/azure-stack-edge-iot-troubleshoot-compute-error-detail.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ You can use the create options via the K8s-experimental section. The following s
9494

9595
When configuring the IoT device during setup, you may see the following error:
9696

97-
>*(Http status code: 400) Could not create or update IoT role on \<YourDeviceName>\. An error occurred with the error code {NO_PARAM}. For more information, refer to the error code details (https://aka.ms/dbe-error-codes). If the error persists, contact Microsoft Support*.
97+
>*(HTTP status code: 400) Could not create or update IoT role on \<YourDeviceName>\. An error occurred with the error code {NO_PARAM}. For more information, refer to the error code details (https://aka.ms/dbe-error-codes). If the error persists, contact Microsoft Support*.
9898
9999
#### Suggested solution
100100

0 commit comments

Comments
 (0)