Add latest changes from gitlab-org/gitlab@15-3-stable-eev15.3.0-rc42

2 files changed, 37 insertions, 6 deletions

diff --git a/doc/administration/raketasks/maintenance.md b/doc/administration/raketasks/maintenance.md
index 6de47c37957..a900da52aba 100644
--- a/doc/administration/raketasks/maintenance.md
+++ b/doc/administration/raketasks/maintenance.md
@@ -187,7 +187,7 @@ Checking GitLab ... Finished
 
 In some cases it is necessary to rebuild the `authorized_keys` file,
 for example, if after an upgrade you receive `Permission denied (publickey)` when pushing [via SSH](../../user/ssh.md)
-and find `404 Key Not Found` errors in [the `gitlab-shell.log` file](../logs.md#gitlab-shelllog).
+and find `404 Key Not Found` errors in [the `gitlab-shell.log` file](../logs/index.md#gitlab-shelllog).
 To rebuild `authorized_keys`, run:
 
 **Omnibus Installation**
diff --git a/doc/administration/raketasks/project_import_export.md b/doc/administration/raketasks/project_import_export.md
index f623d4e4526..f3a9845d129 100644
--- a/doc/administration/raketasks/project_import_export.md
+++ b/doc/administration/raketasks/project_import_export.md
@@ -17,11 +17,7 @@ GitLab provides Rake tasks relating to project import and export. For more infor
 You can query an import through the [Project import/export API](../../api/project_import_export.md#import-status).
 As described in the API documentation, the query may return an import error or exceptions.
 
-## Import large projects
-
-If you have a larger project, consider using a Rake task, as described in our [developer documentation](../../development/import_project.md#importing-via-a-rake-task).
-
-## Import/export tasks
+## Import/export Rake tasks
 
 The GitLab import/export version can be checked by using the following command:
 
@@ -57,3 +53,38 @@ Note the following:
 
 - The exports are stored in a temporary directory and are deleted every
   24 hours by a specific worker.
+
+### Import large projects using a Rake task
+
+If you have a larger project, consider using a Rake task as described in our [developer documentation](../../development/import_project.md#importing-via-a-rake-task).
+
+### Export using a Rake task
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/25598) in GitLab 12.9.
+
+You can use a Rake task to export large project.
+
+Parameters:
+
+| Attribute | Type | Required | Description |
+| --------- | ---- | -------- | ----------- |
+| `username`      | string | yes | User name |
+| `namespace_path` | string | yes | Namespace path |
+| `project_path` | string | yes | Project name |
+| `archive_path` | string | yes | Path to file to store the export project tarball |
+
+```shell
+gitlab-rake "gitlab:import_export:export[username, namespace_path, project_path, archive_path]"
+```
+
+## Troubleshooting
+
+If you are having trouble with import/export, you can enable debug mode using the same Rake task:
+
+```shell
+# Import
+IMPORT_DEBUG=true gitlab-rake "gitlab:import_export:import[root, group/subgroup, testingprojectimport, /path/to/file_to_import.tar.gz]"
+
+# Export
+EXPORT_DEBUG=true gitlab-rake "gitlab:import_export:export[root, group/subgroup, projectnametoexport, /tmp/export_file.tar.gz]"
+```