Skip to content

Commit 8469bb3

Browse files
committed
Merge remote-tracking branch 'upstream/main' into jac0bsmith_doc_prs
2 parents 97a4cb4 + 124f7c9 commit 8469bb3

File tree

554 files changed

+2562
-2333
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

554 files changed

+2562
-2333
lines changed

.openpublishing.redirection.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2179,11 +2179,6 @@
21792179
"redirect_url": "/azure/devtest-labs/devtest-lab-overview",
21802180
"redirect_document_id": false
21812181
},
2182-
{
2183-
"source_path": "articles/devtest-labs/devtest-lab-trusted-launch.md",
2184-
"redirect_url": "/azure/devtest-labs/devtest-lab-overview",
2185-
"redirect_document_id": false
2186-
},
21872182
{
21882183
"source_path": "articles/devtest-labs/integrate-environments-devops-pipeline.md",
21892184
"redirect_url": "/previous-versions/azure/devtest-labs/integrate-environments-devops-pipeline",
@@ -3879,6 +3874,11 @@
38793874
"redirect_url": "/azure/firewall/ftp-support",
38803875
"redirect_document_id": false
38813876
},
3877+
{
3878+
"source_path_from_root": "/articles/firewall/long-running-sessions.md",
3879+
"redirect_url": "/azure/firewall/tcp-session-behavior",
3880+
"redirect_document_id": false
3881+
},
38823882
{
38833883
"source_path_from_root": "/articles/firewall/diagnostic-logs.md",
38843884
"redirect_url": "/azure/firewall/monitor-firewall",

articles/app-service/includes/configure-azure-storage/azure-storage-linux-container-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ You need to mount the storage to the app. Here are three mounting options for Az
4343
| Mounting option | Usage |
4444
|:----------------|:------|
4545
| Basic | Choose this option to mount storage using the Azure portal. You can use the basic option as long as the storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). In this case, the portal gets and stores the access key for you. |
46-
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
46+
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option if storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
4747
| Key Vault | Also use this option when you plan to mount storage using the Azure CLI, which requires the access key. Choose this option when you use Azure Key Vault to securely store and retrieve access keys. [Azure Key Vault](/azure/key-vault/general/overview) has the benefits of storing application secrets centrally and securely with the ability to monitor, administer, and integrate with other Azure services like Azure App Service. |
4848

4949
## Prerequisites

articles/app-service/includes/configure-azure-storage/azure-storage-windows-code-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Here are the three options to mount Azure storage to your app:
2929
| Mounting option | Usage |
3030
|:----------------|:------|
3131
| Basic | Choose this option when you mount storage by using the Azure portal. You can use the basic option as long as the storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). In this case, the portal gets and stores the access key for you. |
32-
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
32+
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option if storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
3333
| Key Vault | Also use this option when you plan to mount storage using the Azure CLI, which requires the access key. Choose this option when using Azure Key Vault to securely store and retrieve access keys. [Azure Key Vault](/azure/key-vault/general/overview) has the benefits of storing application secrets centrally and securely with the ability to monitor, administer, and integrate with other Azure services like Azure App Service. |
3434

3535
## Prerequisites

articles/app-service/includes/configure-azure-storage/azure-storage-windows-container-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Here are the three options to mount Azure storage to your app:
3030
| Mounting option | Usage |
3131
|:----------------|:------|
3232
| Basic | Choose this option when mounting storage using the Azure portal. You can use the basic option as long as the storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). In this case, the portal gets and stores the access key for you. |
33-
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
33+
| Access Key | If you plan to mount storage using the Azure CLI, you need to obtain an access key. Choose this option if storage account doesn't use [service endpoints](../../../storage/common/storage-network-security.md#grant-access-from-a-virtual-network), [private endpoints](../../../storage/common/storage-private-endpoints.md), or [Azure Key Vault](/azure/key-vault/general/overview). |
3434
| Key Vault | Also use this option when you plan to mount storage using the Azure CLI, which requires the access key. Choose this option when using Azure Key Vault to securely store and retrieve access keys. [Azure Key Vault](/azure/key-vault/general/overview) has the benefits of storing application secrets centrally and securely with the ability to monitor, administer, and integrate with other Azure services like Azure App Service. |
3535

3636
## Prerequisites
-144 KB
Loading
40.7 KB
Loading
-55.3 KB
Loading
29 KB
Loading
170 KB
Loading
175 KB
Loading

0 commit comments

Comments
 (0)