Merge branch 'master' into 'master'

updated restore docs wrt backup location [ci skip]

Made sure to point out that the restore location can be overwritten by
an entry in the config.

See merge request !1030

doc/raketasks/backup_restore.md

@@ -249,7 +249,7 @@ Deleting tmp directories...[DONE]
 We will assume that you have installed GitLab from an omnibus package and run
 `sudo gitlab-ctl reconfigure` at least once.
-First make sure your backup tar file is in `/var/opt/gitlab/backups`.
+First make sure your backup tar file is in `/var/opt/gitlab/backups` (or wherever `gitlab_rails['backup_path']` points to).
 ```shell
 sudo cp 1393513186_gitlab_backup.tar /var/opt/gitlab/backups/
@@ -369,4 +369,4 @@ For more information see similar questions on postgresql issue tracker[here](htt
 ## Note
 This documentation is for GitLab CE.
-We backup GitLab.com and make sure your data is secure, but you can't use these methods to export / backup your data yourself from GitLab.com.
+We backup GitLab.com and make sure your data is secure, but you can't use these methods to export / backup your data yourself from GitLab.com.
\ No newline at end of file