merge conflicts, merge conflicts, merge conflicts

content/admin/configuration/index.md

@@ -40,7 +40,7 @@ versions:
 {% topic_link_in_list /managing-connections-between-github-enterprise-server-and-github-enterprise-cloud %}
     {% link_in_list /connecting-github-enterprise-server-to-github-enterprise-cloud %}
     {% link_in_list /enabling-unified-search-between-github-enterprise-server-and-githubcom %}
-    {% link_in_list /enabling-unified-contributions-between-github-enterprise-server-and-githubcom %} 
+    {% link_in_list /enabling-unified-contributions-between-github-enterprise-server-and-githubcom %}
 <!-- if currentVersion ver_gt "enterprise-server@2.16" -->
     {% link_in_list /enabling-alerts-for-vulnerable-dependencies-on-github-enterprise-server %}
     {% link_in_list /enabling-automatic-user-license-sync-between-github-enterprise-server-and-github-enterprise-cloud %}
@@ -49,3 +49,11 @@ versions:
 {% topic_link_in_list /configuring-advanced-security-features %}
     {% link_in_list /configuring-code-scanning-for-your-appliance %}
 <!-- endif -->
+
+{% if currentVersion ver_gt "enterprise-server@2.21" %}
+{% note %}
+
+**Note:** To configure {% data variables.product.prodname_actions %} or {% data variables.product.prodname_registry %} for your enterprise, see "[Managing GitHub Actions for your enterprise](/admin/github-actions)" or "[Managing GitHub Packages for your enterprise](admin/packages)."
+
+{% endnote %}
+{% endif %}

content/packages/using-github-packages-with-your-projects-ecosystem/configuring-docker-for-use-with-github-packages.md

@@ -17,11 +17,7 @@ versions:
 
 ### About Docker and {% data variables.product.prodname_registry %}
 
-{% warning %}
-
-**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.product.prodname_github_container_registry %}{% if currentVersion != "free-pro-team@latest" %} in a future {% data variables.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %}
-
-{% endwarning %}
+{% data reusables.package_registry.docker_registry_deprecation_status %}
 
 When installing or publishing a docker image, {% data variables.product.prodname_registry %} does not currently support foreign layers, such as Windows images.
 
@@ -33,7 +29,9 @@ Before you can use the Docker registry on {% data variables.product.prodname_reg
 
 ### Authenticating to {% data variables.product.prodname_registry %}
 
-{% data reusables.package_registry.authenticate-packages %}
+{% data reusables.package_registry.docker_registry_deprecation_status %}
+
+{% data reusables.package_registry.authenticate-packages }}
 
 #### Authenticating with a personal access token
 
@@ -69,6 +67,8 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen
 
 ### Publishing a package
 
+{% data reusables.package_registry.docker_registry_deprecation_status %}
+
 {% data variables.product.prodname_registry %} supports multiple top-level Docker images per repository. A repository can have any number of image tags. You may experience degraded service publishing or installing Docker images larger than 10GB, layers are capped at 5GB each. For more information, see "[Docker tag](https://docs.docker.com/engine/reference/commandline/tag/)" in the Docker documentation.
 
 {% data reusables.package_registry.lowercase-name-field %}
@@ -120,6 +120,8 @@ For more information, see "[Docker login](https://docs.docker.com/engine/referen
 
 #### Example publishing a Docker image
 
+{% data reusables.package_registry.docker_registry_deprecation_status %}
+
 You can publish version 1.0 of the `monalisa` image to the `octocat/octo-app` repository using an image ID.
 
 {% if currentVersion == "free-pro-team@latest" %}
@@ -178,6 +180,8 @@ $ docker push docker.<em>HOSTNAME</em>/octocat/octo-app/monalisa:1.0
 
 ### Installing a package
 
+{% data reusables.package_registry.docker_registry_deprecation_status %}
+
 You can use the `docker pull` command to install a docker image from {% data variables.product.prodname_registry %}, replacing *OWNER* with the name of the user or organization account that owns the repository, *REPOSITORY* with the name of the repository containing your project, *IMAGE_NAME* with name of the package or image,{% if currentVersion != "free-pro-team@latest" %}*HOSTNAME* with the host name of your {% data variables.product.prodname_ghe_server %} instance, {% endif %} and *TAG_NAME* with tag for the image you want to install. {% data reusables.package_registry.lowercase-name-field %}
 
 

data/reusables/package_registry/docker_registry_deprecation_status.md

@@ -0,0 +1,5 @@
+{% warning %}
+
+**Note:** The {% data variables.product.prodname_registry %} Docker registry will be superseded by {% data variables.productprodname_github_container_registry %}{% if currentVersion != "free-pro-team@latest" %} in a future {% data variables.product.product.product_name %} release{% endif %}.{% if currentVersion == "free-pro-team@latest" %} To learn how to migrate your existing Docker images and any workflows using them, see "[Migrating to {% data variables.product.prodname_github_container_registry %} for Docker images](/packages/getting-started-with-github-container-registry/migrating-to-github-container-registry-for-docker-images)" and "[Getting started with {% data variables.product.prodname_github_container_registry %}](/packages/getting-started-with-github-container-registry)."{% endif %}
+
+{% endwarning %}