Merge branch 'main' into cosmos-nosql-query-geospatial

seesharprun · web-flow · commit 7de6eaab7197 · 2023-07-31T18:11:27.000-04:00
diff --git a/articles/azure-netapp-files/backup-configure-policy-based.md b/articles/azure-netapp-files/backup-configure-policy-based.md
@@ -48,7 +48,7 @@ To enable a policy-based (scheduled) backup:
 
 4. Select **Backup Policies**.
 5. Select **Add**. 
-6. In the **Backup Policy** page, specify the backup policy name.  Enter the number of backups that you want to keep for daily, weekly, and monthly backups. Click **Save**.      
+6. In the **Backup Policy** page, specify the backup policy name.  Enter the number of backups that you want to keep for daily, weekly, and monthly backups. Select **Save**.      
 
     The minimum value for **Daily Backups to Keep** is 2. 
 
@@ -87,7 +87,7 @@ To enable the backup functionality for a volume:
 
     The Vault information is prepopulated.  
 
-  :::image type="content" source="../media/azure-netapp-files/backup-configure-window.png" alt-text="Screenshot showing Configure Backups window." lightbox="../media/azure-netapp-files/backup-configure-window.png":::
+  :::image type="content" source="../media/azure-netapp-files/backup-configure-enabled.png" alt-text="Screenshot showing Configure Backups window." lightbox="../media/azure-netapp-files/backup-configure-enabled.png":::
 
 ## Next steps  
 
diff --git a/articles/azure-netapp-files/backup-disable.md b/articles/azure-netapp-files/backup-disable.md
@@ -34,7 +34,7 @@ If a volume is deleted but the backup policy wasn’t disabled before the volume
 3. Select **Configure**.
 4. In the Configure Backups page, toggle the **Enabled** setting to **Off**. Enter the volume name to confirm, and click **OK**.
 
-    <!-- ![Screenshot that shows the Restore to with Configure Backups window with backup disabled.](../media/azure-netapp-files/backup-configure-backups-disable.png) -->
+    ![Screenshot that shows the Restore to with Configure Backups window with backup disabled.](../media/azure-netapp-files/backup-configure-backups-disable.png)
 
 ## Next steps  
 
