summaryrefslogtreecommitdiff
path: root/doc/README.md
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-10-13 00:08:42 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-10-13 00:08:42 +0000
commitc2fcfe515ff2cd70af37863f9c8f487fed3c8338 (patch)
tree2450752cb227f7ee7e0ef8350ff811c72dc7c9f1 /doc/README.md
parentf5dcc7ae73d1744b7737c16411af6281d78bc455 (diff)
downloadgitlab-ce-c2fcfe515ff2cd70af37863f9c8f487fed3c8338.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/README.md')
-rw-r--r--doc/README.md4
1 files changed, 1 insertions, 3 deletions
diff --git a/doc/README.md b/doc/README.md
index 47f6535e80e..615f3e2f5d9 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -267,9 +267,7 @@ The following documentation relates to the DevOps **Package** stage:
|:----------------------------------------------------------------|:-------------------------------------------------------|
| [Container Registry](user/packages/container_registry/index.md) | The GitLab Container Registry enables every project in GitLab to have its own space to store [Docker](https://www.docker.com/) images. |
| [Dependency Proxy](user/packages/dependency_proxy/index.md) **(PREMIUM)** | The GitLab Dependency Proxy sets up a local proxy for frequently used upstream images/packages. |
-| [Conan Repository](user/packages/conan_repository/index.md) | The GitLab Conan Repository enables every project in GitLab to have its own space to store [Conan](https://conan.io/) packages. |
-| [Maven Repository](user/packages/maven_repository/index.md) | The GitLab Maven Repository enables every project in GitLab to have its own space to store [Maven](https://maven.apache.org/) packages. |
-| [NPM Registry](user/packages/npm_registry/index.md) | The GitLab NPM Registry enables every project in GitLab to have its own space to store [NPM](https://www.npmjs.com/) packages. |
+| [Package Registry](user/packages/package_registry/index.md) | Use GitLab as a private or public registry for a variety of common package managers, including [NPM](user/packages/npm_registry/index.md), [Maven](user/packages/maven_repository/index.md), [PyPI](user/packages/pypi_repository/index.md), and others. You can also store generic files. |
<div align="right">
<a type="button" class="btn btn-default" href="#overview">