From 97db9c4644d04ca42b65240f218f803529ad5cf2 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Tue, 17 Jan 2023 21:07:12 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../package_registry/supported_functionality.md    | 20 ++++++++++++++++
 .../package_registry/supported_hash_types.md       | 28 ++++++----------------
 2 files changed, 27 insertions(+), 21 deletions(-)

(limited to 'doc/user/packages')

diff --git a/doc/user/packages/package_registry/supported_functionality.md b/doc/user/packages/package_registry/supported_functionality.md
index 3d92836ed82..e56ae88872a 100644
--- a/doc/user/packages/package_registry/supported_functionality.md
+++ b/doc/user/packages/package_registry/supported_functionality.md
@@ -124,3 +124,23 @@ The following authentication protocols are supported:
 | [Debian](../debian_repository/index.md)             | Basic auth               |
 | [Go](../go_proxy/index.md)                          | Basic auth               |
 | [Ruby gems](../rubygems_registry/index.md)          | Token                    |
+
+## Supported hash types **(FREE)**
+
+Hash values are used to ensure you are using the correct package. You can view these values in the user interface or with the [API](../../../api/packages.md).
+
+The Package Registry supports the following hash types:
+
+| Package type                                     | Supported hashes                 |
+|--------------------------------------------------|----------------------------------|
+| [Maven](../maven_repository/index.md)            | MD5, SHA1                        |
+| [npm](../npm_registry/index.md)                  | SHA1                             |
+| [NuGet](../nuget_repository/index.md)            | not applicable                   |
+| [PyPI](../pypi_repository/index.md)              | MD5, SHA256                      |
+| [Generic packages](../generic_packages/index.md) | SHA256                           |
+| [Composer](../composer_repository/index.md)      | not applicable                   |
+| [Conan](../conan_repository/index.md)            | MD5, SHA1                        |
+| [Helm](../helm_repository/index.md)              | not applicable                   |
+| [Debian](../debian_repository/index.md)          | MD5, SHA1, SHA256                |
+| [Go](../go_proxy/index.md)                       | MD5, SHA1, SHA256                |
+| [Ruby gems](../rubygems_registry/index.md)       | MD5, SHA1, SHA256 (gemspec only) |
diff --git a/doc/user/packages/package_registry/supported_hash_types.md b/doc/user/packages/package_registry/supported_hash_types.md
index 6d7dbf87468..d39b8d60c93 100644
--- a/doc/user/packages/package_registry/supported_hash_types.md
+++ b/doc/user/packages/package_registry/supported_hash_types.md
@@ -1,25 +1,11 @@
 ---
-stage: Package
-group: Package Registry
-info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+redirect_to: 'supported_functionality.md'
+remove_date: '2023-04-22'
 ---
 
-# Supported hash types **(FREE)**
+This document was moved to [another location](supported_functionality.md).
 
-Hash values are used to ensure you are using the correct package. You can view these values in the user interface or with the [API](../../../api/packages.md).
-
-The Package Registry supports the following hash types:
-
-| Package type                                     | Supported hashes                 |
-|--------------------------------------------------|----------------------------------|
-| [Maven](../maven_repository/index.md)            | MD5, SHA1                        |
-| [npm](../npm_registry/index.md)                  | SHA1                             |
-| [NuGet](../nuget_repository/index.md)            | not applicable                   |
-| [PyPI](../pypi_repository/index.md)              | MD5, SHA256                      |
-| [Generic packages](../generic_packages/index.md) | SHA256                           |
-| [Composer](../composer_repository/index.md)      | not applicable                   |
-| [Conan](../conan_repository/index.md)            | MD5, SHA1                        |
-| [Helm](../helm_repository/index.md)              | not applicable                   |
-| [Debian](../debian_repository/index.md)          | MD5, SHA1, SHA256                |
-| [Go](../go_proxy/index.md)                       | MD5, SHA1, SHA256                |
-| [Ruby gems](../rubygems_registry/index.md)       | MD5, SHA1, SHA256 (gemspec only) |
+<!-- This redirect file can be deleted after <2023-04-22>. -->
+<!-- Redirects that point to other docs in the same project expire in three months. -->
+<!-- Redirects that point to docs in a different project or site (for example, link is not relative and starts with `https:`) expire in one year. -->
+<!-- Before deletion, see: https://docs.gitlab.com/ee/development/documentation/redirects.html -->
-- 
cgit v1.2.3