Add latest changes from gitlab-org/gitlab@15-8-stable-eev15.8.0-rc42

3 files changed, 29 insertions, 7 deletions

diff --git a/doc/raketasks/backup_gitlab.md b/doc/raketasks/backup_gitlab.md
index aea61e36037..771120df1c3 100644
--- a/doc/raketasks/backup_gitlab.md
+++ b/doc/raketasks/backup_gitlab.md
@@ -332,8 +332,16 @@ FLAG:
 On self-managed GitLab, by default this feature is available. To hide the feature, ask an administrator to [disable the feature flag](../administration/feature_flags.md) named `incremental_repository_backup`.
 On GitLab.com, this feature is not available.
 
-Incremental backups can be faster than full backups because they only pack changes since the last backup into the backup
-bundle for each repository. There must be an existing backup to create an incremental backup from:
+NOTE:
+Only repositories support incremental backups. Therefore, if you use `INCREMENTAL=yes`, the task
+creates a self-contained backup tar archive. This is because all subtasks except repositories are
+still creating full backups (they overwrite the existing full backup).
+See [issue 19256](https://gitlab.com/gitlab-org/gitlab/-/issues/19256) for a feature request to
+support incremental backups for all subtasks.
+
+Incremental repository backups can be faster than full repository backups because they only pack changes since the last backup into the backup bundle for each repository.
+The incremental backup archives are not linked to each other: each archive is a self-contained backup of the instance. There must be an existing backup
+to create an incremental backup from:
 
 - In GitLab 14.9 and 14.10, use the `BACKUP=<timestamp_of_backup>` option to choose the backup to use. The chosen previous backup is overwritten.
 - In GitLab 15.0 and later, use the `PREVIOUS_BACKUP=<timestamp_of_backup>` option to choose the backup to use. By default, a backup file is created
@@ -892,7 +900,7 @@ When troubleshooting backup problems, however, replace `CRON=1` with `--trace` t
 ## Limit backup lifetime for local files (prune old backups)
 
 WARNING:
-The process described in this section don't work if you used a [custom filename](#backup-filename)
+The process described in this section doesn't work if you used a [custom filename](#backup-filename)
 for your backups.
 
 To prevent regular backups from using all your disk space, you may want to set a limited lifetime
diff --git a/doc/raketasks/import.md b/doc/raketasks/import.md
index 6e7ba45167c..05c51fa06d8 100644
--- a/doc/raketasks/import.md
+++ b/doc/raketasks/import.md
@@ -4,12 +4,24 @@ group: Distribution
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
 ---
 
-# Import bare repositories **(FREE SELF)**
+# Import bare repositories (deprecated) **(FREE SELF)**
+
+WARNING:
+The Rake task for importing bare repositories was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/108507)
+in GitLab 15.8 and will be removed in GitLab 16.0.
+
+Alternatives to using the `gitlab:import:repos` Rake task include:
+
+- Migrating projects using either [an export file](../user/project/settings/import_export.md) or [direct transfer](../user/group/import/index.md#migrate-groups-by-direct-transfer-recommended) migrate repositories as well.
+- Importing a [repository by URL](../user/project/import/repo_by_url.md).
+- Importing a [repositories from a non-GitLab source](../user/project/import/index.md).
 
 Rake tasks are available to import bare repositories into a GitLab instance.
-When migrating from an existing GitLab instance,
-and to preserve ownership by users and their namespaces,
-use [our project-based import/export](../user/project/settings/import_export.md).
+When migrating from an existing GitLab instance, and to preserve ownership by users and their namespaces,
+migrate projects using either:
+
+- [Direct transfer](../user/group/import/index.md#migrate-groups-by-direct-transfer-recommended).
+- [An export file](../user/project/settings/import_export.md).
 
 Note that:
 
diff --git a/doc/raketasks/restore_gitlab.md b/doc/raketasks/restore_gitlab.md
index 61198a3d9ca..c97a71b1b5d 100644
--- a/doc/raketasks/restore_gitlab.md
+++ b/doc/raketasks/restore_gitlab.md
@@ -20,6 +20,8 @@ If your backup is a different version than the current installation, you must
 [downgrade](../update/package/downgrade.md) or [upgrade](../update/package/index.md#upgrade-to-a-specific-version-using-the-official-repositories) your GitLab installation
 before restoring the backup.
 
+Each backup archive contains a full self-contained backup, including those created through the [incremental repository backup procedure](backup_gitlab.md#incremental-repository-backups). To restore an incremental repository backup, use the same instructions as restoring any other regular backup archive.
+
 ## Restore prerequisites
 
 You need to have a working GitLab installation before you can perform a