Add latest changes from gitlab-org/gitlab@master

4 files changed, 13 insertions, 9 deletions

diff --git a/doc/api/packages/conan.md b/doc/api/packages/conan.md
index d0077d18c11..0ffc3afd23c 100644
--- a/doc/api/packages/conan.md
+++ b/doc/api/packages/conan.md
@@ -494,7 +494,7 @@ Upload a recipe file to the package registry. You must use an upload URL that th
 returned.
 
 ```plaintext
-GET packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel/:recipe_revision/export/:file_name
+PUT packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel/:recipe_revision/export/:file_name
 ```
 
 | Attribute | Type | Required | Description |
@@ -509,7 +509,8 @@ GET packages/conan/v1/files/:package_name/:package_version/:package_username/:pa
 Provide the file context in the request body:
 
 ```shell
-curl --header "Authorization: Bearer <authenticate_token>" \
+curl --request PUT \
+     --user <username>:<personal_access_token> \
      --upload-file path/to/conanfile.py \
      "https://gitlab.example.com/api/v4/packages/conan/v1/files/my-package/1.0/my-group+my-project/stable/0/export/conanfile.py"
 ```
@@ -558,7 +559,7 @@ Upload a package file to the package registry. You must use an upload URL that t
 returned.
 
 ```plaintext
-GET packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel/:recipe_revision/package/:conan_package_reference/:package_revision/:file_name
+PUT packages/conan/v1/files/:package_name/:package_version/:package_username/:package_channel/:recipe_revision/package/:conan_package_reference/:package_revision/:file_name
 ```
 
 | Attribute | Type | Required | Description |
@@ -575,9 +576,10 @@ GET packages/conan/v1/files/:package_name/:package_version/:package_username/:pa
 Provide the file context in the request body:
 
 ```shell
-curl --header "Authorization: Bearer <authenticate_token>" \
+curl --request PUT \
+     --user <username>:<personal_access_token> \
      --upload-file path/to/conaninfo.txt \
-     "https://gitlab.example.com/api/v4/packages/conan/v1/files/my-package/1.0/my-group+my-project/stable/packages/103f6067a947f366ef91fc1b7da351c588d1827f/0/conaninfo.txt"
+     "https://gitlab.example.com/api/v4/packages/conan/v1/files/my-package/1.0/my-group+my-project/stable/0/package/103f6067a947f366ef91fc1b7da351c588d1827f/0/conaninfo.txt"
 ```
 
 ## Delete a Package (delete a Conan recipe)
diff --git a/doc/api/packages/debian.md b/doc/api/packages/debian.md
index 0e85e554f01..b2f451911f3 100644
--- a/doc/api/packages/debian.md
+++ b/doc/api/packages/debian.md
@@ -61,8 +61,8 @@ PUT projects/:id/packages/debian/:file_name
 
 ```shell
 curl --request PUT \
+     --user <username>:<personal_access_token> \
      --upload-file path/to/mypkg.deb \
-     --header "Private-Token: <personal_access_token>" \
      "https://gitlab.example.com/api/v4/projects/1/packages/debian/mypkg.deb"
 ```
 
diff --git a/doc/api/packages/npm.md b/doc/api/packages/npm.md
index a35fe630075..63463a22153 100644
--- a/doc/api/packages/npm.md
+++ b/doc/api/packages/npm.md
@@ -65,7 +65,7 @@ curl --request PUT
      --header "Content-Type: application/json"
      --data @./path/to/metadata/file.json
      --header "Authorization: Bearer <personal_access_token>" \
-     "https://gitlab.example.com/api/v4/projects/1/packages/npm/@myscope/my-pkg"
+     "https://gitlab.example.com/api/v4/projects/1/packages/npm/@myscope%2fmy-pkg"
 ```
 
 The metadata file content is generated by npm, but looks something like this:
diff --git a/doc/api/packages/pypi.md b/doc/api/packages/pypi.md
index 061de5bb9dd..d2858986512 100644
--- a/doc/api/packages/pypi.md
+++ b/doc/api/packages/pypi.md
@@ -264,8 +264,10 @@ PUT projects/:id/packages/pypi
 | `requires_python` | string | no | The PyPI required version. |
 
 ```shell
-curl --request PUT \
-     --upload-file path/to/my.pypi.package-0.0.1.tar.gz \
+curl --request POST \
+     --form 'content=@path/to/my.pypi.package-0.0.1.tar.gz' \
+     --form 'name=my.pypi.package'
+     --form 'version=1.3.7'
      --user <username>:<personal_access_token> \
      "https://gitlab.example.com/api/v4/projects/1/packages/pypi"
 ```