Merge branch 'main' into users/jukullam/template-updates

Author: juliakm

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

@@ -24,7 +24,7 @@ In this article, you'll learn how to:
 > * Recover recently deleted packages from the Recycle Bin.
 
 > [!NOTE]
-> To delete/recover packages or set up retention policies, you must be a feed **Owner**.
+> You must be a feed **Owner** or **Administrator** to delete packages or set up retention policies.
 
 ## Delete packages
 
@@ -84,7 +84,7 @@ Two options are available to delete a NuGet package from your feed, [Unlist](#qa
     ```
 
 > [!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.
+> 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](/rest/api/azure/devops/artifactspackagetypes/nuget/delete-package-version) or the web interface.
 
 #### [npm](#tab/npm/)
 

docs/artifacts/nuget/publish.md

@@ -4,19 +4,19 @@ description: How to connect to your feed and publish NuGet packages using the co
 ms.assetid: C7D75946-1F00-4BD7-87C8-225BBAE9982B
 ms.service: azure-devops-artifacts
 ms.topic: conceptual
-ms.date: 06/23/2022
+ms.date: 06/30/2023
 monikerRange: '<= azure-devops'
 ---
 
 # Publish and restore NuGet packages from the command line (NuGet.exe)
 
 [!INCLUDE [version-lt-eq-azure-devops](../../includes/version-lt-eq-azure-devops.md)]
 
-With Azure Artifacts, you can publish your NuGet packages to public or private feeds and share them with others based on your feed's visibility settings. This article will guide you through connecting to Azure Artifacts and publishing your NuGet packages.
+With Azure Artifacts, you can publish your NuGet packages to public or private feeds and share them with others based on your feed's visibility settings. This article will guide you through connecting to Azure Artifacts and publishing and restoring your NuGet packages.
 
 ## Prerequisites
 
-- An Azure DevOps organization. [Create an organization](../../organizations/accounts/create-organization.md), if you don't have one already.
+- An Azure DevOps organization and a project. Create an [organization](../../organizations/accounts/create-organization.md) or a [project](../../organizations/projects/create-project.md#create-a-project) if you haven't already.
 
 - An Azure Artifacts feed. [Create a new feed](../get-started-nuget.md#create-a-feed) if you don't have one already.
 
@@ -30,14 +30,14 @@ With Azure Artifacts, you can publish your NuGet packages to public or private f
 
 ## Publish packages
 
-To publish a NuGet package to your feed, run the following command in an elevated command prompt. Replace the placeholders with the appropriate information:
+Run the following command to publish your packages to your feed. Replace the placeholders with the appropriate information:
 
 ```Command
 nuget push <PACKAGE_PATH> -src https://pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/nuget/v3/index.json -ApiKey <ANY_STRING>
 ```
 
 > [!NOTE]
-> The `ApiKey` is only used as a placeholder.
+> The `ApiKey` is required, but you can use any arbitrary value when pushing to Azure Artifacts feeds.
 
 - **Example**:
 
@@ -49,16 +49,16 @@ nuget push <PACKAGE_PATH> -src https://pkgs.dev.azure.com/<ORGANIZATION_NAME>/<P
 
 1. Create a [personal access token](../../organizations/accounts/use-personal-access-tokens-to-authenticate.md) (PAT) with **packaging read and write** scope.
 
-1. Add your package source to your nuget.config file. This will add your PAT to your nuget.config file. Make sure to store this file in a safe place, and do not check this file into source control.
+1. Add your package source to your nuget.config file. This will add your PAT to your nuget.config file. Store this file in a safe location, and make sure that you don't check it into source control. See [NuGet sources](/nuget/reference/cli-reference/cli-ref-sources) for more details.
 
     ```Command
-    nuget sources Add -Name <PACKAGE_SOURCE> -Source https://pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/nuget/v3/index.json -UserName <USER_NAME> -Password <PERSONAL_ACCESS_TOKEN> -config <PATH_TO_NUGET_CONFIG_FILE>
+    nuget sources Add -Name <SOURCE_NAME> -Source https://pkgs.dev.azure.com/<ORGANIZATION_NAME>/<PROJECT_NAME>/_packaging/<FEED_NAME>/nuget/v3/index.json -UserName <USER_NAME> -Password <PERSONAL_ACCESS_TOKEN> -config <PATH_TO_NUGET_CONFIG_FILE>
     ```
 
-1. Publish your package:
+1. Publish your package. See [NuGet push](/nuget/reference/cli-reference/cli-ref-push) for more details.
 
     ```Command
-    nuget push <PACKAGE_PATH> -src <PACKAGE_SOURCE> -ApiKey <ANY_STRING>
+    nuget push <PACKAGE_PATH> -src <SOURCE_NAME> -ApiKey <ANY_STRING>
     ```
 
 - **Example**:
@@ -70,7 +70,7 @@ nuget push <PACKAGE_PATH> -src https://pkgs.dev.azure.com/<ORGANIZATION_NAME>/<P
 
 ## Restore packages
 
-To restore your packages, run the following command in an elevated command prompt:
+Run the following command to restore your packages:
 
 ```Command
 nuget.exe restore

docs/artifacts/quickstarts/python-packages.md

@@ -118,9 +118,9 @@ When you connect to Azure DevOps for the first time, you'll be prompted for cred
 
 ## Related articles
 
-- [Publish Python packages with Azure Pipelines](../../pipelines/artifacts/pypi.md).
+- [Use feed views to share packages](../feeds/views.md)
 
-- [Publish and consume Python packages from the command line](python-cli.md)
+- [Publish Python packages with Azure Pipelines](../../pipelines/artifacts/pypi.md).
 
 - [Build Python apps](../../pipelines/ecosystems/python.md).
 

docs/organizations/security/allow-list-ip-url.md

@@ -293,7 +293,7 @@ If you use Microsoft-hosted agent to run your jobs and you need the information
 For more information about hosted Windows, Linux and macOS agents, see [Microsoft-hosted agent IP ranges](../../pipelines/agents/hosted.md#agent-ip-ranges).
 
 ### Azure Pipelines Self-hosted agents
-If you're running a firewall and your code is in Azure Repos, see [Self-hosted Linux agents FAQs](../../pipelines/agents/windows-agent.md#im-running-a-firewall-and-my-code-is-in-azure-repos-what-urls-does-the-agent-need-to-communicate-with), [Self-hosted macOS agents FAQs](../../pipelines/agents/osx-agent.md#im-running-a-firewall-and-my-code-is-in-azure-repos-what-urls-does-the-agent-need-to-communicate-with) or [Self-hosted Windows agents FAQs](../../pipelines/agents/windows-agent.md#im-running-a-firewall-and-my-code-is-in-azure-repos-what-urls-does-the-agent-need-to-communicate-with). This article has information about which domain URLs and IP addresses your private agent needs to communicate with.
+If you're running a firewall and your code is in Azure Repos, see [Self-hosted Linux agents FAQs](../../pipelines/agents/linux-agent.md#im-running-a-firewall-and-my-code-is-in-azure-repos-what-urls-does-the-agent-need-to-communicate-with), [Self-hosted macOS agents FAQs](../../pipelines/agents/osx-agent.md#im-running-a-firewall-and-my-code-is-in-azure-repos-what-urls-does-the-agent-need-to-communicate-with) or [Self-hosted Windows agents FAQs](../../pipelines/agents/windows-agent.md#im-running-a-firewall-and-my-code-is-in-azure-repos-what-urls-does-the-agent-need-to-communicate-with). This article has information about which domain URLs and IP addresses your private agent needs to communicate with.
 
 
 ## Azure DevOps import service

docs/pipelines/ecosystems/customize-python.md

@@ -15,13 +15,13 @@ To create your first pipeline with Python, see the [Python quickstart](python.md
 
 ### Use a specific Python version
 
-To use a specific version of Python in your pipeline, add the [Use Python Version task](/azure/devops/pipelines/tasks/reference/use-python-version-v0) to *azure-pipelines.yml*. This snippet sets the pipeline to use Python 3.6:
+To use a specific version of Python in your pipeline, add the [Use Python Version task](/azure/devops/pipelines/tasks/reference/use-python-version-v0) to *azure-pipelines.yml*. This snippet sets the pipeline to use Python 3.11:
 
 ```yaml
 steps:
 - task: UsePythonVersion@0
   inputs:
-    versionSpec: '3.6'
+    versionSpec: '3.11'
 ```
 
 ### Use multiple Python versions

docs/pipelines/ecosystems/python.md

@@ -81,8 +81,6 @@ pool:
   vmImage: ubuntu-latest
 strategy:
   matrix:
-    Python37:
-      python.version: '3.7'
     Python38:
       python.version: '3.8'
     Python39:

docs/pipelines/process/conditions.md

@@ -320,7 +320,7 @@ jobs:
   - job: B
     steps:
     - script: echo I did a thing
-    condition: ${{ if eq(parameters.doThing, true) }}
+    condition: ${{ eq(parameters.doThing, true) }}
 ```
 
 ```yaml