Skip to content

Commit f834118

Browse files
authored
Merge pull request #291628 from MicrosoftDocs/main
12/6/2024 PM Publish
2 parents a25368c + d4c3045 commit f834118

File tree

748 files changed

+3393
-2885
lines changed

Some content is hidden

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

748 files changed

+3393
-2885
lines changed

.openpublishing.redirection.json

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4024,6 +4024,26 @@
40244024
"source_path_from_root": "/articles/managed-grafana/how-to-transition-domain.md",
40254025
"redirect_url": "/azure/managed-grafana/overview",
40264026
"redirect_document_id": false
4027+
},
4028+
{
4029+
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-portal.md",
4030+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4031+
"redirect_document_id": false
4032+
},
4033+
{
4034+
"source_path_from_root": "/articles/load-balancer/move-across-regions-external-load-balancer-powershell.md",
4035+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4036+
"redirect_document_id": false
4037+
},
4038+
{
4039+
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-portal.md",
4040+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4041+
"redirect_document_id": false
4042+
},
4043+
{
4044+
"source_path_from_root": "/articles/load-balancer/move-across-regions-internal-load-balancer-powershell.md",
4045+
"redirect_url": "/azure/load-balancer/move-across-regions-azure-load-balancer",
4046+
"redirect_document_id": false
40274047
}
40284048
]
40294049
}

articles/api-center/index.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ landingContent:
6161
- linkListType: how-to-guide
6262
links:
6363
- text: Analyze APIs using linting rules
64-
url: enable-api-analysis-linting.md
64+
url: enable-managed-api-analysis-linting.md
6565
- linkListType: concept
6666
links:
6767
- text: Use metadata for governance

articles/app-service/configure-ssl-certificate.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -341,6 +341,9 @@ This is only supported for Windows container apps in multi-tenant App Service. I
341341
### Can I load a private CA certificate in my App Service Trusted Root Store?
342342
You can load your own CA certificate into the Trusted Root Store in [App Service Environment version 3](./environment/overview-certificates.md). You can't modify the list of Trusted Root Certificates in App Service (multi-tenant). For more information on App Service multi-tenant vs. single-tenant, see [App Service Environment v3 and App Service public multitenant comparison](./environment/ase-multi-tenant-comparison.md).
343343

