Add latest changes from gitlab-org/gitlab@master

3 files changed, 10 insertions, 6 deletions

diff --git a/doc/administration/operations/moving_repositories.md b/doc/administration/operations/moving_repositories.md
index e355059f5c8..9cf7ac18c81 100644
--- a/doc/administration/operations/moving_repositories.md
+++ b/doc/administration/operations/moving_repositories.md
@@ -49,9 +49,8 @@ until the move has completed.
 
 To move repositories:
 
-1. Ensure all storages are accessible to the GitLab instance. Configure [local storage](../repository_storage_paths.md#example-configuration),
-   and [cluster storage](../repository_storage_paths.md). In this example, these are
-   `<original_storage_name>` and `<cluster_storage_name>`.
+1. Ensure all [local and cluster storages](../gitaly/configure_gitaly.md#mixed-configuration) are accessible to the GitLab instance. In
+   this example, these are `<original_storage_name>` and `<cluster_storage_name>`.
 1. [Configure repository storage weights](../repository_storage_paths.md#configure-where-new-repositories-are-stored)
    so that the new storages receives all new projects. This stops new projects from being created
    on existing storages while the migration is in progress.
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index f1ddefef5de..cd541e7827f 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -1022,7 +1022,7 @@ docker exec -it <name of container> gitlab-ctl stop sidekiq
 # Verify that the processes are all down before continuing
 docker exec -it <name of container> gitlab-ctl status
 
-# Run the restore
+# Run the restore. NOTE: "_gitlab_backup.tar" is omitted from the name
 docker exec -it <name of container> gitlab-backup restore BACKUP=11493107454_2018_04_25_10.6.4-ce
 
 # Restart the GitLab container
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 21c22f050b6..dd129cfce49 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -33,8 +33,13 @@ usernames. A GitLab administrator can configure the GitLab instance to
 
 ## Project members permissions
 
-The Owner role is only available at the group or personal namespace level (and for instance administrators) and is inherited by its projects.
-While Maintainer is the highest project-level role, some actions can only be performed by a personal namespace or group owner, or an instance administrator, who receives all permissions.
+A user's role determines what permissions they have on a project. The Owner role provides all permissions but is
+available only:
+
+- For group owners. The role is inherited for a group's projects.
+- For Administrators.
+
+Personal namespace owners have the same permissions as an Owner, but are displayed with the Maintainer role on projects created in their personal namespace.
 For more information, see [projects members documentation](project/members/index.md).
 
 The following table lists project permissions available for each role: