Add latest changes from gitlab-org/gitlab@master

7 files changed, 13 insertions, 11 deletions

diff --git a/doc/user/packages/conan_repository/index.md b/doc/user/packages/conan_repository/index.md
index dd6605c2f01..05daa525893 100644
--- a/doc/user/packages/conan_repository/index.md
+++ b/doc/user/packages/conan_repository/index.md
@@ -121,7 +121,9 @@ To authenticate to the Package Registry, you need one of the following:
 
 NOTE:
 Packages from private and internal projects are hidden if you are not
-authenticated. If you try to search or download a package from a private or internal project without authenticating, you will receive the error `unable to find the package in remote` in the Conan client.
+authenticated. If you try to search or download a package from a private or internal
+project without authenticating, you receive the error `unable to find the package in remote`
+in the Conan client.
 
 ### Add your credentials to the GitLab remote
 
@@ -271,7 +273,7 @@ Prerequisites:
 
 NOTE:
 If you try installing the package you created in this tutorial, the install command
-will have no effect because the package already exists.
+has no effect because the package already exists.
 Delete `~/.conan/data` to clean up the packages stored in the cache.
 
 ## Remove a Conan package
diff --git a/doc/user/packages/container_registry/reduce_container_registry_data_transfer.md b/doc/user/packages/container_registry/reduce_container_registry_data_transfer.md
index 0ce9635e05a..110f3ff908c 100644
--- a/doc/user/packages/container_registry/reduce_container_registry_data_transfer.md
+++ b/doc/user/packages/container_registry/reduce_container_registry_data_transfer.md
@@ -22,7 +22,7 @@ usage.
 Use these tools and techniques to determine your image's size:
 
 - [Skopeo](https://github.com/containers/skopeo):
-  use Skopeo's `inspect` command to examine layer count and sizes through API calls. You can
+  use the Skopeo `inspect` command to examine layer count and sizes through API calls. You can
   therefore inspect this data prior to running `docker pull IMAGE`.
 
 - Docker in CI: examine and record the image size when using GitLab CI prior to pushing an image
@@ -41,7 +41,7 @@ Use these tools and techniques to determine your image's size:
 ### Use a smaller base image
 
 Consider using a smaller base image, such as [Alpine Linux](https://alpinelinux.org/).
-An Alpine image is around 5MB, which is several times smaller than popular base images such as
+An Alpine image is around 5 MB, which is several times smaller than popular base images such as
 [Debian](https://hub.docker.com/_/debian).
 If your application is distributed as a self-contained static binary, such as for Go applications,
 you can also consider using the Docker [scratch](https://hub.docker.com/_/scratch/)
diff --git a/doc/user/packages/dependency_proxy/index.md b/doc/user/packages/dependency_proxy/index.md
index a1a9d2a4915..8dc3c98795b 100644
--- a/doc/user/packages/dependency_proxy/index.md
+++ b/doc/user/packages/dependency_proxy/index.md
@@ -322,7 +322,7 @@ services:
 
 ### Issues when authenticating to the Dependency Proxy from CI/CD jobs
 
-GitLab Runner will automatically authenticate to the Dependency Proxy. However, the underlying Docker engine is still subject to its [authorization resolving process](https://gitlab.com/gitlab-org/gitlab-runner/-/blob/main/docs/configuration/advanced-configuration.md#precedence-of-docker-authorization-resolving).
+GitLab Runner authenticates automatically to the Dependency Proxy. However, the underlying Docker engine is still subject to its [authorization resolving process](https://gitlab.com/gitlab-org/gitlab-runner/-/blob/main/docs/configuration/advanced-configuration.md#precedence-of-docker-authorization-resolving).
 
 Misconfigurations in the authentication mechanism may cause `HTTP Basic: Access denied` and `403: Access forbidden` errors.
 
diff --git a/doc/user/packages/generic_packages/index.md b/doc/user/packages/generic_packages/index.md
index a4df3462059..932de0bcde6 100644
--- a/doc/user/packages/generic_packages/index.md
+++ b/doc/user/packages/generic_packages/index.md
@@ -215,7 +215,7 @@ It also demonstrates how to manage a semantic version for the generic package: s
 
 ### Internal Server error on large file uploads to S3
 
-S3-compatible object storage [limits the size of a single PUT request to 5GB](https://docs.aws.amazon.com/AmazonS3/latest/userguide/upload-objects.html). If the `aws_signature_version` is set to `2` in the [object storage connection settings](../../../administration/object_storage.md), attempting to publish a package file larger than the 5GB limit can result in a `HTTP 500: Internal Server Error` response.
+S3-compatible object storage [limits the size of a single PUT request to 5 GB](https://docs.aws.amazon.com/AmazonS3/latest/userguide/upload-objects.html). If the `aws_signature_version` is set to `2` in the [object storage connection settings](../../../administration/object_storage.md), attempting to publish a package file larger than the 5 GB limit can result in a `HTTP 500: Internal Server Error` response.
 
 If you are receiving `HTTP 500: Internal Server Error` responses when publishing large files to S3, set the `aws_signature_version` to `4`:
 
diff --git a/doc/user/packages/go_proxy/index.md b/doc/user/packages/go_proxy/index.md
index a147c3656b7..1a089cd82be 100644
--- a/doc/user/packages/go_proxy/index.md
+++ b/doc/user/packages/go_proxy/index.md
@@ -107,8 +107,8 @@ Open your [`~/.netrc`](https://everything.curl.dev/usingcurl/netrc) file
 and add the following text. Replace the variables in `< >` with your values.
 
 WARNING:
-If you use an environment variable called `NETRC`, Go will use its value
-as a filename and ignore `~/.netrc`. If you intend to use `~/.netrc` in
+If you use an environment variable called `NETRC`, Go uses its value
+as a filename and ignores `~/.netrc`. If you intend to use `~/.netrc` in
 the GitLab CI **do not use `NETRC` as an environment variable name**.
 
 ```plaintext
diff --git a/doc/user/packages/package_registry/index.md b/doc/user/packages/package_registry/index.md
index ab5d652b731..096a8273440 100644
--- a/doc/user/packages/package_registry/index.md
+++ b/doc/user/packages/package_registry/index.md
@@ -64,7 +64,7 @@ For most package types, the following credential types are valid:
 - If you are publishing a package via CI/CD pipelines, you must use a CI job token.
 
 NOTE:
-If you have not activated the "Packages" feature for your project at **Settings > General > Project features**, you will receive a 403 Forbidden response.
+If you have not activated the "Package registry" feature for your project at **Settings > General > Visibility, project features, permissions**, you receive a 403 Forbidden response.
 Accessing package registry via deploy token is not available when external authorization is enabled.
 
 ## Use GitLab CI/CD to build packages
@@ -151,7 +151,7 @@ Several known issues exist when you allow anyone to pull from the Package Regist
 
 - Project-level endpoints are supported. Group-level and instance-level endpoints are not supported. Support for group-level endpoints is proposed in [issue 383537](https://gitlab.com/gitlab-org/gitlab/-/issues/383537).
 - It does not work with the [Composer](../composer_repository/index.md#install-a-composer-package), because Composer only has a group endpoint.
-- It will work with Conan, but using [`conan search`](../conan_repository/index.md#search-for-conan-packages-in-the-package-registry) does not work.
+- It works with Conan, but using [`conan search`](../conan_repository/index.md#search-for-conan-packages-in-the-package-registry) does not work.
 
 ## Accepting contributions
 
diff --git a/doc/user/packages/pypi_repository/index.md b/doc/user/packages/pypi_repository/index.md
index 3d58ef636df..e5b7f06f6ca 100644
--- a/doc/user/packages/pypi_repository/index.md
+++ b/doc/user/packages/pypi_repository/index.md
@@ -311,7 +311,7 @@ password <your_personal_token>
 
 ## Troubleshooting
 
-To improve performance, the pip command caches files related to a package. Note that pip doesn't remove data by
+To improve performance, the pip command caches files related to a package. Pip doesn't remove data by
 itself. The cache grows as new packages are installed. If you encounter issues, clear the cache with
 this command: