summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Paik <rpaik@gitlab.com>2019-09-09 06:51:59 +0000
committerRay Paik <rpaik@gitlab.com>2019-09-09 06:51:59 +0000
commit8df0fe54cad2bab09feb2c97c098ca23796824fd (patch)
treea78cda295b425fd73a493c898af81dcb174b6254
parentbb2e7d3c98e781b940e544379416ec999ceaa6f6 (diff)
parenteea40ee0af2e5b1a1937a58b2c0c61f6c67da423 (diff)
downloadgitlab-ce-8df0fe54cad2bab09feb2c97c098ca23796824fd.tar.gz
Merge branch 'patch-76' into 'master'
fix typo in backup_restore.md See merge request gitlab-org/gitlab-ce!32767
-rw-r--r--doc/raketasks/backup_restore.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 59b775d13bd..06048ad618f 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -190,7 +190,7 @@ it` may occur, and will cause the backup process to fail. To combat this, 8.17
introduces a new backup strategy called `copy`. The strategy copies data files
to a temporary location before calling `tar` and `gzip`, avoiding the error.
-A side-effect is that the backup process with take up to an additional 1X disk
+A side-effect is that the backup process will take up to an additional 1X disk
space. The process does its best to clean up the temporary files at each stage
so the problem doesn't compound, but it could be a considerable change for large
installations. This is why the `copy` strategy is not the default in 8.17.