diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-18 15:10:56 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-09-18 15:10:56 +0300 |
| commit | 3aab29eacb2d35d90d93ed005b6fc825955b4d23 (patch) | |
| tree | 22d27e78673df7e098ca2084f4773d3173aa4e75 /doc/administration/backup_restore | |
| parent | 664bf56eaaaff7a377f3272676b7e27fa12aa143 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/administration/backup_restore')
| -rw-r--r-- | doc/administration/backup_restore/backup_gitlab.md | 6 | ||||
| -rw-r--r-- | doc/administration/backup_restore/restore_gitlab.md | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/doc/administration/backup_restore/backup_gitlab.md b/doc/administration/backup_restore/backup_gitlab.md index 32a940847ff..cd65bf67638 100644 --- a/doc/administration/backup_restore/backup_gitlab.md +++ b/doc/administration/backup_restore/backup_gitlab.md @@ -160,9 +160,9 @@ GitLab uses Redis both as a cache store and to hold persistent data for our back Elasticsearch is an optional database for advanced search. It can improve search in both source-code level, and user generated content in issues, merge requests, and discussions. The [backup command](#backup-command) does _not_ back up Elasticsearch data. Elasticsearch data can be regenerated from PostgreSQL data after a restore. It is possible to [manually back up Elasticsearch](https://www.elastic.co/guide/en/elasticsearch/reference/current/snapshot-restore.html). -## Command line interface +## Command-line interface -GitLab provides a command line interface to back up your entire instance, +GitLab provides a command-line interface to back up your entire instance, including: - Database @@ -301,7 +301,7 @@ the timestamp is `1493107454_2018_04_25_10.6.4-ce`. ### Backup options -The command line tool GitLab provides to back up your instance can accept more +The command-line tool GitLab provides to back up your instance can accept more options. #### Backup strategy option diff --git a/doc/administration/backup_restore/restore_gitlab.md b/doc/administration/backup_restore/restore_gitlab.md index 784a8708de6..d641d50b33d 100644 --- a/doc/administration/backup_restore/restore_gitlab.md +++ b/doc/administration/backup_restore/restore_gitlab.md @@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w # Restore GitLab **(FREE SELF)** -GitLab provides a command line interface to restore your entire installation, +GitLab provides a command-line interface to restore your entire installation, and is flexible enough to fit your needs. The [restore prerequisites section](#restore-prerequisites) includes crucial @@ -287,7 +287,7 @@ Each backup archive contains a full self-contained backup, including those creat ## Restore options -The command line tool GitLab provides to restore from backup can accept more +The command-line tool GitLab provides to restore from backup can accept more options. ### Specify backup to restore when there are more than one |