diff --git a/doc/raketasks/index.md b/doc/raketasks/index.md
index 5ce89af0c4a715fe7ad9bf8f3d09332a037d111e..72da477698af759b9f824fc2cdf9adab4f513262 100644
--- a/doc/raketasks/index.md
+++ b/doc/raketasks/index.md
@@ -22,33 +22,33 @@ You can perform GitLab Rake tasks by using:
 
 The following Rake tasks are available for use with GitLab:
 
-| Tasks                                                 | Description |
-|:------------------------------------------------------|:------------|
-| [Back up and restore](../administration/backup_restore/index.md)              | Back up, restore, and migrate GitLab instances between servers. |
-| [Clean up](cleanup.md)                                | Clean up unneeded items from GitLab instances. |
-| [Development](../development/rake_tasks.md)           | Tasks for GitLab contributors. |
-| [Elasticsearch](../integration/advanced_search/elasticsearch.md#gitlab-advanced-search-rake-tasks) | Maintain Elasticsearch in a GitLab instance. |
-| [General maintenance](../administration/raketasks/maintenance.md) | General maintenance and self-check tasks. |
-| [Geo maintenance](../administration/raketasks/geo.md) | [Geo](../administration/geo/index.md)-related maintenance. |
-| [GitHub import](../administration/raketasks/github_import.md) | Retrieve and import repositories from GitHub. |
+| Tasks                                                                                                      | Description |
+|:-----------------------------------------------------------------------------------------------------------|:------------|
+| [Back up and restore](../administration/backup_restore/index.md)                                           | Back up, restore, and migrate GitLab instances between servers. |
+| [Clean up](cleanup.md)                                                                                     | Clean up unneeded items from GitLab instances. |
+| [Development](../development/rake_tasks.md)                                                                | Tasks for GitLab contributors. |
+| [Elasticsearch](../integration/advanced_search/elasticsearch.md#gitlab-advanced-search-rake-tasks)         | Maintain Elasticsearch in a GitLab instance. |
+| [General maintenance](../administration/raketasks/maintenance.md)                                          | General maintenance and self-check tasks. |
+| [Geo maintenance](../update/deprecations.md#geo-housekeeping-rake-tasks)                                   | [Geo](../administration/geo/index.md)-related maintenance. |
+| [GitHub import](../administration/raketasks/github_import.md)                                              | Retrieve and import repositories from GitHub. |
 | [Import large project exports](../administration/raketasks/project_import_export.md#import-large-projects) | Import large GitLab [project exports](../user/project/settings/import_export.md). |
-| [Incoming email](../administration/raketasks/incoming_email.md) | Incoming email-related tasks. |
-| [Integrity checks](../administration/raketasks/check.md) | Check the integrity of repositories, files, LDAP, and more. |
-| [LDAP maintenance](../administration/raketasks/ldap.md) | [LDAP](../administration/auth/ldap/index.md)-related tasks. |
-| [List repositories](list_repos.md)                    | List all GitLab-managed Git repositories on disk. |
-| [Praefect Rake tasks](../administration/raketasks/praefect.md) | [Praefect](../administration/gitaly/praefect.md)-related tasks. |
-| [Project import/export](../administration/raketasks/project_import_export.md) | Prepare for [project exports and imports](../user/project/settings/import_export.md). |
-| [Sidekiq job migration](../administration/sidekiq/sidekiq_job_migration.md) | Migrate Sidekiq jobs scheduled for future dates to a new queue. |
-| [Service Desk email](../administration/raketasks/service_desk_email.md) | Service Desk email-related tasks. |
-| [SMTP maintenance](../administration/raketasks/smtp.md) | SMTP-related tasks. |
-| [SPDX license list import](spdx.md)                   | Import a local copy of the [SPDX license list](https://spdx.org/licenses/) for matching [License approval policies](../user/compliance/license_approval_policies.md). |
-| [Reset user passwords](../security/reset_user_password.md#use-a-rake-task) | Reset user passwords using Rake. |
-| [Uploads migrate](../administration/raketasks/uploads/migrate.md) | Migrate uploads between local storage and object storage. |
-| [Uploads sanitize](../administration/raketasks/uploads/sanitize.md) | Remove EXIF data from images uploaded to earlier versions of GitLab. |
-| [Service Data](../development/internal_analytics/service_ping/troubleshooting.md#generate-service-ping) | Generate and troubleshoot [Service Ping](../development/internal_analytics/service_ping/index.md). |
-| [User management](user_management.md)                 | Perform user management tasks. |
-| [Webhook administration](web_hooks.md)               | Maintain project webhooks. |
-| [X.509 signatures](x509_signatures.md)                | Update X.509 commit signatures, which can be useful if the certificate store changed. |
+| [Incoming email](../administration/raketasks/incoming_email.md)                                            | Incoming email-related tasks. |
+| [Integrity checks](../administration/raketasks/check.md)                                                   | Check the integrity of repositories, files, LDAP, and more. |
+| [LDAP maintenance](../administration/raketasks/ldap.md)                                                    | [LDAP](../administration/auth/ldap/index.md)-related tasks. |
+| [List repositories](list_repos.md)                                                                         | List all GitLab-managed Git repositories on disk. |
+| [Praefect Rake tasks](../administration/raketasks/praefect.md)                                             | [Praefect](../administration/gitaly/praefect.md)-related tasks. |
+| [Project import/export](../administration/raketasks/project_import_export.md)                              | Prepare for [project exports and imports](../user/project/settings/import_export.md). |
+| [Sidekiq job migration](../administration/sidekiq/sidekiq_job_migration.md)                                | Migrate Sidekiq jobs scheduled for future dates to a new queue. |
+| [Service Desk email](../administration/raketasks/service_desk_email.md)                                    | Service Desk email-related tasks. |
+| [SMTP maintenance](../administration/raketasks/smtp.md)                                                    | SMTP-related tasks. |
+| [SPDX license list import](spdx.md)                                                                        | Import a local copy of the [SPDX license list](https://spdx.org/licenses/) for matching [License approval policies](../user/compliance/license_approval_policies.md). |
+| [Reset user passwords](../security/reset_user_password.md#use-a-rake-task)                                 | Reset user passwords using Rake. |
+| [Uploads migrate](../administration/raketasks/uploads/migrate.md)                                          | Migrate uploads between local storage and object storage. |
+| [Uploads sanitize](../administration/raketasks/uploads/sanitize.md)                                        | Remove EXIF data from images uploaded to earlier versions of GitLab. |
+| [Service Data](../development/internal_analytics/service_ping/troubleshooting.md#generate-service-ping)    | Generate and troubleshoot [Service Ping](../development/internal_analytics/service_ping/index.md). |
+| [User management](user_management.md)                                                                      | Perform user management tasks. |
+| [Webhook administration](web_hooks.md)                                                                     | Maintain project webhooks. |
+| [X.509 signatures](x509_signatures.md)                                                                     | Update X.509 commit signatures, which can be useful if the certificate store changed. |
 
 To list all available Rake tasks:
 
diff --git a/doc/topics/build_your_application.md b/doc/topics/build_your_application.md
index 3fca88bd865677150000c94e16015d3286e30595..6ad69622555b47d3a725db58a7b9d7813ea55ab0 100644
--- a/doc/topics/build_your_application.md
+++ b/doc/topics/build_your_application.md
@@ -27,4 +27,4 @@ Use CI/CD to generate your application.
 - [ChatOps](../ci/chatops/index.md)
 - [Mobile DevOps](../ci/mobile_devops.md)
 - [External repository integrations](../ci/ci_cd_for_external_repos/index.md)
-- [Troubleshooting](../ci/troubleshooting.md)
+- [Debugging and troubleshooting](../ci/debugging.md)
diff --git a/doc/topics/git/index.md b/doc/topics/git/index.md
index de5447424655e606a0943ab28ca5e3770cca4079..f309c1a30a1639f1e72fbf25d85f3d0a2378db3e 100644
--- a/doc/topics/git/index.md
+++ b/doc/topics/git/index.md
@@ -22,7 +22,7 @@ These resources can help you to get the best from using Git with GitLab.
 New to Git? These resources can help you understand basic Git concepts before
 you dive in:
 
-- [Git concepts](terminology.md)
+- [Git concepts](get_started.md)
 - <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
   Video tutorial: [Git-ing started with Git](https://www.youtube.com/watch?v=Ce5nz5n41z4)
 - PDF download: [GitLab Git Cheat Sheet](https://about.gitlab.com/images/press/git-cheat-sheet.pdf)
@@ -43,7 +43,7 @@ appropriate for when you're ready to start learning Git by doing:
 
 A typical Git user encounters these concepts soon after starting to use Git:
 
-- [`git add`](git_add.md) to start tracking files with Git.
+- [`git add`](../../gitlab-basics/add-file.md) to start tracking files with Git.
 - [Tags](../../user/project/repository/tags/index.md) and
   [branches](../../user/project/repository/branches/index.md).
 - [How to undo mistakes](numerous_undo_possibilities_in_git/index.md),
diff --git a/doc/user/project/repository/index.md b/doc/user/project/repository/index.md
index b8894891a0165b195fadd0524233f43771f07ef8..6bcdb4950ccedb47634ed1c858cb11bbdf1c469e 100644
--- a/doc/user/project/repository/index.md
+++ b/doc/user/project/repository/index.md
@@ -33,7 +33,7 @@ You can add files to a repository:
 - After you create a project, by using:
   - [The web editor](web_editor.md#upload-a-file).
   - [The UI](#add-a-file-from-the-ui).
-  - [The command line](../../../topics/git/git_add.md).
+  - [The command line](../../../gitlab-basics/add-file.md).
 
 ### Add a file from the UI