Merge branch 'main' into release-migrate-new-structure

Author: v-alje

articles/api-management/api-management-howto-api-inspector.md

@@ -97,7 +97,7 @@ Detailed steps follow.
 
     ```json
     {
-        "credentialsExpireAfter": PT1H,
+        "credentialsExpireAfter": "PT1H",
         "apiId": "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ApiManagement/service/{serviceName}/apis/{apiId}",
         "purposes": ["tracing"]
     }

articles/app-service/app-service-undelete.md

@@ -1,145 +1,150 @@
 ---
-title: Restore deleted apps
+title: Restore Deleted Apps
 description: Learn how to restore a deleted app in Azure App Service. Avoid the headache of an accidentally deleted app.
 author: seligj95
 ms.author: jordanselig
 ms.date: 10/4/2023
-ms.topic: article 
+ms.topic: how-to
 ms.custom: devx-track-azurepowershell
 ---
-# Restore deleted App Service app
 
-If you happened to accidentally delete your app in Azure App Service, you can now restore it by using the Azure portal or PowerShell.
+# Restore a deleted App Service app
 
-## Restore deleted App Service app by using the portal
+If you accidentally deleted an app in Azure App Service, you can now restore it by using the Azure portal or PowerShell.
 
-If you deleted your app in Azure App Service, you can now restore it from the portal by using following steps:
+## Restore a deleted App Service app by using the Azure portal
 
-1. Navigate to App Services in the portal.
-1. Click on **Manage Deleted Apps**.
+If you deleted your app in Azure App Service, you can restore it from the portal by following these steps:
+
+1. Go to **App Services** in the Azure portal.
+1. Select **Manage Deleted Apps**.
 1. Select **Subscription**.
-1. From the dropdown, select the deleted app. Apps deleted in last 30 days will show up in the drop down list.
-1. Select destination app from the dropdown where you want to restore your app. 
-1. If you would like to restore the deleted app to a slot of destination app, check the slot checkbox and select available slots from the dropdown.
-1. By default only app content is restored. If you want app configuration also to be restored, check **Restore App configuration**.
+1. From the dropdown list, select the deleted app. Apps that were deleted in the last 30 days appear in the list.
+1. Select the destination app from the dropdown list that correlates to where you want to restore your app.
+1. If you want to restore the deleted app to a slot of the destination app, select the slot checkbox and select available slots from the dropdown list.
+1. By default, only app content is restored. If you want app configuration to also be restored, select **Restore App configuration**.
 
-## Restore deleted App Service app by using PowerShell
+## Restore a deleted App Service app by using PowerShell
 
-If you deleted your app in Azure App Service, you can restore it using the commands from the [Az PowerShell module](/powershell/azure/).
+If you deleted your app in Azure App Service, you can restore it by using the commands from the [`Az PowerShell module`](/powershell/azure/).
 
 > [!NOTE]
-> - Deleted apps are purged from the system 30 days after the initial deletion. After an app is purged, it can't be recovered.
-> - Undelete functionality isn't supported for function apps hosted on the Consumption plan or Elastic Premium plan.
-
+> * Deleted apps are purged from the system 30 days after the initial deletion. After an app is purged, it can't be recovered.
+> * Undelete functionality isn't supported for function apps hosted on the Consumption plan or Elastic Premium plan.
 
 ## Re-register App Service resource provider
 
-Some customers might come across an issue where retrieving the list of deleted apps fails. To resolve the issue, run the following command:
+Some customers might experience failure to retrieve the list of deleted apps. To resolve the issue, run the following command:
 
 ```powershell
  Register-AzResourceProvider -ProviderNamespace "Microsoft.Web"
 ```
 
 ## List deleted apps
 
-To get the collection of deleted apps, you can use `Get-AzDeletedWebApp`.
+To access the collection of deleted apps, you can use `Get-AzDeletedWebApp`.
 
-For details on a specific deleted app you can use:
+To get details on a specific deleted app, you can use:
 
 ```powershell
 Get-AzDeletedWebApp -Name <your_deleted_app> -Location <your_deleted_app_location> 
 ```
 
 The detailed information includes:
 
-- **DeletedSiteId**: Unique identifier for the app, used for scenarios where multiple apps with the same name have been deleted
-- **SubscriptionID**: Subscription containing the deleted resource
-- **Location**: Location of the original app
-- **ResourceGroupName**: Name of the original resource group
-- **Name**: Name of the original app.
-- **Slot**: the name of the slot.
-- **Deletion Time**: When was the app deleted  
+* **DeletedSiteId**: Unique identifier for the app, used for scenarios where multiple apps with the same name were deleted.
+* **SubscriptionID**: Subscription that contains the deleted resource.
+* **Location**: Location of the original app.
+* **ResourceGroupName**: Name of the original resource group.
+* **Name**: Name of the original app.
+* **Slot**: Name of the slot.
+* **Deletion Time**: When the app was deleted.
 
 ## Restore deleted app
 
 >[!NOTE]
->- `Restore-AzDeletedWebApp` isn't supported for function apps hosted on the Consumption plan or Elastic Premium plan.
->- The Restore-AzDeletedWebApp cmdlet restores a deleted web app. The web app specified by TargetResourceGroupName, TargetName, and TargetSlot will be overwritten with the contents and settings of the deleted web app. If the target parameters are not specified, they will automatically be filled with the deleted web app's resource group, name, and slot. If the target web app does not exist, it will automatically be created in the app service plan specified by TargetAppServicePlanName.
->- By default `Restore-AzDeletedWebApp` will restore both your app configuration as well any content. If you want to only restore content, you use the **`-RestoreContentOnly`** flag with this commandlet.
->- Custom domains, bindings, or certs that you import to your app won't be restored. You'll need to re-add them after your app is restored. 
+>
+>* `Restore-AzDeletedWebApp` isn't supported for function apps hosted on the Consumption plan or Elastic Premium plan.
+>* The `Restore-AzDeletedWebApp` cmdlet restores a deleted web app. The web app specified by `TargetResourceGroupName`, `TargetName`, and `TargetSlot` is overwritten with the contents and settings of the deleted web app. If the target parameters aren't specified, they're automatically filled with the deleted web app's resource group, name, and slot. If the target web app doesn't exist, it's automatically created in the App Service plan specified by `TargetAppServicePlanName`.
+>* By default `Restore-AzDeletedWebApp` restores both your app configuration and any content. If you want to only restore content, you use the `-RestoreContentOnly` flag with this cmdlet.
+>* Custom domains, bindings, or certs that you import to your app aren't restored. You need to add them again after your app is restored.
+
+After you identify the app you want to restore, you can restore it by using `Restore-AzDeletedWebApp`, as shown in the following examples.
 
+You can find the full cmdlet reference here: [`Restore-AzDeletedWebApp`](/powershell/module/az.websites/restore-azdeletedwebapp).
 
-After identifying the app you want to restore, you can restore it using `Restore-AzDeletedWebApp`, as shown in the following examples.
->*You can find the full commandlet reference here: **[Restore-AzDeletedWebApp](/powershell/module/az.websites/restore-azdeletedwebapp)*** .
+Restore to the original app name:
 
->Restore to the original app name:
 ```powershell
 Restore-AzDeletedWebApp -TargetResourceGroupName <my_rg> -Name <my_app> -TargetAppServicePlanName <my_asp>
 ```
 
->Restore to a different app name:
+Restore to a different app name:
+
 ```powershell
 Restore-AzDeletedWebApp -ResourceGroupName <original_rg> -Name <original_app> -TargetResourceGroupName <target_rg> -TargetName <target_app> -TargetAppServicePlanName <target_asp>
 ```
 
->Restore a slot to target app:
+Restore a slot to the target app:
+
 ```powershell
 Restore-AzDeletedWebApp -TargetResourceGroupName <my_rg> -Name <my_app> -TargetAppServicePlanName <my_asp> -Slot <original_slot>
 ```
 
 > [!NOTE]
-> Deployment slots are not restored as part of your app. If you need to restore a staging slot, use the `-Slot <slot-name>`  flag.
-> The commandlet is restoring original slot to the target app's production slot.
-> By default `Restore-AzDeletedWebApp` will restore both your app configuration as well any content to target app. If you want to only restore content, you use the `-RestoreContentOnly` flag with this commandlet.
+> Deployment slots aren't restored as part of your app. If you need to restore a staging slot, use the `-Slot <slot-name>` flag.
+> The cmdlet restores the original slot to the target app's production slot.
+> By default, `Restore-AzDeletedWebApp` restores both your app configuration as well any content to the target app. If you want to only restore content, you use the `-RestoreContentOnly` flag with this cmdlet.
+
+Restore only site content to the target app:
 
->Restore only site content to the target app
 ```powershell
 Restore-AzDeletedWebApp -TargetResourceGroupName <my_rg> -Name <my_app> -TargetAppServicePlanName <my_asp> -RestoreContentOnly
 ```
 
->Restore used for scenarios where multiple apps with the same name have been deleted with `-DeletedSiteId`
+Restore in scenarios where multiple apps with the same name were deleted with `-DeletedSiteId`:
+
 ```powershell
 Restore-AzDeletedWebApp -ResourceGroupName <original_rg> -Name <original_app> -DeletedId /subscriptions/aaaa0a0a-bb1b-cc2c-dd3d-eeeeee4e4e4e/providers/Microsoft.Web/locations/location/deletedSites/1234 -TargetAppServicePlanName <my_asp>
 
 ```
 
 The inputs for command are:
 
-- **Target Resource Group**: Target resource group where the app is to be restored
-- **TargetName**: Target app for the deleted app to be restored to
-- **TargetAppServicePlanName**: App Service plan linked to the app
-- **Name**: Name for the app, should be globally unique.
-- **ResourceGroupName**: Original resource group for the deleted app, you can get it from Get-AzDeletedWebApp -Name <your_deleted_app> -Location <your_deleted_app_location> 
-- **Slot**: Slot for the deleted app 
-- **RestoreContentOnly**: By default `Restore-AzDeletedWebApp` restores both your app configuration as well any content. If you want to only restore content, you can use the `-RestoreContentOnly` flag with this commandlet.
+- **Target Resource Group**: Target resource group where the app will be restored.
+- **TargetName**: Target app to which you're restoring the deleted app.
+- **TargetAppServicePlanName**: App Service plan linked to the app.
+- **Name**: Name for the app. We recommend that it's globally unique.
+- **ResourceGroupName**: Original resource group for the deleted app. You can get it from `Get-AzDeletedWebApp -Name <your_deleted_app> -Location <your_deleted_app_location>`.
+- **Slot**: Slot for the deleted app.
+- **RestoreContentOnly**: By default `Restore-AzDeletedWebApp` restores both your app configuration as well any content. If you want to only restore content, you can use the `-RestoreContentOnly` flag with this cmdlet.
 
 > [!NOTE]
 > If the app was hosted on and then deleted from an App Service Environment, it can be restored only if the corresponding App Service Environment still exists.
 
-## Restore deleted function app 
+## Restore deleted Azure Functions app
 
-If the function app was hosted on a **Dedicated app service plan**, it can be restored, as long as it was using the default App Service storage.
+If a function app was hosted on a Dedicated App Service plan, it can be restored, as long as it used the default App Service storage.
 
-1. Fetch the DeletedSiteId of the app version you want to restore, using Get-AzDeletedWebApp cmdlet:
+1. Fetch the `DeletedSiteId` of the app version you want to restore, by using the `Get-AzDeletedWebApp` cmdlet:
 
-```powershell
-Get-AzDeletedWebApp -ResourceGroupName <RGofDeletedApp> -Name <NameofApp> 
-```
-2. Create a new function app in a Dedicated plan. Refer to the instructions for [how to create an app in the portal](../azure-functions/functions-create-function-app-portal.md#create-a-function-app).
-3. Restore to the newly created function app using this cmdlet:
+   ```powershell
+   Get-AzDeletedWebApp -ResourceGroupName <RGofDeletedApp> -Name <NameofApp> 
+   ```
 
-```powershell
-Restore-AzDeletedWebApp -ResourceGroupName <RGofnewapp> -Name <newApp> -deletedId "/subscriptions/xxxx/providers/Microsoft.Web/locations/xxxx/deletedSites/xxxx"
-```
+2. Create a new function app in a Dedicated plan. Refer to the instructions for [how to create an app in the portal](../azure-functions/functions-create-function-app-portal.md#create-a-function-app). Restore to the newly created function app by using this cmdlet:
+
+   ```powershell
+   Restore-AzDeletedWebApp -ResourceGroupName <RGofnewapp> -Name <newApp> -deletedId "/subscriptions/xxxx/providers/Microsoft.Web/locations/xxxx/deletedSites/xxxx"
+   ```
 
-Currently there's no support for Undelete (Restore-AzDeletedWebApp) Function app that's hosted in a Consumption plan or Elastic premium plan since the content resides on Azure Files in a Storage account. If you haven't 'hard' deleted that Azure Files storage account, or if the account exists and file shares haven't been deleted, then you may use the steps as workaround:
- 
+Currently there's no support to use the `Restore-AzDeletedWebApp` cmdlet to undelete a function app hosted in a Consumption plan or Elastic premium plan, because the content resides on Azure Files in a storage account. If you didn't hard delete that Azure Files storage account, or if the account exists and you didn't delete file shares, you can use the following steps as a workaround:
 
 1. Create a new function app in a Consumption or Premium plan. Refer the instructions for [how to create an app in the portal](../azure-functions/functions-create-function-app-portal.md#create-a-function-app).
-2. Set the following [app settings](../azure-functions/functions-how-to-use-azure-function-app-settings.md?tabs=portal#settings) to refer to the old storage account , which contains the content from the previous app.
+1. Set the following [app settings](../azure-functions/functions-how-to-use-azure-function-app-settings.md?tabs=portal#settings) to refer to the old storage account, which contains the content from the previous app.
 
-    | App Setting      | Suggested value  | 
-    | ------------ | ---------------- | 
-    | **AzureWebJobsStorage** | Connection String for the storage account used by the deleted app. | 
-    | **WEBSITE_CONTENTAZUREFILECONNECTIONSTRING** | Connection String for the storage account used by the deleted app. | 
-    | **WEBSITE_CONTENTSHARE** | File share on storage account used by the deleted app. | 
+    | App setting      | Suggested value  |
+    | ------------ | ---------------- |
+    | `AzureWebJobsStorage` | Connection string for the storage account used by the deleted app |
+    | `WEBSITE_CONTENTAZUREFILECONNECTIONSTRING` | Connection string for the storage account used by the deleted app |
+    | `WEBSITE_CONTENTSHARE` | File share on storage account used by the deleted app |