summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorAchilleas Pipinellis <axil@gitlab.com>2018-01-29 14:29:37 +0000
committerAchilleas Pipinellis <axil@gitlab.com>2018-01-29 14:29:37 +0000
commit501d81c523b2cf53128e62ea2d7c4dff6681928d (patch)
tree51008fb2644cb6fcd1c17c0e54fa13bb30ccdf53 /doc
parent51897df564db16726b452bdacf9eabe85b7c06f1 (diff)
parent7e8d5e83aa1f4b4f268f8ec413bdad53e44daada (diff)
downloadgitlab-ce-501d81c523b2cf53128e62ea2d7c4dff6681928d.tar.gz
Merge branch '42521-docs-update-usage-of-force-option-when-running-the-restore-raketask' into 'master'
Resolve "Docs update usage of force option when running the restore raketask" Closes #42521 See merge request gitlab-org/gitlab-ce!16759
Diffstat (limited to 'doc')
-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 24d678d5cde..bbd2d214fe4 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -496,7 +496,7 @@ more of the following options:
- `BACKUP=timestamp_of_backup` - Required if more than one backup exists.
Read what the [backup timestamp is about](#backup-timestamp).
-- `force=yes` - Do not ask if the authorized_keys file should get regenerated.
+- `force=yes` - Does not ask if the authorized_keys file should get regenerated and assumes 'yes' for warning that database tables will be removed.
### Restore for installation from source