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

Author: ktoliver

docs/artifacts/how-to/delete-and-recover-packages.md

@@ -28,38 +28,67 @@ In this article, you'll learn how to:
 
 ## Delete packages
 
-#### [Maven](#tab/maven/)
+In Azure Artifacts, packages are immutable. When you publish a package to your feed, its version number will be reserved permanently. You can't upload a new package with that same version number, even if you delete it from your feed.
+
+#### [NuGet](#tab/nuget/)
+
+Two options are available to delete a NuGet package from your feed, [Unlist](#qa) and [Delete](#qa).
+
+> [!NOTE]
+> You must be a **Contributor** to unlist a package and an **Owner** to delete it.
 
 ::: moniker range=">= azure-devops-2019"
 
 1. Select **Artifacts**, and then select your feed.
 
-1. Select the package that you want to delete, and then select **Delete latest**. Select **Delete** to confirm. 
+1. Select the package that you want to delete or deprecate, and then select **Unlist** or **Delete latest**.
+
+    :::image type="content" source="../media/delete/unlist-delete-nuget-package-newnav.png" alt-text="Screenshot that shows buttons for unlisting and deleting NuGet packages.":::
 
 ::: moniker-end
 
 ::: moniker range="tfs-2018"
 
-1. Select **Build and Release**, and then select **Packages**.
-
-1. Select your feed, and then select the package that you want to delete.
+1. Select **Build and Release**.
 
-1. Select **Delete latest** to delete the latest version of your package.
+1. Select **Packages**, and then select the package that you want to delete. 
 
-    :::image type="content" source="../media/delete/delete-maven-package.png" alt-text="Screenshot that shows the button to delete packages from feeds.":::  
+1. Select **Unlist** or **Delete latest**.
 
-In Azure Artifacts, packages are immutable. When you publish a package to your feed, its version number will be reserved permanently. You can't upload a new package with that same version number, even if you delete it from your feed.
+    :::image type="content" source="../media/delete/unlist-delete-nuget-package.png" alt-text="Screenshot that shows the buttons for unlisting and deleting NuGet packages in Team Foundation Server.":::
 
 ::: moniker-end
 
-#### [npm](#tab/npm/)
+### Unlist a NuGet package by using NuGet.exe
 
-There are two options to delete an npm package from your feed:
+1. Select **Artifacts**, and then go to your feed. Select **Connect to feed**.
 
-- **Deprecate**: When you deprecate a package version, a warning message is added to the package's metadata. Azure Artifacts and most npm clients will display the warning message whenever the package is viewed or installed. 
-- **Unpublish**: Unpublishing a package version makes it unavailable to install. Unpublished packages can be restored from the Recycle Bin within 30 days of deletion. After that, the packages will be permanently deleted.
+   ::: moniker range=">= azure-devops-2019"
 
-In Azure Artifacts, packages are immutable. When you publish a package to your feed, its version number will be reserved permanently. You can't upload a new package with that same version number, even if you delete it from your feed.
+     :::image type="content" source="../media/connect-to-feed-azure-devops-newnav.png" alt-text="Screenshot that shows the button for connecting to a feed.":::
+
+   ::: moniker-end
+
+   ::: moniker range="tfs-2018"
+
+    :::image type="content" source="../media/connect-to-feed.png" alt-text="Screenshot that shows the button for connecting to a feed in Team Foundation Server.":::
+
+   ::: moniker-end
+
+2. Select **NuGet.exe**, and then find and copy your **Package Source** URL.
+
+3. Run the following command:
+
+    ```Command
+    nuget.exe delete <PACKAGE_NAME> <PACKAGE_VERSION> -Source <PACKAGE_SOURCE_URL> -ApiKey <KEY>
+    ```
+
+> [!NOTE]
+> Azure DevOps and Visual Studio Team Foundation Server interpret the `nuget.exe delete` command as an unlist operation. To delete a package, you must use the REST API or the web interface.
+
+#### [npm](#tab/npm/)
+
+There are two options to delete an npm package from your feed, [Deprecate](#qa) and [Unpublish](#qa).
 
 > [!NOTE]
 > You must be a **Contributor** to deprecate a package and an **Owner** to unpublish it.
@@ -105,78 +134,39 @@ In Azure Artifacts, packages are immutable. When you publish a package to your f
 > [!NOTE]
 > The `npm unpublish` command won't unpublish all versions of the package. For more information, see the [deprecate](https://docs.npmjs.com/cli/deprecate) or [unpublish](https://docs.npmjs.com/cli/unpublish) documentation.
 
-#### [NuGet](#tab/nuget/)
-
-Two options are available to delete a NuGet package from your feed:
+#### [Python](#tab/python/)
 
-- **Unlist**: Unlisting a package version hides it from the search results in Azure Artifacts feeds and on NuGet.org.
-- **Delete**:  Deleting a package version makes it unavailable to install. Deleted packages can be restored from the Recycle Bin within 30 days of deletion. After that, the packages will be permanently deleted.
+1. Select **Artifacts**, and then select your feed.
 
-In Azure Artifacts, packages are immutable. When you publish a package to your feed, its version number will be reserved permanently. You can't upload a new package with that same version number, even if you delete it from your feed.
+1. Select the package that you want to delete, and then select **Delete latest**.
 
 > [!NOTE]
-> You must be a **Contributor** to unlist a package and an **Owner** to delete it.
+> You must be a feed **Owner** to delete a Python package.
+
+:::image type="content" source="../media/delete/delete-python-package.png" alt-text="Screenshot that shows the button for deleting a package in Python.":::
+
+#### [Maven](#tab/maven/)
 
 ::: moniker range=">= azure-devops-2019"
 
 1. Select **Artifacts**, and then select your feed.
 
-1. Select the package that you want to delete or deprecate, and then select **Unlist** or **Delete latest**.
-
-    :::image type="content" source="../media/delete/unlist-delete-nuget-package-newnav.png" alt-text="Screenshot that shows buttons for unlisting and deleting NuGet packages.":::
+1. Select the package that you want to delete, and then select **Delete latest**. Select **Delete** to confirm. 
 
 ::: moniker-end
 
 ::: moniker range="tfs-2018"
 
-1. Select **Build and Release**.
+1. Select **Build and Release**, and then select **Packages**.
 
-1. Select **Packages**, and then select the package that you want to delete. 
+1. Select your feed, and then select the package that you want to delete.
 
-1. Select **Unlist** or **Delete latest**.
+1. Select **Delete latest** to delete the latest version of your package.
 
-    :::image type="content" source="../media/delete/unlist-delete-nuget-package.png" alt-text="Screenshot that shows the buttons for unlisting and deleting NuGet packages in Team Foundation Server.":::
+    :::image type="content" source="../media/delete/delete-maven-package.png" alt-text="Screenshot that shows the button to delete packages from feeds.":::  
 
 ::: moniker-end
 
-### Unlist a NuGet package by using NuGet.exe
-
-1. Select **Artifacts**, and then go to your feed. Select **Connect to feed**.
-
-   ::: moniker range=">= azure-devops-2019"
-
-     :::image type="content" source="../media/connect-to-feed-azure-devops-newnav.png" alt-text="Screenshot that shows the button for connecting to a feed.":::
-
-   ::: moniker-end
-
-   ::: moniker range="tfs-2018"
-
-    :::image type="content" source="../media/connect-to-feed.png" alt-text="Screenshot that shows the button for connecting to a feed in Team Foundation Server.":::
-
-   ::: moniker-end
-
-2. Select **NuGet.exe**, and then find and copy your **Package Source** URL.
-
-3. Run the following command:
-
-    ```Command
-    nuget.exe delete <PACKAGE_NAME> <PACKAGE_VERSION> -Source <PACKAGE_SOURCE_URL> -ApiKey <KEY>
-    ```
-
-> [!NOTE]
-> Azure DevOps and Visual Studio Team Foundation Server interpret the `nuget.exe delete` command as an unlist operation. To delete a package, you must use the REST API or the web interface.
-
-#### [Python](#tab/python/)
-
-1. Select **Artifacts**, and then select your feed.
-
-1. Select the package that you want to delete, and then select **Delete latest**.
-
-> [!NOTE]
-> You must be a feed **Owner** to delete a Python package.
-
-:::image type="content" source="../media/delete/delete-python-package.png" alt-text="Screenshot that shows the button for deleting a package in Python.":::
-
 #### [Universal Package](#tab/universal/)
 
 1. Select **Artifacts**, and then select your feed.
@@ -251,12 +241,6 @@ To configure retention policies:
 > - The number of published versions reaches the **Maximum number of versions per package** limit.
 > - A version of that package has not been downloaded for the period defined in **Days to keep recently downloaded packages**.
 
-### What happens with old or existing packages when we enable retention policies?
-
-Old or existing packages will be soft-deleted and moved to the Recycle Bin. The deletion job runs once a day, but there might be an initial delay after the policy is turned on for the first time because of an influx of packages. 
-
-Packages remain in the Recycle Bin for 30 days before they're permanently deleted. To remove the packages from your billable storage, you can choose to delete them manually by using the UI or the REST API before the 30 days are up. 
-
 ## Recover deleted packages
 
 Deleted packages will remain in the Recycle Bin for 30 days. After that, they'll be permanently deleted. You must be a feed **Owner** to recover deleted packages.
@@ -295,6 +279,24 @@ Deleted packages will remain in the Recycle Bin for 30 days. After that, they'll
 
 ::: moniker-end
 
+## Q&A
+
+### Q: What is the difference between *Deprecate*, *Unpublish*, *Unlist*, and *Delete* a package version?
+
+A: *Unpublish* and *Deprecate* applies to npm packages, while *Unlist* and *Delete* applies to NuGet packages. You can also *Delete* package versions for the rest of the package types (Maven, Python, and Universal Packages):
+
+- **Deprecate** (npm): When you deprecate a package version, a warning message is added to the package's metadata. Azure Artifacts and most npm clients will display the warning message whenever the package is viewed or installed.
+- **Unpublish** (npm): Unpublishing a package version makes it unavailable to install. Unpublished packages can be restored from the Recycle Bin within 30 days of deletion. After that, the packages will be permanently deleted.
+
+- **Unlist** (NuGet): Unlisting a package version hides it from the search results in Azure Artifacts feeds and on NuGet.org.
+- **Delete**: Deleting a package version makes it unavailable to install. Deleted packages can be restored from the Recycle Bin within 30 days of deletion. After that, the packages will be permanently deleted.
+
+### Q: What happens with old or existing packages when we enable retention policies?
+
+A: Old or existing packages will be soft-deleted and moved to the Recycle Bin. The deletion job runs once a day, but there might be an initial delay after the policy is turned on for the first time because of an influx of packages. 
+
+Packages remain in the Recycle Bin for 30 days before they're permanently deleted. To remove the packages from your billable storage, you can choose to delete them manually by using the UI or the REST API before the 30 days are up. 
+
 ## Related articles
 
 - [Understand upstream sources](../concepts/upstream-sources.md)

docs/artifacts/quickstarts/universal-packages.md

@@ -8,7 +8,7 @@ ms.date: 02/15/2022
 monikerRange: 'azure-devops'
 ---
 
-# Publish and download universal packages with Azure CLI
+# Publish and download universal packages with Azure Artifacts
 
 With universal packages, you can store different types of packages other than the widely used ones such as NuGet, npm, Maven, or Python packages. Using Azure CLI, you can publish and download universal packages from the command line. Uploaded packages can vary in size (up to 4 TB), but should always have a name and a version number. This article will walk you through the steps to publish and download your universal packages to Azure Artifacts feeds.
 

docs/boards/backlogs/office/track-work.md

@@ -223,16 +223,16 @@ This connection method requires that you have installed [Azure DevOps Open in Ex
    >    
    > 	
    >    
-   > ![Open Boards Queries, vertical nav](/docs/boards/queries/media/view-run-queries/open-queries-vert.png)
+   > ![Open Boards Queries, vertical nav](../../queries/media/view-run-queries/open-queries-vert.png)
 
 1. Choose the query you want to open in Excel.
 
-1. From the **Results** tab, choose the  :::image type="icon" source="../../media/icons/actions-icon.png" border="false"::: actions icon
+1. From the **Results** tab, choose the  :::image type="icon" source="../../../media/icons/actions-icon.png" border="false"::: actions icon.
    > [!div class="mx-imgBorder"]  
    >    
    > 	
    >    
-   > ![QUery Results, context menu, Open in Excel Open Boards Queries, vertical nav](media/connect/open-in-excel-from-portal.png)
+   > ![Query Results, context menu, Open in Excel Open Boards Queries, vertical nav](media/connect/open-in-excel-from-portal.png)
 
 ### [Connect from client to Azure Boards](#tab/open-excel-cloud)