344+
### Can App Service Certificate be used for other services?
345+
Yes, certificates purchased via App Service Certificate can be exported and used with Application Gateway or other services. Refer to the following blog article for more information: [Creating a local PFX copy of App Service Certificate](https://azure.github.io/AppService/2017/02/24/Creating-a-local-PFX-copy-of-App-Service-Certificate.html).
346+
344347
## More resources
345348

346349
* [Secure a custom DNS name with a TLS/SSL binding in Azure App Service](configure-ssl-bindings.md)

articles/app-service/environment/auto-migration.md

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ The following errors might be displayed in the portal if you're ineligible for a
7474

7575
## What to do if your App Service Environment is suspended
7676

77-
If your App Service Environment is suspended, you have two options.
77+
If your App Service Environment is suspended, you have three options.
7878

7979
### Unsuspend and self-migrate
8080

@@ -88,6 +88,14 @@ If you want to expedite migration, you can resume/unsuspend your environment as
8888

8989
:::image type="content" source="./media/migration/resume-as-asev3.png" alt-text="Screenshot that shows the button on the Migration page where you can resume as an App Service Environment v3.":::
9090

91+
### Delete your App Service Environment
92+
93+
If you no longer need your App Service Environment, you can delete your environment using the following CLI command. Replace the placeholders for the subscription id, environment name, and resource group with your values for the App Service Environment that you want to delete. The Azure CLI is the only available method for deleting your environment. If you haven't previously used the Azure CLI, [install the Azure CLI](/cli/azure/install-azure-cli) or use [Azure Cloud Shell](https://shell.azure.com/) and use a Bash shell. Deleting your environment will also delete the associated apps and App Service plans. This action is irreversible.
94+
95+
```azurecli
96+
az rest --method delete --url "https://management.azure.com/subscriptions/<SUBSCRIPTION-ID>/resourceGroups/<RESOURCE-GROUP>/providers/Microsoft.Web/hostingEnvironments/<ASE-NAME>?api-version=2020-12-01" --url-parameters forceDelete=true --verbose
97+
```
98+
9199
## Features to limit the effects of auto-migrations
92100

93101
To limit the effect of auto-migrations, we implemented the following features to the auto-migration feature.

articles/app-service/tutorial-python-postgresql-app.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -289,6 +289,22 @@ The creation wizard generated the connectivity variables for you already as [app
289289
:::column:::
290290
:::column-end:::
291291
:::row-end:::
292+
:::row:::
293+
:::column span="2":::
294+
**Step 4:** Back in the **Configuration** page, select **New application setting**. Name the setting `SECRET_KEY`. Paste the value from the previous value. Select **OK**.
295+
:::column-end:::
296+
:::column:::
297+
:::image type="content" source="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting.png" alt-text="A screenshot showing how to set the SECRET_KEY app setting in the Azure portal (Django)." lightbox="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting.png":::
298+
:::column-end:::
299+
:::row-end:::
300+
:::row:::
301+
:::column span="2":::
302+
**Step 5:** Select **Save**.
303+
:::column-end:::
304+
:::column:::
305+
:::image type="content" source="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting-save.png" alt-text="A screenshot showing how to save the SECRET_KEY app setting in the Azure portal (Django)." lightbox="./media/tutorial-python-postgresql-app/azure-portal-app-service-app-setting-save.png":::
306+
:::column-end:::
307+
:::row-end:::
292308

293309
### [Django](#tab/django)
294310

articles/azure-cache-for-redis/cache-how-to-scale.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ For more information on scaling with PowerShell, see [To scale an Azure Cache fo
120120

121121
#### Scale up and down using Azure CLI
122122

123-
To scale your Azure Cache for Redis instances using Azure CLI, call the [az redis update](/cli/azure/redis#az-redis-update) command. Use the `sku.capcity` property to scale within a tier, for example from a Standard C0 to Standard C1 cache:
123+
To scale your Azure Cache for Redis instances using Azure CLI, call the [az redis update](/cli/azure/redis#az-redis-update) command. Use the `sku.capacity` property to scale within a tier, for example from a Standard C0 to Standard C1 cache:
124124

125125
```azurecli
126126
az redis update --cluster-name myCache --resource-group myGroup --set "sku.capacity"="2"

articles/azure-cache-for-redis/cache-how-to-upgrade.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ To defer upgrades to your cache, navigate to the **Advanced Settings** on the Re
8686
8787
## Considerations before upgrading Redis versions
8888

89-
Each new Redis version is intended to be a seamless upgrade from previous versions with backwards-compatibilty as a design principle. However, small changes and bug fixes do occur which can cause application changes. Being conscious of these changes is always a good idea.
89+
Each new Redis version is intended to be a seamless upgrade from previous versions with backwards-compatibility as a design principle. However, small changes and bug fixes do occur which can cause application changes. Being conscious of these changes is always a good idea.
9090

9191
### Client version
9292

articles/azure-cache-for-redis/cache-insights-overview.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Azure Cache for Redis insights are based on the [workbooks feature of Azure Moni
3838
- **Azure Cache For Redis Resource Overview** combines many of the most commonly used metrics so that the health and performance of the cache instance can be viewed at a glance.
3939
:::image type="content" source="media/cache-how-to-monitor/cache-monitoring-resource-overview.png" alt-text="Screenshot of graphs showing a resource overview for the cache.":::
4040

41-
- **Geo-Replication Dashboard** pulls geo-replication health and status metrics from both the geo-primary and geo-secondary cache instances to give a complete picture of geo-replcation health. Using this dashboard is recommended, as some geo-replication metrics are only emitted from either the geo-primary or geo-secondary.
41+
- **Geo-Replication Dashboard** pulls geo-replication health and status metrics from both the geo-primary and geo-secondary cache instances to give a complete picture of geo-replication health. Using this dashboard is recommended, as some geo-replication metrics are only emitted from either the geo-primary or geo-secondary.
4242
:::image type="content" source="media/cache-how-to-monitor/cache-monitoring-geo-dashboard.png" alt-text="Screenshot showing the geo-replication dashboard with a geo-primary and geo-secondary cache set.":::
4343

4444
### Overview

articles/azure-cache-for-redis/cache-monitor-diagnostic-settings.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ az monitor diagnostic-settings create
225225
--event-hub-rule /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/microsoft.eventhub/namespaces/{eventHubNamespace}/authorizationrule/{ruleName}
226226
--storage-account /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{storageAccountName}
227227
--workspace /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{logAnalyticsWorkspaceName}
228-
--marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/proviers/Microsoft.Datadog/monitors/mydatadog
228+
--marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/providers/Microsoft.Datadog/monitors/mydatadog
229229
```
230230

231231
### [Azure CLI with Enterprise and Enterprise Flash tiers](#tab/enterprise-enterprise-flash)
@@ -241,7 +241,7 @@ az monitor diagnostic-settings create
241241
--event-hub-rule /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/microsoft.eventhub/namespaces/{eventHubNamespace}/authorizationrule/{ruleName}
242242
--storage-account /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.Storage/storageAccounts/{storageAccountName}
243243
--workspace /subscriptions/{subscriptionID}/resourceGroups/{resourceGroupName}/providers/Microsoft.OperationalInsights/workspaces/{logAnalyticsWorkspaceName}
244-
--marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/proviers/Microsoft.Datadog/monitors/mydatadog
244+
--marketplace-partner-id/subscriptions/{subscriptionID}/resourceGroups{resourceGroupname}/providers/Microsoft.Datadog/monitors/mydatadog
245245
```
246246

247247
---

articles/azure-cache-for-redis/cache-private-link.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ You can restrict public access to the private endpoint of your cache by disablin
3939
>
4040
4141
> [!IMPORTANT]
42-
> When using private link, you cannot export or import data to a to a storage account that has firewall enabled unless you're using a Premium tier cache with [managed identity to autenticate to the storage account](cache-managed-identity.md).
42+
> When using private link, you cannot export or import data to a to a storage account that has firewall enabled unless you're using a Premium tier cache with [managed identity to authenticate to the storage account](cache-managed-identity.md).
4343
> For more information, see [What if I have firewall enabled on my storage account?](cache-how-to-import-export-data.md#what-if-i-have-firewall-enabled-on-my-storage-account)
4444
>
4545

0 commit comments

Comments
 (0)