From 346576a32bf44a6aebaeb63f9c5a76b442a7b448 Mon Sep 17 00:00:00 2001
From: Suzanne Selhorn <sselhorn@gitlab.com>
Date: Thu, 21 Jan 2021 21:12:20 +0000
Subject: [PATCH] Updated to match matrix

Related to: https://gitlab.com/gitlab-org/gitlab/-/issues/289937
---
 doc/user/packages/conan_repository/index.md | 26 ++++++++++++++-------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/doc/user/packages/conan_repository/index.md b/doc/user/packages/conan_repository/index.md
index f90c220a62263..5b6135f656459 100644
--- a/doc/user/packages/conan_repository/index.md
+++ b/doc/user/packages/conan_repository/index.md
@@ -98,7 +98,8 @@ For more details about creating and managing Conan packages, see the
 ## Add the Package Registry as a Conan remote
 
 To run `conan` commands, you must add the Package Registry as a Conan remote for
-your project or instance.
+your project or instance. Then you can publish packages to
+and install packages from the Package Registry.
 
 ### Add a remote for your project
 
@@ -170,13 +171,13 @@ convention.
 
 ## Authenticate to the Package Registry
 
-To authenticate to the Package Registry, you need either a personal access token
-or deploy token.
+To authenticate to the Package Registry, you need one of the following:
 
-- If you use a [personal access token](../../../user/profile/personal_access_tokens.md),
-  set the scope to `api`.
-- If you use a [deploy token](../../project/deploy_tokens/index.md), set the
-  scope to `read_package_registry`, `write_package_registry`, or both.
+- A [personal access token](../../../user/profile/personal_access_tokens.md)
+  with the scope set to `api`.
+- A [deploy token](../../project/deploy_tokens/index.md) with the
+  scope set to `read_package_registry`, `write_package_registry`, or both.
+- A [CI job token](#publish-a-conan-package-by-using-cicd).
 
 ### Add your credentials to the GitLab remote
 
@@ -278,10 +279,19 @@ create_package:
 Additional Conan images to use as the basis of your CI file are available in the
 [Conan docs](https://docs.conan.io/en/latest/howtos/run_conan_in_docker.html#available-docker-images).
 
+### Re-publishing a package with the same recipe
+
+When you publish a package that has the same recipe (`package-name/version@user/channel`)
+as an existing package, the duplicate files are uploaded successfully and
+are accessible through the UI. However, when the package is installed,
+only the most recently-published package is returned.
+
 ## Install a Conan package
 
 Install a Conan package from the Package Registry so you can use it as a
-dependency.
+dependency. You can install a package from the scope of your instance or your project.
+If multiple packages have the same recipe, when you install
+a package, the most recently-published package is retrieved.
 
 WARNING:
 Project-level packages [cannot be downloaded currently](https://gitlab.com/gitlab-org/gitlab/-/issues/270129).
-- 
GitLab