Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 8 deletions

diff --git a/doc/api/project_import_export.md b/doc/api/project_import_export.md
index e285c721d11..7040646641b 100644
--- a/doc/api/project_import_export.md
+++ b/doc/api/project_import_export.md
@@ -111,6 +111,7 @@ POST /projects/import
 | Attribute | Type           | Required | Description                              |
 | --------- | -------------- | -------- | ---------------------------------------- |
 | `namespace` | integer/string | no | The ID or path of the namespace that the project will be imported to. Defaults to the current user's namespace |
+| `name` | string | no | The name of the project to be imported. Defaults to the path of the project if not provided |
 | `file` | string | yes | The file to be uploaded |
 | `path` | string | yes | Name and path for new project |
 | `overwrite` | boolean | no | If there is a project with the same path the import will overwrite it. Default to false |
@@ -131,14 +132,12 @@ cURL doesn't support posting a file from a remote server. Importing a project fr
 
 ```python
 import requests
-import urllib
-import json
-import sys
+from io import BytesIO
 
-s3_file = urllib.urlopen(presigned_url)
+s3_file = requests.get(presigned_url)
 
 url =  'https://gitlab.example.com/api/v4/projects/import'
-files = {'file': s3_file}
+files = {'file': BytesIO(s3_file.content)}
 data = {
     "path": "example-project",
     "namespace": "example-group"
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 4f660d07071..2025832a714 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -236,7 +236,7 @@ nested groups if you have membership in one of its parents.
 To learn more, read through the documentation on
 [subgroups memberships](group/subgroups/index.md#membership).
 
-## Guest User
+## Free Guest users **(ULTIMATE)**
 
 When a user is given `Guest` permissions on a project and/or group, and holds no
 higher permission level on any other project or group on the instance, the user
@@ -245,8 +245,9 @@ There is no other specific "guest" designation for newly created users.
 
 If the user is assigned a higher role on any projects or groups, the user will
 take a license seat. If a user creates a project, the user becomes a `Maintainer`
-on the project, resulting in the use of a license seat. To prevent a guest user
-from creating projects, you can edit the user profile to mark the user as
+on the project, resulting in the use of a license seat.
+
+To prevent a guest user from creating projects, you can edit the user profile to mark the user as
 [External](#external-users-permissions).
 
 ## External users permissions