Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into appgw-img-scan

Author: greg-lindsay

.openpublishing.redirection.app-service.json

@@ -1322,7 +1322,22 @@
         },
         {
             "source_path_from_root": "/articles/app-service/containers/quickstart-multi-container.md",
-            "redirect_url": "/azure/app-service/quickstart-multi-container",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/containers/tutorial-multi-container-app.md",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/quickstart-multi-container.md",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/app-service/tutorial-multi-container-app.md",
+            "redirect_url": "/azure/app-service/tutorial-custom-container-sidecar",
             "redirect_document_id": false
         },
         {
@@ -1975,11 +1990,6 @@
             "redirect_url": "/azure/app-service/tutorial-java-spring-cosmosdb",
             "redirect_document_id": false
         },
-        {
-            "source_path_from_root": "/articles/app-service/containers/tutorial-multi-container-app.md",
-            "redirect_url": "/azure/app-service/tutorial-multi-container-app",
-            "redirect_document_id": false
-        },
         {
             "source_path_from_root": "/articles/app-service/app-service-web-tutorial-nodejs-mongodb-app.md",
             "redirect_url": "/azure/app-service/tutorial-nodejs-mongodb-app",

.openpublishing.redirection.json

@@ -10,7 +10,7 @@
       "redirect_url": "/previous-versions/azure/azure-app-configuration/rest-api-fiddler",
       "redirect_document_id": false
     },
-    { 
+    {
       "source_path": "articles/kinect-dk/index.yml",
       "redirect_url": "/previous-versions/azure/kinect-dk/index",
       "redirect_document_id": false
@@ -4754,6 +4754,11 @@
       "source_path_from_root": "/articles/virtual-network/virtual-network-service-endpoint-policies-powershell.md",
       "redirect_url": "/azure/virtual-network/virtual-network-service-endpoint-policies",
       "redirect_document_id": false
+    },
+    {
+      "source_path_from_root": "/articles/modeling-simulation-workbench/how-to-guide-manage-storage.md",
+      "redirect_url": "/azure/modeling-simulation-workbench/concept-storage",
+      "redirect_document_id": false
     }
   ]
-}
+}

README.md

@@ -12,7 +12,7 @@ You've decided to contribute. That's great! To contribute to the documentation,
 
 #### GitHub
 
