Skip to content

Commit 40463e1

Browse files
committed
Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into nw-ta-regions-delete
2 parents 816d04f + c33dce1 commit 40463e1

File tree

41 files changed

+93
-483
lines changed

Some content is hidden

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

41 files changed

+93
-483
lines changed

articles/app-service/app-service-sql-asp-github-actions.md

Lines changed: 0 additions & 124 deletions
This file was deleted.

articles/app-service/app-service-sql-github-actions.md

Lines changed: 0 additions & 115 deletions
This file was deleted.

articles/app-service/configure-language-java-deploy-run.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ az webapp config appsettings set --resource-group myResourceGroup --name myApp -
631631
<Valve prefix="site_access_log.${catalina.instance.name}" pattern="%h %l %u %t &quot;%r&quot; %s %b %D %{x-arr-log-id}i" directory="${site.logdir}/http/RawLogs" maxDays="${site.logRetentionDays}" className="org.apache.catalina.valves.AccessLogValve" suffix=".txt"/>
632632
```
633633
* `directory` is set to `AZURE_LOGGING_DIR`, which defaults to `home\logFiles`
634-
* `maxDays` is to `WEBSITE_HTTPLOGGING_RETENTION_DAYS`, which defaults to `0` [forever]
634+
* `maxDays` is to `WEBSITE_HTTPLOGGING_RETENTION_DAYS`, which defaults to `7`. This aligns with the Application Logging platform default
635635

636636
On Linux, it has all of the same customization, plus:
637637

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-linux-azure-portal-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
8484
8585
1. Under **App Service Plan**, select **Create new** App Service Plan. Type *myAppServicePlan* for the name. To change to the Free tier, select **Change size**, select the **Dev/Test** tab, select **F1**, and select the **Apply** button at the bottom of the page.
8686
87-
:::image type="content" source="../../media/quickstart-custom-container/app-service-plan-details-linux.png" alt-text="Screenshot of the Administrator account section where you provide the administrator username and password.":::
87+
:::image type="content" source="../../media/quickstart-custom-container/app-service-plan-details-linux.png" alt-text="Screenshot of the App Service plan options.":::
8888
8989
1. Select the **Next: Docker >** button at the bottom of the page.
9090

articles/app-service/includes/quickstart-custom-container/quickstart-custom-container-windows-azure-portal-pivot.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Sign in to the [Azure portal](https://portal.azure.com).
8585
8686
1. Under **App Service Plan**, select **Create new** App Service Plan. Type *myAppServicePlan* for the name. To change to the Free tier, select **Change size**, select the **Dev/Test** tab, select **P1v3**, and select the **Apply** button at the bottom of the page.
8787
88-
:::image type="content" source="../../media/quickstart-custom-container/app-service-plan-details-windows.png" alt-text="Screenshot of the Administrator account section where you provide the administrator username and password.":::
88+
:::image type="content" source="../../media/quickstart-custom-container/app-service-plan-details-windows.png" alt-text="Screenshot of the App Service plan options.":::
8989
9090
1. Select the **Next: Docker >** button at the bottom of the page.
9191

articles/app-service/includes/quickstart-python/deploy-local-git-azure-portal-1.md

Lines changed: 0 additions & 10 deletions
This file was deleted.

articles/app-service/includes/quickstart-python/deploy-local-git-azure-portal-2.md

Lines changed: 0 additions & 11 deletions
This file was deleted.

articles/app-service/includes/quickstart-python/deploy-local-git-azure-portal-3.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

articles/app-service/includes/quickstart-python/deploy-local-git-azure-portal-4.md

Lines changed: 0 additions & 13 deletions
This file was deleted.

0 commit comments

Comments
 (0)