diff --git a/articles/azure-netapp-files/backup-introduction.md b/articles/azure-netapp-files/backup-introduction.md
@@ -63,8 +63,6 @@ Backup vaults are organizational units to manage backups. You must create a back
 >[!IMPORTANT]
 >If you have existing backups on Azure NetApp Files, you must migrate the backups to a backup vault before you can perform any operation with the backup. To learn how to migrate, see [Manage backup vaults](backup-vault-manage.md#migrate-backups-to-a-backup-vault).
 
-<!-- You can have multiple backup vaults in an Azure NetApp Files subscription. Most deployments, however, will only require one backup vault. -->
-
 ## Cost model for Azure NetApp Files backup
 
 Pricing for Azure NetApp Files backup is based on the total amount of storage consumed by the backup. There are no setup charges or minimum usage fees. 
diff --git a/articles/azure-netapp-files/backup-manage-policies.md b/articles/azure-netapp-files/backup-manage-policies.md
@@ -12,7 +12,7 @@ ms.service: azure-netapp-files
 ms.workload: storage
 ms.tgt_pltfrm: na
 ms.topic: how-to
-ms.date: 08/18/2022
+ms.date: 07/31/2023
 ms.author: anfdocs
 ---
 # Manage backup policies for Azure NetApp Files 
@@ -34,12 +34,12 @@ To modify the backup policy settings:
 
 2. Select **Backup Policies** then select the three dots (`…`) to the right of a backup policy. Select **Edit**.
 
-    ![Screenshot that shows context sensitive menu of Backup Policies.](../media/azure-netapp-files/backup-policies-edit.png)
+    :::image type="content" source="../media/azure-netapp-files/backup-policies-edit.png" alt-text="Screenshot that shows context sensitive menu of Backup Policies." lightbox="../media/azure-netapp-files/backup-policies-edit.png":::
 
 3. In the Modify Backup Policy window, update the number of backups you want to keep for daily, weekly, and monthly backups. Enter the backup policy name to confirm the action. Click **Save**.  
 
-    ![Screenshot that shows the Modify Backup Policy window.](../media/azure-netapp-files/backup-modify-policy.png)
-
+    :::image type="content" source="../media/azure-netapp-files/backup-modify-policy.png" alt-text="Screenshot showing the Modify Backup Policy window." lightbox="../media/azure-netapp-files/backup-modify-policy.png":::
+    
     > [!NOTE] 
     > After backups are enabled and have taken effect for the scheduled frequency, you cannot change the backup retention count to `0`. A minimum number of `1` retention is required for the backup policy. See [Resource limits for Azure NetApp Files](azure-netapp-files-resource-limits.md) for details.  
 
diff --git a/articles/azure-netapp-files/backup-restore-new-volume.md b/articles/azure-netapp-files/backup-restore-new-volume.md
@@ -55,7 +55,7 @@ See [Requirements and considerations for Azure NetApp Files backup](backup-requi
 
 2. From the backup list, select the backup to restore. Select the three dots (`…`) to the right of the backup, then select **Restore to new volume** from the Action menu.   
 
-    <!-- ![Screenshot that shows the option to restore backup to a new volume.](../media/azure-netapp-files/backup-restore-new-volume.png) -->
+    :::image type="content" source="../media/azure-netapp-files/backup-restore-new-volume.png" alt-text="Screenshot of selecting restore backup to new volume." lightbox="../media/azure-netapp-files/backup-restore-new-volume.png":::
 
 3. In the Create a Volume page that appears, provide information for the fields in the page as applicable, and select **Review + Create** to begin restoring the backup to a new volume.   
 
diff --git a/articles/azure-netapp-files/backup-search.md b/articles/azure-netapp-files/backup-search.md
@@ -24,7 +24,16 @@ If a volume is deleted, its backups are still retained. The backups are listed i
 >[!IMPORTANT]
 >All existing backups must be migrated to backup vaults. You can search for backups, but you will not be able to perform any operations on a backup until the backup has been migrated to a backup vault. For more information about this procedure, see [Manage a backup vault](backup-vault-manage.md).
 
-## Search backups at volume level    <!-- will this still work -->
+## Search backups from backup vault 
+
+1. Select **Backups**.
+1. In the **Search Backups** field, enter the backup name that you want to search for.  
+
+    A partial search is supported; you don’t have to specify the entire backup name. The search filters the backups based on the search string.
+
+    :::image type="content" source="../media/azure-netapp-files/backup-search-vault.png" alt-text="Screenshot that shows a list of backups in a vault." lightbox="../media/azure-netapp-files/backup-search-vault.png":::
+
+## Search backups at volume level 
 
 You can display and search backups at the volume level:
 
@@ -38,8 +47,8 @@ You can display and search backups at the volume level:
 
     A partial search is supported; you don’t have to specify the entire backup name. The search filters the backups based on the search string.
 
-    ![Screenshot that shows a list of backup for a volume.](../media/azure-netapp-files/backup-search-volume-level.png)
-
+    :::image type="content" source="../media/azure-netapp-files/backup-search-volume-level.png" alt-text="Screenshot that shows a list of backup for a volume." lightbox="../media/azure-netapp-files/backup-search-volume-level.png":::
+    
 ## Next steps  
 
 * [Understand Azure NetApp Files backup](backup-introduction.md)
diff --git a/articles/azure-netapp-files/backup-vault-manage.md b/articles/azure-netapp-files/backup-vault-manage.md
@@ -36,17 +36,11 @@ If you have existing backups, you must migrate them to a backup vault before you
 
 1. Navigate to **Backups**.
 1. From the banner above the backups, select **Assign Backup Vault**.
-1. Select a backup vault from the dropdown menu. If you have not created a backup vault, select **Create New** and follow the steps in [Create a backup vault](#create-a-backup-vault).
+1. To bulk migrate all the volumes, select **Assign to Backup Vault and Enable Backup**.
 
-  :::image type="content" source="../media/azure-netapp-files/backup-vault-assign.png" alt-text="Screenshot of backup vault assignment." lightbox="../media/azure-netapp-files/backup-vault-assign.png":::
+    If there are backups from volumes that have been deleted that you want to migrate, select **Include backups from Deleted Volumes**. This option will only be enabled if backups from deleted volumes are present. 
 
-1. Select that volume with backups you want to migrate. You can migrate individual backups or bulk migrate all the volumes. 
-
-    If there are backups from volumes that have been deleted that you want to migrate, select **Deleted Volumes**. This option will only be enabled if backups from deleted volumes are present. 
-
-1. Select **Assign to Backup Vault**.
-
-  :::image type="content" source="../media/azure-netapp-files/backup-vault-select.png" alt-text="Screenshot of backup vault selection." lightbox="../media/azure-netapp-files/backup-vault-select.png":::
+   :::image type="content" source="../media/azure-netapp-files/backup-vault-assign.png" alt-text="Screenshot of backup vault assignment." lightbox="../media/azure-netapp-files/backup-vault-assign.png":::
 
 1. Navigate to the **Backup Vault** menu to view and manage your backups.
 
diff --git a/articles/cosmos-db/.openpublishing.redirection.cosmos-db.json b/articles/cosmos-db/.openpublishing.redirection.cosmos-db.json
@@ -6116,6 +6116,11 @@
       "redirect_document_id": false
     },
     {
+      "source_path_from_root": "/articles/cosmos-db/nosql/query/udfs.md",
+      "redirect_url": "/azure/cosmos-db/nosql/stored-procedures-triggers-udfs",
+      "redirect_document_id": false
+    },
+    {      
       "source_path_from_root": "/articles/cosmos-db/nosql/query/geospatial-intro.md",
       "redirect_url": "/azure/cosmos-db/nosql/query/geospatial",
       "redirect_document_id": true
diff --git a/articles/cosmos-db/nosql/query/TOC.yml b/articles/cosmos-db/nosql/query/TOC.yml
@@ -59,11 +59,6 @@
     - name: Bitwise operators
       displayName: bitwise, binary, operators
       href: bitwise-operators.md
-- name: Functions
-  items:
-    - name: User-defined functions
-      displayName: functions, udf
-      href: udfs.md
 - name: Aggregate functions
   items:
     - name: AVG
diff --git a/articles/cosmos-db/nosql/query/udfs.md b/articles/cosmos-db/nosql/query/udfs.md
diff --git a/articles/media/azure-netapp-files/backup-modify-policy-suspend.png b/articles/media/azure-netapp-files/backup-modify-policy-suspend.png
diff --git a/articles/media/azure-netapp-files/backup-restore-new-volume.png b/articles/media/azure-netapp-files/backup-restore-new-volume.png
diff --git a/articles/media/azure-netapp-files/backup-search-vault.png b/articles/media/azure-netapp-files/backup-search-vault.png
diff --git a/articles/media/azure-netapp-files/backup-vault-assign.png b/articles/media/azure-netapp-files/backup-vault-assign.png
diff --git a/articles/storage/blobs/storage-blob-scalable-app-create-vm.md b/articles/storage/blobs/storage-blob-scalable-app-create-vm.md
@@ -2,7 +2,7 @@
 title: Create a VM and storage account for a scalable application in Azure
 description: Learn how to deploy a VM to be used to run a scalable application using Azure blob storage
 author: roygara
-ms.service: storage
+ms.service: azure-storage
 ms.topic: tutorial
 ms.date: 02/20/2018
 ms.author: rogarana
diff --git a/articles/storage/blobs/storage-blob-scalable-app-download-files.md b/articles/storage/blobs/storage-blob-scalable-app-download-files.md
@@ -2,7 +2,7 @@
 title: Download large amounts of random data from Azure Storage 
 description: Learn how to use the Azure SDK to download large amounts of random data from an Azure Storage account 
 author: roygara
-ms.service: storage
+ms.service: azure-storage
 ms.topic: tutorial
 ms.date: 02/04/2021
 ms.author: rogarana
diff --git a/articles/storage/blobs/storage-blob-scalable-app-upload-files.md b/articles/storage/blobs/storage-blob-scalable-app-upload-files.md
@@ -2,7 +2,7 @@
 title: Upload large amounts of random data in parallel to Azure Storage 
 description: Learn how to use the Azure Storage client library to upload large amounts of random data in parallel to an Azure Storage account
 author: roygara
-ms.service: storage
+ms.service: azure-storage
 ms.topic: tutorial
 ms.date: 02/04/2021
 ms.author: rogarana
diff --git a/articles/storage/blobs/storage-blob-scalable-app-verify-metrics.md b/articles/storage/blobs/storage-blob-scalable-app-verify-metrics.md
@@ -2,7 +2,7 @@
 title: Verify throughput and latency metrics for a storage account in the Azure portal 
 description: Learn how to verify throughput and latency metrics for a storage account in the portal.
 author: roygara
-ms.service: storage
+ms.service: azure-storage
 ms.topic: tutorial
 ms.date: 02/20/2018
 ms.author: rogarana
diff --git a/articles/virtual-machines/linux/create-upload-generic.md b/articles/virtual-machines/linux/create-upload-generic.md
@@ -341,7 +341,7 @@ The [Azure Linux Agent](../extensions/agent-linux.md) `waagent` provisions a Lin
    ```bash
    sudo rm -f /var/log/waagent.log
    sudo cloud-init clean
-   sudo  waagent -force -deprovision+user
+   sudo waagent -force -deprovision+user
    sudo rm -f ~/.bash_history
    sudo export HISTSIZE=0
    ```  
diff --git a/articles/virtual-machines/trusted-launch.md b/articles/virtual-machines/trusted-launch.md
@@ -138,9 +138,6 @@ In secure boot chain, each step in the boot process checks a cryptographic signa
 
 Trusted launch for Azure virtual machines is monitored for advanced threats. If such threats are detected, an alert is triggered. Alerts are only available if [Defender for Cloud's enhanced security features](../security-center/enable-enhanced-security.md) are enabled.
 
-Defender for Cloud periodically performs attestation. If the attestation fails, a medium severity alert is triggered. Trusted launch attestation can fail for the following reasons:
-
-Trusted launch for Azure virtual machines is monitored for advanced threats. If such threats are detected, an alert is triggered. Alerts are only available in the [Standard Tier](../security-center/security-center-pricing.md) of Microsoft Defender for Cloud.
 Microsoft Defender for Cloud periodically performs attestation. If the attestation fails, a medium severity alert is triggered. Trusted launch attestation can fail for the following reasons:
 - The attested information, which includes a log of the Trusted Computing Base (TCB), deviates from a trusted baseline (like when Secure Boot is enabled). This can indicate that untrusted modules have been loaded and the OS may be compromised.
 - The attestation quote could not be verified to originate from the vTPM of the attested VM. This can indicate that malware is present and may be intercepting traffic to the TPM.
diff --git a/includes/disks-azure-ad-upload-download-portal.md b/includes/disks-azure-ad-upload-download-portal.md
@@ -3,7 +3,7 @@
  description: include file
  services: storage
  author: roygara
- ms.service: storage
+ ms.service: azure-storage
  ms.topic: include
  ms.date: 01/03/2023
  ms.author: rogarana
diff --git a/includes/disks-azure-ad-upload-download-prereqs.md b/includes/disks-azure-ad-upload-download-prereqs.md
@@ -3,7 +3,7 @@
  description: include file
  services: storage
  author: roygara
- ms.service: storage
+ ms.service: azure-storage
  ms.topic: include
  ms.date: 11/28/2022
  ms.author: rogarana
diff --git a/includes/disks-azure-ad-upload-download-restrictions.md b/includes/disks-azure-ad-upload-download-restrictions.md
@@ -3,7 +3,7 @@
  description: include file
  services: storage
  author: roygara
- ms.service: storage
+ ms.service: azure-storage
  ms.topic: include
  ms.date: 11/18/2022
  ms.author: rogarana
diff --git a/includes/disks-prem-v2-limitations.md b/includes/disks-prem-v2-limitations.md
@@ -3,7 +3,7 @@
  description: include file
  services: storage
  author: roygara
- ms.service: storage
+ ms.service: azure-storage
  ms.topic: include
  ms.date: 03/27/2023
  ms.author: rogarana
diff --git a/includes/disks-premv2-regions.md b/includes/disks-premv2-regions.md
@@ -3,7 +3,7 @@
  description: include file
  services: storage
  author: roygara
- ms.service: storage
+ ms.service: azure-storage
  ms.topic: include
  ms.date: 03/16/2023
  ms.author: rogarana
diff --git a/includes/elastic-san-regions.md b/includes/elastic-san-regions.md
@@ -3,7 +3,7 @@
  description: include file
  services: storage
  author: roygara
- ms.service: storage
+ ms.service: azure-storage
  ms.topic: include
  ms.date: 12/09/2022
  ms.author: rogarana
diff --git a/includes/storage-sync-files-agent-update-policy.md b/includes/storage-sync-files-agent-update-policy.md
diff --git a/includes/storage-sync-files-bad-connection.md b/includes/storage-sync-files-bad-connection.md
diff --git a/includes/storage-sync-files-change-detection.md b/includes/storage-sync-files-change-detection.md
diff --git a/includes/storage-sync-files-remove-server-endpoint.md b/includes/storage-sync-files-remove-server-endpoint.md
diff --git a/includes/virtual-machines-incremental-snapshots.md b/includes/virtual-machines-incremental-snapshots.md