-Contributing to the documentation requires a GitHub account. If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
+Contributing to the documentation requires a [GitHub account](https://github.com/). If you don't have an account, follow the instructions for [GitHub account setup](https://learn.microsoft.com/contribute/get-started-setup-github) from our contributor guide.
 
 #### Tools
 

articles/advisor/advisor-reference-reliability-recommendations.md

@@ -56,7 +56,7 @@ The policy validates the following content in the request or response against th
 | Attribute         | Description                                            | Required | Default |
 | ----------------- | ------------------------------------------------------ | -------- | ------- |
 | unspecified-content-type-action | [Action](#actions) to perform for requests or responses with a content type that isn’t specified in the API schema. Policy expressions are allowed. |  Yes     | N/A   |
-| max-size | Maximum length of the body of the request or response in bytes, checked against the `Content-Length` header. If the request body or response body is compressed, this value is the decompressed length. Maximum allowed value: 102,400 bytes (100 KB). (Contact [support](https://azure.microsoft.com/support/options/) if you need to increase this limit.) Policy expressions are allowed. | Yes       | N/A   |
+| max-size | Maximum length of the body of the request or response in bytes, checked against the `Content-Length` header. If the request body or response body is compressed, this value is the decompressed length. Maximum allowed value: 4 MB. Policy expressions are allowed. | Yes       | N/A   |
 | size-exceeded-action | [Action](#actions) to perform for requests or responses whose body exceeds the size specified in `max-size`. Policy expressions are allowed.|  Yes     | N/A   |
 | errors-variable-name | Name of the variable in `context.Variables` to log validation errors to. Policy expressions aren't allowed. |   No    | N/A   |
 

articles/api-management/validate-content-policy.md

@@ -88,7 +88,7 @@ Manage gateway capacity by manually adding or removing scale units, similar to t
 
 ### Regional availability
 
-Workspace gateways need to be in the same Azure region and subscription as the API Management service. 
+Workspace gateways are currently available in the following regions:
 
 > [!NOTE]
 > These regions are a subset of those where API Management is available.
@@ -107,6 +107,7 @@ Workspace gateways need to be in the same Azure region and subscription as the A
 ### Gateway constraints
 The following constraints currently apply to workspace gateways:
 
+* A workspace gateway needs to be in the same region as the API Management instance's primary Azure region and in the same subscription. 
 * A gateway can be associated only with one workspace
 * A workspace can't be associated with a self-hosted gateway
 * Workspace gateways don't support inbound private endpoints

articles/api-management/workspaces-overview.md

@@ -17,7 +17,7 @@ With [App Service authentication](overview-authentication-authorization.md), the
 
 ## Enabling file-based configuration
 
-1. Create a new JSON file for your configuration at the root of your project (deployed to D:\home\site\wwwroot in your web / function app). Fill in your desired configuration according to the [file-based configuration reference](#configuration-file-reference). If modifying an existing Azure Resource Manager configuration, make sure to translate the properties captured in the `authsettings` collection into your configuration file.
+1. Create a new JSON file for your configuration at the root of your project (deployed to C:\home\site\wwwroot in your web / function app). Fill in your desired configuration according to the [file-based configuration reference](#configuration-file-reference). If modifying an existing Azure Resource Manager configuration, make sure to translate the properties captured in the `authsettings` collection into your configuration file.
 
 2. Modify the existing configuration, which is captured in the [Azure Resource Manager](../azure-resource-manager/management/overview.md) APIs under `Microsoft.Web/sites/<siteName>/config/authsettingsV2`. To modify it, you can use an [Azure Resource Manager template](../azure-resource-manager/templates/overview.md) or a tool like [Azure Resource Explorer](https://resources.azure.com/). Within the authsettingsV2 collection, set two properties (you may remove others):
 

articles/app-service/configure-authentication-file-based.md

@@ -21,7 +21,7 @@ This guide provides key concepts and instructions for containerization of Window
 
 ::: zone pivot="container-linux"
 
-This guide provides key concepts and instructions for containerization of Linux apps in App Service. If are new to Azure App Service, follow the [custom container quickstart](quickstart-custom-container.md) and [tutorial](tutorial-custom-container.md) first. There's also a [multi-container app quickstart](quickstart-multi-container.md) and [tutorial](tutorial-multi-container-app.md). For sidecar containers (preview), see [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md).
+This guide provides key concepts and instructions for containerization of Linux apps in App Service. If are new to Azure App Service, follow the [custom container quickstart](quickstart-custom-container.md) and [tutorial](tutorial-custom-container.md) first. For sidecar containers (preview), see [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md).
 
 ::: zone-end
 
@@ -477,6 +477,9 @@ Further troubleshooting information is available at the Azure App Service blog:
 
 ## Configure multi-container apps
 
+> [!NOTE]
+> Sidecar containers (preview) will succeed multi-container apps in App Service. To get started, see [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md).
+
 - [Use persistent storage in Docker Compose](#use-persistent-storage-in-docker-compose)
 - [Preview limitations](#preview-limitations)
 - [Docker Compose options](#docker-compose-options)
@@ -559,7 +562,7 @@ The following lists show supported and unsupported Docker Compose configuration
 ::: zone pivot="container-linux"
 
 > [!div class="nextstepaction"]
-> [Tutorial: Multi-container WordPress app](tutorial-multi-container-app.md)
+> [Tutorial: Configure a sidecar container for custom container in Azure App Service (preview)](tutorial-custom-container-sidecar.md)
 
 ::: zone-end
 

articles/app-service/configure-custom-container.md

@@ -147,7 +147,7 @@ When you push commits to your App Service repository, App Service deploys the fi
     git push azure main
     ```
 
-    You can also change the `DEPLOYMENT_BRANCH` app setting in the Azure portal, by selecting **Configuration** under **Settings** and adding a new Application Setting with a name of `DEPLOYMENT_BRANCH` and value of `main`.
+    You can also change the `DEPLOYMENT_BRANCH` app setting in the Azure portal, by selecting **Environment variables** under **Settings** and adding a new App setting with a name of `DEPLOYMENT_BRANCH` and value of `main`.
 
 ## Troubleshoot deployment
 

articles/app-service/deploy-local-git.md

@@ -54,7 +54,10 @@ The command also restarts the app. Because `WEBSITE_RUN_FROM_PACKAGE` is set, Ap
 
 ## Run from external URL instead
 
-You can also run a package from an external URL, such as Azure Blob Storage. You can use the [Azure Storage Explorer](../vs-azure-tools-storage-manage-with-storage-explorer.md) to upload package files to your Blob storage account. You should use a private storage container with a [Shared Access Signature (SAS)](../vs-azure-tools-storage-manage-with-storage-explorer.md#generate-a-sas-in-storage-explorer) or [use a managed identity](#access-a-package-in-azure-blob-storage-using-a-managed-identity) to enable the App Service runtime to access the package securely. 
+You can also run a package from an external URL, such as Azure Blob Storage. You can use the [Azure Storage Explorer](../vs-azure-tools-storage-manage-with-storage-explorer.md) to upload package files to your Blob storage account. You should use a private storage container with a [Shared Access Signature (SAS)](../vs-azure-tools-storage-manage-with-storage-explorer.md#generate-a-sas-in-storage-explorer) or [use a managed identity](#access-a-package-in-azure-blob-storage-using-a-managed-identity) to enable the App Service runtime to access the package securely.
+
+> [!NOTE]
+> Currently, an existing App Service resource that runs a local package cannot be migrated to run from a remote package. You will have to create a new App Service resource configured to run from an external URL.
 
 Once you upload your file to Blob storage and have an SAS URL for the file, set the `WEBSITE_RUN_FROM_PACKAGE` app setting to the URL. The following example does it by using Azure CLI: