Merge branch 'main' of https://github.com/MicrosoftDocs/azure-docs-pr into heidist-fresh

Author: HeidiSteen

.openpublishing.redirection.json

@@ -22251,6 +22251,11 @@
       "redirect_url": "/azure/sql-data-warehouse/create-data-warehouse-portal",
       "redirect_document_id": false
     },
+    {
+      "source_path_from_root": "/articles/virtual-machine-scale-sets/flexible-virtual-machine-scale-sets.md",
+      "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+      "redirect_document_id": false
+    },
     {
       "source_path_from_root": "/articles/sql-data-warehouse/sql-data-warehouse-get-started-provision-powershell.md",
       "redirect_url": "/azure/sql-data-warehouse/create-data-warehouse-powershell",

articles/active-directory/privileged-identity-management/azure-ad-pim-approval-workflow.md

@@ -3,18 +3,17 @@ title: Approve or deny requests for Azure AD roles in PIM - Azure AD | Microsoft
 description: Learn how to approve or deny requests for Azure AD roles in Azure AD Privileged Identity Management (PIM).
 services: active-directory
 documentationcenter: ''
-author: curtand
-manager: karenhoran
+author: amsliu
+manager: rkarlin
 editor: ''
-
 ms.service: active-directory
 ms.subservice: pim
 ms.topic: how-to
 ms.tgt_pltfrm: na
 ms.workload: identity
-ms.date: 06/24/2022
-ms.author: curtand
-ms.reviewer: shaunliu
+ms.date: 07/11/2022
+ms.author: amsliu
+ms.reviewer: japere
 ms.custom: pim
 ms.collection: M365-identity-device-management
 ---
@@ -95,6 +94,9 @@ GET https://graph.microsoft.com/v1.0/roleManagement/directory/roleAssignmentSche
 
 ## Approve requests
 
+>[!NOTE]
+>Approvers are not able to approve their own role activation requests.
+
 1. Find and select the request that you want to approve. An approve or deny page appears.
 
     ![Screenshot that shows the "Approve requests - Azure AD roles" page.](./media/azure-ad-pim-approval-workflow/resources-approve-pane.png)

articles/azure-resource-manager/bicep/deploy-what-if.md

@@ -3,7 +3,7 @@ title: Bicep deployment what-if
 description: Determine what changes will happen to your resources before deploying a Bicep file.
 author: tfitzmac
 ms.topic: conceptual
-ms.date: 09/02/2021
+ms.date: 07/11/2022
 ms.author: tomfitz
 ---
 # Bicep deployment what-if operation
@@ -16,6 +16,8 @@ You can use the what-if operation with Azure PowerShell, Azure CLI, or REST API
 
 If you would rather learn about the what-if operation through step-by-step guidance, see [Preview Azure deployment changes by using what-if](/learn/modules/arm-template-whatif/) on **Microsoft Learn**.
 
+[!INCLUDE [permissions](../../../includes/template-deploy-permissions.md)]
+
 ## Install Azure PowerShell module
 
 To use what-if in PowerShell, you must have version **4.2 or later of the Az module**.

articles/azure-resource-manager/templates/deploy-what-if.md

@@ -3,9 +3,9 @@ title: Template deployment what-if
 description: Determine what changes will happen to your resources before deploying an Azure Resource Manager template.
 author: tfitzmac
 ms.topic: conceptual
-ms.date: 03/09/2021
+ms.date: 07/11/2022
 ms.author: tomfitz
-ms.custom: devx-track-azurepowershell, devx-track-azurecli 
+ms.custom: devx-track-azurepowershell, devx-track-azurecli
 ms.devlang: azurecli
 ---
 # ARM template deployment what-if operation
@@ -18,6 +18,8 @@ You can use the what-if operation with Azure PowerShell, Azure CLI, or REST API
 
 To learn more about what-if, and for hands-on guidance, see [Preview Azure deployment changes by using what-if](/learn/modules/arm-template-whatif) on **Microsoft Learn**.
 
+[!INCLUDE [permissions](../../../includes/template-deploy-permissions.md)]
+
 ## Install Azure PowerShell module
 
 To use what-if in PowerShell, you must have version **4.2 or later of the Az module**.

articles/iot-hub/iot-hub-devguide-file-upload.md

@@ -47,7 +47,9 @@ IoT Hub imposes throttling limits on the number of file uploads that it can init
 
 You must associate an Azure storage account and s blob container with your IoT hub to use file upload features. All file uploads from devices registered with your IoT hub will go to this container. To configure a storage account and blob container on your IoT hub, see [Configure file uploads with Azure portal](iot-hub-configure-file-upload.md), [Configure file uploads with Azure CLI](iot-hub-configure-file-upload-cli.md), or [Configure file uploads with PowerShell](iot-hub-configure-file-upload-powershell.md). You can also use the IoT Hub management APIs to configure file uploads programmatically.
 
-If you use the portal, you can create a storage account and container during configuration. Otherwise, to create a storage account, see [Create a storage account](../storage/common/storage-account-create.md) in the Azure storage documentation. Once you have a storage account, you can see how to create a blob container in the [Azure blob storage quickstarts](../storage/blobs/storage-quickstart-blobs-portal.md).
+If you use the portal, you can create a storage account and container during configuration. Otherwise, to create a storage account, see [Create a storage account](../storage/common/storage-account-create.md) in the Azure storage documentation. Once you have a storage account, you can see how to create a blob container in the [Azure blob storage quickstarts](../storage/blobs/storage-quickstart-blobs-portal.md). By default, Azure IoT Hub uses key-based authentication to connect and authorize with Azure Storage. You can also configure user-assigned or system-assigned managed identities to authenticate Azure IoT Hub with Azure Storage. Managed identities provide Azure services with an automatically managed identity in Azure AD in a secure manner. To learn how to configure managed identities, see [Configure file upload with managed identities](iot-hub-managed-identity.md#configure-file-upload-with-managed-identities).
+
+File upload is subject to [Azure storage's firewall settings](../storage/common/storage-network-security.md). Based on your authentication configuration, you will need to ensure your devices can communicate with Azure storage.
 
 There are several other settings that control the behavior of file uploads and file upload notifications. The following sections list all of the settings available. Depending on whether you use the Azure portal, Azure CLI, PowerShell, or the management APIs to configure file uploads, some of these settings may not be available. Make sure to set the **enableFileUploadNotifications** setting if you want notifications sent to your backend services when a file upload completes.
 

articles/virtual-machine-scale-sets/.openpublishing.redirection.virtual-machine-scale-sets.json

@@ -30,6 +30,16 @@
             "redirect_url": "/azure/virtual-machine-scale-sets/quick-create-cli",
             "redirect_document_id": false
         },
+        {
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-convert-template-to-md.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": true
+          },
+        {
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-vertical-scale-reprovision.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/virtual-machine-scale-sets-autoscale-overview",
+            "redirect_document_id": true
+        },
         {
             "source_path_from_root": "/articles/virtual-machine-scale-sets/virtual-machine-scale-sets-create-portal.md",
             "redirect_url": "/azure/virtual-machine-scale-sets/quick-create-portal",
@@ -184,6 +194,111 @@
             "source_path_from_root": "/articles/virtual-machine-scale-sets/orchestration-modes.md",
             "redirect_url": "/previous-versions/azure/virtual-machine-scale-sets/orchestration-modes",
             "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-cli.md",
+            "redirect_url": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-cli.md",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-migration-resources.md",
+            "redirect_url": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-migration-resources.md",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-portal.md",
+            "redirect_url": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-portal.md",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-powershell.md",
+            "redirect_url": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-powershell.md",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-rest-api.md",
+            "redirect_url": "/articles/virtual-machines/flexible-virtual-machine-scale-sets-rest-api.md",
+            "redirect_document_id": false
+        },
+        {
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/cli-sample-create-scale-set-from-custom-image.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/cli-sample-single-availability-zone-scale-set.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/powershell-sample-create-scale-set-from-custom-image.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/cli-sample-attach-disks.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/powershell-sample-enable-autoscale.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/cli-sample-install-apps.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/powershell-sample-create-simple-scale-set.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/cli-sample-create-simple-scale-set.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/cli-sample-zone-redundant-scale-set.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/powershell-sample-install-apps.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/powershell-sample-attach-disks.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/powershell-sample-zone-redundant-scale-set.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/powershell-single-av-zone-scale-set.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+		{
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/powershell-sample-create-complete-scale-set.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },
+          {
+            "source_path_from_root": "/articles/virtual-machine-scale-sets/scripts/cli-sample-enable-autoscale.md",
+            "redirect_url": "/azure/virtual-machine-scale-sets/overview",
+            "redirect_document_id": false
+          },	  
+        {
+            "source_path_from_root": "/articles/virtual-machines/flexible-virtual-machine-scale-sets.md",
+            "redirect_url": "/articles/virtual-machines/flexible-virtual-machine-scale-sets.md",
+            "redirect_document_id": false
         }                                                                                                                                                             
     ]
 }